1.商品上架那里的分销扣点展示/提成额字段传给后台。2.确认中那里的订单,倒计时结束加一个(银行结算中)的标识。3.确认中那里的要加一个详情的提示

This commit is contained in:
donqi 2023-01-29 15:38:37 +08:00
parent c92a2d1557
commit 46d9fb0069
3 changed files with 29 additions and 6 deletions

View File

@ -5,10 +5,11 @@
<view class="cu-dialog"> <view class="cu-dialog">
<view class="padding-xl"> <view class="padding-xl">
{{content}} {{content}}
<slot name="contentView"></slot>
</view> </view>
<view class="cu-bar bg-white"> <view class="cu-bar bg-white">
<view class="action margin-0 flex-sub text-black" @tap="hideModal">{{cancelMsg}}</view> <view v-if="showCancel" 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="showConfirm" class="action margin-0 flex-sub text-main-color solid-left" @click="confirmCallback">{{confirmMsg}}</view>
</view> </view>
</view> </view>
</view> </view>
@ -28,10 +29,18 @@
type: String, type: String,
default: '取消' default: '取消'
}, },
showCancel: {
type: Boolean,
default: true
},
confirmMsg: { confirmMsg: {
type: String, type: String,
default: '确定' default: '确定'
} },
showConfirm: {
type: Boolean,
default: true
},
}, },
data() { data() {
return { return {

View File

@ -51,8 +51,8 @@
</zb-tooltip> </zb-tooltip>
</view> </view>
<view class="margin-right-xs" style="flex-basis: 21%;"> <view class="margin-right-xs" style="flex-basis: 21%;">
<input class="radius-input xs" @input="inputSpecs($event, index, 'deduct')" <input class="radius-input xs" @input="inputSpecs($event, index, 'extMoney')"
:value="item.deduct" placeholder="追加提成额"></input> :value="item.extMoney" placeholder="追加提成额"></input>
</view> </view>
<view class="margin-right-xs" style="flex-basis: 14%;"> <view class="margin-right-xs" style="flex-basis: 14%;">
<input class="radius-input xs" @input="inputSpecs($event, index, 'groupPrice')" <input class="radius-input xs" @input="inputSpecs($event, index, 'groupPrice')"

View File

@ -174,9 +174,11 @@
:second="$dateUtil.countDownDiff($dateUtil.addHours(order.updateTime, 1)).seconds"> :second="$dateUtil.countDownDiff($dateUtil.addHours(order.updateTime, 1)).seconds">
</uni-countdown> </uni-countdown>
</view> </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 class="text-lg margin-right-xs"><text class="cuIcon-notice"></text></text>
<text>银行发起T+1分账中{{order.updateTime}}</text> <text>银行发起T+1分账中{{order.updateTime}}</text>
<text class="cuIcon-questionfill"></text>
</view> </view>
<view class="margin-top-sm text-red" v-if="order.orderDetailId != null && order.ledgerAccountStatus === 2"> <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> <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> <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> <urgent-msg v-if="sendUrgentMsgModal" :show="sendUrgentMsgModal" @hideModal="hideModal"></urgent-msg>
<pic-modal ref="showPicModal" :imgList="picModalImgList"></pic-modal> <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 --> <!-- popup -->
<uni-popup ref="dispatchOrderPopup" type="bottom" @change="changePopupState"> <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 <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.$refs[refName].showModal(curOrder, params);
this.curOrder = curOrder; this.curOrder = curOrder;
}, },
normalShowModalByRef(refName) {
this.$refs[refName].showModal();
},
hideModal(e) { hideModal(e) {
this.curOrder = null; this.curOrder = null;
this[e.currentTarget.dataset.modal] = false; this[e.currentTarget.dataset.modal] = false;