diff --git a/rc-busness/README.md b/rc-busness/README.md index fa8a2f27..50081e7d 100644 --- a/rc-busness/README.md +++ b/rc-busness/README.md @@ -1,6 +1,6 @@ # rc-busness -## Build Setup aaaas +## Build Setup aaaasa ```bash # install dependencies diff --git a/rc-busness/assets/css/discount.less b/rc-busness/assets/css/discount.less new file mode 100644 index 00000000..9b580ef7 --- /dev/null +++ b/rc-busness/assets/css/discount.less @@ -0,0 +1,319 @@ +@media screen and (max-width:768px){ + .allmain{ + .rc-top{ + margin-top: 2.5rem; + } + + } + .active { + font-size: 14px; + color: #E2001A; + + } + .unactive { + font-size: 14px; + color: #444444; + + } + .rc-usermain{ + .online{ + margin-top: 0; + } + + .rc { + height: 64px; + display: flex; + align-items: center; + margin-left: 23px; + span { + display: block; + margin-left: 32px; + font-weight: bold; + + } + span:first-child { + margin-left: 0; + } + } + } + + + .rc-discount { + margin-left: 20px; + display: flex; + margin-top: 16px; + width: 335px; + background: #ffffff; + position: relative; + img { + display: block; + width: 100%; + height: 100%; + } + .rc-contair { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + z-index: 8; + } + .rc-left { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + color: #e1001a; + text-align: center; + width: 30%; + font-weight: bold; + float: left; + height: 100%; + i { + font-style: normal; + font-size: 12px; + } + span { + font-size: 26px; + } + strong { + font-style: normal; + font-size: 12px; + display: block; + } + } + .rc-right { + display: flex; + flex-direction: column; + height: 100%; + i { + font-style: normal; + font-size: 14px; + color: #e1001a; + } + .rc-userfont { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: #999999; + font-size: 12px; + strong{ + display: block; + margin-top: 8px; + } + } + + em { + font-style: normal; + } + .ts-stand{ + display: flex; + align-items: center; + justify-content: end; + padding-right: 17px; + margin-bottom: 8px; + } + .ts-standard-btn{ + + width: 72px; + display: flex; +height: 25px; +background: #E2001A; +border-radius: 100px; +align-items: center; +font-size: 12px; +justify-content: center; +margin-top: 8px; + + } + span{ + margin-top: 0; + } + margin-top: 17px; + padding-left: 36px; + } + .rc-footer { + display: flex; + align-items:flex-end + 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: 30px; + } + } + + + } + +} +@media screen and (min-width: 769px){ + + .allmain{ + .rc-top{ + margin-top: 1.5rem; + } + .rs-dis{ + display: flex; + flex-flow: wrap; + justify-content: center; + } + + } + .active { + font-size: 14px; + color: #E2001A; + + } + .unactive { + font-size: 14px; + color: #444444; + + } + .rc-usermain{ + .online{ + margin-top: 0; + } + + .rc { + height: 96px; + display: flex; + align-items: center; + margin-left: 23px; + justify-content: center; + span { + display: block; + margin-left: 40px; + font-size: 16px; + font-weight: bold; + + } + span:first-child { + margin-left: 0; + } + } + } + + + .rc-discount { + margin-left: 20px; + display: flex; + margin-top: 16px; + width: 335px; + background: #ffffff; + position: relative; + img { + display: block; + width: 100%; + height: 100%; + } + .rc-contair { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + z-index: 8; + } + .rc-left { + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + color: #e1001a; + text-align: center; + width: 30%; + font-weight: bold; + float: left; + height: 100%; + i { + font-style: normal; + font-size: 12px; + } + span { + font-size: 26px; + } + strong { + font-style: normal; + font-size: 12px; + display: block; + } + } + .rc-right { + display: flex; + flex-direction: column; + height: 100%; + i { + font-style: normal; + font-size: 16px; + color: #e1001a; + } + .rc-userfont { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + color: #999999; + font-size: 12px; + strong{ + display: block; + margin-top: 8px; + } + } + + em { + font-style: normal; + } + .ts-stand{ + display: flex; + align-items: center; + justify-content: end; + padding-right: 17px; + margin-bottom: 8px; + } + .ts-standard-btn{ + + width: 72px; + display: flex; +height: 25px; +background: #E2001A; +border-radius: 100px; +align-items: center; +font-size: 12px; +justify-content: center; +margin-top: 8px; + + } + span{ + margin-top: 0; + } + margin-top: 17px; + padding-left: 36px; + } + .rc-footer { + display: flex; + align-items:flex-end; + 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: 30px; + } + } + + + } + + +} \ No newline at end of file diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index 9c802413..4d52e87b 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -4,6 +4,19 @@ body{ line-height: 1.5; color: #666; } +//用户光点 +.rc-screen-reader{ + width: 0.81rem; + height: 0.81rem; + border-radius: 50%; + position: absolute; + background-color: red; + top: 16%; + left: 66%; + display: block; + width: 0.37rem; + height: 0.37rem; +} img, picture { display: block; max-width: 100%; diff --git a/rc-busness/assets/css/index.less b/rc-busness/assets/css/index.less index 1ee9dd3b..b4d1b764 100644 --- a/rc-busness/assets/css/index.less +++ b/rc-busness/assets/css/index.less @@ -6,6 +6,9 @@ background-color: #E1001A; } @media screen and (max-width:768px){ + .ul-dog{ + display: none; + } .searchBara{ position: fixed; width: 100%; @@ -273,6 +276,7 @@ } width: 100%; margin-top: 0.45rem; + } } .active { @@ -286,22 +290,28 @@ color: #444444; border: 1px solid #D7D7D7; } + // .usermain{ + // display: none; + // } } @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 +324,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 +479,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 +513,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/integral.less b/rc-busness/assets/css/integral.less new file mode 100644 index 00000000..e461175d --- /dev/null +++ b/rc-busness/assets/css/integral.less @@ -0,0 +1,195 @@ +@media screen and (max-width:768px){ + .rc-button{ + width: 100%; + height: 80px; + background: #FFFFFF; +box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); + display: flex; + align-items: center; + justify-content: center; + margin-top: 12px; + +.rc-order{ +width: 164px; + height: 48px; + border: 2px solid #E2001A; + border-radius: 30px; + background: #E2001A; + text-align: center; + align-items: center; + line-height: 48px; +span{ + font-size: 16px; + display: block; + color: #FFFFFF; + +} +} + } +.rc-usermain{ + width: 92%; + margin: 0 auto; + + ul{ + height: 70px; + display: block; + border-bottom: 1px solid #D8D8D8; + display: flex; + align-items: center; + justify-content: center; + text-align: center; + font-size: 16px; + color: #444444; + li{ + float: left; + width: 30%; + + + } + li:after{ + // height: 2px; + // border: 1px solid red; + // display: block; + content:"|"; + color: #707070; + margin-left: 5px; + + } + li:last-child:after{ + content:""; + + } + } + + ol{ + li{ + font-style: normal; + display: block; + height: 32px; + margin-top: 16px; + display: flex; + // justify-content: space-between; + align-items: center; + color: #666666; + font-size: 14px; + text-align: center; + i{ + font-style: normal; + display: block; + width: 40%; + } + span{ + font-style: normal; + display: block; + width: 36%; + } + em{ + font-style: normal; + display: block; + width: 23%; + } + + + } + } + + +} + +} + +@media screen and (min-width: 769px) +{ + + .rc-button{ + width: 100%; + height: 80px; + background: #FFFFFF; +box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); + display: flex; + align-items: center; + justify-content: center; + margin-top: 12px; + display: none; + +.rc-order{ +width: 164px; + height: 48px; + border: 2px solid #E2001A; + border-radius: 30px; + background: #E2001A; + text-align: center; + align-items: center; + line-height: 48px; +span{ + font-size: 16px; + display: block; + color: #FFFFFF; + +} +} + } +.rc-usermain{ + width: 92%; + margin: 0 auto; + margin-top: 60px; + + ul{ + height: 64px; +background: #F6F6F6; +border: 1px solid #D7D7D7; +opacity: 1; +border-radius: 3px 3px 0px 0px; + display: block; + display: flex; + align-items: center; + justify-content: center; + text-align: center; + font-size: 16px; + color: #444444; + li{ + float: left; + width: 42%; + + + } + + } + + ol{ + li{ + font-style: normal; + display: block; + height: 48px; + margin-top: 16px; + display: flex; + border: 1px solid #D7D7D7; + // justify-content: space-between; + align-items: center; + color: #666666; + font-size: 14px; + text-align: center; + i{ + font-style: normal; + display: block; + width: 34%; + } + span{ + font-style: normal; + display: block; + width: 34%; + } + em{ + font-style: normal; + display: block; + width: 34%; + } + + + } + } + + +} + +} \ No newline at end of file diff --git a/rc-busness/assets/css/openaddress.less b/rc-busness/assets/css/openaddress.less new file mode 100644 index 00000000..689de33e --- /dev/null +++ b/rc-busness/assets/css/openaddress.less @@ -0,0 +1,11 @@ +@media screen and (max-width:768px){ + + +} + +@media screen and (min-width: 769px) +{ + + + +} \ No newline at end of file diff --git a/rc-busness/assets/dog/1615961267978_BdtOyG.jpg b/rc-busness/assets/dog/four.jpg similarity index 100% rename from rc-busness/assets/dog/1615961267978_BdtOyG.jpg rename to rc-busness/assets/dog/four.jpg diff --git a/rc-busness/assets/dog/1615961220013_Pgrg4o.mp4 b/rc-busness/assets/dog/four.mp4 similarity index 100% rename from rc-busness/assets/dog/1615961220013_Pgrg4o.mp4 rename to rc-busness/assets/dog/four.mp4 diff --git a/rc-busness/assets/dog/1615961193866_CRRN2p.jpg b/rc-busness/assets/dog/one.jpg similarity index 100% rename from rc-busness/assets/dog/1615961193866_CRRN2p.jpg rename to rc-busness/assets/dog/one.jpg diff --git a/rc-busness/assets/dog/1616137837391_LkOGwt.mp4 b/rc-busness/assets/dog/one.mp4 similarity index 100% rename from rc-busness/assets/dog/1616137837391_LkOGwt.mp4 rename to rc-busness/assets/dog/one.mp4 diff --git a/rc-busness/assets/dog/1615961258160_lEjV9J.jpg b/rc-busness/assets/dog/three.jpg similarity index 100% rename from rc-busness/assets/dog/1615961258160_lEjV9J.jpg rename to rc-busness/assets/dog/three.jpg diff --git a/rc-busness/assets/dog/1615961247165_qVo04H.mp4 b/rc-busness/assets/dog/three.mp4 similarity index 100% rename from rc-busness/assets/dog/1615961247165_qVo04H.mp4 rename to rc-busness/assets/dog/three.mp4 diff --git a/rc-busness/assets/dog/1615961228023_9PoCCS.jpg b/rc-busness/assets/dog/two.jpg similarity index 100% rename from rc-busness/assets/dog/1615961228023_9PoCCS.jpg rename to rc-busness/assets/dog/two.jpg diff --git a/rc-busness/assets/dog/1615961409788_BpyOxx.mp4 b/rc-busness/assets/dog/two.mp4 similarity index 100% rename from rc-busness/assets/dog/1615961409788_BpyOxx.mp4 rename to rc-busness/assets/dog/two.mp4 diff --git a/rc-busness/assets/image/sub-nav-1.jpg b/rc-busness/assets/image/sub-nav-1.jpg new file mode 100644 index 00000000..e941c393 Binary files /dev/null and b/rc-busness/assets/image/sub-nav-1.jpg differ diff --git a/rc-busness/assets/image/sub-nav-2.jpg b/rc-busness/assets/image/sub-nav-2.jpg new file mode 100644 index 00000000..508ef7a8 Binary files /dev/null and b/rc-busness/assets/image/sub-nav-2.jpg differ diff --git a/rc-busness/assets/image/sub-nav-3.jpg b/rc-busness/assets/image/sub-nav-3.jpg new file mode 100644 index 00000000..ed8d2ae5 Binary files /dev/null and b/rc-busness/assets/image/sub-nav-3.jpg differ diff --git a/rc-busness/assets/image/sub-nav-4.jpg b/rc-busness/assets/image/sub-nav-4.jpg new file mode 100644 index 00000000..5713519e Binary files /dev/null and b/rc-busness/assets/image/sub-nav-4.jpg differ diff --git a/rc-busness/assets/showimage/ico-bilibili.png b/rc-busness/assets/showimage/ico-bilibili.png new file mode 100644 index 00000000..6f640fa5 Binary files /dev/null and b/rc-busness/assets/showimage/ico-bilibili.png differ diff --git a/rc-busness/assets/showimage/ico-weibo.png b/rc-busness/assets/showimage/ico-weibo.png new file mode 100644 index 00000000..0aa2108b Binary files /dev/null and b/rc-busness/assets/showimage/ico-weibo.png differ diff --git a/rc-busness/assets/showimage/ico-zhihu.png b/rc-busness/assets/showimage/ico-zhihu.png new file mode 100644 index 00000000..c5045369 Binary files /dev/null and b/rc-busness/assets/showimage/ico-zhihu.png differ diff --git a/rc-busness/assets/showimage/qrcode-aichong.jpg b/rc-busness/assets/showimage/qrcode-aichong.jpg new file mode 100644 index 00000000..33642a2b Binary files /dev/null and b/rc-busness/assets/showimage/qrcode-aichong.jpg differ diff --git a/rc-busness/assets/showimage/qrcode-chanpin.jpg b/rc-busness/assets/showimage/qrcode-chanpin.jpg new file mode 100644 index 00000000..099583e8 Binary files /dev/null and b/rc-busness/assets/showimage/qrcode-chanpin.jpg differ diff --git a/rc-busness/assets/showimage/qrcode-douyin.jpg b/rc-busness/assets/showimage/qrcode-douyin.jpg new file mode 100644 index 00000000..1b125c4a Binary files /dev/null and b/rc-busness/assets/showimage/qrcode-douyin.jpg differ diff --git a/rc-busness/assets/showimage/qrcode-royal-elite.jpg b/rc-busness/assets/showimage/qrcode-royal-elite.jpg new file mode 100644 index 00000000..51bfcf13 Binary files /dev/null and b/rc-busness/assets/showimage/qrcode-royal-elite.jpg differ diff --git a/rc-busness/assets/showimage/royalcanincn-qrcode.jpg b/rc-busness/assets/showimage/royalcanincn-qrcode.jpg new file mode 100644 index 00000000..ff5a1c85 Binary files /dev/null and b/rc-busness/assets/showimage/royalcanincn-qrcode.jpg differ diff --git a/rc-busness/assets/showimage/sub-nav-1.jpg b/rc-busness/assets/showimage/sub-nav-1.jpg new file mode 100644 index 00000000..e941c393 Binary files /dev/null and b/rc-busness/assets/showimage/sub-nav-1.jpg differ diff --git a/rc-busness/assets/showimage/sub-nav-2.jpg b/rc-busness/assets/showimage/sub-nav-2.jpg new file mode 100644 index 00000000..508ef7a8 Binary files /dev/null and b/rc-busness/assets/showimage/sub-nav-2.jpg differ diff --git a/rc-busness/assets/showimage/sub-nav-3.jpg b/rc-busness/assets/showimage/sub-nav-3.jpg new file mode 100644 index 00000000..ed8d2ae5 Binary files /dev/null and b/rc-busness/assets/showimage/sub-nav-3.jpg differ diff --git a/rc-busness/assets/showimage/sub-nav-4.jpg b/rc-busness/assets/showimage/sub-nav-4.jpg new file mode 100644 index 00000000..5713519e Binary files /dev/null and b/rc-busness/assets/showimage/sub-nav-4.jpg differ diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue index e43ae230..0cbbca9e 100644 --- a/rc-busness/components/header.vue +++ b/rc-busness/components/header.vue @@ -37,14 +37,18 @@
微信扫一扫 - +
- + 登录 + + + + - + - + - + +
-
+

