From a80acba99fd703ab1a7bfda3cb47fd20c04cd2a5 Mon Sep 17 00:00:00 2001 From: Vion Date: Sun, 23 Jan 2022 22:05:40 +0800 Subject: [PATCH 1/8] Confirm btn removed --- rc-busness/pages/personal/useraddress.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index b4a9db93..e9b0162c 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -497,6 +497,5 @@ export default { \ No newline at end of file From 9fda9e4478f654a0d57d2f6304e9e7099ac66928 Mon Sep 17 00:00:00 2001 From: Vion Date: Sun, 23 Jan 2022 22:30:57 +0800 Subject: [PATCH 2/8] Payment bug fixed --- rc-busness/assets/css/orderquantity.less | 2 +- rc-busness/assets/css/usertion.less | 4 ++-- rc-busness/pages/personal/settlement.vue | 2 +- rc-busness/pages/productdetails/producted.vue | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rc-busness/assets/css/orderquantity.less b/rc-busness/assets/css/orderquantity.less index 9b12653e..941f6a66 100644 --- a/rc-busness/assets/css/orderquantity.less +++ b/rc-busness/assets/css/orderquantity.less @@ -292,7 +292,7 @@ width: 96px; height: 96px; display: block; - + object-fit: contain; } } diff --git a/rc-busness/assets/css/usertion.less b/rc-busness/assets/css/usertion.less index e337189e..79694c85 100644 --- a/rc-busness/assets/css/usertion.less +++ b/rc-busness/assets/css/usertion.less @@ -293,7 +293,7 @@ margin-right: 20px; //pc端 -@media screen and (min-width: 768px) and (max-width: 1920px) { +@media screen and (min-width: 768px) { .rc-margin-y--md{ display: none; } @@ -444,7 +444,7 @@ margin-right: 20px; width: 100%; margin-left: 16px; - + justify-content: end; } .rc-userright { diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index 6ee2f83c..ec08d894 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -313,7 +313,7 @@ export default { basePoint:basePoint, productName: item.productName, buyCount: item.buyCount, - productId: item.productCode, + productCode: item.productCode, payAmount: item.productPrice, memberId: userInfo.data.id, phoneNumber: userInfo.data.mobile, diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 28a0512d..6ddcb0f0 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -4,7 +4,7 @@
-
+
CK z!IR($?jmkTR1^;)5j=Vmyy#Vp#vMfj#fw|}eW81-bh@ivRaf`44aL+K8hrQp67cs-=oh5zsYg3sUr5A{6OVT6Nw4-n3T9F#`~__Y&$M zI`cJ-^aHA`3XVZ*7j#_7aEKEBpe-O2Eo2V0YJ@l3F@ZzO|79@X_Fzn62ZrA>0azP$ zVz`#NLEl=O@S?^c0(C(f3&+1i6N0_NKC{XMvjrLgW#L$9U@kzzpsEDs3X}?^fU!8# zG|5w#V*uKK^PZOGP*P*s#cOa54$KSk%d)}p0%bZClUsl_qj>PnB-bVcT90#G(48pL zDNC@Am_H*Am@gosQ)Pkq1QJ7806 zIK@#At6Xk}ygC&X4_7d+K)G`&=?Zej7K}i<5ORkd9ZucNOHL*7OA1y9kawq)s<;pR z9>cf)6%I}C>5%uFQh;`%e-KR)1)ngFcOE}{!bwgnJ|A+*1}HwRcQ9{IjzEQgd4Y<6 z4jC-{hVk*5IUf*)P2#Z7Ow0`hpiMab2}2HT$M{J!-g!*cfnjWBo?pK~rUTzI0a>Z69HUU^Sp?DEX zEA0eoSjg$VL1<cUk3*EqS2xK7@)oX#RgM0L+B#3KIlF}(SHG({3~Jq SW7t*z0000Ek+1lmp2^@1vA3o_=SBj
    2mocEiSYK+CjBnhq+h?lXML_V`@oJbEz^A=`+axWSnB_PNLR-yHspR ziwPBhc2UhtIIP#Ei9^#%ij?=2eT*vB#fcuTqt=hSug;wsLP4N*s+rnPWj_)`OCWHS zJ53K}DQIIa+W7klO8z229net0PJt#+M&sNC2wCft1sh7Yr4vbz>4`WQKZSYQ;&$n7 zl@~|??V!5z(ZIVP+I#B9EJI)jw2NvN;g_}wB25emIKh-dbm0fKw1HY54}yHY69`(Tae%~w zAkMrX01_S<#LMuHZh8H%T5eV8Qwv%dq2myZP-O_@e(3YZZaRfO27{1Z3fFmAD zpL`(@hUKICDE5H%b=>K2_(qRbQtCDg`>_^R+Ej7^eNMGsOOo*&v}dQ}c{KSdKUk_V^h+G3YnFMHl?e1x?iYmKTzELLkKI zd>_Pl2!&U8A+#>j9s=+|`w_c+9sHuF?Y(K8+jRo%q`K=+?Vqfx);UUz04%~HkmxZt z>vfetyD2dryByeTAudX%;2|IeFjw>~>>hc}E!kWn5axK!f~|c+^?)z8fcLAMbii8b zn~l`I$qgA?AwK1yTKquaur&D+k z*p{OH3#L$4TQMRRMIfldIA)mNhR<_$F+%8f{X#&z3#a;mVrHz1A`r;48h+1GznZV> zEgk`k%~S&tXz*sVRf6eAfCmp*99ZBX+#3;qDj*P#c^_$VM#Q#fYYr>BOpYKj-6IdU3_|4-ZUaHFyqXg z_zfD)NF(qFW~ea&w@ILk_W4kUr$(AQtc3=!Ke4Hix?1xgQBVWH_jv&1xi#wW>Gty> zQiVf4@)9U>_A(#a&qx02q!H*jfsWQqpziLWP~;^LVw`aRLhMeBn?@juK%s@!0tBl4 zG^~er5AE`bGf$@pYgQ3|4s72=hgUyDhwj5U4?5XJU@M&IVP|s>BhW5N;M#!L2D_yP zHUCNbKcv|Bv4h0xfA4)du&jl8HzJ%{Cusz*9cWGiwQtOQVHkl_a-OSZe}g7%c&Z>k zN7g<`-OE-`s@u~8ETlUq_!-6TFtK=BK>}rVSzx$kObUKutR=J}5SPH@>2CfB9eJcM z(X4BVMh=9&c7Q&AB5zT1%5CcT({&(7Zo*Xbe?~H4Spsn$o@5-q`feJ1!!=SJ&!e@dn>9XT z2#)l4_Jd3fq@w>LOQ0-kSX+%-y;91ou_-%@(b@rw)}orSevnBZ75yK(1j-V@u36i^ zWO*c)M6!O6Ng!3@o~?YKLfRufr2%GbC5^i35-A14ei8de(HgC#MdIxHM0f{v;{j@Pc!)5F6{g2S8>04u>{JphDT~_+GIv+(OKyi zNgPa7VYE?V$}x%s{(5Ok6_6)`TLj{w*{oGV8&zI-u9PTISm`gP)Kml7=TaO~_kt8E zAwct|IKaw?T*-6NdK_?|HVx=!Lu=BJT(TBL~R=wl}ffyy8I~oI%Hg3go zDbQ3kYY6XHhSSE>-F@K|fwHWzYt~d->F3=Vd|cfV0OVS!pHj#&c}<{PvsS%!wUm>s zSOD8P)<9U?G2|vZG=T~tz-G-Htu4J-3MDlH*u+arpudAa=Sa0WWSL5(fpTHt-5=~^ z%Z}E2*H;3_hBGD!@EV7#uiO@Qgv*p4*c)Jj<*oSk=5GE4! zQieMOGM6&2I?p35nZ)LbwN4nE<-+YrFJ&lu4s@w}AdV5L#vxWR<|=jIQ2I0w94(_j zG8a>oJxtSU0-50)AWk&Q)o{9-;T$@k%)TCAO_QC|k$JoSKOfNk#myl%SHoLs29)WL zRv8L>k;e>a#heanAFIUX$_#16CPWpJ8PckQ>gBrDuDRk9&)C-q=jcif6Emn@Z|kuJ zi({WT23p2RW^;7_qbv0f@XT!MVfa*y2`bi!=JzM8xmVg;nZaQ&Sy4#GHx_bZRUOJZ zC6Kwb8Ga7?J2I)~*_X^YohWZ@R`M!uCj_!%u6PMz|Kep4Fjx6TVCgHu_3~S9(245>{%tY_i$ulm5j;`OCA{w5uji zcai~K3}0AR%)R-s4>{s4GZItI4=Q-bCeAxF580Fm@M3KEBr-mcOyxNpJ4DNS$fkZmvf1fB3uOCQL;?$SHx?N#2LGD}5qs-qF`_|7Q?^RGbfTLZEO5c-b*T zPV)}F3S3{dlEG1p057Mcu=QTy%T_YiJ?)2O8)K`;fM%A_K#B!;dE67C6UW-|JsJ70 zdrF%zb?%C{B2W}o%-v;_#f5WRnQEi4n)hBAc6fMnR?OX{kJOcy={cd=ZP+Vzvb)v$ zQyR}SGl}?2L!JyYFWpr%z{^X75qy(>RWFqN_K<5;*b?x_dnphj7 zifyQFl=CX}n+hS&GlqI4{mfzrNE?P?tVyHp_%bW(#F*fq)pOqJf6V)Y)!}K&lPtmFP=<8u181Hx?JFx}XM1o3TmL1;w{O z3yql1pLXe5y+=R{7&P#u2I}1Eh(KvAr0&*d?>iv$H4M7q+qMbg7e1%DQI|Vp z0817du-|L0Yy)f&NITTBu!c3Coa1cU2g-dx)hoio+U0J_U1-6y=uud10jPxU7<)yV zGB>-<|FYP0!SA^U{fbBVWXptQi|wGvHN8~!9%6S`aK}CQM46mfr842pxV^>B; z1ma3|Q_b8I#a@9zirKAH=MNGBB854hiyEkXqZ6qd6DU0@OWb2n>`o^Y>vw{IfD^x` zC?|S|KU9uc>NlZ!*5LoIsTTtwE)y^0y7T}=0 zj}g})cA6WheUlrqxkjM0Q(bcfoa#U8FjzOb#)~qEbx!G04lqHgwV7>)r%k^jqPYA?K z-A#%4DKgf9M5Bvox_-A<1jJEv^0%RRUM#kxeD8Zkpd82gWmGcW3*mK{RtShrSc1#2 zCHY@gIh}s*DS^@?s`)Ze*ToK$B)_dTfRUMC<{g_)lI~K4tIc1 zw`>1M90qxQ6QiR)Z=i$w{3guM`U6QIO(atv2bwt9J_Szv>@dVJ%Mt;#0gkcaY~#6t#ls#|9pI&8-Q4( zy^!T?5a(@Z%(s%%wrOgbL`o#32$Zi!uzU7&Oa+{ed8IR8E~cR)r{fuY=zik+BmgK* zG&MfK^JZL5@>U~t{LlTGf>WaM1S$kIpLH}q$?1p;n1&ALJFu{)O;jU)=Fg}G+4z|Q z$1(pRcn&7>XPBQL3F2*1TjNyr$w}0T
