字段更改

miniprogram/component/protocolConfirmationView/protocolConfirmationView.ts

@@ -45,6 +45,13 @@ Component({
 					show: false
 				})
 			}
+		},
+		close() {
+			this.setData({
+				show: false,
+				func: () => { },
+				content: ''
+			})
 		}
 	}
 })

miniprogram/component/protocolConfirmationView/protocolConfirmationView.wxml

@@ -1,12 +1,12 @@
 <!--component/protocolConfirmationView.wxml-->
-<view wx:if="{{show}}" class="protocol-confirmation-container">
-    <view class="protocol-confirmation-content">
+<view wx:if="{{show}}" class="protocol-confirmation-container" bind:tap="close">
+    <view class="protocol-confirmation-content" capture-bind:tap="">
       <scroll-view scroll-y class="content" bindscrolltolower="onScrollToLower">
         <view class="text-content">
           <richTextView text="{{content}}" />
         </view>
       </scroll-view>
-      <view class="btn {{canSubmit?'btn-active':''}}" bind:tap="confirm">
+      <view class="btn {{canSubmit?'btn-active':''}}" capture-bind:tap="confirm">
         同意并确认报名
       </view>
     </view>

miniprogram/pages/my-order/my-order.ts

@@ -69,6 +69,8 @@ Page({
 		// const index = e.currentTarget.dataset.index;
 		const workContractType = e.currentTarget.dataset.workcontracttype;
 		const otheragreement = e.currentTarget.dataset.otheragreement;
+		console.log('otheragreement',otheragreement);
+		
 		// const parentindex = e.currentTarget.dataset.parentindex;
 		if (this.data.userInfo.authenticationStatus === 1) {
 			this.selectComponent('.protocolConfirmationView').open({

miniprogram/pages/my-order/my-order.wxml

@@ -39,7 +39,7 @@
           </view>
           <view class="order-info">
             <text>订单号: {{item.orderNumber}}</text>
-            <view class="button-confirm" wx:if="{{status === 0}}" data-id="{{item.id}}" data-otherAgreement="{{item.hwRequirement.otherAgreement}}" data-parentIndex="{{key}}"
+            <view class="button-confirm" wx:if="{{status === 0}}" data-id="{{item.id}}" data-otherAgreement="{{item.otherAgreement}}" data-parentIndex="{{key}}"
               data-index="{{index}}" data-workContractType="{{item.workContractType}}" catchtap="confirm">确认签署</view>
             <text class="doing" wx:if="{{status === 2}}">进行中</text>
             <text class="done" wx:if="{{status === 1}}">已完成</text>