aEz#SU>&557ZjZXRv31PAJkU>By1s+pAqJl(>!V;-`kV6>KtV>GmL!2
z0)pT!P%Cd2eM;?4WpOWv3yWKg94oS9d11~1Y7L;k(=nWK`Y62r8e}ak+N4!CIMW?{
zo45$*NTYMy4Kr@~;J5-iYRWQc-+m1CuQ|Kq>1zN&*AmJPDGQeKPSaki87(ekxp;Uj
zsgv^v!@CINQ;9JX3mu8q{1=#Xb=_7$7Nv2(Uw{d?H@8)#~X>IL<}Ru-H4X5w4O
z#jLKu=lS9f2j79+uXz`Oog`!}_NJc+pnXRIJ%{S|sK~CAC6?wKdAeMYsiBnW&x>?@$vr;Pf3GD2?a_XTFE>GkG|(rELJ+
zSAI!UXzC7Nbmwz)JF10t;5x_gDfdxrR}Uz5`b09*EH>lf7;sw0s5;PnaW08yujVU?
zrAVB{(-FzjR{&(kK3QR@Fj!7X9+$stiXy?SlDKtoh?wy=-GMW2B=ca}p5ZL^bAmXyRIT8w1Fywcq$n7=MWm3#|RQKjOeD
zl-cP#6-k|1(^KcK_pjdHv*TIF80|EUym!LV>8Z6ZO23ii
zXyxlFQ~ne~J9OouPkS9GIRIIZaf2%?-pcxFQwM4>3hpg8g4rJ;fmLliuh%NKwgn*D
zvfLpncI?s9-n-k9@^y{?$ZcU3AP%9r_=ir%000W*Nkl^os{ROWcs>+saKecZ2ii)?N}^~VIPpknwo
z`PSYjh4+JnY#Ts!{6VJt0wiVU##_Q+?^Nw*DKvg3+_3nA2|T{fpN+bIGc@e?v{hH;
zH#zcTd*4E*e(zF)?5s3PDH`Fav_?uBY}70(G;VdGO#=05p>eaco+i}4p{ma6-<*;q
zA7*EraSzb1GMuuCTS&I?=9V
zOqsX3Ea%=xY1S;K%y`tV{J@88Oak@%VJilneJINy{D;EOMTfR9yT}~_l`X%_F%^Yd
zfw4V)iebw+@pIvVPy6E^N6(2U9Wm9_^g44m7KRMY#(V9QEa>HnV+Leg$RY5Q6wA!D
zW(Uq$g<7lhv1KLHzuP;n%7A2iPA
zTU8r?ObVHJx5+*i0c6Kt8h}nf<6&PLyTOWo#xcMiKWx|P9-HaD6b=7T9&BFS9zNT3
zq&UiJQ~AZDf8#iHY}T%CYaUw{TwPpAzVA$PV4wI_}lhV><>QPkBAx<&B9e12eD3
z-l4GLwi5i#bs)6{Pn?9<;}fn&5%c@VKad;zJl{QVs&(9}%K&mx$hNXf)inrThVV8J
ztDw|NiC8^8dmr@&7~gp{p*%vKU(0tg?{;)TIwXPO&YW3Kej!0%bdO7WZ7b{O+w@=8
z)fw1^$}b7?OKECeBi|>}(T+L?AUj{R>DX)nxfS8lAjVoO(&1el9diG5MVtZiU>?KH
zz6j-CsLDJqOR#@;xOEOdaSmC~a5;f~0p$jeafx!LJN&Bs7k+pK3_S9tOIObEXlJ&r
zxUWtDsAVf#Ts@vZZy^Xjf%5TQi`MsJpqMjYA_tCkSWxs
zD$l1Zyc6X2KrZdy%8I$RJ>HkEG)Az>(KRXuyuy;p`I+N7SElzAW?6K06x{-l1CgCOUtW0yBKM%7Db<#c*zX_e>`L^?_1cKA
z-es6-`BHhPaea3m+kF5z%dBP$lDpQIhY1&e7#(xsIuxF*AnPGpjU!Kl)CN=um9d6&497+wxCvFUjLOH&1Qb
zG_i6rL3j(P;C2V1-U_-FV)il@pNgN^Lm-aY-;_>MH3?@@G58-A|Q>0eCvNUF0C{ONbP&xaClUtp3Bnsuu{5EH{mOMGR_wG(9iL}4DldS(Kq}bG
zJ5BqGcfnHQbwqiO2mw6D`>CrB6(WFt&XTbKvjP_KYuHbMj^6uM&i>(a^lPGif&+1wvP^
zD=7duiR21f4H!evJOyPI!o`SOgu2Qg9}&u|S|P{{gyCv})LO#aRw&y;Rr+8tI6Pei
zOI!Dq9DqL1k4DszJ~fFTe=%Wx9zie@bd1l4)uA8-$08SVN)qWS3mikR^Pvu*@*afi
zkYF{MUe{J}%S1-m#zRXMK;Cae1-a@GXl?}gU;;rn2@U2Tm?zsv{KNbH*5(|6Mrz-J
z2Ad(=jD)+;)B&{SP)|hAiwVAx2GD8xkq^#}Lk&DS2V^QK#-chZI%(RD>9iB4OWAs}
zbQ;rbj)NWtF_U~Z>dqp4n|yvVQoE(pK~uOceFi|0L<-0RE87iFu&F5U_|Or
z9UN_a-7H`1$Xj;&Q9Z~B#EKKhaYD5-whltD57EPfQco&>k}x=dWR6q8@$Tefb!X9w
zd2gSVKxdl>7r4zdjzncN5{^KEp{Nc*WH6eqbNT#%=}c0Kx*FK#XR_*@CYk(?AgHU2
zX4O1H_bQsgb``yqGQXx_vay(FSdqOgV
k93|{cT18KQqa%I(e<7r
Date: Wed, 19 Aug 2020 15:36:25 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E8=81=94=E7=B3=BB=E5=AE=A2=E6=9C=8D?=
=?UTF-8?q?=E6=8B=A8=E5=8F=B7=EF=BC=8C=E6=96=B0=E4=BA=BA=E4=BC=98=E6=83=A0?=
=?UTF-8?q?=E5=88=B8=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pageB/coupon/details.vue | 11 +++++++++--
pageE/setting/feedback.vue | 9 +++++++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/pageB/coupon/details.vue b/pageB/coupon/details.vue
index 81e8a3d..03dcc7d 100644
--- a/pageB/coupon/details.vue
+++ b/pageB/coupon/details.vue
@@ -45,6 +45,7 @@
我们有万能穿搭公式
+
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index ce506a1..0058543 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -46,7 +46,7 @@
-
+
@@ -61,6 +61,7 @@
diff --git a/static/js/common.js b/static/js/common.js
index 9f036ed..49a9f48 100644
--- a/static/js/common.js
+++ b/static/js/common.js
@@ -67,5 +67,29 @@ const common = {
else result = hours + ':' + minutes + ':' + seconds;
return result;
},
+ /**
+ * 广告位跳转
+ * @param { String } type 跳转类型
+ * @param { String | Number } id 跳转id 商品id/商家id...
+ * @return { undefined } undefined
+ */
+ jumpPage({ type, id }) {
+ let url;
+ switch (type) {
+ case 1:
+ url = '/pageB/sdetails/index?id=' + id;
+ break;
+ case 2:
+ url = '/pageC/merchant/index?id=' + id;
+ break;
+ case 3:
+ url = '/pageE/tool/MineCoupon'
+ break;
+ default:
+ break;
+ }
+ // console.log(url);
+ uni.navigateTo({ url: url });
+ },
}
-export default common
\ No newline at end of file
+export default common;
\ No newline at end of file
From 64597b26facdfe0357639664ec6da466146d4b7c Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Wed, 19 Aug 2020 17:27:49 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5?=
=?UTF-8?q?=E5=85=A8=E9=83=A8=E6=8B=BC=E5=9B=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
components/shop/group/item.vue | 14 +++++++-------
pageC/classify/goods.vue | 24 +++++++++++++++++++++---
2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/components/shop/group/item.vue b/components/shop/group/item.vue
index eacbf15..c00210d 100644
--- a/components/shop/group/item.vue
+++ b/components/shop/group/item.vue
@@ -3,8 +3,8 @@
{{ info.pintuan_goods_name }}
- ¥{{ info.pintuan_goods_price }}
- 立即拼团
+ ¥{{ info.pintuan_goods_price }}
+ 立即拼团
@@ -65,18 +65,18 @@ export default {
// align-items: center;
// align-content: flex-end;
justify-content: space-between;
- margin-top: 10rpx;
- > view:first-child{
+ margin-top: 16rpx;
+ .value {
font-size: 26rpx;
color: #FF3131;
- margin-bottom: 12rpx;
+ // margin-bottom: 12rpx;
}
- > view:last-child{
+ .btn {
font-size: 22rpx;
height: 22rpx;
color: #FDD360;
text-align: end;
- margin-top:8rpx;
+ // margin-top:8rpx;
}
}
}
diff --git a/pageC/classify/goods.vue b/pageC/classify/goods.vue
index c10af42..c6305a8 100644
--- a/pageC/classify/goods.vue
+++ b/pageC/classify/goods.vue
@@ -17,7 +17,11 @@
{{ goods.goods_name }}
{{ goods.goods_advword }}
- ¥{{ goods.goods_price }}
+
+
+ ¥{{ goods.goods_price }}
+ ¥{{ goods.goods_marketprice }}
+
@@ -189,9 +193,23 @@ export default {
font-size: 28rpx;
color: rgba(102,102,102,1);
}
+ // .price {
+ // font-size: 26rpx;
+ // color: rgba(255,49,49,1);
+ // }
.price {
- font-size: 26rpx;
- color: rgba(255,49,49,1);
+ display: flex;
+ align-items: center;
+ .present {
+ font-size: 26rpx;
+ color: rgba(255,49,49,1);
+ margin-right: 20rpx;
+ }
+ .origin {
+ text-decoration: line-through;
+ font-size: 24rpx;
+ color: #999;
+ }
}
}
}
From 627cfc4aa0480a737aa856a173a612744dc5ab1d Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Wed, 19 Aug 2020 17:55:58 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E5=8A=A0?=
=?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/api/shop.js | 3 ++-
pageE/tool/MineCoupon.vue | 44 +++++++++++++++++++++++++++------------
pageE/tool/WashOrder.vue | 8 +++++--
3 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/common/api/shop.js b/common/api/shop.js
index 50dd9e5..fccbc0e 100644
--- a/common/api/shop.js
+++ b/common/api/shop.js
@@ -271,12 +271,13 @@ export default {
});
},
// 我的优惠券(已有的)
- getMemberCouponList({ store_id, gc_id, type, status }) {
+ getMemberCouponList({ store_id, gc_id, type, status, page }) {
return vm.$u.post('Coupon/getMemberCouponList', {
store_id: store_id,
gc_id: gc_id,
type: type,
status: status,
+ page: page,
});
},
// 获取直播列表
diff --git a/pageE/tool/MineCoupon.vue b/pageE/tool/MineCoupon.vue
index 3d9febc..5049f0c 100644
--- a/pageE/tool/MineCoupon.vue
+++ b/pageE/tool/MineCoupon.vue
@@ -3,13 +3,14 @@
-
+
+
@@ -32,6 +33,9 @@ export default {
swiperHeight: '',
couponList: [],
goodsClass: [],
+ page: 0,
+ timer: true,
+ loadStatus: ['loadmore', 'loadmore', 'loadmore'],
}
},
components: {
@@ -46,8 +50,7 @@ export default {
},
watch: {
current(value) {
- let status = value + 1;
- this.getMemberCouponList(status);
+ this.getMemberCouponList(value);
}
},
methods: {
@@ -56,16 +59,31 @@ export default {
this.goodsClass = res.data;
})
},
- getMemberCouponList(current) {
- this.$u.api.getMemberCouponList({
- status: current
- }).then(res => {
- if(res.errCode == 0) {
- this.couponList[this.current] = res.data;
- } else {
- this.couponList[this.current] = [];
- }
- this.$forceUpdate();
+ async getMemberCouponList({ load = 'reload' }) {
+ const res = await this.$u.api.getMemberCouponList({
+ status: this.current + 1, // 代金券状态 1:未用 2:已用 3:过期 4:收回
+ page: this.page,
+ })
+ this.timer = true;
+ if(res.errCode == 0) {
+ if(load == 'reload') this.couponList[this.current] = res.data;
+ else if(load == 'loadmore') this.couponList[this.current].push(...res.data);
+ }
+ this.$forceUpdate();
+ return res.data.length;
+ },
+ onreachBottom() {
+ if(!this.timer) return false;
+ this.timer = false;
+ this.loadStatus.splice(this.current, 1, "loading");
+ this.page++;
+ this.getMemberCouponList({ load: 'loadmore' }).then(length => {
+ this.loadStatus.splice(this.current, 1, "nomore");
+ if(length == 0) this.page--;
+ }).catch(() => {
+ this.loadStatus.splice(this.current, 1, "nomore");
+ console.log(this.loadStatus[this.current]);
+ this.page--;
})
},
useCoupon(coupon) {
diff --git a/pageE/tool/WashOrder.vue b/pageE/tool/WashOrder.vue
index 513c6f5..e3c46de 100644
--- a/pageE/tool/WashOrder.vue
+++ b/pageE/tool/WashOrder.vue
@@ -293,8 +293,12 @@ export default {
this.loadStatu = "loading";
this.page++;
this.getOrderList({ load: 'loadmore' }).then(length => {
- this.loadStatu = "nomore";
- if(length == 0) this.page--;
+ if(length == 0) {
+ this.page--;
+ this.loadStatu = "nomore";
+ } else {
+ this.loadStatu = "loadmore";
+ }
}).catch(() => {
this.loadStatu = "nomore";
this.page--;
From 4e842b127c66c90e53bc5af003fb9245315463f3 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Wed, 19 Aug 2020 18:04:32 +0800
Subject: [PATCH 12/14] fixing bug coupon
---
pageE/tool/MineCoupon.vue | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pageE/tool/MineCoupon.vue b/pageE/tool/MineCoupon.vue
index 5049f0c..103c1bc 100644
--- a/pageE/tool/MineCoupon.vue
+++ b/pageE/tool/MineCoupon.vue
@@ -10,7 +10,7 @@
-
+
@@ -33,6 +33,7 @@ export default {
swiperHeight: '',
couponList: [],
goodsClass: [],
+ pageSize: 6,
page: 0,
timer: true,
loadStatus: ['loadmore', 'loadmore', 'loadmore'],
@@ -65,11 +66,10 @@ export default {
page: this.page,
})
this.timer = true;
- if(res.errCode == 0) {
- if(load == 'reload') this.couponList[this.current] = res.data;
- else if(load == 'loadmore') this.couponList[this.current].push(...res.data);
- }
+ if(load == 'reload') this.couponList[this.current] = res.data;
+ else if(load == 'loadmore') this.couponList[this.current].push(...res.data);
this.$forceUpdate();
+ // console.log(this.couponList);
return res.data.length;
},
onreachBottom() {
@@ -87,7 +87,7 @@ export default {
})
},
useCoupon(coupon) {
- console.log(coupon);
+ // console.log(coupon);
// if(coupon.type == 1) {
// this.$u.route({
// type: 'switchTab',
From 69760e637715c16c7bfa638a1895c2294480b9d6 Mon Sep 17 00:00:00 2001
From: Gdpao <1341331954@qq.com>
Date: Wed, 19 Aug 2020 19:24:14 +0800
Subject: [PATCH 13/14] gdpao
---
components/index/video-item/index.vue | 3 ++-
pageB/video/video.nvue | 6 +++++-
pages/index/index.vue | 24 +++++++++++-------------
static/image/userinfo/dianzan.png | Bin 2651 -> 10741 bytes
static/image/userinfo/dianzan1.png | Bin 3913 -> 17965 bytes
static/image/userinfo/dianzan2.png | Bin 2722 -> 0 bytes
static/image/userinfo/gouwuche.png | Bin 2381 -> 13271 bytes
static/image/userinfo/gouwuche1.png | Bin 5014 -> 23033 bytes
static/image/userinfo/gouwuche2.png | Bin 3443 -> 0 bytes
static/image/userinfo/pinglun.png | Bin 2259 -> 6411 bytes
static/image/userinfo/pinglun1.png | Bin 3658 -> 7522 bytes
static/image/userinfo/pinglun2.png | Bin 3114 -> 0 bytes
static/image/userinfo/shoucang.png | Bin 2450 -> 12962 bytes
static/image/userinfo/shoucang1.png | Bin 4955 -> 22143 bytes
static/image/userinfo/shoucang2.png | Bin 3325 -> 0 bytes
15 files changed, 18 insertions(+), 15 deletions(-)
delete mode 100644 static/image/userinfo/dianzan2.png
delete mode 100644 static/image/userinfo/gouwuche2.png
delete mode 100644 static/image/userinfo/pinglun2.png
delete mode 100644 static/image/userinfo/shoucang2.png
diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue
index bb127bc..dd983a0 100644
--- a/components/index/video-item/index.vue
+++ b/components/index/video-item/index.vue
@@ -15,7 +15,7 @@
{{ item.member_nickname }}
-
+
@@ -105,6 +105,7 @@
>image{
width: 37rpx;
height: 8rpx;
+ padding: 20rpx;
}
.action {
z-index: 19;
diff --git a/pageB/video/video.nvue b/pageB/video/video.nvue
index 38b1ffb..7095b60 100644
--- a/pageB/video/video.nvue
+++ b/pageB/video/video.nvue
@@ -52,7 +52,7 @@