From 4e9aeb54250aba3aef72b42fa96329edd908190e Mon Sep 17 00:00:00 2001 From: wangxiaowei <1121133807@qq.com> Date: Sat, 28 Sep 2024 22:51:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8A=A2=E8=B4=AD=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/shop.js | 4 +- bundle_b/pages/panic_buying/index.vue | 49 ++++++++++++++++++++---- components/index-home/index-home.vue | 8 ++-- components/panic-buying/panic-buying.vue | 2 +- pages/confirm_order/confirm_order.vue | 2 +- pages/goods_details/goods_details.vue | 13 +++++-- pages/index/index.vue | 2 +- 7 files changed, 60 insertions(+), 20 deletions(-) diff --git a/api/shop.js b/api/shop.js index 98a60d8..7880eeb 100644 --- a/api/shop.js +++ b/api/shop.js @@ -132,6 +132,6 @@ export function getLocalStoreRecord(params) { return request.get("LocalStore/record", {params}) } -export function getPanic(params) { - return request.post("GroupBuyGoods/getGroupBuyGoods", params) +export function getPanic(data) { + return request.get("GroupBuyGoods/getGroupBuyGoods", {data}) } \ No newline at end of file diff --git a/bundle_b/pages/panic_buying/index.vue b/bundle_b/pages/panic_buying/index.vue index 81fbd79..dd1b75c 100644 --- a/bundle_b/pages/panic_buying/index.vue +++ b/bundle_b/pages/panic_buying/index.vue @@ -1,18 +1,22 @@ @@ -42,11 +54,17 @@ empty: { icon: 'https://zjeloong.oss-cn-hangzhou.aliyuncs.com/uniapp/order_null.png', tip: '暂无记录', // 提示 - } + }, + textColor: '#ccc' + }, + upDown: { + bgColor: '#fff' }, storeState: 1, list: [], - cancelTime: 1727169974 + cancelTime: 1727169974, + showModel: false, + rule: '' } }, methods: { @@ -73,16 +91,18 @@ let hasNext = !!res.data.more; if (page.num == 1) this.list = []; this.list = this.list.concat(curPageData); + this.rule = res.data.rule; this.mescroll.endSuccess(curPageLen, hasNext); } }) }, - toPage(goods_id){ + toPage(goods_id, activity_sn){ this.$Router.push({ path: '/pages/goods_details/goods_details', query: { - id: goods_id + id: goods_id, + activity_sn } }) } @@ -91,8 +111,10 @@ \ No newline at end of file diff --git a/components/index-home/index-home.vue b/components/index-home/index-home.vue index dc51948..af90ba6 100644 --- a/components/index-home/index-home.vue +++ b/components/index-home/index-home.vue @@ -46,14 +46,14 @@ - - + + + diff --git a/components/panic-buying/panic-buying.vue b/components/panic-buying/panic-buying.vue index c0107e5..f3ac14b 100644 --- a/components/panic-buying/panic-buying.vue +++ b/components/panic-buying/panic-buying.vue @@ -17,7 +17,7 @@ - + diff --git a/pages/confirm_order/confirm_order.vue b/pages/confirm_order/confirm_order.vue index 0b958df..9ce714e 100644 --- a/pages/confirm_order/confirm_order.vue +++ b/pages/confirm_order/confirm_order.vue @@ -100,7 +100,7 @@ bargainLaunchId: -1, invoiceArr: [], subsidy_type: 1, - goods_type: 0 // 当为4（抢购）的时候会改变这个值 + order_type: 0 ,// 当为4（抢购）的时候会改变这个值, }; }, diff --git a/pages/goods_details/goods_details.vue b/pages/goods_details/goods_details.vue index 37c399d..d9420b4 100644 --- a/pages/goods_details/goods_details.vue +++ b/pages/goods_details/goods_details.vue @@ -431,7 +431,8 @@ team_min_price distribution: {}, invite_code: '', see_wholesale: false, - code: '' + code: '', + activity_sn: 0 }; }, onUnload() { @@ -448,6 +449,8 @@ team_min_price this.set = this.$store.getters.hasSetId; const options = this.$Route.query; if (options) { + this.activity_sn = options.activity_sn || 0 + if (options.scene) { // 生成海报 区分普通商品和集采、代发、批发 const scene = strToParams(decodeURIComponent(options.scene)); @@ -691,7 +694,8 @@ team_min_price w_price: e.detail.w_price, set: this.set, invite_code: this.invite_code, - price_type: e.detail.price_type + price_type: e.detail.price_type, + activity_sn: this.goodsType == 4 ? this.activity_sn : 0 }], type: 'buy' }; @@ -796,10 +800,11 @@ team_min_price const { goodsDetail, inviteCode, - team + team, + activity_sn } = this; - let url = '/pages/goods_details/goods_details?id=' + this.id + "&invite_code=" + inviteCode + '&path=goods_details'; + let url = '/pages/goods_details/goods_details?id=' + this.id + "&invite_code=" + inviteCode + '&path=goods_details&activity_sn=' + activity_sn; if (this.p_id) { url += '&p_id=' + this.p_id; if (this.goodsDetail.set_price_type == 0 || this.goodsDetail.set_price_type == 3) { diff --git a/pages/index/index.vue b/pages/index/index.vue index 83e1a31..1809f68 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -304,7 +304,7 @@ padding: 0; } .index-bg { - background-image: url('https://dlh.hainings.com/uploads/images/202305310842517659b6584.png'); + background-image: url('https://zjeloong.oss-cn-hangzhou.aliyuncs.com/uploads/images/202305310842517659b6584.png'); background-size: 100% auto; background-repeat: no-repeat; }