Merge branch 'dev' of http://gogs.ywtinfo.com/chenjunkun/th_net_hospital_ali_mp into dev

antbuilder/industry/hospitalV2/components/appointment-result/index.axml

@@ -145,6 +145,10 @@
         <icon type="cancel" size="32" color="#999"></icon>
         <view>已取消</view>
       </view>
+      <view class="result-block result-block-cansel cansel" a:elif="{{ result.status === 11 }}">
+        <icon type="cancel" size="32" color="#999"></icon>
+        <view>已退款</view>
+      </view>
 
       <template is="from" data="{{ viewItem, result }}" />
 

antbuilder/industry/hospitalV2/components/appointment-result/index.js

@@ -31,6 +31,7 @@ Component({
 				extClass: "buttonBold",
 			},
 		],
+
 		viewItem: [
 			{
 				label: "就诊日期",

antbuilder/industry/hospitalV2/components/hospital-project/index.js

@@ -275,6 +275,7 @@ Component(
 						deptName,
 						doctorName,
 						doctorCode,
+						fee,
 					} = projectItem;
 					const res = await nucleicOrderConfirm({
 						cardNum: bindCardNum,
@@ -290,6 +291,7 @@ Component(
 						deptName,
 						doctorName,
 						doctorCode,
+						fee,
 					}); // 区分支持线上支付 和 不支持线上支付
 
 					if (res.amount && onlinePay) {

antbuilder/industry/hospitalV2/components/subscribe-record/record-item/index.sjs

@@ -1,44 +1,47 @@
 const statusMap = {
-  status_0: {
-    name: '待支付',
-    activeClass: 'warm',
-  },
-  status_1: {
-    name: '预约成功',
-    activeClass: 'success',
-  },
-  status_7: {
-    name: '已就诊',
-    activeClass: 'cancel',
-  },
-  status_8: {
-    name: '过期未就诊',
-    activeClass: 'cancel',
-  },
-  status_9: {
-    name: '已取消',
-    activeClass: 'cancel',
-  },
-  status_2: {
-    name: '待就诊',
-    activeClass: 'cancel',
-  },
+	status_0: {
+		name: "待支付",
+		activeClass: "warm",
+	},
+	status_1: {
+		name: "预约成功",
+		activeClass: "success",
+	},
+	status_7: {
+		name: "已就诊",
+		activeClass: "cancel",
+	},
+	status_8: {
+		name: "过期未就诊",
+		activeClass: "cancel",
+	},
+	status_9: {
+		name: "已取消",
+		activeClass: "cancel",
+	},
+	status_2: {
+		name: "待就诊",
+		activeClass: "cancel",
+	},
+	status_11: {
+		name: "已退款",
+		activeClass: "cancel",
+	},
 };
 
 /* 获取状态名称 */
 const statusName = (status) => {
-  const { name } = statusMap[`status_${status}`] || {};
-  return name;
+	const { name } = statusMap[`status_${status}`] || {};
+	return name;
 };
 
 /* 获取状态样式 */
 const statusClass = (status) => {
-  const { activeClass } = statusMap[`status_${status}`] || {};
-  return activeClass;
+	const { activeClass } = statusMap[`status_${status}`] || {};
+	return activeClass;
 };
 
 export default {
-  statusName,
-  statusClass,
+	statusName,
+	statusClass,
 };
-