From 13bdc08c8655010a484801953eae0c39fe0a3a2f Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Tue, 4 Aug 2020 20:00:58 +0800 Subject: [PATCH 1/3] upgrade 9.4 --- components/mine/order-item/index.vue | 2 +- components/shop/list/index.vue | 3 ++- components/shop/list/item.vue | 5 +++-- pageC/classify/goods.vue | 8 +++++++- pageC/classify/index.vue | 6 ++++++ pageE/order/Details.vue | 7 ++++--- 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/components/mine/order-item/index.vue b/components/mine/order-item/index.vue index e9f1c02..ab6245c 100644 --- a/components/mine/order-item/index.vue +++ b/components/mine/order-item/index.vue @@ -25,7 +25,7 @@ - + 申请退款 查看物流 确认收货 diff --git a/components/shop/list/index.vue b/components/shop/list/index.vue index 268be23..3f8907e 100644 --- a/components/shop/list/index.vue +++ b/components/shop/list/index.vue @@ -93,7 +93,8 @@ export default { }, setSwiperHeight() { // height: 230px, margin-bottom: 13 - this.swiperHeight = Math.ceil(this.goodsList.length / 2) * (230 + 13) + 'px'; + const height = Math.ceil(this.goodsList.length / 2) * (230 + 13); + this.swiperHeight = height == 0 ? '230px' : height + 'px'; }, // tabs通知swiper切换 tabsChange(index) { diff --git a/components/shop/list/item.vue b/components/shop/list/item.vue index c33e26c..b46904f 100644 --- a/components/shop/list/item.vue +++ b/components/shop/list/item.vue @@ -2,8 +2,8 @@ - {{ info.goods_name }} - {{ info.goods_advword }} + {{ info.goods_name }} + {{ info.goods_advword }} ￥{{ info.goods_price }} @@ -62,6 +62,7 @@ export default { flex-direction: column; justify-content: space-around; .title{ + line-height: 34rpx; font-size: 30rpx; color: #333; margin-bottom: 13rpx; diff --git a/pageC/classify/goods.vue b/pageC/classify/goods.vue index 8499dad..4678187 100644 --- a/pageC/classify/goods.vue +++ b/pageC/classify/goods.vue @@ -12,7 +12,7 @@ 好评 - + {{ goods.goods_name }} @@ -112,6 +112,12 @@ export default { uni.setNavigationBarTitle({ title: title }); + }, + toDetailsPage(id) { + this.$u.route('/pageB/sdetails/index', { + id: id, + type: 1 // 商品详情 商品类型 1普通 2拼团 3秒杀 4优惠券 + }); } } }; diff --git a/pageC/classify/index.vue b/pageC/classify/index.vue index ceb8b91..4e8b34f 100644 --- a/pageC/classify/index.vue +++ b/pageC/classify/index.vue @@ -49,6 +49,12 @@ onReady() { this.getMenuItemTop() }, + onNavigationBarButtonTap(e) { + if(e.index == 0) this.$u.route('/pageB/search/index'); + }, + onNavigationBarSearchInputClicked() { + this.$u.route('/pageB/search/index'); + }, methods: { toSearchPage() { this.$u.route({ diff --git a/pageE/order/Details.vue b/pageE/order/Details.vue index 992a662..fdb1583 100644 --- a/pageE/order/Details.vue +++ b/pageE/order/Details.vue @@ -3,7 +3,7 @@ {{ s_object[orderstate].text }} - 距离结束：{{ countdown }} + 距离结束：{{ countdown }} @@ -175,7 +175,7 @@ export default { // console.log(spikeTime); if(spikeTime <= 0) { this.isSpike = true; - this.spikeTime = '00:00:00' + this.countdown = '00:00:00' clearInterval(this.timer); return false; }; @@ -204,9 +204,10 @@ export default { }).then(res => { if(res.errCode == 0) { this.orderInfo = res.data; - this.setSpikeTime(res.data.end_time); this.viewState(this.orderInfo.view_type); this.setTitle(this.orderInfo.view_type); + if(res.data.view_type == 1) this.setSpikeTime(res.data.end_time); + else if(res.data.view_type == 9) this.setSpikeTime(res.data.pintuangroup_endtime); } uni.stopPullDownRefresh(); // 结束刷新 }) From f6c6ffa1769ccc3b106c42b61fef2acd2ad55feb Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Tue, 4 Aug 2020 20:09:21 +0800 Subject: [PATCH 2/3] upgrade 8.4 --- pageB/sdetails/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue index 643e35d..acf6c69 100644 --- a/pageB/sdetails/index.vue +++ b/pageB/sdetails/index.vue @@ -241,7 +241,7 @@ export default { let img = []; list.forEach(item => { let temp = { - image: item + image: item[1] } img.push(temp); }) @@ -311,7 +311,7 @@ export default { if (res.errCode == 0) { this.evaluate = res.data.goods_evaluate_info; this.goodsInfo = res.data.goods; - this.setSwiperList(res.data.goods_image[0]); + this.setSwiperList(res.data.goods_image); this.glist = res.data.spec_list; // console.log(this.goodsInfo.mobile_body); } @@ -325,7 +325,7 @@ export default { if(res.errCode == 0) { this.evaluate = res.data.data.goods_evaluate_info; this.goodsInfo = res.data.data.goods; - this.setSwiperList(res.data.data.goods_image[0]); + this.setSwiperList(res.data.data.goods_image); this.glist = res.data.data.spec_list; this.user_suc = res.data.data.user_suc; this.groupUser =res.data.data.user; @@ -341,7 +341,7 @@ export default { this.groupbuyInfo = res.data.groupbuyInfo; this.evaluate = res.data.goodsInfo.goods_evaluate_info; this.goodsInfo = res.data.goodsInfo.goods; - this.setSwiperList(res.data.goodsInfo.goods_image[0]); + this.setSwiperList(res.data.goodsInfo.goods_image); this.setSpikeTime(res.data.groupbuyInfo.groupbuy_endtime); } }) From fe9a54987ed5f00f71614a0c3a3962cfa8fb8034 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Tue, 4 Aug 2020 20:11:45 +0800 Subject: [PATCH 3/3] upgrade 8.4 --- pages.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages.json b/pages.json index 53db37f..99adf7c 100644 --- a/pages.json +++ b/pages.json @@ -570,7 +570,7 @@ "buttons": [ { "type":"none", - "text":"写意见", + "text":"投诉", "float":"right", "fontSize":"14" }