fix: 增加个账切换

antbuilder/core/utils/ywtService.js

@@ -4,157 +4,154 @@ import { terminal } from "./constants";
 
 // 进行授权
 export async function ywtAuth(data) {
-  const [err, res] = await ywtRequest({
-    url: "/auth/bind",
-    method: "post",
-    data,
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
+	const [err, res] = await ywtRequest({
+		url: "/auth/bind",
+		method: "post",
+		data,
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
 }
 
 // 获取挂号时段
 export async function doctorSchedule(data) {
-  const [err, res] = await ywtRequest({
-    url: "/register/doctorSchedule",
-    method: "post",
-    data,
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
+	const [err, res] = await ywtRequest({
+		url: "/register/doctorSchedule",
+		method: "post",
+		data,
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
 }
 
 // 获取就医须知
 export async function getRegisteredAnnouncement(data) {
-  const [err, res] = await ywtRequest({
-    url: "/register/getRegisteredAnnouncement",
-    method: "post",
-    data,
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
+	const [err, res] = await ywtRequest({
+		url: "/register/getRegisteredAnnouncement",
+		method: "post",
+		data,
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
 }
 
 // 获取就诊指南
 export async function getGuideList(data) {
-  const [err, res] = await ywtRequest({
-    url: "/commonAnnouncement/getGuideList",
-    method: "post",
-    data,
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
+	const [err, res] = await ywtRequest({
+		url: "/commonAnnouncement/getGuideList",
+		method: "post",
+		data,
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
 }
 
 // 获取医院介绍
 export async function getIntroduce(data) {
-  const [err, res] = await ywtRequest({
-    url: "/introduce/getIntroduce",
-    method: "post",
-    data,
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
+	const [err, res] = await ywtRequest({
+		url: "/introduce/getIntroduce",
+		method: "post",
+		data,
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
 }
 
 // 支付完成后提交 authCode
 export async function submitAuthCode(data) {
-  const [err, res] = await ywtRequest({
-    url: "/auth/submitAuthCode",
-    method: "post",
-    data,
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
+	const [err, res] = await ywtRequest({
+		url: "/auth/submitAuthCode",
+		method: "post",
+		data,
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
 }
 
 // 消息推送授权
 export async function getSubscribeAuth() {
-  const [err, authResult] = await getAuthUser(["hospital_order"]);
-  if (err) {
-    my.showToast({
-      type: "fail",
-      content: "智能消息推送授权失败",
-    });
-    return [err, null];
-  } else {
-    const [error, result] = await submitAuthCode({
-      authCode: authResult.authCode,
-    });
-    if (error) {
-      my.showToast({
-        type: "fail",
-        content: "消息订阅失败",
-      });
-    }
-    return [error, result];
-  }
+	const [err, authResult] = await getAuthUser(["hospital_order"]);
+	if (err) {
+		my.showToast({
+			type: "fail",
+			content: "智能消息推送授权失败",
+		});
+		return [err, null];
+	} else {
+		const [error, result] = await submitAuthCode({
+			authCode: authResult.authCode,
+		});
+		if (error) {
+			my.showToast({
+				type: "fail",
+				content: "消息订阅失败",
+			});
+		}
+		return [error, result];
+	}
 }
 
 // 数据埋点记录
 export async function recordOpLog({ type }) {
-  const [err, res] = await ywtRequest({
-    url: "/dev/opLog",
-    method: "post",
-    data: {
-      type,
-      terminal: terminal,
-      userType: 1,
-    },
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
+	const [err, res] = await ywtRequest({
+		url: "/dev/opLog",
+		method: "post",
+		data: {
+			type,
+			terminal: terminal,
+			userType: 1,
+		},
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
 }
 
 // 医保2.0预结算
 export async function prePayConfirm({
-  patientId,
-  clinicCode,
-  hisOrdNum,
-  orderSum,
-  payInsType,
-  orderInsType,
-  payAuthNo,
-  authNo,
-  medicalCardInstId,
-  medicalCardId
+	patientId,
+	clinicCode,
+	hisOrdNum,
+	orderSum,
+	payInsType,
+	orderInsType,
+	payAuthNo,
+	authNo,
+	medicalCardInstId,
+	medicalCardId,
+	consumeType,
 }) {
-  const [err, res] = await ywtRequest({
-    url: "/outpatient/prePayConfirm",
-    method: "post",
-    data: {
-      patientId,
-      clinicCode,
-      hisOrdNum,
-      orderSum,
-      payInsType,
-      orderInsType,
-      payAuthNo,
-      authNo,
-      medicalCardInstId,
-      medicalCardId
-    },
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
+	const [err, res] = await ywtRequest({
+		url: "/outpatient/prePayConfirm",
+		method: "post",
+		data: {
+			patientId,
+			clinicCode,
+			hisOrdNum,
+			orderSum,
+			payInsType,
+			orderInsType,
+			payAuthNo,
+			authNo,
+			medicalCardInstId,
+			medicalCardId,
+			consumeType,
+		},
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
 }
 
-
 // 支付宝获取业务授权
-export async function getPayAuthInfo({
-  authCode,
-  callUrl,
-  reqBizNo
-}) {
-  const [err, res] = await ywtRequest({
-    url: "/outpatient/getPayAuthInfo",
-    method: "post",
-    data: {
-      authCode,
-      callUrl,
-      reqBizNo
-    },
-  });
-  if (err || !res) return [err, null];
-  return [null, res];
-}
+export async function getPayAuthInfo({ authCode, callUrl, reqBizNo }) {
+	const [err, res] = await ywtRequest({
+		url: "/outpatient/getPayAuthInfo",
+		method: "post",
+		data: {
+			authCode,
+			callUrl,
+			reqBizNo,
+		},
+	});
+	if (err || !res) return [err, null];
+	return [null, res];
+}

antbuilder/industry/hospitalV2/components/hospital-payment-detail-yibao/index.axml

@@ -45,13 +45,13 @@
         </view>
 
         <!-- 个帐支付 -->
-        <!-- <view className="personal-pay">
+        <view className="personal-pay">
           <view className="title">个人账户支付</view>
           <view className="btns">
             <button  data-valuex="{{ true }}" onTap="handleIsUserPersonalAccount" className="{{isUserPersonalAccount ? 'y' : 'n'}}">使用</button>
             <button  data-valuex="{{ false }}" onTap="handleIsUserPersonalAccount" className="{{!isUserPersonalAccount ? 'y' : 'n'}}">不使用</button>
           </view>
-        </view> -->
+        </view>
         
         <view class="bd-append">
           <view class="bd-append-icon"></view>

antbuilder/industry/hospitalV2/components/hospital-payment-detail-yibao/index.js

@@ -127,8 +127,13 @@ Component(
 						total: orderSum,
 						orderInsType,
 					} = this.$page.data.query;
-					const { payAuthNo, authNo, medicalCardInstId, medicalCardId } =
-						this.data;
+					const {
+						payAuthNo,
+						authNo,
+						medicalCardInstId,
+						medicalCardId,
+						isUserPersonalAccount,
+					} = this.data;
 
 					const [err, result] = await prePayConfirm({
 						patientId,
@@ -141,6 +146,7 @@ Component(
 						authNo,
 						medicalCardInstId,
 						medicalCardId,
+						consumeType: isUserPersonalAccount ? 0 : 2,
 					});
 					if (!err) {
 						// 预结算成功
@@ -151,11 +157,9 @@ Component(
 							canPay: true,
 						});
 					} else {
+						console.log("err ==>", err, typeof err, JSON.stringify(err));
 						my.navigateBack();
-						throw `${err}`;
 					}
-				} catch (error) {
-					console.log("error ===>", error);
 				} finally {
 					my.hideLoading();
 				}
@@ -185,12 +189,8 @@ Component(
 						isCulculate: true,
 					},
 					() => {
-						setTimeout(() => {
-							my.hideLoading();
-							_this.setData({
-								isCulculate: false,
-							});
-						}, 3000);
+						my.hideLoading();
+						_this.handlePrePayConfirm();
 					}
 				);
 			},

antbuilder/industry/hospitalV2/utils/tradePay.js

@@ -91,7 +91,7 @@ function outpatient(params) {
 		insuAdmDr,
 		insUploadFeeResp,
 	}).then((tradeData) => {
-		if (tradeData.tradeNo) {
+		if (tradeData.tradeNo || tradeData.orderStr) {
 			// 发起支付
 			return _tradePay(tradeData);
 		} else {
@@ -128,6 +128,7 @@ function _tradePay(
 		? { orderStr: tradeData.orderStr }
 		: { tradeNO: tradeData.tradeNo };
 	return new Promise((resolve, reject) => {
+		console.log("obj ==>", obj);
 		my.tradePay({
 			// tradeNO: tradeData.tradeNo,
 			...obj,
@@ -149,6 +150,7 @@ function _tradePay(
 					);
 				} else {
 					// 其他情况调用接口确认
+					console.log("triggerPay ==>", tradeData, payRes);
 					triggerPay({
 						tradeNo: tradeData.tradeNo,
 						outTradeNo: tradeData.outTradeNo,