wangxin 2 éve
szülő
commit
ea193b2bd6

+ 3 - 2
miniprogram/pages/detail/detail.ts

@@ -46,7 +46,8 @@ Page({
 		show: true, // 是否展示
 		name_error: '', // 姓名错误信息
 		id_error: '', //  身份证错误信息
-		id: 0,
+    id: 0,
+    otherAgreement:'', // 协议内容
 		hwOrderAPI: {
 			workContractType: -1,
 			workContract: '',
@@ -253,7 +254,7 @@ Page({
 	 */
 	buttonSubmit() {
 		const workContractType = this.data.hwOrderAPI.workContractType;
-		const otherAgreement = this.data.hwOrderAPI.otherAgreement;
+		const otherAgreement = this.data.otherAgreement;
 		if (this.data.userInfo.authenticationStatus === 1) {
 			this.selectComponent('.protocolConfirmationView').open({
 				content: otherAgreement, callback: () => {

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

@@ -68,11 +68,11 @@ Page({
 		const id = e.currentTarget.dataset.id;
 		// const index = e.currentTarget.dataset.index;
 		const workContractType = e.currentTarget.dataset.workcontracttype;
-		const otherAgreement = e.currentTarget.dataset.otherAgreement;
+		const otheragreement = e.currentTarget.dataset.otheragreement;
 		// const parentindex = e.currentTarget.dataset.parentindex;
 		if (this.data.userInfo.authenticationStatus === 1) {
 			this.selectComponent('.protocolConfirmationView').open({
-				content: otherAgreement, callback: () => {
+				content: otheragreement, callback: () => {
 					// 电子合同确认
 					workContractType === 1 && confirmECOrdersImpl({
 						orderId: id

+ 1 - 1
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.otherAgreement}}" data-parentIndex="{{key}}"
+            <view class="button-confirm" wx:if="{{status === 0}}" data-id="{{item.id}}" data-otherAgreement="{{item.hwRequirement.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>