From 4a3f59d2a87641eba90653c4279219b98c14c11b Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Wed, 13 Dec 2023 16:13:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order_details/index.vue | 2 +- pages/product/addGood/addGood.vue | 23 ++++++++++++-- pages/users/order_list/indexCopy.vue | 36 ++++++++++++---------- pages/users/payment/payment.vue | 46 ++++++++++++++++++---------- 4 files changed, 72 insertions(+), 35 deletions(-) diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 7c47e19..16d9315 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -84,7 +84,7 @@ diff --git a/pages/product/addGood/addGood.vue b/pages/product/addGood/addGood.vue index ceea70f..2ae8446 100644 --- a/pages/product/addGood/addGood.vue +++ b/pages/product/addGood/addGood.vue @@ -58,7 +58,17 @@ - + + 店铺分类 + + + {{ setFormData.mer_cate_name }} + 请选择店铺分类 + + + + 商品单位 + + + + @@ -190,6 +205,7 @@ } from "@/libs/uniApi.js"; import avatar from "@/components/yq-avatar/yq-avatar.vue"; import platfrom from "./components/platform.vue"; + import storeClassification from '../components/store_classification.vue'; import commodityComponent from "./components/commodity.vue"; import priceComponent from "./components/price.vue"; export default { @@ -197,7 +213,8 @@ avatar, platfrom, commodityComponent, - priceComponent + priceComponent, + storeClassification }, data() { return { @@ -431,6 +448,7 @@ }).catch(e=>{ console.log(e); }) + }, // 更新商品条码 updateCode(e) { @@ -520,6 +538,7 @@ // 获取已选择得店铺数据 handleGetSelectStore(item) { + console.log(item); this.setFormData.mer_cate_id = item.map(val => val.store_category_id); this.setFormData.mer_cate_name = item.map(val => val.cate_name).join(','); this.$refs.select_store.close(); diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue index a7f527b..8d39e4f 100644 --- a/pages/users/order_list/indexCopy.vue +++ b/pages/users/order_list/indexCopy.vue @@ -67,7 +67,7 @@ - + {{item.group_order_sn}} @@ -155,7 +155,7 @@ - + @@ -263,7 +263,7 @@ - 查看详情 + 查看详情 { // console.log(res.data) that.$set(that, 'orderData', res.data); @@ -648,7 +652,7 @@ /** * 去订单详情 */ - goOrderDetails: function(order_id) { + goOrderDetails: function(order_id, item) { let self = this @@ -662,13 +666,13 @@ console.log(self.orderStatus) openOrderSubscribe().then(() => { uni.hideLoading(); - if (self.orderStatus == 0) { + if (self.orderStatus == 0||(item&&item.order_status==1)) { uni.navigateTo({ - url: '/pages/order_details/stay?order_id=' + order_id + url: `/pages/order_details/stay?order_id=${item.group_order_id}&product_type=${this.product_type}` }) } else { uni.navigateTo({ - url: '/pages/order_details/index?order_id=' + order_id + url: `/pages/order_details/index?order_id=${order_id}` }) } }).catch(() => { @@ -676,13 +680,13 @@ }) // #endif // #ifndef MP - if (self.orderStatus == 0) { + if (self.orderStatus == 0||(item&&item.order_status==1)) { uni.navigateTo({ - url: '/pages/order_details/stay?order_id=' + order_id + url: `/pages/order_details/stay?order_id=${item.group_order_id}&product_type=${this.product_type}` }) } else { uni.navigateTo({ - url: '/pages/order_details/index?order_id=' + order_id + url: `/pages/order_details/index?order_id=${order_id}` }) } // #endif @@ -743,7 +747,7 @@ if (status == 5) { uni.navigateTo({ - url: '/pages/users/refund/list?type=98' + url: '/pages/users/refund/list?type='+this.product_type }) } else { if (status == this.orderStatus) return; @@ -770,7 +774,7 @@ groupOrderList({ page: that.page, limit: that.limit, - product_type: 98 + product_type: this.product_type }).then(res => { that.isReady = true; let list = res.data.list || []; @@ -797,7 +801,7 @@ status: arr, page: that.page, limit: that.limit, - product_type: 98 + product_type: this.product_type }).then(res => { let list = res.data.list || []; let loadend = list.length < that.limit; diff --git a/pages/users/payment/payment.vue b/pages/users/payment/payment.vue index 060f29f..071efb1 100644 --- a/pages/users/payment/payment.vue +++ b/pages/users/payment/payment.vue @@ -89,6 +89,7 @@ import { postsettle, } from '@/api/admin.js' +import { Toast } from '../../../libs/uniApi'; export default { data() { return { @@ -172,13 +173,20 @@ }, getOrderInfo() { groupOrderDetail(this.order_id, this.product_type).then(res => { - this.couponData = res.data + this.couponData = res.data; this.$nextTick(() => { if (this.couponData.interest !== null) { this.moerTime(this.couponData.interest.start_time) } }) - }) + }).catch(e=>{ + Toast(e); + setTimeout(() => { + uni.navigateBack({ + delta: 1 + }) + }, 1000) + }) }, SubOrder() { if (this.couponData.pay_type == 8) { @@ -197,8 +205,8 @@ title: '付款成功' }) setTimeout(() => { - uni.navigateBack({ - delta: 1 + uni.navigateTo({ + url:`/pages/order_pay_status/index?order_id=${this.order_id}&product_type=${this.product_type}` }) }, 1000) }else { @@ -231,14 +239,15 @@ provider: 'wxpay', orderInfo: jsConfig, success: (e) => { - uni.navigateBack({ - delta: 1 - }) - + setTimeout(() => { + uni.navigateTo({ + url:`/pages/order_pay_status/index?order_id=${this.order_id}&msg=${res.message}&product_type=${this.product_type}` + }) + }, 1000) }, fail: (e) => { // 暂不跳转 - let url = '/pages/order_pay_status/index?order_id=' + orderId + + let url = '/pages/order_pay_status/index?order_id=' + this.order_id + '&msg=取消支付' + '&product_type=' + that.product_type; return that.$util.Tips({ title: '取消支付', @@ -249,7 +258,7 @@ }, complete: () => { // 暂不跳转 - let url = '/pages/order_pay_status/index?order_id=' + orderId + + let url = '/pages/order_pay_status/index?order_id=' + this.order_id + '&msg=取消支付' + '&product_type=' + that.product_type; return that.$util.Tips({ title: '取消支付', @@ -262,15 +271,20 @@ // #endif } - // setTimeout(() => { - // uni.navigateBack({ - // delta: 1 - // }) - // }, 1000) + else { + setTimeout(() => { + uni.navigateTo({ + url:`/pages/order_pay_status/index?order_id=${this.order_id}&product_type=${this.product_type}` + }) + }, 1000) + } uni.showToast({ title: res.message }) - }) + }).catch(e=>{ + console.log(e); + Toast(e) + }) } },