|
@@ -10,7 +10,9 @@
|
|
<view class="container-details" :style="{ paddingTop: navbarHeight + 'px' }">
|
|
<view class="container-details" :style="{ paddingTop: navbarHeight + 'px' }">
|
|
<view class="status-text">
|
|
<view class="status-text">
|
|
<view class="view-type">{{ information.status | TextFormat }}</view>
|
|
<view class="view-type">{{ information.status | TextFormat }}</view>
|
|
- <view class="status-visible"> {{ information.orderSeen == 2 ? '订单对机构不可见' : '订单对机构可见' }} </view>
|
|
|
|
|
|
+ <view class="status-visible">
|
|
|
|
+ {{ information.orderSeen == 2 ? '订单对机构不可见' : '订单对机构可见' }}
|
|
|
|
+ </view>
|
|
<view class="Rebate " v-if="information.rebateFlag == 1">返佣</view>
|
|
<view class="Rebate " v-if="information.rebateFlag == 1">返佣</view>
|
|
<text class="bage-buss btn" v-if="information.orderSubmitType == 3 || information.orderSubmitType == 4"
|
|
<text class="bage-buss btn" v-if="information.orderSubmitType == 3 || information.orderSubmitType == 4"
|
|
>协销</text
|
|
>协销</text
|
|
@@ -90,10 +92,7 @@
|
|
@paymentConfirm="hanldPaymentConfirm"
|
|
@paymentConfirm="hanldPaymentConfirm"
|
|
/>
|
|
/>
|
|
<!-- 分享弹窗 -->
|
|
<!-- 分享弹窗 -->
|
|
- <share-alert :orderId="orderId"
|
|
|
|
- :shareType="isShareType"
|
|
|
|
- v-if="isShareModal"
|
|
|
|
- @shareConfirm="onShareAppMessage">
|
|
|
|
|
|
+ <share-alert :orderId="orderId" :shareType="isShareType" v-if="isShareModal" @shareConfirm="onShareAppMessage">
|
|
</share-alert>
|
|
</share-alert>
|
|
<!-- 促销活动弹窗 -->
|
|
<!-- 促销活动弹窗 -->
|
|
<activi-popup :Promotion="handlerPros" :popupShow="popupShow"></activi-popup>
|
|
<activi-popup :Promotion="handlerPros" :popupShow="popupShow"></activi-popup>
|
|
@@ -163,7 +162,7 @@ export default {
|
|
isRequest: false, //是否加载完成渲染子组件
|
|
isRequest: false, //是否加载完成渲染子组件
|
|
isOrderShare: false,
|
|
isOrderShare: false,
|
|
isShareModal: false,
|
|
isShareModal: false,
|
|
- isShareType:2,
|
|
|
|
|
|
+ isShareType: 2,
|
|
isPayModel: false,
|
|
isPayModel: false,
|
|
modelType: 0,
|
|
modelType: 0,
|
|
ableUserMoney: '', //机构余额
|
|
ableUserMoney: '', //机构余额
|
|
@@ -386,15 +385,16 @@ export default {
|
|
//监听根据付款状态做操作
|
|
//监听根据付款状态做操作
|
|
this.OrderService.OrderPaymentValidation({ orderId: data.orderId })
|
|
this.OrderService.OrderPaymentValidation({ orderId: data.orderId })
|
|
.then(response => {
|
|
.then(response => {
|
|
- let data = this.payModelData = response.data
|
|
|
|
- if(data.balanceFlag == 0){// 0可以走余额抵扣,1不能走余额抵扣
|
|
|
|
|
|
+ let data = (this.payModelData = response.data)
|
|
|
|
+ if (data.balanceFlag == 0) {
|
|
|
|
+ // 0可以走余额抵扣,1不能走余额抵扣
|
|
if (data.code == -1) {
|
|
if (data.code == -1) {
|
|
this.$util.modal('', '订单已申请全部退款,无需再付款!', '确定', '', false, () => {})
|
|
this.$util.modal('', '订单已申请全部退款,无需再付款!', '确定', '', false, () => {})
|
|
} else {
|
|
} else {
|
|
this.isPayModel = true
|
|
this.isPayModel = true
|
|
this.modelType = 3
|
|
this.modelType = 3
|
|
}
|
|
}
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
this.$util.modal('', '该订单已走线上支付流程,不能进行余额抵扣。', '确定', '', false, () => {})
|
|
this.$util.modal('', '该订单已走线上支付流程,不能进行余额抵扣。', '确定', '', false, () => {})
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -599,7 +599,7 @@ page {
|
|
float: left;
|
|
float: left;
|
|
color: #ff2a2a;
|
|
color: #ff2a2a;
|
|
}
|
|
}
|
|
- .status-visible{
|
|
|
|
|
|
+ .status-visible {
|
|
float: left;
|
|
float: left;
|
|
color: #999999;
|
|
color: #999999;
|
|
margin-left: 20rpx;
|
|
margin-left: 20rpx;
|
|
@@ -628,7 +628,7 @@ page {
|
|
float: right;
|
|
float: right;
|
|
font-size: $font-size-24;
|
|
font-size: $font-size-24;
|
|
}
|
|
}
|
|
- .bage-name{
|
|
|
|
|
|
+ .bage-name {
|
|
line-height: 32rpx;
|
|
line-height: 32rpx;
|
|
display: inline-block;
|
|
display: inline-block;
|
|
color: #999999;
|
|
color: #999999;
|