diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue index e1d748a..f37ac9c 100644 --- a/pages/commissionedSales/delegation_details/index.vue +++ b/pages/commissionedSales/delegation_details/index.vue @@ -110,7 +110,8 @@ - 查看TA提到的宝贝({{objinfo.product_list.length||0}}) + 查看TA提到的宝贝 + ({{objinfo.product_list.length||0}}) diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue index 57c6bdb..e234601 100644 --- a/pages/commissionedSales/receivedCommission/index.vue +++ b/pages/commissionedSales/receivedCommission/index.vue @@ -253,6 +253,7 @@ activeItem: "tabOne", tabTitle: "", orderList: [], + type_id: '', where: { page: 1, type: 2, @@ -303,7 +304,8 @@ ] } }, - onLoad() { + onLoad(options) { + this.type_id = options.type_id this.tabTitle = this.tabs[0].name //有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下: console.log(this.tabs[0]) @@ -387,7 +389,7 @@ icon: 'success' }) uni.navigateTo({ - url: '/pages/users/order_confirm/index?cartId=' + res.data.cart_id.toString() + url: `/pages/users/order_confirm/index?cartId=${res.data.cart_id.toString()}&type_id=${this.type_id}` }) } diff --git a/pages/index/index.vue b/pages/index/index.vue index 157069d..829b909 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1065,7 +1065,7 @@ break; case 9: uni.navigateTo({ - url: `/pages/commissionedSales/receivedCommission/index` + url: `/pages/commissionedSales/receivedCommission/index?type_id=${this.userInfoData.mer_info.type_id}` }) break; case 10: diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue index 47c8ce0..f9f5819 100644 --- a/pages/moreProject/moreProject.vue +++ b/pages/moreProject/moreProject.vue @@ -86,7 +86,7 @@ 委托销售 --> - + 委托销售 diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue index 2e7bb70..33c579d 100644 --- a/pages/order_details/stay.vue +++ b/pages/order_details/stay.vue @@ -157,7 +157,7 @@ 商品总额: ¥{{orderInfo.total_price}} - + 支付方式: 余额支付 支付宝支付 diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index fae8f15..56d561b 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -389,8 +389,8 @@ ¥0.00 ¥{{totalPrice }} - - 可结算周期到期后再付款¥{{totalPrice}} + + 可结算周期到期后再付款¥{{totalPrice}} 优惠:¥ {{couponData.total_coupon}} @@ -1084,7 +1084,7 @@ that.cartArr[4].title = `结算周期:${res.data.order[0].settle_cycle}天 日利率:${res.data.order[0].interest_rate}%` - if (res.data.order[0].credit_buy == 1 && this.type_id == 12) { + if (res.data.order[0].credit_buy == 1 && (this.type_id == 12||this.type_id == 10||this.type_id == 17) && (res.data.order_type==99||res.data.order_type==98)) { this.cartArr[4].payStatus = 1 } else { this.cartArr[4].payStatus = 0 @@ -2117,6 +2117,7 @@ bottom: 0; left: 0; z-index: 30; + .footer_count { font-size: 28rpx; @@ -2153,6 +2154,7 @@ border-radius: 50rpx; text-align: center; line-height: 70rpx; + flex-shrink: 0; &.disabled { background-color: #cccccc; diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue index c395e4d..060f29f 100644 --- a/pages/users/payment/payment.vue +++ b/pages/users/payment/payment.vue @@ -172,7 +172,6 @@ }, getOrderInfo() { groupOrderDetail(this.order_id, this.product_type).then(res => { - console.log(res) this.couponData = res.data this.$nextTick(() => { if (this.couponData.interest !== null) { @@ -202,11 +201,16 @@ delta: 1 }) }, 1000) - } + }else { + uni.showToast({ + icon: 'none', + title: res.message + }) + } }).catch(err => { - uni.showToast({ - title: err.message + icon: 'error', + title: err.message || err }) }) } else {