From 3df255e805cc82bf3a7fddcacb73690d64955b9a Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Sat, 13 Apr 2024 15:40:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/orderGoods/index.vue | 20 +- manifest.json | 4 +- pages/cloud_warehouse/market/market.vue | 2 +- pages/order_details/delivery.vue | 2 + pages/order_details/index.vue | 10 +- pages/order_details/stay.vue | 26 +- pages/store/home/index.vue | 4 +- pages/users/order_list/index.vue | 14 +- pages/whole_sale/index.vue | 1367 ++++++++++++----------- 9 files changed, 728 insertions(+), 721 deletions(-) diff --git a/components/orderGoods/index.vue b/components/orderGoods/index.vue index 10c0284..2beaad7 100644 --- a/components/orderGoods/index.vue +++ b/components/orderGoods/index.vue @@ -186,7 +186,11 @@ default: function() { return {}; } - } + }, + sale_type: { + type: [Number, String], + default: 1, + }, }, computed: mapGetters(['viewColor']), data() { @@ -216,7 +220,7 @@ methods: { evaluateTap: function(unique, orderId) { uni.navigateTo({ - url: `/pages/users/goods_comment_con/index?uni=${unique}&order_id=${orderId}` + url: `/pages/users/goods_comment_con/index?uni=${unique}&order_id=${orderId}&sale_type=${this.sale_type}` }) }, // 判断是否到支付尾款时间 @@ -236,12 +240,12 @@ .product_group_id if (item.product_type == 3) item.activity_id = item.cart_info && item.cart_info.productAssistAttr .product_assist_id - goShopDetail(item).then(res => { + goShopDetail(item, '', this.sale_type).then(res => { initiateAssistApi(item.activity_id).then(res => { let id = res.data.product_assist_set_id; uni.hideLoading(); uni.navigateTo({ - url: '/pages/activity/assist_detail/index?id=' + id + url: '/pages/activity/assist_detail/index?id=' + id + '&sale_type=' + this.sale_type }); }).catch((err) => { uni.showToast({ @@ -260,13 +264,13 @@ uni.navigateTo({ url: '/pages/users/refund/confirm?order_id=' + this.orderId + '&type=1' + '&ids=' + item.order_product_id + '&refund_type=1&order_type=' + this - .orderData.order_type + .orderData.order_type + '&sale_type=' + this.sale_type }) } else { uni.navigateTo({ url: '/pages/users/refund/select?order_id=' + this.orderId + '&type=1&order_type=' + this.orderData.order_type + '&ids=' + item - .order_product_id + .order_product_id + '&sale_type=' + this.sale_type }) } }).catch(() => { @@ -277,12 +281,12 @@ if (this.evaluate == 0 || this.evaluate == 9 || this.orderData.is_virtual != 0) { uni.navigateTo({ url: '/pages/users/refund/confirm?order_id=' + this.orderId + '&type=1' + '&ids=' + item - .order_product_id + '&refund_type=1&order_type=' + this.orderData.order_type + .order_product_id + '&refund_type=1&order_type=' + this.orderData.order_type + '&sale_type=' + this.sale_type }) } else { uni.navigateTo({ url: '/pages/users/refund/select?order_id=' + this.orderId + '&type=1&order_type=' + this - .orderData.order_type + '&ids=' + item.order_product_id + .orderData.order_type + '&ids=' + item.order_product_id + '&sale_type=' + this.sale_type }) } // #endif diff --git a/manifest.json b/manifest.json index 53d4a88..44a3bd6 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "2.0.30", - "versionCode" : 2030, + "versionName" : "2.0.31", + "versionCode" : 2031, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue index 01708e9..e3063b0 100644 --- a/pages/cloud_warehouse/market/market.vue +++ b/pages/cloud_warehouse/market/market.vue @@ -305,7 +305,7 @@ {{street}} + color="#fff"> diff --git a/pages/order_details/delivery.vue b/pages/order_details/delivery.vue index 9b364ef..d4b48c7 100644 --- a/pages/order_details/delivery.vue +++ b/pages/order_details/delivery.vue @@ -84,12 +84,14 @@ deliveryInfo: {}, expressList: [], domain: HTTP_REQUEST_URL, + sale_type: 1 }; }, computed: mapGetters(['isLogin']), onLoad: function (options) { if (!options.orderId) return this.$util.Tips({title:'缺少订单号'}); this.orderId = options.orderId; + options.sale_type ? this.sale_type = options.sale_type : null; if (this.isLogin) { this.getExpress(); } else { diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 6ebd316..3dba764 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -133,12 +133,12 @@ + :activityType='orderInfo.activity_type' :sale_type="sale_type" :orderId="order_id" :cartInfo="cartInfo" :jump="true"> - @@ -510,7 +510,8 @@ invoice: { invoice: false, add: false, - } + }, + sale_type: 1 }; }, computed: { @@ -533,6 +534,7 @@ onLoad: function(options) { if (options.order_id) { this.$set(this, 'order_id', options.order_id); + options.sale_type ? this.sale_type = options.sale_type : null; } }, onShow() { @@ -611,7 +613,7 @@ goStore(mer_id) { if (this.hide_mer_status != 1) { uni.navigateTo({ - url: '/pages/store/home/index?id=' + mer_id + url: '/pages/store/home/index?id=' + mer_id + '&sale_type=' + this.sale_type }) } }, diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue index f147a24..02e2711 100644 --- a/pages/order_details/stay.vue +++ b/pages/order_details/stay.vue @@ -60,7 +60,7 @@ {{item.merchant.mer_name}} - + @@ -153,11 +153,11 @@ - - - 公司名称: - {{orderInfo.orderList[0].order_extend.bank_info.company_name}} - + + + 公司名称: + {{orderInfo.orderList[0].order_extend.bank_info.company_name}} + 对公账号: {{orderInfo.orderList[0].order_extend.bank_info.corporate_account}} @@ -171,10 +171,6 @@ {{orderInfo.orderList[0].order_extend.bank_info.corporate_bank_address}} - - - @@ -315,7 +311,8 @@ invoice: { invoice: false, add: false, - } + }, + sale_type: 1 }; }, watch: { @@ -335,6 +332,7 @@ onLoad: function(options) { if (options.order_id) { this.$set(this, 'order_id', options.order_id); + options.sale_type ? this.sale_type = options.sale_type : null; } }, onShow() { @@ -392,7 +390,7 @@ goStore(item) { if (this.hide_mer_status != 1) { uni.navigateTo({ - url: `/pages/store/home/index?id=${item.merchant.mer_id}` + url: `/pages/store/home/index?id=${item.merchant.mer_id}` + '&sale_type=' + this.sale_type }) } }, @@ -400,9 +398,9 @@ goProduct(goods) { goods.activity_id = goods.cart_info && goods.cart_info.activeSku && goods.cart_info.activeSku .product_group_id - goShopDetail(goods, '').then(res => { + goShopDetail(goods, '', this.sale_type).then(res => { uni.navigateTo({ - url: `/pages/goods_details/index?id=${goods.product_id}` + url: `/pages/goods_details/index?id=${goods.product_id}` + '&sale_type=' + this.sale_type }) }) }, diff --git a/pages/store/home/index.vue b/pages/store/home/index.vue index e7b7bf1..763d619 100644 --- a/pages/store/home/index.vue +++ b/pages/store/home/index.vue @@ -74,8 +74,8 @@ 价格 - + diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index 3d9f440..a4b337b 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -730,11 +730,11 @@ uni.hideLoading(); if (self.orderStatus == 0) { uni.navigateTo({ - url: '/pages/order_details/stay?order_id=' + order_id + url: '/pages/order_details/stay?order_id=' + order_id + '&sale_type=' + this.sale_type }) } else { uni.navigateTo({ - url: '/pages/order_details/index?order_id=' + order_id + url: '/pages/order_details/index?order_id=' + order_id + '&sale_type=' + this.sale_type }) } }).catch(() => { @@ -744,11 +744,11 @@ // #ifndef MP if (self.orderStatus == 0) { uni.navigateTo({ - url: '/pages/order_details/stay?order_id=' + order_id + url: '/pages/order_details/stay?order_id=' + order_id + '&sale_type=' + this.sale_type }) } else { uni.navigateTo({ - url: '/pages/order_details/index?order_id=' + order_id + url: '/pages/order_details/index?order_id=' + order_id + '&sale_type=' + this.sale_type }) } // #endif @@ -764,18 +764,18 @@ // #ifdef MP if (self.orderStatus == 0) { uni.navigateTo({ - url: '/pages/order_details/stay?order_id=' + order_id + url: '/pages/order_details/stay?order_id=' + order_id + '&sale_type=' + this.sale_type }) } else { uni.navigateTo({ - url: '/pages/order_details/index?order_id=' + order_id + url: '/pages/order_details/index?order_id=' + order_id + '&sale_type=' + this.sale_type }) } // #endif // #ifndef MP if (self.orderStatus == 0) { uni.navigateTo({ - url: '/pages/order_details/stay?order_id=' + order_id + url: '/pages/order_details/stay?order_id=' + order_id + '&sale_type=' + this.sale_type }) } else { uni.navigateTo({ diff --git a/pages/whole_sale/index.vue b/pages/whole_sale/index.vue index 1013760..46fc24b 100644 --- a/pages/whole_sale/index.vue +++ b/pages/whole_sale/index.vue @@ -1,746 +1,747 @@ \ No newline at end of file