From 46d9fb0069a246651e162f47f5fb686955db9722 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Sun, 29 Jan 2023 15:38:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=95=86=E5=93=81=E4=B8=8A=E6=9E=B6=E9=82=A3?=
 =?UTF-8?q?=E9=87=8C=E7=9A=84=E5=88=86=E9=94=80=E6=89=A3=E7=82=B9=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA/=E6=8F=90=E6=88=90=E9=A2=9D=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BC=A0=E7=BB=99=E5=90=8E=E5=8F=B0=E3=80=822.=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E4=B8=AD=E9=82=A3=E9=87=8C=E7=9A=84=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=EF=BC=8C=E5=80=92=E8=AE=A1=E6=97=B6=E7=BB=93=E6=9D=9F=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=EF=BC=88=E9=93=B6=E8=A1=8C=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=89=E7=9A=84=E6=A0=87=E8=AF=86=E3=80=823.?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=B8=AD=E9=82=A3=E9=87=8C=E7=9A=84=E8=A6=81?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E8=AF=A6=E6=83=85=E7=9A=84=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/modal/confirm-modal.vue  | 15 ++++++++++++---
 pages/my/new-serv.vue               |  4 ++--
 pages/order-manage/order-manage.vue | 16 +++++++++++++++-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/components/modal/confirm-modal.vue b/components/modal/confirm-modal.vue
index 1903867..73a3e15 100644
--- a/components/modal/confirm-modal.vue
+++ b/components/modal/confirm-modal.vue
@@ -5,10 +5,11 @@
 			<view class="cu-dialog">
 				<view class="padding-xl">
 					{{content}}
+					<slot name="contentView"></slot>
 				</view>
 				<view class="cu-bar bg-white">
-					<view class="action margin-0 flex-sub text-black" @tap="hideModal">{{cancelMsg}}</view>
-					<view class="action margin-0 flex-sub text-main-color solid-left" @click="confirmCallback">{{confirmMsg}}</view>
+					<view v-if="showCancel" class="action margin-0 flex-sub text-black" @tap="hideModal">{{cancelMsg}}</view>
+					<view v-if="showConfirm" class="action margin-0 flex-sub text-main-color solid-left" @click="confirmCallback">{{confirmMsg}}</view>
 				</view>
 			</view>
 		</view>
@@ -28,10 +29,18 @@
 				type: String,
 				default: '取消'
 			},
+			showCancel: {
+				type: Boolean,
+				default: true
+			},
 			confirmMsg: {
 				type: String,
 				default: '确定'
-			}
+			},
+			showConfirm: {
+				type: Boolean,
+				default: true
+			},
 		},
 		data() {
 			return {
diff --git a/pages/my/new-serv.vue b/pages/my/new-serv.vue
index 467cf34..83c6578 100644
--- a/pages/my/new-serv.vue
+++ b/pages/my/new-serv.vue
@@ -51,8 +51,8 @@
 									</zb-tooltip>
 								</view>
 								<view class="margin-right-xs" style="flex-basis: 21%;">
-									<input class="radius-input xs" @input="inputSpecs($event, index, 'deduct')"
-										:value="item.deduct" placeholder="追加提成额"></input>
+									<input class="radius-input xs" @input="inputSpecs($event, index, 'extMoney')"
+										:value="item.extMoney" placeholder="追加提成额"></input>
 								</view>
 								<view class="margin-right-xs" style="flex-basis: 14%;">
 									<input class="radius-input xs" @input="inputSpecs($event, index, 'groupPrice')"
diff --git a/pages/order-manage/order-manage.vue b/pages/order-manage/order-manage.vue
index 2ae011d..7f5c42d 100644
--- a/pages/order-manage/order-manage.vue
+++ b/pages/order-manage/order-manage.vue
@@ -174,9 +174,11 @@
 					:second="$dateUtil.countDownDiff($dateUtil.addHours(order.updateTime, 1)).seconds">
 				</uni-countdown>
 			</view>
-			<view class="margin-top-sm text-red" v-if="order.orderDetailId != null && order.ledgerAccountStatus === 1">
+			<!-- v-if="order.orderDetailId != null && order.ledgerAccountStatus === 1" -->
+			<view class="margin-top-sm text-red" @click="normalShowModalByRef('ledgerAccountRemark')">
 				<text class="text-lg margin-right-xs"><text class="cuIcon-notice"></text></text>
 				<text>银行发起（T+1）分账中：{{order.updateTime}}</text>
+				<text class="cuIcon-questionfill"></text>
 			</view>
 			<view class="margin-top-sm text-red" v-if="order.orderDetailId != null && order.ledgerAccountStatus === 2">
 				<text class="text-lg margin-right-xs"><text class="cuIcon-notice"></text></text>
@@ -375,6 +377,15 @@
 		<edit-time-arrange v-if="showEditTimeArrangeModal" :show="showEditTimeArrangeModal" :data="curOrder" :curDate="curDate" @showArrangeFailTime="showArrangeFailTime" @editServTime="editServTime" :ifRollback2WS="true"></edit-time-arrange>
 		<urgent-msg v-if="sendUrgentMsgModal" :show="sendUrgentMsgModal" @hideModal="hideModal"></urgent-msg>
 		<pic-modal ref="showPicModal" :imgList="picModalImgList"></pic-modal>
+		<confirm-modal ref="ledgerAccountRemark" :showCancel="false" :showConfirm="true">
+			<block slot="contentView">
+				<view class="text-left">
+					<view class="text-bold">T+1银联结算动态：</view>
+					<view>订单款项已进入发起银联分帐付款指令中，请确保您的银行帐户已绑定（银联支持任意个人银行帐户绑定结算）。根据支付规则，分帐支付按T+1结算方式（即按发起时间，次日内清算机构【银联】根据清算信息，完成支付到帐，如遇节假日，则节假日后的次日内完成支付到帐）！</view>
+				</view>
+			</block>
+		</confirm-modal>
+		
 		<!-- popup -->
 		<uni-popup ref="dispatchOrderPopup" type="bottom" @change="changePopupState">
 			<view class="text-bold text-gray text-lg text-center left-top-sm-bar" data-popup="dispatchOrderPopup" @click="togglePopup"><text
@@ -870,6 +881,9 @@
 				this.$refs[refName].showModal(curOrder, params);
 				this.curOrder = curOrder;
 			},
+			normalShowModalByRef(refName) {
+				this.$refs[refName].showModal();
+			},
 			hideModal(e) {
 				this.curOrder = null;
 				this[e.currentTarget.dataset.modal] = false;