-
-
- +
+
+ +
+
+ + {{item.title}} +

{{item.detail}}

+ {{item.price}}
- - - {{item.title}} -

{{item.detail}}

- {{item.price}}
立即购买 @@ -331,17 +330,16 @@
-
-
- +
+
+ +
+
+ + {{item.title}} +

{{item.detail}}

+ {{item.price}}
- - - {{item.title}} -

{{item.detail}}

- {{item.price}}
立即购买 @@ -694,8 +692,11 @@
- - +
+
+
+ +
@@ -752,7 +753,7 @@ fixedHeader:false, dataLoaded:true, useraindex:0, - + mobileVideoPlaying:false, usertitle:'明星猫粮', dogtitle:'明星犬粮', processinformation:[], @@ -1096,7 +1097,7 @@ } }, catStarProductswiperOption: { - loop: true, + //loop: true, slidesPerView: 'auto', centeredSlides: true, speed:1000, @@ -1120,7 +1121,7 @@ } }, dogStarProductswiperOption: { - loop: true, + //loop: true, slidesPerView: 'auto', centeredSlides: true, speed:1000, @@ -1177,6 +1178,19 @@ window.removeEventListener('scroll', this.scrollToTop); }, methods:{ + playMobileVideo(item){ + let videoPath=item.video; + let player = this.$refs['mobile-video-player']; + let _self = this; + player.src=videoPath; + player.play(); + this.mobileVideoPlaying = true; + }, + closeMobileVideo(){ + this.mobileVideoPlaying = false; + let player = this.$refs['mobile-video-player']; + player.pause(); + }, ifAdoid(item,index){ //console.log(index); this.userindex=index; diff --git a/rc-busness/pages/personal/mypersonal.vue b/rc-busness/pages/personal/mypersonal.vue index bf401aee..9ff515cf 100644 --- a/rc-busness/pages/personal/mypersonal.vue +++ b/rc-busness/pages/personal/mypersonal.vue @@ -3,7 +3,7 @@
- +
-
-
- 当前等级：{{userorder}} -
-
- 距离升级还差:{{ rcvalue }} -
-
- - - - -
-
- 新手铲屎官 - 资深铲屎官 - 金牌铲屎官 -
-
-
-
-
- +
+
+ + + + + +
-
- {{item.title}} - {{item.usereat}} +
+ 当前等级：{{userorder}} +
+
+ 距离升级还差:{{ rcvalue }} +
+
+ +
+
+ 新手铲屎官 + 资深铲屎官 + 金牌铲屎官 +
+
+
+
+
+ +
+
+ {{item.title}} + {{item.usereat}} +
+
-
-
@@ -246,17 +242,17 @@ data(){ } }, methods:{ - onChange(index){ - console.log(index); - if(index==0){ - this.newlist=this.newlista; - }else if(index==1){ - this.newlist=this.senior - }else if(index==2){ - this.newlist=this.goldmedal - } - console.log(this.newlist) - } + onChange(index){ + console.log(index); + if(index==0){ + this.newlist=this.newlista; + }else if(index==1){ + this.newlist=this.senior + }else if(index==2){ + this.newlist=this.goldmedal + } + console.log(this.newlist) + } }, components:{ diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 6ddcb0f0..e0e3ba53 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -147,7 +147,7 @@
-
+
商品数量：
Date: Mon, 24 Jan 2022 12:02:35 +0800 Subject: [PATCH 5/8] Error page hyperlink updated --- rc-busness/layouts/error.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc-busness/layouts/error.vue b/rc-busness/layouts/error.vue index 506a8797..80964257 100644 --- a/rc-busness/layouts/error.vue +++ b/rc-busness/layouts/error.vue @@ -11,7 +11,7 @@

{{ error.statusCode }} 发现未知错误

- 返回首页 + 返回首页
From ab70862f638c9d09cb563fd4a2dc9aebe265a1e7 Mon Sep 17 00:00:00 2001 From: Vion Date: Mon, 24 Jan 2022 15:28:57 +0800 Subject: [PATCH 6/8] Coupon flow completed --- rc-busness/assets/css/global.less | 7 +- rc-busness/pages/personal/settlement.less | 86 +++++++++++++++++-- rc-busness/pages/personal/settlement.vue | 83 ++++++++++++++++-- rc-busness/pages/productdetails/producted.vue | 7 +- 4 files changed, 164 insertions(+), 19 deletions(-) diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index 555128fe..2e98aeac 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -26,7 +26,6 @@ aside div[data-js-modal-menu] { .fade-leave-active { opacity: 0; } - .ts-no-data { text-align: center; margin: 3rem 0; @@ -818,7 +817,11 @@ picture { margin: 0 auto; .el-dialog{ width: 100%; - + } + .el-dialog__body{ + max-height:50vh; + overflow-x:hidden; + overflow-y:auto; } } #tns2-iw { diff --git a/rc-busness/pages/personal/settlement.less b/rc-busness/pages/personal/settlement.less index 92bc93c8..925a5e72 100644 --- a/rc-busness/pages/personal/settlement.less +++ b/rc-busness/pages/personal/settlement.less @@ -6,13 +6,89 @@ ul li ol li em strong i { .rc-header { width: 100%; } - - - .settlement { - } +.rc-discount { + position: relative; + width: 100%; + img { + display: block; + width: 100%; + height: 100%; + } + .rc-contair { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + } + .rc-left { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + color: #e1001a; + width: 34%; + float: left; + height: 100%; + i { + font-style: normal; + font-size: 12px; + } + span { + font-size: 26px; + } + strong { + font-style: normal; + font-size: 12px; + display: block; + margin-top: 8px; + } + } + .rc-right { + display: flex; + flex-direction: column; + padding: 5px 10px; + justify-content: center; + height: 100%; + i { + font-style: normal; + font-size: 16px; + color: #e1001a; + } + .rc-main { + color: #999999; + font-size: 12px; + } + span { + display: block; + margin-top: 2px; + } + em { + font-style: normal; + } + } + .rc-footer { + display: flex; + justify-content: flex-end; + margin-right: 10px; + span { + width: 72px; + height: 25px; + background: #e2001a; + text-align: center; + line-height: 25px; + font-size: 12px; + color: #ffffff; + margin-bottom: 8px; + border-radius: 100px; + margin-right: 8px; + cursor: pointer; + } + } +} .rc-main { width: 92%; @@ -255,7 +331,7 @@ ul li ol li em strong i { } ul { - width: 25%; + width: 100%; display: flex; flex-direction: column; justify-content: space-between; diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index ec08d894..c5e1b587 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -65,12 +65,12 @@ 配送方式: {{ shopprice.price }} - +
  • 商品总价: {{ sumPrice }} @@ -147,12 +147,43 @@
    • + +
    您还没有优惠券，可在商品的详情页面中领取
    +
    +
    + +
    +
    +
    + ￥{{ item.couponAmount }} +
    +
    +
    + + {{ item.couponDesc }} + +
    + 有效期 + {{ item.validTo }} +
    +
    + 立即使用 +
    +
    +
    +
    +
    +