From c4fc7ec96e2e2def3b474277a68c5ac2aebb06ea Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Fri, 26 May 2023 15:21:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/package.json | 2 +- yudao-ui-app/pages/goods_cashier/index.vue | 4 ++-- .../pages/users/order_confirm/index.vue | 19 ++++++++++--------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/yudao-ui-app/package.json b/yudao-ui-app/package.json index 40092a0fc..a991192ef 100644 --- a/yudao-ui-app/package.json +++ b/yudao-ui-app/package.json @@ -21,7 +21,7 @@ "env": { "UNI_PLATFORM": "h5", "isVConsole": true, - "APP_BASE_URL": "http://192.168.1.147:48080" + "APP_BASE_URL": "http://192.168.1.188:48080" } }, "prod": { diff --git a/yudao-ui-app/pages/goods_cashier/index.vue b/yudao-ui-app/pages/goods_cashier/index.vue index 0af7ecaff..a07634451 100644 --- a/yudao-ui-app/pages/goods_cashier/index.vue +++ b/yudao-ui-app/pages/goods_cashier/index.vue @@ -125,7 +125,7 @@ onLoad(options) { if (options.order_id) this.orderId = options.order_id if (options.from_type) this.fromType = options.from_type - // this.getCashierOrder() + this.getCashierOrder() }, onShow() { let options = wx.getEnterOptionsSync(); @@ -175,7 +175,7 @@ }, getCashierOrder() { uni.showLoading({ - title: '创建订单中' + title: '加载中' }); getCashierOrder(this.orderId, this.fromType).then(res => { console.log(res) diff --git a/yudao-ui-app/pages/users/order_confirm/index.vue b/yudao-ui-app/pages/users/order_confirm/index.vue index 9fc1eaa07..2a6448db6 100644 --- a/yudao-ui-app/pages/users/order_confirm/index.vue +++ b/yudao-ui-app/pages/users/order_confirm/index.vue @@ -16,7 +16,7 @@ [默认] - {{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.detail}} + {{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.detail}} @@ -53,7 +53,7 @@ - + 积分抵扣 @@ -333,11 +333,11 @@ */ onShow: function() { let _this = this - // wx.getLaunchOptionsSync + // wx.getLaunchOptionsSync this.textareaStatus = true; if (this.isLogin && this.toPay == false) { //this.getaddressInfo(); - + } uni.$on("handClick", res => { @@ -387,7 +387,7 @@ }, /** * 授权回调事件 - * + * */ onLoadFun: function() { //this.getaddressInfo(); @@ -485,7 +485,7 @@ }, /** * 处理点击优惠券后的事件 - * + * */ ChangCoupons: function(e) { // this.usableCoupon = e @@ -549,7 +549,7 @@ }, /** * 获取当前金额可用优惠券 - * + * */ getCouponList: function() { getCouponsOrderPrice(this.preOrderNo).then(res => { @@ -617,7 +617,7 @@ let that = this; orderCreate(data).then(res => { console.log(res.data,'订单信息') - that.getOrderPay(res.data.orderNo, '支付成功'); + that.getOrderPay(res.data.columns.orderNo, '支付成功'); }).catch(err => { uni.hideLoading(); @@ -628,6 +628,7 @@ }, getOrderPay: function(orderNo, message) { let that = this; + console.log('orderNO---', orderNo) uni.navigateTo({ url: '/pages/goods_cashier/index?order_id=' + orderNo }) @@ -674,7 +675,7 @@ // title: err // }); // }) - + // }, // fail: function(e) { // uni.hideLoading(); From f628b07126f81929e051afc005b6cafd69447762 Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Fri, 26 May 2023 15:35:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/pages/goods_cashier/index.vue | 35 +++++----------------- yudao-ui-app/pages/user/index.vue | 4 +-- 2 files changed, 9 insertions(+), 30 deletions(-) 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 }, ],