From bf7c8c05a57b22b60cb0c1f58e492a623c3ee2f5 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Wed, 19 Jan 2022 11:38:57 +0800 Subject: [PATCH 01/31] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/assets/css/global.less | 8 ++++-- rc-busness/assets/css/product-list.less | 8 ++++++ rc-busness/assets/css/search.less | 37 ++++++++++++------------- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index edefb690..b65b75ee 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -378,12 +378,15 @@ img, picture { } .ts-scrollable{ li{ - // width: 4.125rem; + width: 6rem; + overflow: hidden; padding: 0 0.62rem; height: 1.625rem; margin-left: .5rem; font-size:.75rem; - line-height: 1.375rem; + text-overflow:ellipsis; + white-space:nowrap; + line-height: 1.625rem; } &::-webkit-scrollbar{ display:none; @@ -395,6 +398,7 @@ img, picture { /* pc端 */ @media screen and (min-width: 769px) { + /deep/.van-tabs__wrap { max-width: 768px; diff --git a/rc-busness/assets/css/product-list.less b/rc-busness/assets/css/product-list.less index cf1e3bef..ff328e24 100644 --- a/rc-busness/assets/css/product-list.less +++ b/rc-busness/assets/css/product-list.less @@ -9,10 +9,18 @@ ul li ol li em strong i { //rc-main start margin-top:.23rem; .usersearch { + .ts-scrollable-container{ + h2{ + font-weight: bold; + color: #333333; + } + } + margin: 0 auto; overflow: hidden; } + //rc-main end } diff --git a/rc-busness/assets/css/search.less b/rc-busness/assets/css/search.less index 27cce00e..4bb952bb 100644 --- a/rc-busness/assets/css/search.less +++ b/rc-busness/assets/css/search.less @@ -19,6 +19,13 @@ ul li ol li em strong i { margin: 0 auto; overflow: hidden; margin-top: 20px; + .ts-scrollable-container{ + h2{ + font-weight: bold; + color: #333333; + +} +} .rc-padding--md{ padding: 0; } @@ -129,8 +136,9 @@ strong{ color: #333333; margin-top: 1.5rem; h2{ - font-size: 18px; + font-size: 16px; font-weight: bold; + color: #333333; } span { font-size: 14px; @@ -189,7 +197,6 @@ justify-content: center; margin-left: 1rem; color: #999999; img { -width: 1.5rem; height: 1rem; } span { @@ -220,7 +227,7 @@ margin-left: 0.18rem; } .ts-scrollable-container{ - margin-top: 0.93rem; + margin-top: 1rem; } } @@ -236,6 +243,7 @@ margin-left: 0.18rem; } h2{ margin-left: 0; + font-weight: bold; } } @@ -278,19 +286,6 @@ border-radius: 100px; bottom: 0; left: 0; z-index: 9; - ol li{ - background: none; - width: 7.87rem; - height: 2.25rem; - background: #FFFFFF; - border-radius: 6.25rem; - background: none; - display: flex; - align-items: center; - justify-content: center; - margin-left: 1rem; - } - } .rc-bottoma{ @@ -392,6 +387,7 @@ border-radius: 100px; display: flex; align-items: center; width: 6%; + color: #333333; } .ts-scrollable{ // overflow-y: hidden; @@ -501,9 +497,9 @@ margin-left: 8px; color: #333333; margin-top: 12px; h2 { - font-size: 18px; + font-size: 26px; + font-weight: bold; color: #333333; - margin-left: 12px; } span { font-size: 14px; @@ -648,9 +644,10 @@ border-radius: 30px; } .rc-product { h2 { - font-size: 18px; + font-size: 26px; + font-weight: bold; color: #333333; - margin-left: 12px; + } } .rc-productcat { From 405401da7a12d5e77a021922980874bd85c74235 Mon Sep 17 00:00:00 2001 From: "952108534@qq.com" <952108534@qq.com> Date: Wed, 19 Jan 2022 11:40:25 +0800 Subject: [PATCH 02/31] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=BC=95=E7=94=A8jq?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/pages/productdetails/productlist.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/rc-busness/pages/productdetails/productlist.vue b/rc-busness/pages/productdetails/productlist.vue index 34fbc003..8c8ed82c 100644 --- a/rc-busness/pages/productdetails/productlist.vue +++ b/rc-busness/pages/productdetails/productlist.vue @@ -302,7 +302,6 @@ + + \ No newline at end of file diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index d9273711..a93c17ef 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -1,19 +1,21 @@ @@ -712,9 +715,11 @@ meta: {title: '首页'}, data(){ return{ + fixedHeader:false, + dataLoaded:true, useraindex:0, usertitle:'明星猫粮', - dogtitle:'明星狗粮', + dogtitle:'明星犬粮', processinformation:[], catshi:[], userindex:0, @@ -734,18 +739,22 @@ userserachlist:[{}], doggan:[], dogtype:[ - { - title: "幼犬", - - }, - { - title: "成犬", - }, - { - title: "老年犬", - }, - - ], + { + title: "幼犬", + }, + { + title: "成犬", + }, + { + title: "老年犬", + }, + { + title: "品种犬", + }, + { + title: "亚健康", + } + ], anchor:'', dogshi:[], catlist:[], @@ -788,54 +797,56 @@ ], 'pc':[ {src:"/images/banner/pc-banner1.png",link:""}, - {src:"/images/banner/pc-banner2.png",link:""} + {src:"/images/banner/pc-banner2.png",link:""}, + {src:"/images/banner/pc-banner3.png",link:""}, + {src:"/images/banner/pc-banner4.png",link:""} ] }, showingBanners:[], + maoganCurIndex:0, + maoshiCurIndex:0, + quanshiCurIndex:0, + quanganCurIndex:0, userdoglist: [ - { - title: "小型犬", - catimage: require("../assets/cat.png"), - }, - { - title: "中型犬", - catimage: require("../assets/four.png"), - }, - { - title: "大型犬", - catimage: require("../assets/one.png"), - }, - - ], - discoun: [ - { - title: "幼猫", - }, - { - title: "成猫", - }, - { - title: "老年猫", - }, - { - title: "品种猫", - - - }, - { - title: "亚健康猫", - - - }, - - ], + { + title: "小型犬", + catimage: "/images/dog/small.png", + }, + { + title: "中型犬", + catimage: "/images/dog/medium.png", + }, + { + title: "大型犬", + catimage: "/images/dog/big.png", + }, + ], + discoun: [ + { + title: "幼猫", + }, + { + title: "成猫", + }, + { + title: "老年猫", + }, + { + title: "品种猫", + + + }, + { + title: "亚健康猫" + }, + ], discountlist: [ { - title: "明星猫粮", - detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', - catimage: require("../assets/star-cat.png"), - price:'¥2' + title: "明星猫粮", + detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', + catimage: require("../assets/star-cat.png"), + price:'¥2' }, { title: "猫湿粮", @@ -851,7 +862,7 @@ catimage: require("../assets/cat.png"), }, { - title: "明星狗粮", + title: "明星犬粮", detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', price:'¥112', catimage: require("../assets/six.png"), @@ -909,64 +920,72 @@ ], catlistvideo: [ { - title: "明星猫粮", + title: "主食级猫湿粮", video:"/images/cat/one.mp4", catimage: "/images/cat/one.jpg", - detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', - price:'¥123.45', + productimage: "/images/cat/star-1.png", + detail:'为10柔软细腻慕斯 适合离乳期幼猫舔食', + price:'¥77', }, { - title: "猫湿粮", - video:"/images/cat/two.mp4", - catimage: "/images/cat/two.jpg", - detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', - price:'¥123.45', + title: "幼猫成长专属", + video:"/images/cat/two.mp4", + catimage: "/images/cat/two.jpg", + productimage: "/images/cat/star-2.png", + detail:'支持幼猫自身保护力 为快速生长提供足够能量', + price:'¥147', }, { - title: "猫干粮", + title: "室内成猫专属", video:"/images/cat/three.mp4", catimage: "/images/cat/three.jpg", - detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', - price:'¥123.45', + productimage: "/images/cat/star-3.png", + detail:'高易消化蛋白 减少粪便量和异味', + price:'¥140', }, { - title: "猫干粮", + title: "英短成猫专属", video:"/images/cat/four.mp4", catimage: "/images/cat/four.jpg", - detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', - price:'¥123.45', + productimage: "/images/cat/star-4.png", + detail:'增强肌肉质量 支持骨骼与关节健康', + price:'¥183', }, ], doglistvideo: [ { - title: "明星狗粮", - video:"/images/dog/one.mp4", - catimage: "/images/dog/one.jpg", - detail:'为10月龄及以上成犬量身打造的精准营养', - price:'¥123.45', + title: "主食级狗湿粮", + video:"/images/dog/one.mp4", + catimage: "/images/dog/one.jpg", + productimage: "/images/cat/star-1.png", + detail:'柔软细腻慕斯 适合离乳期幼犬舔食', + price:'¥77', }, { - title: "狗湿粮", - video:"/images/dog/two.mp4", - catimage: "/images/dog/two.jpg", - detail:'为10月龄及以上英国成犬量身打造的精准营养', - price:'¥123.45', + title: "贵宾成犬专属", + video:"/images/dog/two.mp4", + catimage: "/images/dog/two.jpg", + productimage: "/images/cat/star-2.png", + detail:'护肤靓毛 理想体态', + price:'¥241', }, { - title: "狗干粮", - video:"/images/dog/three.mp4", - catimage: "/images/dog/three.jpg", - detail:'为10月龄及以上英国犬成犬量身打造的精准营养', - price:'¥123.45', + title: "小型犬成犬专属", + video:"/images/dog/three.mp4", + catimage: "/images/dog/three.jpg", + productimage: "/images/cat/star-3.png", + detail:'亮泽被毛 呵护牙齿', + price:'¥121', }, - { - title: "狗干粮", - video:"/images/dog/four.mp4", - catimage: "/images/dog/four.jpg", - detail:'为10月龄及以上英国成犬量身打造的精准营养', - price:'¥123.45', + { + title: "离乳期全价奶糕", + video:"/images/dog/four.mp4", + catimage: "/images/dog/four.jpg", + productimage: "/images/cat/star-4.png", + detail:'高易再水合颗粒 帮助增强保护健康成长', + price:'¥88', }, ], @@ -1040,53 +1059,88 @@ // }, ], - swiperOption: { - loop: true, - slidesPerView: 'auto', - centeredSlides: true, - speed:1000, - spaceBetween: 30, - // autoplay: true, - loopAdditionalSlides: 100, - pagination: { - el: '.swiper-pagination', - dynamicBullets: true - }, - navigation: { - nextEl: '.swiper-button-next', - prevEl: '.swiper-button-prev' + headerSwiperOption: { + loop: true, + slidesPerView: 'auto', + centeredSlides: true, + speed:1000, + spaceBetween: 0, + autoplay: true, + pagination: { + el: '#homeBannerSwiperPagnation' + }, + paginationClickable: true, + loopAdditionalSlides: 100, + navigation: { + nextEl: '.swiper-button-next', + prevEl: '.swiper-button-prev' + }, + on: { + slideChange(Swiper) { + }, - on: { - slideChange(Swiper) { - //console.log('onSlideChangeEnd',this); - // vm.ifadroind('','',this.realIndex); - vm.useraindex=this.realIndex; - }, - tap() { - //console.log('onTap', this); - } - // slideChange() { - // console.log('onSlideChangeEnd', this); - // }, - // tap() { - // console.log('onTap', this); - // } - } - }, + tap() { + + } + } + }, + catStarProductswiperOption: { + loop: true, + slidesPerView: 'auto', + centeredSlides: true, + speed:1000, + spaceBetween: 30, + // autoplay: true, + loopAdditionalSlides: 100, + pagination: { + el: '#catStarSwiperPagnation', + }, + navigation: { + nextEl: '.swiper-button-next', + prevEl: '.swiper-button-prev' + }, + on: { + slideChange(Swiper) { + vm.useraindex=this.realIndex; + }, + tap() { + } + } + }, + dogStarProductswiperOption: { + loop: true, + slidesPerView: 'auto', + centeredSlides: true, + speed:1000, + spaceBetween: 30, + // autoplay: true, + loopAdditionalSlides: 100, + pagination: { + el: '#dogStarSwiperPagnation', + }, + navigation: { + nextEl: '.swiper-button-next', + prevEl: '.swiper-button-prev' + }, + on: { + slideChange(Swiper) {}, + tap() {} + } + }, } - }, - components:{ - Myheader, - Myfooter, - unlogin, - // userswiper - }, - created(){ + }, + components:{ + Myheader, + Myfooter, + unlogin, + // userswiper + }, + created(){ vm=this; - - }, - watch:{ -}, + }, + watch:{ + + }, mounted(){ const that = this this.ifAdoid(); @@ -1096,298 +1150,374 @@ } window.addEventListener("scroll", this.handleScroll, true); this.userchufang();//查询处方粮商品信息 + this.catmessage();//查询猫的信息 + this.catclickGan(); + this.catclickShi(); + this.dogmessage();//查询狗的信息 + this.userdogShi(); + this.userdogGan(); }, 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) + 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) - 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; - - } - }, - - 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; - 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 + 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; } - 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; + 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; - // } - //console.log("当前是手机打开") - } - }, - userdog(item,index){ + } + }, + + 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; + 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); + + let positionIdentifier=document.querySelectorAll('.ts-position-identifier'); + let tmpTitle=''; + let scrollToTop=0; + let _self=this; + let transition = 230; + positionIdentifier.forEach(function(ele,index){ + tmpTitle = ele.getAttribute("data-rel"); + if(item.title==tmpTitle) + { + if(_self.fixedHeader && item.title!='明星猫粮') + { + transition+=130; + } + scrollToTop = _self.heightToTop(positionIdentifier[index]) - transition; + //positionIdentifier[index].scrollIntoView(true); + window.scrollTo({ + top:scrollToTop, + behavior:'smooth' + }) + //document.body.scrollTop = oPos; + } + }) + /* + 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; + + // } + //console.log("当前是手机打开") + */ + } + }, + heightToTop(ele){ + //ele为指定跳转到该位置的DOM节点 + let root = document.body; + let height = 0; + do{ + height += ele.offsetTop; + ele = ele.offsetParent; + }while( ele !== root ) + return height; + }, + userdogShi(){ + this.activeIndex5=(this.activeIndex5?this.activeIndex5:0); + let apiDogSize=this.userdoglist[this.activeIndex5].title; + let apiDogFoodType=this.dogtype[this.quanshiCurIndex].title; + this.userstype=1; let petType={ petType:1, - name:index, + categoryName:"皇家犬湿粮", + name:apiDogFoodType, } for(let i =0;i0) - { - this.gotop = true - this.searchBar=false - } - else - { - this.gotop = false; - this.searchBar=true - } - } + let fixedCatbarSeperator = document.getElementById("fixed-catbar-seperator"); + if(!fixedCatbarSeperator) + { + return; + } + let scrolltop = document.documentElement.scrollTop || document.body.scrollTop; + if((scrolltop-fixedCatbarSeperator.offsetTop)>0) + { + this.fixedHeader=false; + this.gotop = true + this.searchBar=false + } + else + { + this.fixedHeader=true; + this.gotop = false; + this.searchBar=true + } + }, + toTop() { + let top = document.documentElement.scrollTop || document.body.scrollTop; + // 实现滚动效果 + const timeTop = setInterval(() => { + document.body.scrollTop = document.documentElement.scrollTop = top -= 400; + if (top <= 0) { + clearInterval(timeTop); + } + }, 10); + }, + async courseId(item) { + this.dataLoaded=false; + let data = await postCourseId(this.productCode,1,this.usermessage.data.id,this.usermessage.data.mobile,item.picFile,item.name,item.basePrice,item.specifications); + if(data){ + this.productlist=data; + this.dataLoaded=true; + } + }, + //请求猫 + async catmessage(stype,dataType) { + this.dataLoaded=false; + let data=[]; + if(stype==undefined||stype==null){ + data = await biaomessage(0,'',1,6); + }else{ + data = await biaomessage(this.userserachlist,'',1,6); + } + if(data){ + let userlist=[]; + //userlist=data.slice(0,6); + if(dataType) + { + if(dataType=='Shi') + this.catshi=data; + else if(dataType=='Gan') + this.catgan=data; + } + else + { + this.catlist=data; + //this.catgan=userlist; + //this.catshi=userlist; + } + this.dataLoaded=true; + } + }, - - - }, - toTop() { - let top = document.documentElement.scrollTop || document.body.scrollTop; - // 实现滚动效果 - const timeTop = setInterval(() => { - document.body.scrollTop = document.documentElement.scrollTop = top -= 400; - if (top <= 0) { - clearInterval(timeTop); - } - }, 10); - }, - async courseId(item) { - let data = await postCourseId(this.productCode,1,this.usermessage.data.id,this.usermessage.data.mobile,item.picFile,item.name,item.basePrice,item.specifications); - if(data){ - this.productlist=data; - } - }, - //请求猫 - async catmessage(stype) { - let data=[]; - if(stype==undefined||stype==null){ - data = await biaomessage(0); - }else{ - data = await biaomessage(this.userserachlist); - } - if(data){ - this.catlist=data; - let userlist=[]; - userlist=data.slice(0,6); - this.catshi=userlist; - this.catgan=userlist; - + //请求犬 + async dogmessage(stype,dataType) { + this.dataLoaded=false; + let data=[]; + if(stype==undefined||stype==null){ + data = await biaomessage(1,'',1,6); + }else{ + data = await biaomessage(this.userserachlist,'',1,6); + } + if(data){ + let userlist=[]; + //userlist=data.slice(0,6); + if(dataType) + { + if(dataType=='Shi') + this.dogshi=data; + else if(dataType=='Gan') + this.doggan=data; + } + else + { + this.doglist=data; + //this.doggan=userlist; + //this.dogshi=userlist; + } + this.dataLoaded=true; + } + }, - } - - }, - - //请求犬 - async dogmessage(stype) { - let data=[]; - if(stype==undefined||stype==null){ - - data = await biaomessage(1); - }else{ - data = await biaomessage(this.userserachlist); - } - if(data){ - let userlist=[]; - userlist=data.slice(0,6); - this.doglist=data; - this.doggan=userlist; - this.dogshi=userlist; - } - }, - - selectproduce(item,index){ + selectproduce(item,index){ if(item.productList[0]==undefined){ item.productlist[0].productCode=0; } @@ -1401,79 +1531,95 @@ productCode:item.productList[0].productCode }, }); - }, + }, - //请求处方量信息数据 - async userchufang() { - let list=[]; - let data = await userque(); - if(data){ - list=data.slice(0,6); - this.processinformation=list; - this.chufanlist=data; - - } - - }, - - //点击请求处方量标签信息数据 - async userquery(item) { - let data = await userquery(item); - if(data){ - this.processinformation=data; - } - - }, - //处方用粮筛选 - userclick(item,index){ - this.userquery(index) - }, - //全价猫湿粮筛选 - catclick(item,index){ - this.userstype=0; - let petType={ - petType:0, - name:index, - } - for(let i =0;i + \ No newline at end of file diff --git a/rc-busness/pages/myorder/userrecord.vue b/rc-busness/pages/myorder/userrecord.vue index 3b1991bb..7c284dfa 100644 --- a/rc-busness/pages/myorder/userrecord.vue +++ b/rc-busness/pages/myorder/userrecord.vue @@ -1,108 +1,101 @@ \ No newline at end of file diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue index abf63464..bc4b7994 100644 --- a/rc-busness/pages/personal/discount.vue +++ b/rc-busness/pages/personal/discount.vue @@ -2,11 +2,10 @@
-
-
+
-
+
- {{ item.couponAmount }} + {{item.couponTypeId=='4'?parseInt(((item.discount) *10))+ '折':item.couponAmount}}
{{ item.couponName }}
- + {{ item.couponName }}
有效期 {{item.validFrom}}至 - {{ item.validTo }} + {{item.validTo}}
@@ -71,6 +70,7 @@ export default { userload: true, pastdue: false, unused: false, + usercolor:{color:'#e1001a'}, usermessage:[], userstates:0, userimage: require("../../assets/image/unused.png"), @@ -196,6 +196,10 @@ export default { if(data){ console.log(data); this.newlist=data.data; + this.newlist.forEach(element=>{ + element.validFrom=element.validFrom.slice(0,10) + element.validTo=element.validTo.slice(0,10) + }) console.log(this.newlist); } @@ -207,21 +211,26 @@ export default { this.pastdue = true; this.userimage = require("../../assets/image/hasused.png"); this.userstates=1 - this.userdraw(this.usermessage.data.mobile,0) + console.log(this.$refs.userleft); + this.usercolor={color:'white'} + + + this.userdraw(this.usermessage.data.mobile,1) } if (this.activeIndex == 0) { this.userload = true; this.pastdue = false; this.userdraw(this.usermessage.data.mobile,0) - + this.usercolor={color:'#e1001a'} this.userstates=0 this.userimage = require("../../assets/image/unused.png"); } if (this.activeIndex == 2) { this.userload = false; this.pastdue = true; - this.userdraw(this.usermessage.data.mobile,0) + this.userdraw(this.usermessage.data.mobile,2) this.userstates=2 + this.usercolor={color:'white'} this.userimage = require("../../assets/image/expired.png"); } console.log(index); @@ -242,6 +251,18 @@ export default { // } // dis_livchat(option); // } + }, + + directives: { + 'color': { + bind: function(el, binding){ + el.style.color = binding.value + }, + inserted: function(el){ + + } + }, + }, mounted() { if(this.usermessage!=='' ||this.usermessage.data!==undefined){ diff --git a/rc-busness/pages/personal/integral.vue b/rc-busness/pages/personal/integral.vue index 50259d92..dd1a63ce 100644 --- a/rc-busness/pages/personal/integral.vue +++ b/rc-busness/pages/personal/integral.vue @@ -1,33 +1,38 @@ \ No newline at end of file diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index 74141890..c9a878dc 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -1,8 +1,8 @@ - \ No newline at end of file + diff --git a/rc-busness/pages/useraddress/editaddress.vue b/rc-busness/pages/useraddress/editaddress.vue index c0ce8fa5..bd7e2e7d 100644 --- a/rc-busness/pages/useraddress/editaddress.vue +++ b/rc-busness/pages/useraddress/editaddress.vue @@ -1,99 +1,131 @@ - \ No newline at end of file + diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue index 4f776954..fc17013c 100644 --- a/rc-busness/pages/useraddress/openaddress.vue +++ b/rc-busness/pages/useraddress/openaddress.vue @@ -1,27 +1,29 @@ From b0ae1cbe942275c3155e9175cf7dc392247dc9e5 Mon Sep 17 00:00:00 2001 From: Admin <376654749@qq.com> Date: Thu, 20 Jan 2022 02:44:19 +0000 Subject: [PATCH 15/31] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!4?= =?UTF-8?q?4=20:=202022-1-19=20=20Jiamin'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc-busness/assets/css/addaddress.less | 212 --------------- rc-busness/assets/css/editaddress.less | 89 ------ rc-busness/assets/css/global.less | 8 +- rc-busness/assets/css/integral.less | 5 +- rc-busness/assets/css/product-list.less | 139 ++++------ rc-busness/assets/css/search.less | 90 ++---- rc-busness/pages/personal/integral.vue | 9 +- rc-busness/pages/personal/mypersonal.vue | 6 +- .../pages/productdetails/productlist.vue | 56 ++-- rc-busness/pages/useraddress/addaddress.vue | 190 +++++-------- rc-busness/pages/useraddress/editaddress.vue | 200 ++++++-------- rc-busness/pages/useraddress/openaddress.vue | 256 ++++++++++++++---- rc-busness/pages/usersearch/search.vue | 30 +- 13 files changed, 470 insertions(+), 820 deletions(-) delete mode 100644 rc-busness/assets/css/addaddress.less delete mode 100644 rc-busness/assets/css/editaddress.less diff --git a/rc-busness/assets/css/addaddress.less b/rc-busness/assets/css/addaddress.less deleted file mode 100644 index 471c5f6f..00000000 --- a/rc-busness/assets/css/addaddress.less +++ /dev/null @@ -1,212 +0,0 @@ - - - -@media screen and (max-width:768px){ - .usercontend{ - display: flex; - align-items: center; - justify-content: center; - flex-direction: column; - .rc-useaddress{ - textarea{ - display: none; - } - } - .rc-button{ - display: flex; - justify-content: center; - font-size: 14px; - width: 100%; - box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); - height: 80px; - align-items: center; - padding:0 20px 0 20px; - span - { - width: 160px; - height: 48px; - border: 2px solid #E2001A; - border-radius: 30px; - display: flex; - align-items: center; - justify-content: center; - color: #E2001A; - } - em{ - font-style: normal; - width: 164px; - height: 48px; - background: #E2001A; - cursor: pointer; - border-radius: 30px; - display: flex; - align-items: center; - justify-content: center; - color: #FFFFFF; - margin-left: 40px; - } - } - .rc-max-width--xl{ - h2{ - display: none; - } - } - - } - -.rc-max-width--xl{ - margin-top: 16px; - input{ - width: 258px; - height: 34px; - border: none; - border-bottom: 1px solid #808285; - color: #999999; - font-size: 16px; - margin-left: 2px; - } - span{ - font-size: 16px; - font-weight: bold; - width: 22%; - text-align: center; - color: #333333; - margin-top: 2px; - } - .rc-people{ - width: 100%; - display: flex; - align-items: center; - span{ - text-align: left; - } - } -// .rc-phone{ - -// } -// .rc-address{ - -// } -// .rc-useaddress{ - -// } - - - -} - - -} - -@media screen and (min-width: 769px) -{ - .usercontend{ - display: flex; - align-items: center; - justify-content: center; - position: relative; - flex-direction: column; - .rc-button{ - display: flex; - justify-content: center; - font-size: 14px; - width: 100%; - box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); - height: 80px; - align-items: center; - - padding:0 20px 0 20px; - span - { - width: 160px; - height: 48px; - border: 2px solid #E2001A; - border-radius: 30px; - display: flex; - align-items: center; - justify-content: center; - color: #E2001A; - } - em{ - font-style: normal; - width: 164px; - height: 48px; - background: #E2001A; - cursor: pointer; - border-radius: 30px; - display: flex; - align-items: center; - justify-content: center; - color: #FFFFFF; - margin-left: 40px; - } - } - h2{ - font-size: 26px; - color: #333333; - text-align: center; - font-weight: bold; - } - .rc-useaddress{ - display: flex; - align-items: center; - textarea{ - width: 680px; - height: 118px; - background: #FFFFFF; - border: 1px solid #808285; - opacity: 1; - border-radius: 0px; - padding-top: 12px; - padding-left: 16px; - } - -.userinput{ - display: none; -} - } - } - - -.rc-max-width--xl{ - margin-top: 16px; - input{ - width: 680px; - height: 45px; - border: 1px solid #808285; - color: #999999; - font-size: 16px; - margin-left: 2px; - padding-left: 16px; - } - span{ - font-size: 16px; - font-weight: bold; - width: 10%; - text-align: center; - color: #333333; - margin-top: 2px; - } - .rc-people{ - width: 100%; - display: flex; - align-items: center; - - } - -// .rc-phone{ - -// } -// .rc-address{ - -// } -// .rc-useaddress{ - -// } - - - -} - - -} \ No newline at end of file diff --git a/rc-busness/assets/css/editaddress.less b/rc-busness/assets/css/editaddress.less deleted file mode 100644 index 269b6de2..00000000 --- a/rc-busness/assets/css/editaddress.less +++ /dev/null @@ -1,89 +0,0 @@ -@media screen and (max-width:768px){ - .rc-button{ - display: flex; - justify-content: center; - font-size: 14px; - width: 100%; - box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); - height: 80px; - align-items: center; - position: absolute; - bottom: 0; - padding:0 20px 0 20px; - span - { - width: 160px; - height: 48px; - border: 2px solid #E2001A; - border-radius: 30px; - display: flex; - align-items: center; - justify-content: center; - color: #E2001A; - } - em{ - font-style: normal; - width: 164px; - height: 48px; - background: #E2001A; - cursor: pointer; - border-radius: 30px; - display: flex; - align-items: center; - justify-content: center; - color: #FFFFFF; - margin-left: 40px; - } - } -.rc-max-width--xl{ - margin-top: 16px; - input{ - width: 258px; - height: 34px; - border: none; - border-bottom: 1px solid #808285; - color: #999999; - font-size: 16px; - margin-left: 2px; - } - span{ - font-size: 16px; - font-weight: bold; - width: 22%; - text-align: center; - color: #333333; - margin-top: 2px; - } - .rc-people{ - width: 100%; - display: flex; - align-items: center; - span{ - text-align: left; - } - - - } -// .rc-phone{ - -// } -// .rc-address{ - -// } -// .rc-useaddress{ - -// } - - - -} - - -} - -@media screen and (min-width: 769px) -{ - - - -} \ No newline at end of file diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index a7b638fe..5b9540d2 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -405,15 +405,12 @@ img, picture { } .ts-scrollable{ li{ - width: 6rem; - overflow: hidden; + // width: 4.125rem; padding: 0 0.62rem; height: 1.625rem; margin-left: .5rem; font-size:.75rem; - text-overflow:ellipsis; - white-space:nowrap; - line-height: 1.625rem; + line-height: 1.375rem; } &::-webkit-scrollbar{ display:none; @@ -425,7 +422,6 @@ img, picture { /* pc端 */ @media screen and (min-width: 769px) { - /deep/.van-tabs__wrap { max-width: 768px; diff --git a/rc-busness/assets/css/integral.less b/rc-busness/assets/css/integral.less index cf1c9309..e461175d 100644 --- a/rc-busness/assets/css/integral.less +++ b/rc-busness/assets/css/integral.less @@ -26,7 +26,10 @@ span{ } } } -.rc-max-width--xl{ +.rc-usermain{ + width: 92%; + margin: 0 auto; + ul{ height: 70px; display: block; diff --git a/rc-busness/assets/css/product-list.less b/rc-busness/assets/css/product-list.less index b1fd2b92..cf1e3bef 100644 --- a/rc-busness/assets/css/product-list.less +++ b/rc-busness/assets/css/product-list.less @@ -9,18 +9,10 @@ ul li ol li em strong i { //rc-main start margin-top:.23rem; .usersearch { - .ts-scrollable-container{ - h2{ - font-weight: bold; - color: #333333; - } - } - margin: 0 auto; overflow: hidden; } - //rc-main end } @@ -32,53 +24,6 @@ ul li ol li em strong i { .usercontentshow{ position: relative; - .rc-productcat { - display: flex; - align-items: center; - flex-wrap: nowrap; - ol{ - display: flex; - align-items: center; - flex-flow: row; - .ts-standard-btn{ - width: 7.87rem; - height: 2.25rem; - background: #FFFFFF; - border-radius: 6.25rem; - background: none; - display: flex; - align-items: center; - justify-content: center; - margin-left: 1rem; - color: #999999; - img { - height: 1rem; - } - span { - margin-left: 0.18rem; - } - } - } - .userrccat{ - width: 32%; - height: 34px; - background: #ffffff; - border-radius: 100px; - display: flex; - align-items: center; - justify-content: center; - margin-left: 0; - font-size: 14px; - span { - margin-left: 3px; - } - img { - width: 24px; - height: 16px; - } - border: 2px solid #E2001A; - } - } .userrccat{ width: 32%; height: 34px; @@ -148,7 +93,48 @@ ul li ol li em strong i { height: 617px; background: white; z-index: 999; - + .rc-productcat { + display: flex; + align-items: center; + flex-wrap: nowrap; + .rc-cat { + width: 32%; + height: 34px; + background: #ffffff; + border-radius: 100px; + display: flex; + align-items: center; + justify-content: center; + margin-left: 0; + font-size: 14px; + span { + margin-left: 3px; + } + img { + width: 24px; + height: 16px; + } + } + .userrccat{ + width: 32%; + height: 34px; + background: #ffffff; + border-radius: 100px; + display: flex; + align-items: center; + justify-content: center; + margin-left: 0; + font-size: 14px; + span { + margin-left: 3px; + } + img { + width: 24px; + height: 16px; + } + border: 2px solid #E2001A; + } + } } @@ -233,7 +219,6 @@ ul li ol li em strong i { justify-content: center; font-size: .14rem; margin-right:.2rem; - margin-left: 16px; span { margin-left: 3px; } @@ -318,7 +303,6 @@ ul li ol li em strong i { //pc端 @media screen and (min-width: 768px){ - .userrccat{ width: 327px; height: 48px; @@ -344,7 +328,6 @@ ul li ol li em strong i { } .online{ width:100%; - margin-top: 17px; &.bold{ height:0.5rem; margin-top: 5rem; @@ -395,13 +378,7 @@ ul li ol li em strong i { } .rc-bottom{ - .rc-productcat { - ol{ - display: flex; - align-items: center; - flex-flow: row; - - } + .rc-productcat { display: flex; align-items: center; flex-wrap: nowrap; @@ -508,7 +485,7 @@ border-radius: 30px; margin-left: 16px; } span { - margin-left: 4px; + margin-left: 0px; } img { width: 24px; @@ -565,38 +542,18 @@ border-radius: 30px; } */ .ts-scrollable-container{ - + overflow-y: hidden; + overflow-x: clip; width: 100%; - margin-top: 18px; h2{ display: flex; align-items: center; width: 4%; } .ts-scrollable{ + overflow-y: hidden; + overflow-x: clip; width: 100%; - ol{ - display: flex; - align-items: center; - } - .ts-standard-btn{ - width: 237px; - height: 48px; -background: #FFFFFF; -border-radius: 30px; -background: none; -display: flex; -align-items: center; -justify-content: center; -margin-left: 40px; -img { -width: 24px; -height: 24px; -} -span { -margin-left: 8px; -} - } } } diff --git a/rc-busness/assets/css/search.less b/rc-busness/assets/css/search.less index e843f622..27cce00e 100644 --- a/rc-busness/assets/css/search.less +++ b/rc-busness/assets/css/search.less @@ -14,6 +14,15 @@ ul li ol li em strong i { position: relative; margin-top: 5.25rem; + .usersearch { + width: 100%; + margin: 0 auto; + overflow: hidden; + margin-top: 20px; + .rc-padding--md{ + padding: 0; + } + } .active{ border: 2px solid #E2001A; color: #E2001A; @@ -29,22 +38,6 @@ ul li ol li em strong i { } //手机端 @media screen and (max-width: 768px) { - .usersearch { - width: 100%; - margin: 0 auto; - overflow: hidden; - margin-top: 20px; - .ts-scrollable-container{ - h2{ - font-weight: bold; - color: #333333; - -} -} - .rc-padding--md{ - padding: 0; - } - } .rc-button { display: flex; @@ -54,9 +47,6 @@ ul li ol li em strong i { box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1); height: 80px; align-items: center; - position: absolute; - bottom: 0; - padding:0 20px 0 20px; span { width: 160px; @@ -139,9 +129,8 @@ strong{ color: #333333; margin-top: 1.5rem; h2{ - font-size: 16px; + font-size: 18px; font-weight: bold; - color: #333333; } span { font-size: 14px; @@ -179,9 +168,6 @@ strong{ // 我想搜 .usercontentshow{ position: relative; - .rc-column{ - padding-bottom: 0; - } .rc-productcat { display: flex; align-items: center; @@ -203,15 +189,13 @@ justify-content: center; margin-left: 1rem; color: #999999; img { +width: 1.5rem; height: 1rem; } span { margin-left: 0.18rem; } } - li:first-child{ - margin-left: 0; - } } //筛选 .userselect{ @@ -236,7 +220,7 @@ margin-left: 0.18rem; } .ts-scrollable-container{ - margin-top: 1rem; + margin-top: 0.93rem; } } @@ -252,7 +236,6 @@ margin-left: 0.18rem; } h2{ margin-left: 0; - font-weight: bold; } } @@ -292,10 +275,22 @@ border-radius: 100px; .rc-bottom{ position: fixed; background: white; - height: 617px; bottom: 0; left: 0; z-index: 9; + ol li{ + background: none; + width: 7.87rem; + height: 2.25rem; + background: #FFFFFF; + border-radius: 6.25rem; + background: none; + display: flex; + align-items: center; + justify-content: center; + margin-left: 1rem; + } + } .rc-bottoma{ @@ -381,25 +376,7 @@ border-radius: 100px; } //pc端 @media screen and (min-width: 768px){ - .usersearch { - width: 100%; - margin: 0 auto; - overflow: hidden; - margin-top: 40px; - .ts-scrollable-container{ - h2{ - font-weight: bold; - color: #333333; -} -} - .rc-padding--md{ - padding: 0; - } - } - .online{ - margin-top: 47px; - } /deep/.el-dialog__header { padding: 0; margin: 0; @@ -415,7 +392,6 @@ border-radius: 100px; display: flex; align-items: center; width: 6%; - color: #333333; } .ts-scrollable{ // overflow-y: hidden; @@ -525,10 +501,9 @@ margin-left: 8px; color: #333333; margin-top: 12px; h2 { - font-size: 26px; - font-weight: bold; + font-size: 18px; color: #333333; - margin: 0; + margin-left: 12px; } span { font-size: 14px; @@ -622,16 +597,13 @@ border-radius: 30px; /deep/.van-search__content--square{ background: white; } - /deep/.van-search{ - padding-left: 0; - } .van-search__content--square{ display: flex; align-items: center; justify-content: center; background: white; border: 1px solid #D7D7D7; - height: 50px; + height: 80px; width: 1200px; border-radius: 200px; } @@ -676,11 +648,9 @@ border-radius: 30px; } .rc-product { h2 { - font-size: 26px; - font-weight: bold; + font-size: 18px; color: #333333; - margin: 0; - + margin-left: 12px; } } .rc-productcat { diff --git a/rc-busness/pages/personal/integral.vue b/rc-busness/pages/personal/integral.vue index 6aac580c..e62c1b4a 100644 --- a/rc-busness/pages/personal/integral.vue +++ b/rc-busness/pages/personal/integral.vue @@ -1,8 +1,8 @@ @@ -115,7 +115,6 @@ export default { \ No newline at end of file diff --git a/rc-busness/pages/personal/mypersonal.vue b/rc-busness/pages/personal/mypersonal.vue index 77d0b5c9..9c9fb4e0 100644 --- a/rc-busness/pages/personal/mypersonal.vue +++ b/rc-busness/pages/personal/mypersonal.vue @@ -342,7 +342,9 @@ obligation(item,index){ }else{ if(item.title=='收货地址'){ -this.$router.push({ name: "useraddress-openaddress",}) +this.$router.push({ + path: `/useraddress/openaddress/` + }) console.log('这是地址的跳转'); } @@ -355,7 +357,7 @@ this.$router.push({ name: "useraddress-openaddress",}) this.$router.push({ path: `/personal/discount/` }) - + console.log('这是地址的跳转'); } diff --git a/rc-busness/pages/productdetails/productlist.vue b/rc-busness/pages/productdetails/productlist.vue index 862c457d..8c8ed82c 100644 --- a/rc-busness/pages/productdetails/productlist.vue +++ b/rc-busness/pages/productdetails/productlist.vue @@ -11,19 +11,17 @@
-
    -
  1. - - {{ item.title }} -
  2. -
+
+ + {{ item.title }} +
@@ -299,13 +297,11 @@ 确认
-
- + \ No newline at end of file diff --git a/rc-busness/pages/useraddress/editaddress.vue b/rc-busness/pages/useraddress/editaddress.vue index bd7e2e7d..c0ce8fa5 100644 --- a/rc-busness/pages/useraddress/editaddress.vue +++ b/rc-busness/pages/useraddress/editaddress.vue @@ -1,131 +1,99 @@ - + \ No newline at end of file diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue index fc17013c..4f776954 100644 --- a/rc-busness/pages/useraddress/openaddress.vue +++ b/rc-busness/pages/useraddress/openaddress.vue @@ -1,29 +1,27 @@ diff --git a/rc-busness/pages/usersearch/search.vue b/rc-busness/pages/usersearch/search.vue index c933d390..8091d6c6 100644 --- a/rc-busness/pages/usersearch/search.vue +++ b/rc-busness/pages/usersearch/search.vue @@ -34,7 +34,7 @@ v-for="(item, index) in searchdata" :key="index" @click="selectsearch(item, index)" - :class="activeIndexa == index" + :class="activeIndexa == index ? 'active' : 'unactive'" > {{ item.title }} @@ -219,13 +219,12 @@
- -
-
-
+
取消 确认
+
+
@@ -313,13 +312,11 @@ - - - \ No newline at end of file diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue index ab013a1b..3c121957 100644 --- a/rc-busness/components/header.vue +++ b/rc-busness/components/header.vue @@ -6,7 +6,6 @@
  • @@ -68,16 +75,16 @@
  • - +
  • - +
  • - 定制营养方案 + 定制营养方案