Browse Source

fix: 优化

carver 2 years ago
parent
commit
904bc9ea2b

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

@@ -29,7 +29,7 @@
               <view class="result-card-label">{{ item.label }}</view>
               <view class="result-card-label">{{ item.label }}</view>
               <view class="result-card-val">
               <view class="result-card-val">
                 <text class="{{ result.payType === '就诊时支付' ? 'light' : '' }}">
                 <text class="{{ result.payType === '就诊时支付' ? 'light' : '' }}">
-                  <text a:if="{{ result.payType === '就诊时支付' }}">(就诊时支付)</text>
+                  <text a:if="{{ result.payType === '就诊时支付' }}"></text>
                   <text a:else>(已支付)</text>
                   <text a:else>(已支付)</text>
                   <text>¥{{ result.amount }}</text>
                   <text>¥{{ result.amount }}</text>
                 </text>
                 </text>

+ 4 - 1
antbuilder/industry/hospitalV2/components/booking-detail/index.axml

@@ -3,11 +3,14 @@
   <view class="booking-detail-content">
   <view class="booking-detail-content">
     <!-- 预约成功 -->
     <!-- 预约成功 -->
     <title-layout>
     <title-layout>
-      <view class="detail-icon" slot="content">
+      <view a:if="{{ result.status == '1'}}" class="detail-icon" slot="content">
         <am-icon type="check_" size="40" color="#22b35e" />
         <am-icon type="check_" size="40" color="#22b35e" />
         <text class="text">预约成功</text>
         <text class="text">预约成功</text>
         <mas-qrcode code="{{result.qrCode}}" className="code" />
         <mas-qrcode code="{{result.qrCode}}" className="code" />
       </view>
       </view>
+      <view a:if="{{ result.status == '2'}}" class="detail-icon" slot="content">
+        <text class="text">待就诊</text>
+      </view>
       <view slot="content" class="detail-list">
       <view slot="content" class="detail-list">
         <view class="item">
         <view class="item">
           <text>就诊人</text>
           <text>就诊人</text>

+ 1 - 1
antbuilder/industry/hospitalV2/components/hospital-num-source/num-item/index.js

@@ -85,6 +85,7 @@ Component(
 			async onItemFollow({ target }) {
 			async onItemFollow({ target }) {
 				const { item } = target.dataset;
 				const { item } = target.dataset;
 				const cost = item.list[0].cost || "0";
 				const cost = item.list[0].cost || "0";
+				console.log("cost ===>", item);
 				const { hospitalId } = this.getQuery();
 				const { hospitalId } = this.getQuery();
 				if (!this.checkRemain(item)) return;
 				if (!this.checkRemain(item)) return;
 				const { rangeItem } = this.data;
 				const { rangeItem } = this.data;
@@ -168,7 +169,6 @@ Component(
 					};
 					};
 				}
 				}
 				item.list = finalList;
 				item.list = finalList;
-				console.log("item list ===>", finalList);
 				this.setData({
 				this.setData({
 					showRange: true,
 					showRange: true,
 					rangeItem: item,
 					rangeItem: item,

+ 2 - 3
antbuilder/industry/hospitalV2/components/order-pay/index.axml

@@ -13,8 +13,7 @@
       <view class="order-block-title">预约信息</view>
       <view class="order-block-title">预约信息</view>
       <view a:for="{{ orderList }}" key="{{ index }}" class="order-form-item">
       <view a:for="{{ orderList }}" key="{{ index }}" class="order-form-item">
         <view class="order-form-label">{{ item.label }}</view>
         <view class="order-form-label">{{ item.label }}</view>
-        <view class="order-form-val" a:if="{{ item.key === 'timeRange' }}">{{ order.date }}({{ order.day }}){{ order.am }}</view>
-
+        <view class="order-form-val" a:if="{{ item.key === 'timeRange' }}">{{ order.startTimeNew }}-{{order.endTime}}</view>
         <view class="order-form-val" a:elif="{{ item.key === 'startTime' }}">
         <view class="order-form-val" a:elif="{{ item.key === 'startTime' }}">
           <text a:if="{{ order.time }}">
           <text a:if="{{ order.time }}">
             {{ order.time }}
             {{ order.time }}
@@ -30,7 +29,7 @@
       </view>
       </view>
       <view class="order-form-item sign" a:if="{{ !onlinePay }}">
       <view class="order-form-item sign" a:if="{{ !onlinePay }}">
         <view class="order-form-label">挂号费用</view>
         <view class="order-form-label">挂号费用</view>
-        <view class="order-form-val">({{ order.payType }})¥{{ order.amount }}</view>
+        <view class="order-form-val">¥{{ order.amount }}</view>
       </view>
       </view>
     </view>
     </view>
 
 

+ 1 - 1
antbuilder/industry/hospitalV2/components/order-pay/index.js

@@ -35,7 +35,7 @@ Component(
 				},
 				},
 				{
 				{
 					key: "districtName",
 					key: "districtName",
-					label: "就诊院",
+					label: "就诊院",
 				},
 				},
 			],
 			],
 			checkedPatient: {},
 			checkedPatient: {},

+ 3 - 1
antbuilder/industry/hospitalV2/components/select-hospital-area/index.js

@@ -34,7 +34,7 @@ Component({
 		},
 		},
 
 
 		async toNextPage(item, replace) {
 		async toNextPage(item, replace) {
-			const { name, hospitalDistrictId } = item;
+			const { name, hospitalDistrictId, extInfo } = item;
 			const { isNotice = "Y" } = this.getExtInfo();
 			const { isNotice = "Y" } = this.getExtInfo();
 			/* 如果没有就诊须知跳转选择科室页面 */
 			/* 如果没有就诊须知跳转选择科室页面 */
 
 
@@ -55,6 +55,7 @@ Component({
 					query: {
 					query: {
 						name,
 						name,
 						hospitalDistrictId,
 						hospitalDistrictId,
+						hospitalId: extInfo.hospitalId || "",
 					},
 					},
 				});
 				});
 			} else {
 			} else {
@@ -65,6 +66,7 @@ Component({
 						...query,
 						...query,
 						name,
 						name,
 						hospitalDistrictId,
 						hospitalDistrictId,
+						hospitalId: extInfo.hospitalId || "",
 					},
 					},
 					componentData,
 					componentData,
 					title: "选择科室",
 					title: "选择科室",

+ 1 - 1
antbuilder/industry/hospitalV2/components/subscribe-record/record-item/index.axml

@@ -37,7 +37,7 @@
       </view>
       </view>
     </view>
     </view>
     <view class="item-box">
     <view class="item-box">
-      <view class="item-label">就诊院</view>
+      <view class="item-label">就诊院</view>
       <view class="item-value">{{ item.districtName || '--' }}</view>
       <view class="item-value">{{ item.districtName || '--' }}</view>
     </view>
     </view>
     <view class="item-box">
     <view class="item-box">