diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index cd1b7348..c9c0ff25 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -21,12 +21,10 @@ body { .fade-leave-active { opacity: 0; } - .ts-no-data { text-align: center; margin: 3rem 0; } - .ts-mask { width: 100%; height: 100%; @@ -38,7 +36,15 @@ body { justify-content: center; align-items: center; z-index: 99; - + .ts-mask-close{ + position:absolute; + top:1rem; + right:1rem; + width:1rem; + height:1rem; + background: url("../image/btn-close.png") center center no-repeat; + background-size:contain; + } .ts-mask-bg { background-color: #000; opacity: .6; @@ -54,10 +60,11 @@ input[type=checkbox]{ position:relative; cursor: pointer; border:none; - border: 1px solid #d7d7d7; + //border: 1px solid #d7d7d7; border-radius: 3px; width: 1.5rem; height: 1.5rem; + -webkit-appearance:none; &:before { top: 0; left: 0; @@ -327,12 +334,12 @@ picture { border-radius: .25rem; z-index:11; ul{ - width: 60px; - height: 181px; + width: 3.75rem; + height: 11.3rem; background-color: white; display: flex; flex-direction: column; - + justify-content: space-between; li { width: 100%; display: flex; @@ -354,7 +361,7 @@ picture { } span { - font-size: 0.12rem; + font-size: .75rem; } .tuntop { @@ -415,7 +422,7 @@ picture { } label { input[type=checkbox] { - top:.25rem; + top:0rem; } } .rc-header__nav--primary{ @@ -523,7 +530,12 @@ picture { max-width: 768px; margin: 0 auto; } - + div[data-js-modal-menu] { + display:none; + } + aside div[data-js-modal-menu] { + display:block; + } html { font-size: 16px; } @@ -808,7 +820,11 @@ picture { margin: 0 auto; .el-dialog{ width: 100%; - + } + .el-dialog__body{ + max-height:50vh; + overflow-x:hidden; + overflow-y:auto; } } #tns2-iw { diff --git a/rc-busness/assets/css/index.less b/rc-busness/assets/css/index.less index 112b95dc..c8465ce9 100644 --- a/rc-busness/assets/css/index.less +++ b/rc-busness/assets/css/index.less @@ -20,6 +20,14 @@ } .ts-position-identifier{ +} +.ts-mobile-player-container { + video { + width:100%; + height:auto; + position: relative; + z-index:2; + } } .ul-zhuan,.ul-dog{ li{ @@ -83,6 +91,7 @@ } li{ margin-top:1.875rem; + margin-left:0; } } .ts-banner-swiper-container{ @@ -211,9 +220,29 @@ width: 100%; height:auto; display: block; - video{ - max-width:100%; - max-height:100%; + position:relative; + z-index:0; + &:before{ + content:""; + background:#000; + opacity:.6; + position:absolute; + width:100%; + height:100%; + left:0; + top:0; + z-index:1; + } + &:after{ + content:""; + position:absolute; + top:0; + left:0; + width:100%; + height:100%; + background:url("../image/btn-play.png") center center no-repeat; + background-size:90px 90px; + z-index:2; } } } @@ -225,19 +254,32 @@ align-items: center; border: 1px solid #d7d7d7; border-radius:4px; + img{ + object-fit: cover; + display: block; + z-index:0; + } .rc-click{ width: 100%; display: flex; flex-direction: column; justify-content: flex-start; align-items: center; + img{ + width: 100%; + height: auto; + position:relative; + } } - img{ - width: 10rem; - height: 10rem; - object-fit: cover; - display: block; - margin-top: 2.5rem; + .click-zone{ + align-items: center; + display: flex; + flex-direction: column; + img{ + width: 10rem; + height: 10rem; + margin-top: 2.5rem; + } } span{ font-size: 1.125rem; @@ -348,13 +390,13 @@ // } } .active { - font-size: 0.14rem; + font-size: .875rem; img{ border-width: 1px; } } .unactive { - font-size: 0.14rem; + font-size: .875rem; img{ border-width: 1px; } diff --git a/rc-busness/assets/css/mypersonal.less b/rc-busness/assets/css/mypersonal.less index 9b2d6dc8..5f1e2887 100644 --- a/rc-busness/assets/css/mypersonal.less +++ b/rc-busness/assets/css/mypersonal.less @@ -253,6 +253,9 @@ ul li ol li em strong i { width: 440px; height: 652px; } +.ts-crumbs { + padding-left:.25rem; +} .ts-mypersonal{ margin-left:0; .rc-column{ diff --git a/rc-busness/assets/css/orderquantity.less b/rc-busness/assets/css/orderquantity.less index c92bd4a5..b78087ff 100644 --- a/rc-busness/assets/css/orderquantity.less +++ b/rc-busness/assets/css/orderquantity.less @@ -288,12 +288,12 @@ border: 1px solid #D8D8D8; margin-left: 40px; - img { - width: 96px; - height: 96px; - display: block; - - } + img { + width: 96px; + height: 96px; + display: block; + object-fit: contain; + } } .rc-right { diff --git a/rc-busness/assets/css/producted.less b/rc-busness/assets/css/producted.less index 115ecc62..730a0bef 100644 --- a/rc-busness/assets/css/producted.less +++ b/rc-busness/assets/css/producted.less @@ -451,7 +451,6 @@ } span { font-size: 45px; - font-weight: bold; } strong { font-style: normal; diff --git a/rc-busness/assets/css/search.less b/rc-busness/assets/css/search.less index 23f69fe2..bf719986 100644 --- a/rc-busness/assets/css/search.less +++ b/rc-busness/assets/css/search.less @@ -289,7 +289,7 @@ border-radius: 100px; .rc-bottom{ position: fixed; background: white; - height: 617px; + height: 21.875rem; bottom: 0; left: 0; z-index: 9; diff --git a/rc-busness/assets/css/settlement.less b/rc-busness/assets/css/settlement.less index 12826929..07d11a18 100644 --- a/rc-busness/assets/css/settlement.less +++ b/rc-busness/assets/css/settlement.less @@ -236,6 +236,7 @@ color: #333333; font-style: normal; display: flex; justify-content: space-between; + align-items: baseline; span { font-size: 14px; @@ -251,6 +252,10 @@ color: #333333; } } } + .ts-right-arr { + line-height:1rem; + height:1.5rem; + } } diff --git a/rc-busness/assets/css/usermember.less b/rc-busness/assets/css/usermember.less index 1d08b84a..c59d05b5 100644 --- a/rc-busness/assets/css/usermember.less +++ b/rc-busness/assets/css/usermember.less @@ -152,10 +152,11 @@ ul li ol li em strong i { } - .rc-value{ - display: flex; - justify-content: space-between; - } + .rc-value{ + display: flex; + justify-content: space-between; + cursor: pointer; + } } .usermember{ diff --git a/rc-busness/assets/css/usertion.less b/rc-busness/assets/css/usertion.less index 3b51b56d..018274ad 100644 --- a/rc-busness/assets/css/usertion.less +++ b/rc-busness/assets/css/usertion.less @@ -326,7 +326,7 @@ margin-right: 20px; //pc端 -@media screen and (min-width: 768px) and (max-width: 1920px) { +@media screen and (min-width: 768px){ //快递列表 .delivery { @@ -518,7 +518,7 @@ margin-right: 20px; width: 100%; margin-left: 16px; - + justify-content: end; } .rc-userright { diff --git a/rc-busness/assets/image/btn-close.png b/rc-busness/assets/image/btn-close.png new file mode 100644 index 00000000..7fbfe3d0 Binary files /dev/null and b/rc-busness/assets/image/btn-close.png differ diff --git a/rc-busness/assets/image/btn-play.png b/rc-busness/assets/image/btn-play.png new file mode 100644 index 00000000..cc7a3428 Binary files /dev/null and b/rc-busness/assets/image/btn-play.png differ diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue index 8ed8b2f9..57c8bf29 100644 --- a/rc-busness/components/header.vue +++ b/rc-busness/components/header.vue @@ -304,7 +304,7 @@
diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index be5fa08a..ad41d59d 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -97,17 +97,16 @@
-
-
- +
+
+ +
+
+ + {{item.title}} +

{{item.detail}}

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

{{item.detail}}

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

{{item.detail}}

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

{{item.detail}}

- {{item.price}}
立即购买 @@ -694,8 +692,11 @@
- - +
+
+
+ +
@@ -752,7 +753,7 @@ fixedHeader:false, dataLoaded:true, useraindex:0, - + mobileVideoPlaying:false, usertitle:'明星猫粮', dogtitle:'明星犬粮', processinformation:[], @@ -1096,7 +1097,7 @@ } }, catStarProductswiperOption: { - loop: true, + //loop: true, slidesPerView: 'auto', centeredSlides: true, speed:1000, @@ -1120,7 +1121,7 @@ } }, dogStarProductswiperOption: { - loop: true, + //loop: true, slidesPerView: 'auto', centeredSlides: true, speed:1000, @@ -1177,6 +1178,19 @@ window.removeEventListener('scroll', this.scrollToTop); }, methods:{ + playMobileVideo(item){ + let videoPath=item.video; + let player = this.$refs['mobile-video-player']; + let _self = this; + player.src=videoPath; + player.play(); + this.mobileVideoPlaying = true; + }, + closeMobileVideo(){ + this.mobileVideoPlaying = false; + let player = this.$refs['mobile-video-player']; + player.pause(); + }, ifAdoid(item,index){ //console.log(index); this.userindex=index; diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue index 21bcba0d..9bd34dd9 100644 --- a/rc-busness/pages/personal/discount.vue +++ b/rc-busness/pages/personal/discount.vue @@ -231,6 +231,5 @@ import Myheader from "~/components/header.vue"; \ No newline at end of file diff --git a/rc-busness/pages/personal/mypersonal.vue b/rc-busness/pages/personal/mypersonal.vue index bf401aee..9ff515cf 100644 --- a/rc-busness/pages/personal/mypersonal.vue +++ b/rc-busness/pages/personal/mypersonal.vue @@ -3,7 +3,7 @@
- +
+
  • 商品总价: {{ sumPrice }} @@ -88,8 +88,12 @@
    +
    + 优惠金额: + {{ discountAmount }} +
    合计金额: - {{ sumPrice }} + {{ discountedSumPrice }}
    提交订单 @@ -147,12 +151,50 @@
    + +
    您还没有优惠券，可在商品的详情页面中领取
    +
    +
    + +
    +
    +
    + + ￥ + + + {{item.couponTypeId=='4'?parseInt(((item.discount)*10))+'折':item.couponAmount}} + +
    + {{ item.couponName }} +
    +
    + + {{ item.couponName }} + +
    + 有效期 + {{item.validFrom}}至 + {{item.validTo}} +
    +
    + 立即使用 +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/rc-busness/pages/personal/usermember.vue b/rc-busness/pages/personal/usermember.vue index 4f1db7d0..77611bc1 100644 --- a/rc-busness/pages/personal/usermember.vue +++ b/rc-busness/pages/personal/usermember.vue @@ -4,46 +4,42 @@
    -
    - -
    - - - - - - -
    -
    - 当前等级：{{userorder}} -
    -
    - 距离升级还差:{{ rcvalue }} -
    -
    - - - - -
    -
    - 新手铲屎官 - 资深铲屎官 - 金牌铲屎官 -
    -
    -
    -
    -
    - +
    +
    + + + + + +
    -
    - {{item.title}} - {{item.usereat}} +
    + 当前等级：{{userorder}} +
    +
    + 距离升级还差:{{ rcvalue }} +
    +
    + +
    +
    + 新手铲屎官 + 资深铲屎官 + 金牌铲屎官 +
    +
    +
    +
    +
    + +
    +
    + {{item.title}} + {{item.usereat}} +
    +
    -
    -
    @@ -246,17 +242,17 @@ data(){ } }, methods:{ - onChange(index){ - console.log(index); - if(index==0){ - this.newlist=this.newlista; - }else if(index==1){ - this.newlist=this.senior - }else if(index==2){ - this.newlist=this.goldmedal - } - console.log(this.newlist) - } + onChange(index){ + console.log(index); + if(index==0){ + this.newlist=this.newlista; + }else if(index==1){ + this.newlist=this.senior + }else if(index==2){ + this.newlist=this.goldmedal + } + console.log(this.newlist) + } }, components:{ diff --git a/rc-busness/pages/personal/userpay.vue b/rc-busness/pages/personal/userpay.vue index ae13d38d..156c1b67 100644 --- a/rc-busness/pages/personal/userpay.vue +++ b/rc-busness/pages/personal/userpay.vue @@ -19,7 +19,7 @@

    付款金额:

    -

    ￥{{ userPayData.userprice }}

    +

    ￥{{ userPayData.userprice }}

    收货信息:

    diff --git a/rc-busness/pages/productdetails/producted.vue b/rc-busness/pages/productdetails/producted.vue index 28a0512d..a33cdc17 100644 --- a/rc-busness/pages/productdetails/producted.vue +++ b/rc-busness/pages/productdetails/producted.vue @@ -4,7 +4,7 @@
    -
    +
    -
    +
    商品数量：
    - + +
    目前还没有可用的优惠券
    -
    -
    -
    - ￥{{ item.couponAmount }} -
    -
    -
    - - {{ item.couponDesc }} - -
    - 有效期 - {{ item.validTo }} -
    -
    - 立即领取 -
    -
    -
    +
    +
    +
    + + ￥ + + + {{item.couponTypeId=='4'?parseInt(((item.discount)*10))+'折':item.couponAmount}} + +
    + {{ item.couponName }} +
    +
    + + {{ item.couponName }} + +
    + 有效期 + {{item.validFrom}}至 + {{item.validTo}} +
    +
    + 立即领取 +
    +
    +
    @@ -471,6 +479,7 @@ export default { userclose() { this.userlist = []; + this.dialogInfo1=false; }, async userquery() { let data = await goodsmessage(this.productCode); @@ -517,7 +526,7 @@ export default { let alllist = []; this.userlist = this.alldraw.data; this.userlist.forEach((element, index) => { - if (typeof element.productCodes == "string") { + if (typeof element.productCodes == "string" || !element.productCodes) { userlist.push(element); // let s=element.productCodes.split(','); // console.log(s.indexOf(this.productCode) != -1 ) @@ -526,14 +535,36 @@ export default { }); let menualist = []; userlist.filter((item) => { - item.productCodes = item.productCodes.split(","); - item.productCodes.forEach((element) => { - if (element == this.productCode && item.activityId !== 10) { - console.log(element); - console.log(this.productCode); - menualist.push(item); - } - }); + let valDateFromTime=0; + let valDateToTime=0; + let curTime = new Date().getTime(); + let dateChecked=true; + if(item.fValidFrom) { + valDateFromTime = new Date(item.fValidFrom).getTime(); + } + if(item.fValidTo) { + valDateToTime = new Date(item.fValidTo).getTime(); + } + if(valDateFromTime && curTime < valDateFromTime) { + dateChecked=false; + } + if(valDateToTime && curTime > valDateToTime) { + dateChecked=false; + } + if(dateChecked) { + if(!item.productCodes) { + menualist.push(item); + } else { + item.productCodes = item.productCodes.split(","); + item.productCodes.forEach((element) => { + if (element == this.curItem.productCode && item.activityId !== 10) { + menualist.push(item); + } + }); + } + } else { + //Expired coupons + } }); this.usernewlist = menualist; }