From cfbb7d152364d0689035aa72703ce7ed70fbf5ee Mon Sep 17 00:00:00 2001 From: Vion Date: Mon, 17 Jan 2022 18:48:28 +0800 Subject: [PATCH 1/3] Merged with Carl --- rc-busness/pages/index.vue | 1047 +++++++++++++++++------------------- 1 file changed, 487 insertions(+), 560 deletions(-) diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index bd387cfb..77f0d9b7 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -13,61 +13,60 @@ - -
-
-
-
-
-
    -
  • - - {{ item.title }} -
    • -
+
+
+
+
+
+
    +
  • + + {{ item.title }} +
    • +
+
+
+ +
+
+ +
+ +
+

{{usertitle}}

+ + + +
+
+ +
-
-
- -
-
- -
- -
-

{{usertitle}}

- - - -
-
- -
-
- - {{item.title}} -

{{item.detail}}

- {{item.price}} - 立即购买 -
-
-
+
+ + {{item.title}} +

{{item.detail}}

+ {{item.price}} + 立即购买 +
+
+
-
- + {{item.title}}

{{item.detail}}

@@ -76,117 +75,28 @@
立即购买
-
- - - -
- - -
- - - - - - - -
-
-

全价猫湿粮

- - -
-
    -
  • -
    -
    - -
    -
    -
    -
    - {{item.name}} - 0.001{{item.price}} -
    - 立即购买 -
    -
    • -
- - - -
- 查看更多 -
- - - -
- - - -
-
    -
  1. - {{ item.title }} -
    2. -
-
-
    -
  • - - {{ item.title }} -
    • -
-
-
-
    -
  • -
    -
    - -
    -
    -
    -
    - {{item.title}} - 0.001{{item.price}} -
    - 立即购买 -
    -
    • -
- - -
- 查看更多 -
- - - -
- -
-
-
-
-

全价猫干粮

- - -
-
    -
  • +
+ + +
+ + +
+ + + + + + + +
+
+

全价猫湿粮

+ + +
+
    +
  • @@ -199,110 +109,52 @@
    立即购买
    -
    • -
- - - -
- 查看更多 -
- -
- - - -
- -
    -
  1. - - {{ item.title }} -
    2. -
-
-
    - - -
  • - - {{ item.title }} -
    • - -
-
-
-
    -
  • -
    -
    - -
    -
    -
    -
    - {{item.title}} - 0.001{{item.price}} -
    - 立即购买 -
    -
    • -
- -
- 查看更多 -
- - - -
- -
- - - -
-
-
- -
-
-

{{dogtitle}}

-
- - - -
-
- -
- -
- - {{item.title}} -

{{item.detail}}

- {{item.price}} - 立即购买 -
-
-
-
-
- + + + + + +
+ 查看更多 +
+ + + +
+ + + +
+
    +
  1. + {{ item.title }} +
    2. +
+
+
    +
  • + + {{ item.title }} +
    • +
+
+
+
    +
  • +
    +
    + +
    @@ -343,35 +195,130 @@ {{item.name}} 0.001{{item.price}}
    -
    - - - -
- - -
- -
- -
-

全价犬湿粮

- -
- -
-
-
    -
  • - - {{ item.title }} -
    • -
+ 立即购买 +
+ + + + + +
+ 查看更多 +
+ +
+ + + +
+ +
    +
  1. + + {{ item.title }} +
    2. +
+
+
    + + +
  • + + {{ item.title }} +
    • + +
+
+
+
    +
  • +
    +
    + +
    +
    +
    +
    + {{item.title}} + 0.001{{item.price}} +
    + 立即购买 +
    +
    • +
+ +
+ 查看更多 +
+ + + +
+ +
+ + + +
+
+
+ +
+
+

{{dogtitle}}

+
+ + + +
+
+ +
+ +
+ + {{item.title}} +

{{item.detail}}

+ {{item.price}} + 立即购买 +
+
+
+
+
+ +
+ + + {{item.title}} +

{{item.detail}}

