diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index 9c802413..14960942 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -142,6 +142,7 @@ img, picture { } li{ border-radius: 100px; + flex-shrink: 0; } } .active{ @@ -267,7 +268,7 @@ img, picture { width:100%; } .rc-top{ - margin-top: 74px; + margin-top: 90px; } .rc-list__header { background: none; @@ -348,7 +349,7 @@ img, picture { font-size:16px; } .rc-top{ - margin-top: 124px; + margin-top: 150px; } .ts-product-list{ text-align: left; diff --git a/rc-busness/assets/css/index.less b/rc-busness/assets/css/index.less index 1ee9dd3b..38384959 100644 --- a/rc-busness/assets/css/index.less +++ b/rc-busness/assets/css/index.less @@ -273,6 +273,7 @@ } width: 100%; margin-top: 0.45rem; + } } .active { @@ -286,22 +287,26 @@ color: #444444; border: 1px solid #D7D7D7; } + } @media screen and (min-width: 769px) { + .rc-selection{ + display: none; + } .sw-center{ display: none; } .useraimg{ width: 100%; -height: 29.31rem; +// height: 29.31rem; object-fit: cover; } .van-swipe-item { color: #fff; - height: 29.31rem; + height: 100%; width: 100%; font-size: 1.25rem; line-height: 9.375rem; @@ -314,13 +319,19 @@ object-fit: cover; margin-top: 2.875rem; margin: 0 auto; position: relative; - //margin-top: 9.375rem; +// margin-top: 9.375rem; #xxxFullScreen { background-color: white; - margin-top: 100px; +// margin-top: 100px; #swiper1 { width: 100%; overflow: hidden; + margin-top: 2.31rem; + + h2{ + padding-bottom: 5rem; + } + } .swiper-container2 { @@ -463,8 +474,14 @@ img{ } .rc-max-width--xl { + .rc-ma { + .rc-margin-y--xl{ + margin-bottom: 1.88rem; + } + // padding:60px 0; + .ul-zhuan{ width: 100%; display: flex; @@ -491,21 +508,71 @@ img{ margin-left:1.25rem; } } + + + } + margin-bottom: 0; + h2{ + margin-top:2.31rem; + padding-bottom: 0.62rem; +} + +} +.usermain{ + margin-top: 2.5rem; + padding-bottom: 2.82rem; + .ul-dog{ + width: 100%; + display: flex; + justify-content: center; + flex-wrap: wrap; + flex-direction: row; + + span{ + margin-top: 2.5rem; + display: block; + } + img{ + width: 9.5rem; + height: 9.5rem; + display: block; + } + li{ + cursor: pointer; + font-size: 16px; + width: 9.875rem; + text-align: center; + height: 9.875rem; + background: #F6F6F6; + border-radius: 50%; + margin-left:3rem; + } + } } .rc-main{ width: 100%; margin-top: 2.5rem; + + .rc-text--center{ + margin-top: 4.8rem; + + } .van-tabs{ display: none; } .selectionswitch{ + + .rc-text--center{ + margin-top: 4.8rem; + } .van-tabs{ display: none; } } .rc-selection{ + display: none; width: 100%; ol{ width: 100%; diff --git a/rc-busness/assets/css/login.less b/rc-busness/assets/css/login.less index 8ba135c4..c5fe6b07 100644 --- a/rc-busness/assets/css/login.less +++ b/rc-busness/assets/css/login.less @@ -139,7 +139,7 @@ } } // /* 最小768px最大1920 *pc端/ -@media screen and (min-width: 768px) and (max-width: 1920px) { +@media screen and (min-width: 769px) { .usecheck{ display: flex; text-align: left; diff --git a/rc-busness/assets/css/settlement.less b/rc-busness/assets/css/settlement.less index 12826929..99e0c647 100644 --- a/rc-busness/assets/css/settlement.less +++ b/rc-busness/assets/css/settlement.less @@ -41,8 +41,7 @@ color: #333333; } } .rc-main { - width: 92%; - margin: 0 auto; + .rc-userbottom{ display: none; } @@ -304,8 +303,6 @@ color: #333333; @media screen and (min-width: 768px) and (max-width: 1920px) { .rc-main { - width: 92%; - margin: 0 auto; .rc-userbottomm{ display: none; } diff --git a/rc-busness/assets/css/useraddress.less b/rc-busness/assets/css/useraddress.less new file mode 100644 index 00000000..851f74d6 --- /dev/null +++ b/rc-busness/assets/css/useraddress.less @@ -0,0 +1,351 @@ + +// 手机端 +@media screen and(min-width: 320px) and(max-width:768px) { + .active { + font-size: 14px; + color: #e2001a; + cursor: pointer; +} +.unactive { + font-size: 14px; + color: #444444; + cursor: pointer; +} + .rc-layout-container { + + + width: 100%; + .rc-main { + .rc-usermaina{ + width: 100%; + height: 100%; + } + .rc-headera { + display: flex; + justify-content: space-between; + height: 64px; + align-items: center; + } + .rc-userheader{ + display: none; + } + + .rc-center { + width: 100%; + height: 245px; + margin-top: 8px; + .rc-usermain { + .pc-bottom{ + display: none; + } + + display: flex; + .rc-image { + border: 1px solid #D8D8D8; + margin-top: 17px; +; + img { + width: 96px; + height: 96px; + display: block; + + } + } + + .rc-right { + + .rc-userbottomm{ + display: none; + } + display: flex; + flex-direction: column; + width: 100%; + margin-left: 16px; + justify-content: center; + em + { + font-style: normal; + display: block; + font-size: 16px; + margin-top: 18px; + font-weight: bold; + +color: #E1001A; + } + } + .rc-userright { + display: flex; + flex-direction: column; + color: #666666; + font-size: 14px; + span{ + display: block; + margin-top: 16px; + } + } + .rc-userbottom { + display: flex; + justify-content: space-between; + margin-top: 8px; + span{ + color: #666666; + font-size: 14px; + } + i{ + font-style: normal; + color: #E1001A; + font-size: 18px; + font-weight: bold; + } + } + } + + .rc-bottom { + display: flex; + align-items: center; + justify-content: center; + margin-top: 24px; + span { + display: block; + width: 130px; + display: flex; + align-items: center; + line-height: 40px; + text-align: center; + color: #e2001a; + height: 40px; + border: 2px solid #e2001a; + justify-content: center; + border-radius: 30px; + font-weight: bold; + } + span:last-child{ + margin-left: 15px; + } + } + } + + .rc-title { + height: 52px; + display: flex; + align-items: center; + border-bottom: 1px solid #d8d8d8; + justify-content: space-between; + span{ + font-size: 14px; + color: #999999; + margin-left: 8px; + } + em{ + font-style: normal; + font-size: 14px; + +color: #333333; + } + i{ + font-style: normal; + font-size: 14px; + +color: #333333; + } + .rc-usertitle strong{ + display: none; + } + } + } + } +} +// /* 最小768px最大1920 *pc端/ +@media screen and (min-width: 768px) and (max-width: 1920px) { + .active { + font-size: 18px; + color: #e2001a; + cursor: pointer; + // margin-left: 40px; +} +.unactive { + font-size: 18px; + color: #444444; + cursor: pointer; + // margin-left: 80px; +} + .rc-layout-container { + .rc-main { + .rc-headera { + display: flex; + height: 64px; + align-items: center; + border: 1px solid #D7D7D7; + border-radius: 3px 3px 0px 0px; + font-size: 18px; + span:first-child{ + margin-left: 40px; + } + span{ + margin-left: 80px; + } + } + + .rc-userheader{ + width: 100%; + height: 64px; + background: #F6F6F6; + border: 1px solid #D7D7D7; + display: flex; + align-items: center; + justify-content: space-between; + font-size: 18px; + span:first-child{ + margin-left: 173px; + } + span:last-child{ + margin-right: 87px; + } + } + + .rc-center { + width: 100%; + height: 220px; + border: 1px solid #D7D7D7; + .rc-usermain { + display: flex; + justify-content: space-between; + align-items: center; + height: 164px; + .rc-usercenter{ + width: 25%; + em{ + font-size: 18px; + } + } + .rc-image { + border: 1px solid #D8D8D8; + margin-left: 40px; + + img { + width: 96px; + height: 96px; + display: block; + + } + } + + .rc-right { + .rc-userbottom{ + display: none; + } + display: flex; + + width: 100%; + margin-left: 16px; + + em + { + font-style: normal; + font-weight: bold; + font-size: 16px; + margin-top: 18px; + +color: #E1001A; + } + } + .rc-userright { + display: flex; + flex-direction: column; + color: #666666; + font-size: 16px; + span{ + display: block; + margin-top: 6px; + } + } + .rc-userbottomm { + display: flex; + justify-content: space-between; + align-items: center; + width: 58%; + font-size: 20px; + color: #E1001A; + font-weight: bold; + i{ + font-style: normal; + + + } + } + + .pc-bottom { + display: flex; + align-items: center; + justify-content: center; + flex-direction: column; + margin-right: 40px; + + span { + display: block; + width: 130px; + cursor: pointer; + display: flex; + align-items: center; + line-height: 40px; + font-weight: bold; + text-align: center; + color: #e2001a; + height: 40px; + border: 2px solid #e2001a; + justify-content: center; + border-radius: 30px; + } + span:last-child{ + margin-top: 15px; + } + } + } + + .rc-bottom { + display: none; + } + } + + .rc-title { + height: 55px; + display: flex; + align-items: center; + border-bottom: 1px solid #d8d8d8; + justify-content: space-between; + span{ + font-size: 16px; + color: #999999; + margin-left: 8px; + } + strong{ + font-style: normal; + font-size: 16px; + color: #444444; + } + em{ + font-style: normal; + font-size: 16px; + +color: #333333; + } + i{ + font-style: normal; + font-size: 16px; + margin-left: 40px; + +color: #333333; + } + .rc-usertitle{ + margin-right: 73px; + display: flex; + align-items: center; + em{ + display: block; + margin-left: 8px; + } + } + } + } + } +} \ No newline at end of file diff --git a/rc-busness/assets/dog/four.jpg b/rc-busness/assets/dog/four.jpg new file mode 100644 index 00000000..d8058f8d Binary files /dev/null and b/rc-busness/assets/dog/four.jpg differ diff --git a/rc-busness/assets/dog/four.mp4 b/rc-busness/assets/dog/four.mp4 new file mode 100644 index 00000000..466d701a Binary files /dev/null and b/rc-busness/assets/dog/four.mp4 differ diff --git a/rc-busness/assets/dog/one.jpg b/rc-busness/assets/dog/one.jpg new file mode 100644 index 00000000..7e1e5dd3 Binary files /dev/null and b/rc-busness/assets/dog/one.jpg differ diff --git a/rc-busness/assets/dog/one.mp4 b/rc-busness/assets/dog/one.mp4 new file mode 100644 index 00000000..fb30b38d Binary files /dev/null and b/rc-busness/assets/dog/one.mp4 differ diff --git a/rc-busness/assets/dog/three.jpg b/rc-busness/assets/dog/three.jpg new file mode 100644 index 00000000..d39f7747 Binary files /dev/null and b/rc-busness/assets/dog/three.jpg differ diff --git a/rc-busness/assets/dog/three.mp4 b/rc-busness/assets/dog/three.mp4 new file mode 100644 index 00000000..37740ea1 Binary files /dev/null and b/rc-busness/assets/dog/three.mp4 differ diff --git a/rc-busness/assets/dog/two.jpg b/rc-busness/assets/dog/two.jpg new file mode 100644 index 00000000..084f533f Binary files /dev/null and b/rc-busness/assets/dog/two.jpg differ diff --git a/rc-busness/assets/dog/two.mp4 b/rc-busness/assets/dog/two.mp4 new file mode 100644 index 00000000..e19212fc Binary files /dev/null and b/rc-busness/assets/dog/two.mp4 differ diff --git a/rc-busness/assets/image/pc-banner1.png b/rc-busness/assets/image/pc-banner1.png new file mode 100644 index 00000000..0930e107 Binary files /dev/null and b/rc-busness/assets/image/pc-banner1.png differ diff --git a/rc-busness/assets/image/pc-banner2.png b/rc-busness/assets/image/pc-banner2.png new file mode 100644 index 00000000..eb453954 Binary files /dev/null and b/rc-busness/assets/image/pc-banner2.png differ diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index 50a4814a..913f038d 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -13,6 +13,7 @@ +
-
+

{{usertitle}}

@@ -90,12 +91,15 @@
+ + + -
-
-

全价猫湿粮

+
+
+

全价猫湿粮

@@ -182,8 +186,8 @@
-
-
+
+

全价猫干粮

@@ -275,12 +279,76 @@
-
+
+
+ +
+
+

{{dogtitle}}

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

{{item.detail}}

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

{{item.detail}}

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

全价犬湿粮

+
+
+
+
    +
  • + + {{ item.title }} +
    • +
+
+
  • @@ -374,11 +442,28 @@
-
-
+ + + +
+

全价犬干粮

+
+
+
    +
  • + + {{ item.title }} +
    • +
+
  • @@ -470,9 +555,9 @@
-
+
-
+

处方用粮

@@ -640,9 +725,19 @@ return{ useraindex:0, usertitle:'明星猫粮', + dogtitle:'明星狗粮', processinformation:[], catshi:[], + userindex:0, userstype:'', + onemao:false, + twomao:false, + threemao:false, + dogshow:false, + fourmao:false, + fivemao:false, + sixmao:false, + stypechange:true, userunlogin:false, searchBar:true, usermessage:[], @@ -670,24 +765,13 @@ gotop: false, usersetting: `${settings.rbs}`, activeIndex: 0, + activeIndex5:0, + activeIndex6:0, activeInde2: 0, activeInde3:0, catproduct:true, catfood:false, - dogselection:[ - { - title: "小型犬", - - }, - { - title: "中型犬", - }, - { - title: "大型犬", - }, - - ], selection:[ { @@ -717,7 +801,7 @@ activeInde3:0, {src:require("../assets/image/four.jpg"),link:""}, ], - doglist: [ + userdoglist: [ { title: "小型犬", catimage: require("../assets/cat.png"), @@ -759,44 +843,51 @@ activeInde3:0, { title: "明星猫粮", detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', - catimage: require("../assets/cat.png"), + catimage: require("../assets/star-cat.png"), price:'￥2' }, { title: "猫湿粮", detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', - price:'￥12', - catimage: require("../assets/four.png"), + catimage: require("../assets/two.png"), }, { title: "猫干粮", detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', price:'￥102', - catimage: require("../assets/one.png"), + catimage: require("../assets/cat.png"), }, - { - title: "犬湿粮", + { + title: "明星狗粮", detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', - price:'￥112', - catimage: require("../assets/two.png"), + catimage: require("../assets/six.png"), }, - { - title: "犬干粮", + + { + title: "犬湿粮", detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', price:'￥112', catimage: require("../assets/three.png"), + }, + { + title: "犬干粮", + detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', + + price:'￥112', + catimage: require("../assets/one.png"), + }, { title: "处方用粮", detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', price:'￥112', - catimage: require("../assets/six.png"), + catimage: require("../assets/four.png"), }, ], @@ -855,6 +946,38 @@ activeInde3:0, price:'¥123.45', }, + ], + + doglistvideo: [ + { + title: "明星狗粮", + video:require("../assets/dog/one.mp4"), + catimage: require("../assets/dog/one.jpg"), + detail:'为10月龄及以上成犬量身打造的精准营养', + price:'¥123.45', + }, + { + title: "狗湿粮", + video:require("../assets/dog/two.mp4"), + catimage: require("../assets/dog/two.jpg"), + detail:'为10月龄及以上英国成犬量身打造的精准营养', + price:'¥123.45', + }, + { + title: "狗干粮", + video:require("../assets/dog/three.mp4"), + catimage: require("../assets/dog/three.jpg"), + detail:'为10月龄及以上英国犬成犬量身打造的精准营养', + price:'¥123.45', + }, + { + title: "狗干粮", + video:require("../assets/dog/four.mp4"), + catimage: require("../assets/dog/four.jpg"), + detail:'为10月龄及以上英国成犬量身打造的精准营养', + price:'¥123.45', + }, + ], fixedlist: [ { @@ -967,13 +1090,27 @@ activeInde3:0, Myfooter, tabs, 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")); - let jump = document.querySelectorAll('.d_jump') + if(this.usermessage==null ||this.usermessage==undefined){ this.userunlogin=true } @@ -989,8 +1126,12 @@ vm=this; window.removeEventListener('scroll', this.scrollToTop); }, methods:{ - ifadroind(item,index,order){ - console.log(item,order); + + + + 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"; @@ -1000,35 +1141,157 @@ vm=this; 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.activeIndex=index; + if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) { console.log("当前是电脑打开") - this.usertitle=item.title - this.catlistvideo[order]=item; - this.catproduct=true; - console.log(this.catproduct); + 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 + // 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; + +} + }, + + 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"; + + 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; + } + 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; + + + + }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; + }else{ this.catfood=true; - this.catproduct=false; + // 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-1].scrollIntoView(true); +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(item.title=="猫湿粮"){ - this.catproduct=false; - this.catfood=true; - }else if(item.title=="明星猫粮"){ - this.catproduct=true; - this.catfood=false; - - } + // } console.log("当前是手机打开") } @@ -1229,7 +1492,21 @@ catshiid[userindex-1].scrollIntoView(true); }, selectGoods(item,index){ + console.log(item,index); + this.activeIndex=index; + console.log(item.title); this.ifadroind(item,index,this.useraindex) +// this.ifAdoid(item,index); + +}, +quanshi(item,index){ + console.log(item,index); + this.activeIndex5=index + console.log(this.activeIndex5); + +}, +userdoghot(item,index){ + this.activeIndex6=index }, selectGo(item,index){ diff --git a/rc-busness/pages/personal/settlement.vue b/rc-busness/pages/personal/settlement.vue index 685f7c19..9c51afac 100644 --- a/rc-busness/pages/personal/settlement.vue +++ b/rc-busness/pages/personal/settlement.vue @@ -1,28 +1,27 @@ @@ -194,638 +195,6 @@ jiesuan(){ \ No newline at end of file diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index b845bd84..74141890 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -1,7 +1,8 @@