{{usertitle}}

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

全价猫湿粮

+
+
+

全价猫湿粮

@@ -124,7 +127,6 @@ -
@@ -182,8 +184,8 @@
-
-
+
+

全价猫干粮

@@ -275,12 +277,76 @@
-
+
+
+ +
+
+

{{dogtitle}}

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

{{item.detail}}

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

{{item.detail}}

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

全价犬湿粮

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

全价犬干粮

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

处方用粮

@@ -628,7 +711,6 @@ import Myheader from "~/components/header.vue"; import Myfooter from "~/components/rc-footer.vue"; import unlogin from "~/components/unlogin.vue"; - import tabs from "@/components/tabs.vue"; import '@vant/touch-emulator'; import { userquery,postCourseId,biaomessage,userque,searchchanpin } from "../ajax/getData"; const settings = require("@/config"); @@ -640,9 +722,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 +762,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 +798,7 @@ activeInde3:0, {src:require("../assets/image/four.jpg"),link:""}, ], - doglist: [ + userdoglist: [ { title: "小型犬", catimage: require("../assets/cat.png"), @@ -759,44 +840,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 +943,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: [ { @@ -965,15 +1085,25 @@ activeInde3:0, components:{ Myheader, 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 +1119,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 +1134,158 @@ 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; + 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; + + + + }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("当前是手机打开") } @@ -1072,10 +1329,13 @@ catshiid[userindex-1].scrollIntoView(true); this.toTop(); }, handleScroll(e) - { - let fixedCatbarSeperator = document.getElementById("fixed-catbar-seperator"); - let scrolltop = document.documentElement.scrollTop || document.body.scrollTop; - if((scrolltop-fixedCatbarSeperator.offsetTop)>0) + { + let scrolltop = document.documentElement.scrollTop || document.body.scrollTop; + let fixedCatbarSeperator = document.querySelector("#fixed-catbar-seperator"); + // console.log(fixedCatbarSeperator.offsetTop,scrolltop); + if(fixedCatbarSeperator!=='null' &&fixedCatbarSeperator!=='underfined'){ + console.log('-===='); + if((scrolltop-fixedCatbarSeperator.offsetTop)>0) { this.gotop = true this.searchBar=false @@ -1085,6 +1345,10 @@ catshiid[userindex-1].scrollIntoView(true); this.gotop = false; this.searchBar=true } + } + + + }, toTop() { let top = document.documentElement.scrollTop || document.body.scrollTop; @@ -1229,7 +1493,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/discount.vue b/rc-busness/pages/personal/discount.vue new file mode 100644 index 00000000..abf63464 --- /dev/null +++ b/rc-busness/pages/personal/discount.vue @@ -0,0 +1,265 @@ + + + + + + \ No newline at end of file diff --git a/rc-busness/pages/personal/integral.vue b/rc-busness/pages/personal/integral.vue new file mode 100644 index 00000000..dd1a63ce --- /dev/null +++ b/rc-busness/pages/personal/integral.vue @@ -0,0 +1,120 @@ + + + + + \ No newline at end of file diff --git a/rc-busness/pages/personal/mypersonal.vue b/rc-busness/pages/personal/mypersonal.vue index a1967cae..ede3add3 100644 --- a/rc-busness/pages/personal/mypersonal.vue +++ b/rc-busness/pages/personal/mypersonal.vue @@ -1,6 +1,7 @@ + + + + \ No newline at end of file diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue new file mode 100644 index 00000000..1482ff52 --- /dev/null +++ b/rc-busness/pages/useraddress/openaddress.vue @@ -0,0 +1,295 @@ + + + + + diff --git a/rc-busness/pages/userlogin/login.vue b/rc-busness/pages/userlogin/login.vue index fcea716f..ce80b789 100644 --- a/rc-busness/pages/userlogin/login.vue +++ b/rc-busness/pages/userlogin/login.vue @@ -183,7 +183,9 @@ export default { }, components: {}, - mounted() {}, + mounted() { + console.log(this.$route.params); + }, // watch: function () { // console.log(this.inRank); // },