!23 2022-1-17 JiaMIn

Merge pull request !23 from Admin/sit-jiamin-v2

rc-busness/assets/css/discount.less

@@ -152,7 +152,9 @@ margin-top: 8px;
 
 }
 @media screen and (min-width: 769px){
-
+.online{
+  margin-top: 30px;
+}
      .allmain{
       
         .rs-dis{
@@ -162,6 +164,7 @@ margin-top: 8px;
         }
     
     }
+ 
     .active {
         font-size: 14px;
         color: #E2001A;

rc-busness/assets/css/product-list.less

@@ -11,12 +11,15 @@ ul li ol li em strong i {
 	.usersearch {
 		margin: 0 auto;
 		overflow: hidden;
+	
 	}
 	 //rc-main end
 }
 
 //手机端
 @media screen and (max-width: 768px) {
+
+
 	.usercontentshow{
 		position: relative;
 	}
@@ -234,6 +237,19 @@ ul li ol li em strong i {
 
 //pc端
 @media screen and (min-width: 768px){
+	.usersearch {
+		margin: 0 auto;
+		overflow: hidden;
+		margin-top: 5rem;
+	}
+	.online{
+		width:100%;
+	   &.bold{
+		   height:0.5rem;
+		   margin-top: 5rem;
+		   background:#f6f6f6;
+	   }
+	}
 	/deep/.el-dialog {
 	width: 920px;
 	height: 570px;

rc-busness/pages/index.vue

@@ -1474,6 +1474,7 @@ selectGoods(item,index){
   console.log(item,index);
    this.activeIndex=index; 
    console.log(item.title);
+   
  this.ifadroind(item,index,this.useraindex)
 //  this.ifAdoid(item,index);
 

rc-busness/pages/personal/discount.vue

@@ -29,7 +29,7 @@
             <div class="rc-contair">
               <div class="rc-left" ref="userleft" id="userleft" :style='usercolor'>
                 <div>
-                  <i>￥</i><span>{{item.couponTypeId=='4'?(item.discount) *10:item.couponAmount}}</span>
+                  <i>￥</i><span>{{item.couponTypeId=='4'?parseInt(((item.discount) *10))+ '折':item.couponAmount}}</span>
                 </div>
                 <strong>{{ item.couponName }}</strong>
               </div>
@@ -40,7 +40,7 @@
                 <div class="rc-userfont">
                     <strong>有效期</strong>
                   <span>{{item.validFrom}}至</span>
-                  <em>{{ item.validTo }}</em>
+                  <em>{{item.validTo}}</em>
                 </div>
                    <nuxt-link :to="`/productdetails/productlist`">
                 <div  v-if="userload" class="ts-stand">
@@ -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);
       }
             

rc-busness/pages/personal/useraddress.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
     <Myheader></Myheader>
+      <div class="rc-top"></div>
     <div class="rc-header">
       <div class="rc-main">
         <div class="rc-headera">

rc-busness/pages/useraddress/openaddress.vue

@@ -104,7 +104,6 @@ export default {
 
     //查询人的所有地址
     async editaddress(user) {
-   
      user.data.id=844350
         let data = await selectaddress(user.data.id);
         this.list=data.data;