diff --git a/src/components/CommodityCard/CommodityCard.vue b/src/components/CommodityCard/CommodityCard.vue index 1ce494a..7986cdd 100644 --- a/src/components/CommodityCard/CommodityCard.vue +++ b/src/components/CommodityCard/CommodityCard.vue @@ -74,7 +74,7 @@ image { -webkit-line-clamp: 2; text-align: justify; overflow: hidden; - font-size: 24rpx; + font-size: 26rpx; color: #333333; } .info { diff --git a/src/pages/addOpticsData/addOpticsData.vue b/src/pages/addOpticsData/addOpticsData.vue index 6098740..9b55e27 100644 --- a/src/pages/addOpticsData/addOpticsData.vue +++ b/src/pages/addOpticsData/addOpticsData.vue @@ -1,4 +1,4 @@ - + - - + + diff --git a/src/pages/address/addressList.vue b/src/pages/address/addressList.vue index 0d712d5..eec3dc3 100644 --- a/src/pages/address/addressList.vue +++ b/src/pages/address/addressList.vue @@ -133,6 +133,9 @@ export default { text-align: center; margin-right: 20rpx; text { + display: flex; + justify-content: center; + align-items: center; font-size: 12px; color: #ffffff; letter-spacing: -0.23px; @@ -161,7 +164,7 @@ export default { } } .arrow { - width: 6px; + width: 12px; height: 12px; position: absolute; right: 40rpx; diff --git a/src/pages/confirmOrder/confirmOrder.vue b/src/pages/confirmOrder/confirmOrder.vue index 9310f07..1e69284 100644 --- a/src/pages/confirmOrder/confirmOrder.vue +++ b/src/pages/confirmOrder/confirmOrder.vue @@ -39,6 +39,7 @@ @@ -108,7 +109,7 @@ 微信支付 @@ -158,6 +159,7 @@ --> + 实付金额:¥{{Number(skuInfo.real_price) * count}} @@ -378,7 +380,7 @@ export default { } image { height: 28rpx; - width: 28rpx; + width: 30rpx; } .addressText { font-size: 28rpx; @@ -536,13 +538,15 @@ export default { margin-right: 20rpx; text-align: right; .choosePayWay { + display: flex; + align-items: center; text { color: #333333; } image { - height: 26rpx; - width: 30rpx; - margin-right: 20px; + height: 36rpx; + width: 40rpx; + margin-right: 8px; } } .randomSubstraction { @@ -642,6 +646,9 @@ export default { text-align: center; margin-right: 20rpx; text { + display: flex; + justify-content: center; + align-items: center; font-size: 12px; color: #ffffff; letter-spacing: -0.23px; @@ -659,7 +666,7 @@ export default { width: 100%; image { width: 24px; - height: 26px; + height: 28px; margin: 12rpx 32rpx 0 40rpx; } .address { @@ -670,11 +677,15 @@ export default { } } .arrow { - width: 6px; + width: 12px; height: 12px; position: absolute; right: 40rpx; bottom: 104rpx; } } +.last_zhanwei{ + background: #f2f2f2; + height: 60px; +} diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index c3d1f00..d0bbb9a 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -111,7 +111,7 @@ export default { components: { UniDrawer: UniDrawer, HMfilterDropdown: HMfilterDropdown, - Card: Card + Card: Card, }, data () { return { @@ -120,23 +120,23 @@ export default { loadingText: '~~到底了~~', filterDropdownValue: [], filterData: [], - searchText: '' + searchText: '', } }, computed: { goodsList () { // 也可以从 getters 获取 - // console.log('index-list=====>',this.$store.state.index.list) + // console.log('index-list=====>',this.$store.state.index.list) return this.$store.state.index.list }, categoryList () { return this.$store.state.index.categoryList - } + }, }, filters: { outData (value) { return JSON.stringify(value) - } + }, }, onLoad () { store.dispatch('index/category') @@ -172,7 +172,7 @@ export default { this.keyWords = keyword store.dispatch('index/search', { params: {}, - keyword + keyword, }) }, // 接收菜单结果 @@ -195,7 +195,7 @@ export default { if (this.categoryList[i].value === 'filter') { params = { ...selectedPayload, - ...params + ...params, } } else { params[`${this.categoryList[i].value}`] = value[i][0] @@ -204,7 +204,7 @@ export default { } store.dispatch('index/search', { params, - keyword: this.keyWords + keyword: this.keyWords, }) } } diff --git a/src/pages/user/user.vue b/src/pages/user/user.vue index 50e71be..f67292a 100644 --- a/src/pages/user/user.vue +++ b/src/pages/user/user.vue @@ -72,7 +72,7 @@ - 全部订单 + 我的订单 --> + + 地址管理 - 地址管理 + + + - - + 系统介绍 - 系统介绍 + + - - + 加入我们 - 加入我们 + + - - - + + 联系客服 - 联系客服 - @@ -358,7 +360,7 @@ export default { background-color: #f2f2f2; } .userInfo { - background-image: linear-gradient(270deg, #ffa481 0%, #ff6b4a 66%); + background-image: linear-gradient(270deg, #f79067 0%, #FF5F3B 66%); width: 100%; height: 240rpx; color: #ffffff; @@ -423,8 +425,8 @@ export default { align-items: center; image { margin-right: 32rpx; - width: 30rpx; - height: 34rpx; + width: 40rpx; + height: 44rpx; } } image { @@ -454,7 +456,7 @@ export default { flex-direction: row; justify-content: space-between; align-items: center; - border-bottom: 1px solid #e9e9e9; + border-bottom: 1px solid #F5F5F5; font-weight: bold; font-size: 18px; color: #333333; @@ -508,9 +510,8 @@ export default { justify-content: space-between; align-items: center; .item { - display: flex; - justify-content: space-between; - border-bottom: 1px solid #f2f2f2; + display: grid; + grid-template-columns: 10% 90%; align-items: center; height: 72rpx; width: 100%; @@ -519,16 +520,23 @@ export default { color: #333333; display: flex; align-items: center; + justify-content: space-between; + height: 72rpx; + border-bottom: 1px solid #F2F2F2; image { - margin-right: 32rpx; - width: 30rpx; - height: 34rpx; + margin-right: 0; + height: 16px; + width: 8px; } } image { - height: 16px; - width: 8px; + margin-right: 32rpx; + width: 40rpx; + height: 44rpx; } + .lastLeft{ + border-bottom: none; + } } } .recommend { diff --git a/src/static/chat_logo.png b/src/static/chat_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..17c79cb25e52cea4488f48460cfa14ed09183abc GIT binary patch literal 4016 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 literal 1036 zcmV+n1oQieP)Px&#z{m$R9Fecm`zAjQ547jXB;EM3`+zH3flBV&DnDs!-F zsg|#wB4g;cbs_V}T(@WhVGZ9MMMWS&hLKE{w1MgyDZ}IXypXd92XAn3btoTZ|2cx` zu|wicQ;3=e|7zc=nDohV&mvsc%gd|-MSg+$2B6^*P*Tdc;soAJj4*7mW?E5DAbF8N z1j^PCs*eJJgFt&X*lO-N3+gly^pcI*R6%Q%A9Ght_^C7)avKjpM&)yo@t za8>e7B5L)yx0zxT8C4NUgA@!&3Q`->urmEJvOVp<+z;6Uh;u$9#R{8x;&|{_5>g7t zpAq>u46=XL`-Yme_cUpv*RDFNW#}gktp{oa}+e9o*+NG1_rOD zBB>xb|JEoNXjYJMneI$TiCYlRd_xulv=ESa2Ni8~=he38^JTUm=`DTeHMvB()5RUD z-hCgX7(WGZ_vVpI65fxQ4L#kPJ~kl%mylA;5meiDoC&K~rW!upzljJho|r137Q3ni z$=4Sz9J_*f<_PMxkMgTa8^0AC#;*N9%`t8@*N_2gOElf&r z2Y~H+c`v^L6myVeWJd;o1&|uR?VJ}-(OS#2u3`QB>?>gh458PgTex(& zynuq@C)p@rXMk7gYSaG2XQ+ab&zy3|0`ssYO(WK?;~KR@mpIaC-?rO~-m7Q8*H2nO zJ^{UfpaHrS9n=@S&Upf*t@6PU4{i%CD2^Ntq8Wx8X2`qLAARc;Y@xg(sJlLDW|xg~ zYr<2eyvOhHkNNfc&q9aUo;!lNH%!kVR)r|?XvV#cdr3!7w|&&T%j_icQ}x;T_N1ji z)h88CYS|0__eGfWV#Q27f3M_km|paPx$y-7qtR9Fe^SiMREK@grfB?Qqzt!!+35AAb}O*-)fVhXX)DgcFhk};!)^zwOy!ek=4)XrK)esB^wr!!7>rE@AmtPIG4UpP9R#m(3$^{4qJGl#df@kv5ZzssNK4Nulc^v=ulktEhAd)0(=I>vamuzc=Pxs zFplWFy93eprUhPliP!$b+wprkknJfXq_@O?)}VUdDxSNoN})1OSR!}k(&`n;Oq=g?gz~jf5vPzzA*;8{)ghCN zt`3$K`pb0>?N zN1|UNdO12)?HI)$Bb+;7ijZil$xhZEwe%8v-1Pq`@B@3Ogv4NR;%@)|002ovPDHLk FV1mA!@*n^J literal 382 zcmV-^0fGLBP)Px$I7vi7R9FdP{GaXhpJ4z13)oI(CU3?`TeiXMhdG9E>NZB07&$aHbN=Ugdo%p| zzl8~8AhM-k3m6&Sg6RLb0m@)L83bG})GU}0jFY!+1+gJMhKVBR?LcM>!@u9>|L1tW zM+lR^`uAH9sv2Y#2EcAH2U{`2_g`{AKie_qjjn5J1$E9Px%BuPX;R9Fe^STS$YKoovo0#d6Cky^HH3@il(1_st{u`7^JB!;SGU_dlPDg&@o z>d++IydE9zmC+F(g-Ay-8Q(v8pDV%69P7Z&E<1WVCD+MS&%YXy6ps9C2A?n zIjhk_J8;sB?JEE#T*j5DKo;{1pBHMfufP;Ka{`%jV4el@ESQo(g*4AR4KuSKZ-}~6 zUy@&gx7=>jM0GK5KVw%20U7@A=<6Y0T=}tqVQ~aR-3Yl{x&g2IJ&lDn+?S$Zi@W0A zqIhKNikbtXJ!KZS^DG8OC@4KfyZfm~0%<`<^;}W6I5!TW0`L@m_e0X5CN=lWv*aPv!Q?2KM&CX|Ce$1C81-B`fB54x9P)Px$qDe$SR7ef&m%mHHKorNnFI7-F2s*ksxcFmmbZ~KN(n;zh=;ENQg*u3fn@cAl zX%|79y4Xo2i{X#yd6+`Z3z?|tvM5SInfXvD@SW& zyDvJqTs2qG=Vy#kVZbtUs#4{i09CV+DmHLwBn6jE7vMr9{Krr7sOg%~PWoy{P_A#K zLekRDILHJ4u#9RRR9cCU6VB~}7K&xqF$J&?L zHipWN$mz7S0l8w91auQjfZV6laK&7J79f|4mMCk9nQ}t7poVu9z=A7tAXlwzpx>6< z(=ez`j&~W7hL22va=PAx@83)A8IjT?$36cE3*IvW$~11sQQng!nU|W~!gf!hu*`s5 zE3Sb2t|XLYLU-889}Px+|4BqaR9Fe^SZQ!mRTMtwrKL0#H`>twWuzTM5k+*s!3AZiV4E~lrA1JOf?>4wu&G~aTzy6a9nVkL5q%n%V^8eB**W*KJ{C)rbXFdn&#`zsvF1(~uvFRmQ@d;>k&8M6atpC`BiDGp?HKE5NoC;$H%n#yR@->e}-&XF*B9+wyeQoiU6dQG;KTyw^AU`1fH|N^EMWCD=)1( z66UEYI-Ay)#Mi_rZcdWjg*-+f!(hhH49N~SyyDC9c`=7 zDuL8v0NjrDX=uMmnHiI@z~h~G^x*Y*Vd?8ZcaTzOEH7)?9ZhHM#|11d+l{cmMhMKn z+Sbu!{qN+`l>id^5fLVr9RS3pQ!uTj(HYaYxXvG&152tZN~iYLH=!dB2KgHc&F9*N zkGi7o60nr#kEZ~=0YPa1`x0f1n89v$pesRYT%7iaB!Sn^OeKwKsk+g{%o2}B=Tk1V zr)4c9On{|Z5tt5SoNclAVgeRt!DK}Js{orqq*YUmw=$7p?8Y?EzX0oMr12v5G(Kb~ zRH=}cHnbT1Sa02>n%iCk{}jw0MI02fr@9X`R#IS@7h-!V5`uNwD<~kV zLSW}cfOQp&rQ@wIbxA8Pgh0Yp`_r^}G2hZ(h8r6;fjFdDRN>}KLS(}5j z^=LFhbYEQgk3#q|eVn-*V4pB(Anz8;!AfGqZ$1DlHs)fzm0_UM1-E!IXfRp>1Kw?> z4Z8&V&kf=8Fe%v5GAMq|Oc<*z&iqB7eo&udo(^R%sokyP-cG^JFOOv7~t7l+o&5w2aHwBg0Nal_{kzuxw=UOPTWV&2<0{p0<$bg z$UmS?_yjUi(Z34v2H-6KI-hHr<|8ih007xQ(m}HZpi2PS7f%Te9w%~nHE0+QI}T&d0m#6JIp(k6aHU+`_@OZ_75Sra8a7}ZeSo2! zwCstA3Lv;#DU9+weEVnYV0O@l8BVSq4*X&WPxcKVn`yLl5NWBG0N`W@E+$GFOqnBw znZfGfmp3(2ik1s|{Rz-G4S)2Cy8!+j=g};?LbIo|S5Q)iU6!3R*a8#5^#<6|hx8n?u_i z&41GRTvNZ7EIb;!u^;-bq1Lu-a$f=Jl#WL#3a&+}+@^yiLZ->q^SW+fMJ8^yMu$FC zzBm(tj$;9nu%h)HBD&YYfpRZEjUnlEFV}83Y?cC01IQmxwe=wA`_*(MSVw>np0pWzzP)d>pTc>t0ojV5m?Wv@$NkGK>oRO1SP3{ zL*d;hGjma9BIr6E6hNxf+yR=Q;Zf$L&^tTa4>f{595t%)CJsSZ85@QC46DzHB1yW- zPdEKe=`sck-(mfiqcYp712jnpEv*t6lV<`#L#hQc0_QIdkkgYh5_^8<(-b>hZ+V!DKx5{Y{f zgssLeVdbWueoot8;6Fp{kiKY>u;Bg8{~k~x$Z)?)^^K+WlqKj-(G9~gi#<&%Oe~$6 z2>~k(Siph*bpV|PE4@saBd41K!7NoTGgalL+=;l#r~wR`NYFSygw6(~55ZP~0AFL! zb@fgPuwp)u+lQ1DOh-Mv5^M}0m0Z)X+zdcmc{vn7)*#$u7*|`e6r&{AXr}3^-K7sl zGr+I5BF&A(I8G!f#-($ExJ!aZdK9sKGuE_H42vo~;a24aiT)8rSXFfZi+rzHijoDZ zWF&3ju)+j4XoF6@LxqbfQ&qL)qLlQt9XDkxJjG(?<=*$rJc-&T3|I-&zft%|olyON z1>YzrkDqE(!PeX~>BYy74YLxO>B0ah}Rx(4DzdKaMa zrahFNb`vk&@JB3t2->-z3#LVl@YN>;A7M5fh(()dtlNN<;E3;RD#vo~T=uO0)vQ#? z?SoLnsNEOeJS@?L)XX2Px+n@L1LR9Fe^SZQpOMHqhGZ)xd)3ZZyJ6wer<1QP{~q6ij+-L@bCq9}sIi*`#( zQ9+|t(11~F>9(SvD5wcquyAoW{6>F#q>RAtE-=!$5aVcp$= zPvD`>s%_NG{8^brXnsM-S?I)W15RWQL?#3BI+QvND!fZA@LrH?N0m(;L2zvboZvlJ z){SKGGboHeII`PJI9bW1oe`j_@Scls_-z^h}f#anJTE>Mi2w2vjuYcObG-!yLJ4tj)pqeOq-Xm zZy$B8Ao!2$@#HckKvh~Y0TSL!=lPsT$YLirRpHaIFXd-eB@moPaI0dg6=@`f>zxYS099$x5;|$% zAX&Al2=0ETpj(~BmQv>tjw!M|UmAiB+j3lq83?J5C{t(lsXdTXY63W^3NG<7TIol7 z8w^o#IkUvd?^}VWx{E?lDC<^fXnHEiPD0Z-EGw=BqUD?p4~5KS=y~22qJw#?uZgkB zn#g)wnl~@wKKA>nh~rUXN3evzSBNV0Jx&5{XJ-gv-5~YNFB*Xq|5SCgh5a8qO`SPL zL@e%`m<~7o032w4kW7?wOkm+D*01FsBLQAPLH>18-Po1FwCQFHy_pkx!c0yq4bZDk z8e^DDOjRAQ@@^IsC_PAR~ooUo*j2)7QmFp&yu21TMd!(UdG_vyt!z1Il0+(Vy{y-iS zUWI>y(>7u^MSp#Bd`D)+puOV_RaIP&&OWt%H@aqt&63D08hSas(mxwj3yM!hB-+aT zbtVCPj%=AAHO)UHTV({8h^TC$TrL^39$_V$r)Q%oE1H`u{BO2pRnxcdcr=qAlgZ%> zLv5qmHJZWLDDgDB3YU#HNm}38zzZ8 zq+00hLLR0ck>w$iO`j^icMh3jh%<+8CAZ5Wvj-W&mJzKE4IGQs@)X_YG}y=bsni>V zF7;M2OR^&PD?<*G5xhZ=Cm)l?rkNgF>(96k#u-!sk8kV2JHq1p5+o>W8zp83ki6w3Cy-Y zFG>dFLntswEwgHz5OtLp2A6l;BIn))9w-&)E)XG-B*%&ov-B)>_+B-v)yvR zm~`wv)2;h?O?IKaX@xVvNX4Y8o|A(E`(Gx*K0}DOM-f+m2IPX`F^EK%O`Dq`h=L*0 zr25&zPEd9|b~hL8;4UM$KlwtOn(CrRSYq3uE*TPb^DvEL z?SPr(f&JUnoh3&(W$d~EWAV<_&J=Eg-}ksPgE?}!@j(n6e&>X)Oa;#1u$`nTO->i$ z!w2d_0(c);d6W1q`Nd71Sy3SYZliO?Fc&5lGv*yqA5$iu6aNDqjMF!gn=QL9C4;tr z)CNE2!C`Qfy>vVpp^jbZ4)5{yxU*z(&`Mw>ZcOsge+t3vFyJh%O18Q<6F6-<+rubbtDEMZf1gUiaF)EjWxRIeC}`-al*+EDu|bUcZDzcJnNazDLe zkL!|&>J`lA^e+#2bn_v9iMSwBHtp26>%C&oRx-aXj2JqZhoO;u$M7Y%(>(O!0(^j7 z#XG&pfD?HdLq?s~7jW8KpBRkeK>U5OmOySISf=^HyE~f8jAS|cJZ#q>&|KvV+O}>_ z%YOt=J23&dyy!9JlNAY0#d?5gTXjNT9~yrFA5S`nEZHxF00000NkvXXu0mjfRphz< diff --git a/src/static/joinUs (2).png b/src/static/joinUs (2).png index aef739a3df43c0c19c25071d1e036fe3742bb498..2ce2964785dc03728ca45ba240918ca29c8132e8 100644 GIT binary patch literal 618 zcmV-w0+s!VP)Px%BuPX;R9Fe^STS$YKoovo0#d6Cky^HH3@il(1_st{u`7^JB!;SGU_dlPDg&@o z>d++IydE9zmC+F(g-Ay-8Q(v8pDV%69P7Z&E<1WVCD+MS&%YXy6ps9C2A?n zIjhk_J8;sB?JEE#T*j5DKo;{1pBHMfufP;Ka{`%jV4el@ESQo(g*4AR4KuSKZ-}~6 zUy@&gx7=>jM0GK5KVw%20U7@A=<6Y0T=}tqVQ~aR-3Yl{x&g2IJ&lDn+?S$Zi@W0A zqIhKNikbtXJ!KZS^DG8OC@4KfyZfm~0%<`<^;}W6I5!TW0`L@m_e0X5CN=lWv*aPv!Q?2KM&CX|Ce$1C81-B`fB54x9P)Px$qDe$SR7ef&m%mHHKorNnFI7-F2s*ksxcFmmbZ~KN(n;zh=;ENQg*u3fn@cAl zX%|79y4Xo2i{X#yd6+`Z3z?|tvM5SInfXvD@SW& zyDvJqTs2qG=Vy#kVZbtUs#4{i09CV+DmHLwBn6jE7vMr9{Krr7sOg%~PWoy{P_A#K zLekRDILHJ4u#9RRR9cCU6VB~}7K&xqF$J&?L zHipWN$mz7S0l8w91auQjfZV6laK&7J79f|4mMCk9nQ}t7poVu9z=A7tAXlwzpx>6< z(=ez`j&~W7hL22va=PAx@83)A8IjT?$36cE3*IvW$~11sQQng!nU|W~!gf!hu*`s5 zE3Sb2t|XLYLU-889}