+ {{item.price}} +
+
+ 立即购买 +
+
+ + + +
+ + +
@@ -802,58 +749,53 @@ }, ], - - anchor:'', - dogshi:[], - catlist:[], - chufanlist:[], - doglist:[], - gotop: false, - usersetting: `${settings.rbs}`, - activeIndex: 0, - activeIndex5:0, - activeIndex6:0, - activeInde2: 0, + anchor:'', + dogshi:[], + catlist:[], + chufanlist:[], + doglist:[], + gotop: false, + usersetting: `${settings.rbs}`, + activeIndex: 0, + activeIndex5:0, + activeIndex6:0, + activeInde2: 0, activeInde3:0, - catproduct:true, - catfood:false, + catproduct:true, + catfood:false, - selection:[ - { - title: "幼猫", - - }, - { - title: "成猫", - }, - { - title: "老年猫", - }, - { - title: "品种猫", - - }, - { - title: "亚健康", - - }, - ], - - banners:{ - 'mobile':[ - {src:"/images/one.jpg",link:""}, - {src:"/images/two.jpg",link:""}, - {src:"/images/three.jpg",link:""}, - {src:"/images/four.jpg",link:""} - ], - 'pc':[ - {src:"/images/pc-banner1.png",link:""}, - {src:"/images/pc-banner2.png",link:""}, - ] - }, - showingBanners:{}, - userdoglist: [ + selection:[ + { + title: "幼猫", + }, + { + title: "成猫", + }, + { + title: "老年猫", + }, + { + title: "品种猫", + }, + { + title: "亚健康", + }, + ], + banners:{ + 'mobile':[ + {src:"/images/banner/one.jpg",link:""}, + {src:"/images/banner/two.jpg",link:""}, + {src:"/images/banner/three.jpg",link:""}, + {src:"/images/banner/four.jpg",link:""} + ], + 'pc':[ + {src:"/images/banner/pc-banner1.png",link:""}, + {src:"/images/banner/pc-banner2.png",link:""} + ] + }, + showingBanners:[], + userdoglist: [ { title: "小型犬", catimage: require("../assets/cat.png"), @@ -1135,229 +1077,218 @@ } }, } - }, - components:{ - Myheader, - Myfooter, - unlogin, - // userswiper - }, - created(){ -vm=this; - }, - watch:{ -}, - mounted(){ - const that = this - this.ifAdoid() - // window.onresize = () => { - // setTimeout(() => { - // this.ifAdoid() - // }, 500); - - // } - this.usermessage= JSON.parse(localStorage.getItem("userInfo")); - - if(this.usermessage==null ||this.usermessage==undefined){ - this.userunlogin=true - } - window.addEventListener("scroll", this.handleScroll, true); - this.userchufang();//查询处方粮商品信息 - this.catmessage();//查询猫的信息 - this.dogmessage();//查询狗的信息 - // this.usershi();//查询对应的标签 - // this.userhot(); - - }, - destroyed () { - window.removeEventListener('scroll', this.scrollToTop); -}, - methods:{ - - - - ifAdoid(item,index){ - console.log(index); - this.userindex=index; - var sUserAgent = navigator.userAgent.toLowerCase(); - var bIsIpad = sUserAgent.match(/ipad/i) == "ipad"; - var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os"; - var bIsMidp = sUserAgent.match(/midp/i) == "midp"; - var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4"; - var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb"; - var bIsAndroid = sUserAgent.match(/android/i) == "android"; - var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce"; - var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile"; - - if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) { - console.log("当前是电脑打开") - this.stypechange=false; - console.log(this.usertitle) - - // let catshiid=document.querySelectorAll('.selectionswitch'); - // catshiid[this.userindex].style.display='none'; - // catshiid[this.userindex].style.display='none'; - this.catproduct=true; - this.onemao=false; - this.twomao=false; - this.threemao=false; - this.fourmao=false; - this.fivemao=false; - this.sixmao=false; - this.dogshow=false; - this.showingBanners=this.banners.pc; - // console.log(catshiid); - }else{ - console.log("当前是手机打开") - this.stypechange=true; - this.onemao=true; - this.twomao=true; - this.threemao=true; - this.fourmao=true; - this.fivemao=true; - this.dogshow=true; - this.catproduct=true - this.sixmao=true; - this.showingBanners=this.banners.mobile; + }, + components:{ + Myheader, + Myfooter, + unlogin, + // userswiper + }, + created(){ + vm=this; + }, + watch:{ + }, + mounted(){ + const that = this + this.ifAdoid(); + this.usermessage= JSON.parse(localStorage.getItem("userInfo")); + if(this.usermessage==null ||this.usermessage==undefined){ + this.userunlogin=true } - }, + window.addEventListener("scroll", this.handleScroll, true); + this.userchufang();//查询处方粮商品信息 + this.catmessage();//查询猫的信息 + this.dogmessage();//查询狗的信息 + }, + destroyed () { + window.removeEventListener('scroll', this.scrollToTop); + }, + methods:{ + ifAdoid(item,index){ + //console.log(index); + this.userindex=index; + var sUserAgent = navigator.userAgent.toLowerCase(); + var bIsIpad = sUserAgent.match(/ipad/i) == "ipad"; + var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os"; + var bIsMidp = sUserAgent.match(/midp/i) == "midp"; + var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4"; + var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb"; + var bIsAndroid = sUserAgent.match(/android/i) == "android"; + var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce"; + var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile"; + if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) { + console.log("当前是电脑打开") + this.stypechange=false; + //console.log(this.usertitle) - ifadroind(item,index,order){ - //console.log(item,index,order); - - var sUserAgent = navigator.userAgent.toLowerCase(); - var bIsIpad = sUserAgent.match(/ipad/i) == "ipad"; - var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os"; - var bIsMidp = sUserAgent.match(/midp/i) == "midp"; - var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4"; - var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb"; - var bIsAndroid = sUserAgent.match(/android/i) == "android"; - var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce"; - var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile"; + this.catproduct=true; + this.onemao=false; + this.twomao=false; + this.threemao=false; + this.fourmao=false; + this.fivemao=false; + this.sixmao=false; + this.dogshow=false + this.showingBanners=this.banners.pc; + } + else + { + console.log("当前是手机打开") + this.showingBanners=this.banners.mobile; + this.stypechange=true; + this.onemao=true; + this.twomao=true; + this.threemao=true; + this.fourmao=true; + this.fivemao=true; + this.dogshow=true; + this.catproduct=true + this.sixmao=true; - if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) { - console.log("当前是电脑打开啊啊啊") - if(item.title=='明星猫粮'){ - this.catproduct=true; - this.twomao=false; - this.threemao=false; - this.fourmao=false; - this.fivemao=false; - this.dogshow=false; - this.sixmao=false; - this.onemao=false; - } - if(item.title=='猫湿粮'){ - this.onemao=true; - this.dogshow=false; - console.log(this.onemao); - this.twomao=false; - this.threemao=false; - this.fourmao=false; - this.fivemao=false; - this.catproduct=false; + } + }, - + ifadroind(item,index,order){ + //console.log(item,index,order); - }if(item.title=='猫干粮'){ - this.onemao=false; - this.twomao=true; - this.dogshow=false; - this.threemao=false; - this.fourmao=false; - this.chufang=false; - this.catproduct=false; - } - - if(item.title=='犬干粮'){ - this.onemao=false; - this.twomao=false; - this.threemao=false; - this.fourmao=true; - this.chufang=false; - this.dogshow=false; - this.catproduct=false; - } - if(item.title=='犬湿粮'){ - this.onemao=false; - this.twomao=false; - this.threemao=true; - this.fourmao=false; - this.chufang=false; - this.catproduct=false; - this.dogshow=false; - } - if(item.title=='处方用粮'){ - this.onemao=false; - this.twomao=false; - this.threemao=false; - this.fourmao=false; - this.fivemao=true; - this.dogshow=false; - this.catproduct=false; - } - if(item.title=='明星狗粮'){ - this.onemao=false; - this.twomao=false; - this.threemao=false; - this.fourmao=false; - this.fivemao=false; - this.dogshow=true; - this.catproduct=false; - } - // this.usertitle=item.title - // this.catlistvideo[order]=item; - // this.catproduct=true; + var sUserAgent = navigator.userAgent.toLowerCase(); + var bIsIpad = sUserAgent.match(/ipad/i) == "ipad"; + var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os"; + var bIsMidp = sUserAgent.match(/midp/i) == "midp"; + var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4"; + var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb"; + var bIsAndroid = sUserAgent.match(/android/i) == "android"; + var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce"; + var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile"; - }else{ - this.catfood=true; - // this.catproduct=false; - let userindex=index - console.log(item,index); - let mingxin=document.querySelector('.pageFullScreen'); - let dogtop=document.querySelector('.oc-top'); - console.log(dogtop); -console.log(mingxin.offsetTop); -if(item.title=='犬湿粮'||item.title=='犬干粮'||item.title=='处方用粮'){ - userindex=userindex-2 -}else{ - userindex=userindex-1 -} -if(item.title=='明星猫粮'){ - mingxin.scrollIntoView(true); -}else{ - let catshiid=document.querySelectorAll('.selectionswitch'); -catshiid[userindex].scrollIntoView(true); -} -if(item.title=='明星狗粮') -dogtop.scrollIntoView(true); - // if(item.title=="猫湿粮"){ - // this.catproduct=false; - // this.catfood=true; - // }else if(item.title=="明星猫粮"){ - // this.catproduct=true; - // this.catfood=false; + if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) { + //console.log("当前是电脑打开啊啊啊") + if(item.title=='明星猫粮'){ + this.catproduct=true; + this.twomao=false; + this.threemao=false; + this.fourmao=false; + this.fivemao=false; + this.dogshow=false; + this.sixmao=false; - // } - console.log("当前是手机打开") - -} - }, - userdog(item,index){ - this.userstype=1; - let petType={ - petType:1, - name:index, - } - for(let i =0;i + \ No newline at end of file From 9b2ee06486eba63e22a4ff4081219bd0561396e4 Mon Sep 17 00:00:00 2001 From: Vion Date: Mon, 17 Jan 2022 19:04:28 +0800 Subject: [PATCH 2/3] Statics resources --- rc-busness/assets/css/mypersonal.less | 42 +++++++++++++----- rc-busness/assets/image/img-pointBg.png | Bin 0 -> 1483 bytes rc-busness/pages/personal/mypersonal.vue | 35 ++++++++++----- .../static/images/{ => banner}/four.jpg | Bin rc-busness/static/images/{ => banner}/one.jpg | Bin .../static/images/{ => banner}/pc-banner1.png | Bin .../static/images/{ => banner}/pc-banner2.png | Bin .../static/images/{ => banner}/three.jpg | Bin rc-busness/static/images/{ => banner}/two.jpg | Bin 9 files changed, 54 insertions(+), 23 deletions(-) create mode 100644 rc-busness/assets/image/img-pointBg.png rename rc-busness/static/images/{ => banner}/four.jpg (100%) rename rc-busness/static/images/{ => banner}/one.jpg (100%) rename rc-busness/static/images/{ => banner}/pc-banner1.png (100%) rename rc-busness/static/images/{ => banner}/pc-banner2.png (100%) rename rc-busness/static/images/{ => banner}/three.jpg (100%) rename rc-busness/static/images/{ => banner}/two.jpg (100%) diff --git a/rc-busness/assets/css/mypersonal.less b/rc-busness/assets/css/mypersonal.less index d96f6826..7ce18230 100644 --- a/rc-busness/assets/css/mypersonal.less +++ b/rc-busness/assets/css/mypersonal.less @@ -140,6 +140,7 @@ ul li ol li em strong i { } .rc-cordd{ color:#666666; + position:relative; span{ display: inline-block; margin-top: 16px; @@ -249,6 +250,13 @@ ul li ol li em strong i { width: 440px; height: 652px; } +.ts-mypersonal{ + margin-left:0; + .rc-column{ + padding-left:0; + padding-right:0; + } +} .online{ margin:40px auto; } @@ -362,17 +370,29 @@ ul li ol li em strong i { } } .block{ - height: 8px; - background: #D7D7D7; - margin-top: 16px; - border-radius: 4px; - .r-block{ - width: 0%; - height: 100%; - background: #008900; - } - - + height: 8px; + background: #D7D7D7; + margin-top: 16px; + border-radius: 4px; + position:relative; + margin-top:3.32rem; + .r-block{ + width: 0%; + height: 100%; + background: #008900; + } + .ts-point-tag{ + background:url("../image/img-pointBg.png") no-repeat center top; + background-size:contain; + height:2.375rem; + width:3.625rem; + text-align:center; + position:absolute; + font-size:.875rem; + line-height:2rem; + left:0; + top:-2.6rem; + } } .rc-value{ display: flex; diff --git a/rc-busness/assets/image/img-pointBg.png b/rc-busness/assets/image/img-pointBg.png new file mode 100644 index 0000000000000000000000000000000000000000..beffc900b2f17de31e3d559568dc9e791c800565 GIT binary patch literal 1483 zcmeAS@N?(olHy`uVBq!ia0vp^>wvh3gAGWY`tWKOkYXuz@(kesf*OvL4h9C+CQlc~ zkczmsa}0BY(XYuwy*mC_Kklcx{56C?tTCBr~Ln) z#oH#yN_>ilkB{%X`~G{?-lsaJr8d@9+$en0?7+qJ@UHyC-GcA#_P?EdHtqAn)3!Ie zt*z$zZNB|BuD@12I7VQmfQFO8lfV0-*2b;6{yMt(^Zf4HdE4*bynA=A^tAnvDszez zCQNcT@q0(m$~oC4QqqLE3#slB-}Ccd)S&v{gjO^J0$Gyc--?~WN~3RbUiroj^hutPj(`yLd=Zpjrv7} z+ZVrFvACCyql073vq%4A6WLuGk2ok;Hb!Xunbv*V`<@FU%MliVaGog^{ESDw7A$l1 zVJJN6(D_-wA%;IaYE)`CgvN=ewb$Y!r^$Z0a*>IVv(f&uWV!7ksYw=23J(-NBwx$h zzW?3Vs_C}1TO1sm9;~i8R;#}#&-)QaV?(2ZPVV`XO8*nT752?FD+yw3+{BWnuctTf zefRFITT64&)6-4O?rY6H^;5vZ}>C;UQc)5s8LQdyeOdI zqVSKeTBdFuIH4aXF8nMH%PVImw_dX3WXj~Y(>e3o;u)FpypO(jSl^J$zBkq2Pjdu| z{_%anA4@IHex1P87|z*Jy}!Ns?T=mJx6PA$XX___w`uFL_BMFz`YYAue*f~fmd~4| zH(!`pwfEkvZQ0>5@6UA4cAjHanI3y9{MwGL@IzbDd?xNW|Lobbu(Z-;vOAB>4f}a2 z?z_l|-#YUi7p?hecG~WGrv3b-hrE?{^gngIC4P*nu-(V@cR<{dr|S+?>{t0dagT>} z%840;?iG9ZpSa%oFCl-V_AJXE`%~Rpl#j6$9*?kW*)#uW;{3kC6|V%A)be^BkqtJT zzUSk!Lz633e~!(o?3I%M3f-x{pXhD%`Prpo>I?jisxPRU^o?q^(fsQ!I&RD3Pt~OOXvzwRUk=SFki9pt2_dAc?c%AIt^7Mdmo@HGt&@G=X z2yVAI?D_O=-|sEyJD-N~**u!|c>D7=J8l=4mc>X5?zFYHudhl>d?=py*2hh8UBwOO zd;UtFJ}YkY&`#;y;WVRph2kfrwKI$#bv5z 距离升级还差: {{ rcvalue }}
-
+
+
@@ -129,7 +130,7 @@ - +
@@ -138,11 +139,12 @@