diff --git a/yudao-ui-app/pages/goods_cashier/index.vue b/yudao-ui-app/pages/goods_cashier/index.vue index a07634451..fd0d3fac3 100644 --- a/yudao-ui-app/pages/goods_cashier/index.vue +++ b/yudao-ui-app/pages/goods_cashier/index.vue @@ -60,7 +60,7 @@ import countDown from '@/components/countDown'; import numberScroll from '@/components/numberScroll.vue' import { - getCashierOrder, + getOrderDetail, orderPay } from '@/api/order.js'; export default { @@ -177,37 +177,16 @@ uni.showLoading({ title: '加载中' }); - getCashierOrder(this.orderId, this.fromType).then(res => { - console.log(res) - this.payPrice = this.payPriceShow = res.data.pay_price - this.payPostage = res.data.pay_postage - this.offlinePostage = res.data.offline_postage - this.invalidTime = res.data.invalid_time - //微信支付是否开启 - this.cartArr[0].payStatus = res.data.wechat_pay_status || 0 - //支付宝是否开启 - this.cartArr[1].payStatus = res.data.ali_pay_status || 0; - //#ifdef MP - this.cartArr[1].payStatus = false; - //#endif - //余额支付是否开启 - // that.cartArr[2].title = '可用余额:' + res.data.userInfo.now_money; - this.cartArr[2].number = res.data.now_money; - this.cartArr[2].payStatus = res.data.yue_pay_status - if (res.data.offline_pay_status) { - this.cartArr[3].payStatus = 1 - } else { - this.cartArr[3].payStatus = 0 - } - //好友代付是否开启 - this.cartArr[4].payStatus = res.data.friend_pay_status || 0; - uni.hideLoading(); + getOrderDetail(this.orderId).then(res => { + console.log('res', res) + const orderInfo = res.data + this.payPrice = parseFloat(orderInfo.proTotalPrice).toFixed(2) + this.payPriceShow = parseFloat(orderInfo.proTotalPrice).toFixed(2) }).catch(err => { - uni.hideLoading(); return this.$util.Tips({ title: err }) - }) + }).finally(uni.hideLoading) }, payType(number, paytype, index) { this.active = index; diff --git a/yudao-ui-app/pages/user/index.vue b/yudao-ui-app/pages/user/index.vue index 3ef682395..1d28d940a 100644 --- a/yudao-ui-app/pages/user/index.vue +++ b/yudao-ui-app/pages/user/index.vue @@ -171,13 +171,13 @@ { img: '/static/images/order_icon4.png', title: '已完成', - url: '/pages/users/order_list/index?status=3', + url: '/pages/users/order_list/index?status=4', num: 0 }, { img: '/static/images/order_icon5.png', title: '售后/退款', - url: '/pages/users/user_return_list/index', + url: '/pages/users/user_return_list/index?status=-3', num: 0 }, ],