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

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

@@ -199,12 +199,12 @@
 
         <block a:elif="{{ item.key === 'date' }}">
           <view class="result-card-label">{{ item.label }}</view>
-          <view class="result-card-val">{{ result.date }}（{{ result.day }}）{{ result.am }}</view>
+          <view class="result-card-val">{{ result.registeredDate }}</view>
         </block>
 
         <block a:elif="{{ item.key === 'time' }}">
           <view class="result-card-label">{{ item.label }}</view>
-          <view class="result-card-val">{{ result.time }} {{ result.queueNum }}号</view>
+          <view class="result-card-val">{{ result.timeRange }}</view>
         </block>
 
         <block a:elif="{{ item.key === 'name' }}">

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

@@ -216,6 +216,7 @@ Component({
 					idNum: query.orderId,
 					depName: this.data.result.depName,
 					amount: result.amount,
+					orderId: query.orderId,
 				},
 				{
 					tradeType: "Appointment",