mkm
/
shop-applet
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug

This commit is contained in:
weipengfei 2023-10-28 11:17:38 +08:00
parent 94094ad137
commit 666ec55e9a
7 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pages/commissionedSales/delegation_details/index.vue
View File

@ -110,7 +110,8 @@
</view> </view>
<view class="content_bootm"> <view class="content_bootm">
<view class="content_bootm_txt"> <view class="content_bootm_txt">
查看TA提到的宝贝({{objinfo.product_list.length||0}}) 查看TA提到的宝贝
<text v-if="objinfo.product_list">({{objinfo.product_list.length||0}})</text>
</view> </view>

6
pages/commissionedSales/receivedCommission/index.vue
View File

@ -253,6 +253,7 @@
activeItem: "tabOne", activeItem: "tabOne",
tabTitle: "", tabTitle: "",
orderList: [], orderList: [],
type_id: '',
where: { where: {
page: 1, page: 1,
type: 2, type: 2,
@ -303,7 +304,8 @@
] ]
} }
}, },
onLoad() { onLoad(options) {
this.type_id = options.type_id
this.tabTitle = this.tabs[0].name this.tabTitle = this.tabs[0].name
//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下: //有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
console.log(this.tabs[0]) console.log(this.tabs[0])
@ -387,7 +389,7 @@
icon: 'success' icon: 'success'
}) })
uni.navigateTo({ 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}`
}) })
} }

2
pages/index/index.vue
View File

@ -1065,7 +1065,7 @@
break; break;
case 9: case 9:
uni.navigateTo({ uni.navigateTo({
url: `/pages/commissionedSales/receivedCommission/index` url: `/pages/commissionedSales/receivedCommission/index?type_id=${this.userInfoData.mer_info.type_id}`
}) })
break; break;
case 10: case 10:

2
pages/moreProject/moreProject.vue
View File

@ -86,7 +86,7 @@
</image> </image>
<text class="text">委托销售</text> <text class="text">委托销售</text>
</view> --> </view> -->
<view class="examine" @click="navigator(`/pages/commissionedSales/receivedCommission/index`)"> <view class="examine" @click="navigator(`/pages/commissionedSales/receivedCommission/index?type_id=${userInfoData.mer_info.type_id}`)">
<image class="icon_img" src="@/static/images/index13.png" mode="aspectFit"> <image class="icon_img" src="@/static/images/index13.png" mode="aspectFit">
</image> </image>
<text class="text">委托销售</text> <text class="text">委托销售</text>

2
pages/order_details/stay.vue
View File

@ -157,7 +157,7 @@
<view>商品总额：</view> <view>商品总额：</view>
<view class='conter'>￥{{orderInfo.total_price}}</view> <view class='conter'>￥{{orderInfo.total_price}}</view>
</view> </view>
<view class='item acea-row row-between' v-if="orderInfo.orderList[0].merchant.settle_cycle"> <view class='item acea-row row-between' v-if="orderInfo.orderList&&orderInfo.orderList[0]&&orderInfo.orderList[0].merchant.settle_cycle">
<view>支付方式：</view> <view>支付方式：</view>
<view class='conter' v-if="orderInfo.pay_type==0">余额支付</view> <view class='conter' v-if="orderInfo.pay_type==0">余额支付</view>
<view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view> <view class='conter' v-if="orderInfo.pay_type==4 || orderInfo.pay_type==5">支付宝支付</view>

8
pages/users/order_confirm/index.vue
View File

@ -389,8 +389,8 @@
<text class='pColor' v-if="cartArr[4].payStatus == 1 && active == 4">￥0.00</text> <text class='pColor' v-if="cartArr[4].payStatus == 1 && active == 4">￥0.00</text>
<text class='pColor' v-else>￥{{totalPrice }}</text> <text class='pColor' v-else>￥{{totalPrice }}</text>
</view> </view>
<view style="font-size: 14px;color: #F84221;" v-if="cartArr[4].payStatus == 1 && active == 4"> <view style="font-size: 12px;color: #F84221;" v-if="cartArr[4].payStatus == 1 && active == 4">
可结算周期到期后再付款￥{{totalPrice}} 可结算周期到期后再付款<text style="font-size: 14px;">￥{{totalPrice}}</text>
</view> </view>
<view class="coupon_price" v-if="couponData.total_coupon > 0"> <view class="coupon_price" v-if="couponData.total_coupon > 0">
优惠:¥ {{couponData.total_coupon}} 优惠:¥ {{couponData.total_coupon}}
@ -1084,7 +1084,7 @@
that.cartArr[4].title = that.cartArr[4].title =
`结算周期：${res.data.order[0].settle_cycle}天 日利率：${res.data.order[0].interest_rate}%` `结算周期：${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 this.cartArr[4].payStatus = 1
} else { } else {
this.cartArr[4].payStatus = 0 this.cartArr[4].payStatus = 0
@ -2118,6 +2118,7 @@
left: 0; left: 0;
z-index: 30; z-index: 30;
.footer_count { .footer_count {
font-size: 28rpx; font-size: 28rpx;
} }
@ -2153,6 +2154,7 @@
border-radius: 50rpx; border-radius: 50rpx;
text-align: center; text-align: center;
line-height: 70rpx; line-height: 70rpx;
flex-shrink: 0;
&.disabled { &.disabled {
background-color: #cccccc; background-color: #cccccc;

12
pages/users/payment/payment.vue
View File

@ -172,7 +172,6 @@
}, },
getOrderInfo() { getOrderInfo() {
groupOrderDetail(this.order_id, this.product_type).then(res => { groupOrderDetail(this.order_id, this.product_type).then(res => {
console.log(res)
this.couponData = res.data this.couponData = res.data
this.$nextTick(() => { this.$nextTick(() => {
if (this.couponData.interest !== null) { if (this.couponData.interest !== null) {
@ -202,11 +201,16 @@
delta: 1 delta: 1
}) })
}, 1000) }, 1000)
} }else {
uni.showToast({
icon: 'none',
title: res.message
})
}
}).catch(err => { }).catch(err => {
uni.showToast({ uni.showToast({
title: err.message icon: 'error',
title: err.message || err
}) })
}) })
} else { } else {