From 390bda7c0eb0cbbaf301f8f564622ea223c06710 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Thu, 20 Aug 2020 11:28:49 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=EF=BC=8C=E4=BD=BF=E7=94=A8=E4=BC=98?= =?UTF-8?q?=E6=83=A0=E5=88=B8=E4=BB=B7=E6=A0=BC=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageC/cart/ConfirmOrder.vue | 54 ++++++++++++++++++------------------- pageE/tool/MineCoupon.vue | 1 + pages/mine/index.vue | 4 +-- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/pageC/cart/ConfirmOrder.vue b/pageC/cart/ConfirmOrder.vue index d143717..8e64769 100644 --- a/pageC/cart/ConfirmOrder.vue +++ b/pageC/cart/ConfirmOrder.vue @@ -309,17 +309,7 @@ export default { }, setTotalPrice() { const goods = this.orderInfo.store_goods_total; - // console.log(this.freight); - let freight = 0, price = 0; - // 商品价格加上运费 - // [goods, freight].forEach(object => { - // for (const key in object) { - // if (object.hasOwnProperty(key)) { - // const element = object[key]; - // price += Number(element); - // } - // } - // }) + let freight = 0, price = 0, minPrice; // 运费 for (const key in this.freight) { if (this.freight.hasOwnProperty(key)) { @@ -327,27 +317,35 @@ export default { freight += Number(element); } } - // 商品价格 - for (const key in goods) { - if (goods.hasOwnProperty(key)) { - const element = goods[key]; - price += Number(element); + // 商品价格减去优惠券 + // 店铺 + for (const gid in goods) { + if (goods.hasOwnProperty(gid)) { + // 计算最小价格 + minPrice += 0.01; + // 每个店铺所有商品的价格 + let sprice = Number(goods[gid]); + if(JSON.stringify(this.storeCoupon) != '{}') { + for (const cid in this.storeCoupon) { + if (this.storeCoupon.hasOwnProperty(cid)) { + const cprice = this.storeCoupon[cid]; + // 商品减去优惠券价格 + if(gid == cid) { + sprice -= cprice.voucher_price; + // 每个店铺最低付款 0.01 + if(sprice <= 0) sprice = 0.01; + } + } + } + } + // 所有商品总价 + price += sprice; } } - // 减去优惠券 // 平台 if(JSON.stringify(this.choiceCoupon) != '{}') price -= Number(this.choiceCoupon.voucher_price); - // 店铺 - if(JSON.stringify(this.storeCoupon) != '{}') { - for (const key in this.storeCoupon) { - if (this.storeCoupon.hasOwnProperty(key)) { - const element = this.storeCoupon[key]; - price -= element.voucher_price; - } - } - } - // 最低付款 0.01 - if(price <= 0) price = 0.01; + // 每个店铺最低付款 0.01 + if(price <= minPrice) price = minPrice; // console.log(price); this.totalPrice = (price + freight).toFixed(2); }, diff --git a/pageE/tool/MineCoupon.vue b/pageE/tool/MineCoupon.vue index 103c1bc..1e3daf7 100644 --- a/pageE/tool/MineCoupon.vue +++ b/pageE/tool/MineCoupon.vue @@ -61,6 +61,7 @@ export default { }) }, async getMemberCouponList({ load = 'reload' }) { + if(load == 'reload') this.page = 0; const res = await this.$u.api.getMemberCouponList({ status: this.current + 1, // 代金券状态 1:未用 2:已用 3:过期 4:收回 page: this.page, diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 6185c91..15bfc0f 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -209,7 +209,7 @@ export default { this.getOrderNumber(); }, onNavigationBarButtonTap(e) { - console.log(e); + // console.log(e); if(e.index == 0) this.$u.route('/pageE/setting/Index'); }, methods: { @@ -237,7 +237,7 @@ export default { }) }, toOtherPage(url) { - console.log(url); + // console.log(url); uni.navigateTo({ url: '/pageE' + url }); From 4c8e2ba4b6a726f44738b8c5778cbf77ff91b0b4 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Thu, 20 Aug 2020 11:41:58 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageC/cart/ConfirmOrder.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pageC/cart/ConfirmOrder.vue b/pageC/cart/ConfirmOrder.vue index 8e64769..b74bb04 100644 --- a/pageC/cart/ConfirmOrder.vue +++ b/pageC/cart/ConfirmOrder.vue @@ -309,7 +309,7 @@ export default { }, setTotalPrice() { const goods = this.orderInfo.store_goods_total; - let freight = 0, price = 0, minPrice; + let [freight, price, minPrice] = [0, 0, 0]; // 运费 for (const key in this.freight) { if (this.freight.hasOwnProperty(key)) { @@ -346,7 +346,9 @@ export default { if(JSON.stringify(this.choiceCoupon) != '{}') price -= Number(this.choiceCoupon.voucher_price); // 每个店铺最低付款 0.01 if(price <= minPrice) price = minPrice; - // console.log(price); + console.log("minPrice" + minPrice); + console.log("freight:" + freight); + console.log("price:" + price); this.totalPrice = (price + freight).toFixed(2); }, setDelivery(index) { From 16c2c1fa716f1719f6b87c54b8d9f9021fa7c638 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Thu, 20 Aug 2020 11:42:52 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=88=B8=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageC/cart/ConfirmOrder.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pageC/cart/ConfirmOrder.vue b/pageC/cart/ConfirmOrder.vue index b74bb04..3f248f2 100644 --- a/pageC/cart/ConfirmOrder.vue +++ b/pageC/cart/ConfirmOrder.vue @@ -346,9 +346,9 @@ export default { if(JSON.stringify(this.choiceCoupon) != '{}') price -= Number(this.choiceCoupon.voucher_price); // 每个店铺最低付款 0.01 if(price <= minPrice) price = minPrice; - console.log("minPrice" + minPrice); - console.log("freight:" + freight); - console.log("price:" + price); + // console.log("minPrice" + minPrice); + // console.log("freight:" + freight); + // console.log("price:" + price); this.totalPrice = (price + freight).toFixed(2); }, setDelivery(index) { From a91fa4708b1cf79aa2f1f5eb52521eccea893fa5 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Thu, 20 Aug 2020 12:05:15 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8B=BC=E5=9B=A2?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/shop/group/index.vue | 14 ++++++++------ pageE/setting/version.vue | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/components/shop/group/index.vue b/components/shop/group/index.vue index f97a940..6d1ea1e 100644 --- a/components/shop/group/index.vue +++ b/components/shop/group/index.vue @@ -13,7 +13,7 @@ - + @@ -61,7 +61,7 @@ export default { gc_id: id, }).then(res => { this.groupList[this.current] = res.data; - // console.log(this.groupList); + console.log(this.groupList); this.$forceUpdate(); }) }, @@ -105,10 +105,12 @@ export default { .list { box-sizing: border-box; padding: 0 30rpx; - display: flex; - > view { - &:not(:nth-child(3n)) { - margin-right: 20rpx; + .group-container { + display: flex; + > view { + &:not(:nth-child(3n)) { + margin-right: 20rpx; + } } } } diff --git a/pageE/setting/version.vue b/pageE/setting/version.vue index 9fc76db..ca9f2a1 100644 --- a/pageE/setting/version.vue +++ b/pageE/setting/version.vue @@ -12,8 +12,8 @@ 版本更新 - 已是最新版本 - 1.1.10 + 已是最新版本 + 发现新版本 From c81ee7e961fa5716e3898be44942635b1f1597e5 Mon Sep 17 00:00:00 2001 From: zmr900709 <1838875027@qq.com> Date: Thu, 20 Aug 2020 14:23:21 +0800 Subject: [PATCH 5/7] 1 --- components/index/video-item/index.vue | 4 ++-- components/informations/notice/notice.vue | 8 ++++++-- components/shop/special-shop/index.vue | 2 +- pageB/components/userinfo/index.vue | 2 +- pageB/photo/index.vue | 15 +++++++++------ pageB/video/video.nvue | 2 ++ pageD/activity/activity.vue | 2 +- pageD/notice/notice.vue | 13 +++++++++++-- pageD/privateChat/privateChat.vue | 8 +++++++- pages/mine/index.vue | 14 ++++++++++---- 10 files changed, 50 insertions(+), 20 deletions(-) diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue index dd983a0..607f98a 100644 --- a/components/index/video-item/index.vue +++ b/components/index/video-item/index.vue @@ -6,7 +6,7 @@ 视频 - + {{ item.article_title }} {{ item.article_content }} @@ -103,7 +103,7 @@ } } >image{ - width: 37rpx; + width: 35rpx; height: 8rpx; padding: 20rpx; } diff --git a/components/informations/notice/notice.vue b/components/informations/notice/notice.vue index 712914a..cd812ac 100644 --- a/components/informations/notice/notice.vue +++ b/components/informations/notice/notice.vue @@ -1,5 +1,5 @@