diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index f9ca05fc..2e98aeac 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -4,6 +4,12 @@ body { line-height: 1.5; color: #666; } +div[data-js-modal-menu] { + display:none; +} +aside div[data-js-modal-menu] { + display:block; +} .el-message-box .el-button--primary{ background-color: #e1001a !important; color:#fff; @@ -20,12 +26,10 @@ body { .fade-leave-active { opacity: 0; } - .ts-no-data { text-align: center; margin: 3rem 0; } - .ts-mask { width: 100%; height: 100%; @@ -37,7 +41,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; @@ -53,10 +65,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; @@ -323,12 +336,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; @@ -350,7 +363,7 @@ picture { } span { - font-size: 0.12rem; + font-size: .75rem; } .tuntop { @@ -411,7 +424,7 @@ picture { } label { input[type=checkbox] { - top:.25rem; + top:0rem; } } .rc-header__nav--primary{ @@ -804,7 +817,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 9b12653e..b78087ff 100644 --- a/rc-busness/assets/css/orderquantity.less +++ b/rc-busness/assets/css/orderquantity.less @@ -279,7 +279,7 @@ align-items: center; height: 164px; .rc-usercenter{ - width: 25%; + width: 27%; em{ font-size: 18px; } @@ -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 { @@ -329,7 +329,7 @@ display: flex; justify-content: space-between; align-items: center; - width: 58%; + width: 56%; font-size: 20px; color: #E1001A; font-weight: bold; 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/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 e337189e..79694c85 100644 --- a/rc-busness/assets/css/usertion.less +++ b/rc-busness/assets/css/usertion.less @@ -293,7 +293,7 @@ margin-right: 20px; //pc端 -@media screen and (min-width: 768px) and (max-width: 1920px) { +@media screen and (min-width: 768px) { .rc-margin-y--md{ display: none; } @@ -444,7 +444,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/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue index 9fa62e32..bb03cd94 100644 --- a/rc-busness/pages/myorder/usertion.vue +++ b/rc-busness/pages/myorder/usertion.vue @@ -40,18 +40,18 @@
- +
{{ userlist.productName }}
- 规格:{{ item.productId }} + 规格:{{ userlist.specifications }}
- 数量:{{ item.pcs }}件 - ￥{{ 10 }} + 数量:{{ userlist.pcs }}件 + ￥{{ userlist.ecPrice }}
{{customer}}
@@ -96,7 +96,7 @@
  • 下单时间:: - {{ item.orderDate }} + {{ logisticsDate }}
  • 付款方式:: @@ -147,8 +147,12 @@ import Myheader from "~/components/header.vue"; import { mapMutations } from "vuex"; import { userin} from "../../ajax/getData"; - import MyFooter from '~/components/rc-footer.vue' + import MyFooter from '~/components/rc-footer.vue'; + import Vue from 'vue'; +let vm = new Vue(); + import formatConversion from '../../static/js/date' import {selectaddress,canceldanhao,generateOrderWX} from "../../ajax/getData"; + export default { data() { return { @@ -276,9 +280,7 @@ if(data){ else if(this.trackingstates==2){ this.trackingstates='未发货' } - console.log(this.goldmedal[i].orderDate); - this.logisticsDate=new Date(this.goldmedal[i].orderDate.toLocaleString())//时间戳 - console.log(this.logisticsDate); + this.logisticsDate=this.formatConversion(this.goldmedal[i].orderDate)//时间戳 this.logisticsCompany=this.goldmedal[i].orderDetailList[0].logisticsCompany; //物流公司 this.orderNumber=this.goldmedal[i].orderNumber this.usersalesAmount=this.goldmedal[i].salesAmount; diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue index 32045c60..cbf93649 100644 --- a/rc-busness/pages/personal/discount.vue +++ b/rc-busness/pages/personal/discount.vue @@ -41,7 +41,7 @@
    • - {{ item.couponName }} + {{ item.couponDesc }}
    有效期 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 }} @@ -147,12 +147,43 @@
    • + +
    您还没有优惠券，可在商品的详情页面中领取
    +
    +
    + +
    +
    +
    + ￥{{ item.couponAmount }} +
    +
    +
    + + {{ item.couponDesc }} + +
    + 有效期 + {{ item.validTo }} +
    +
    + 立即使用 +
    +
    +
    +
    +
    +