!102 2022-1-24 Jiamin

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

rc-busness/assets/css/global.less

@@ -10,6 +10,7 @@ body {
 	border:unset;
 }
 
+
 .rc-menu--xs .rc-screen-reader{
 	left:28%;
 }
@@ -148,6 +149,9 @@ picture {
 	margin-left: auto;
 	margin-right: auto;
 }
+.useruantity{
+	margin: 1rem 1.25rem;
+}
 
 .ts-remove {
 	text-decoration: line-through;

rc-busness/assets/css/usertion.less

@@ -2,8 +2,110 @@ ul li ol li em strong i {
     list-style: none;
     font-style: normal;
   }
+  .rc-main{
+    margin: 0;
+    padding: 0;
+  }
   //手机端
 @media screen and (max-width: 768px) {
+  .online{
+    margin: 0;
+    &.bold{
+      height: 0.5rem;
+    }
+  }
+  // 订单状态
+  .rc-receiving {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    // margin: 1rem 1.25rem;
+    em {
+        font-style: normal;
+      color: #e1001a;
+      font-size: 1.375rem;
+      font-weight: bold;
+    }
+    span {
+      color: #666666;
+      font-size: 0.875rem;
+      display: block;
+      margin-left: 1.125rem;
+      width: 62%;
+      margin-top: 0.5rem;
+
+    }
+  }
+  //快递列表
+  .delivery {
+    display: flex;
+    flex-direction: column;
+    margin: 1rem 1.25rem;
+    .to-delivery {
+      img{
+        width: 1rem;
+        height: 1rem;
+        object-fit: contain;
+      }
+      display: flex;
+      align-items: center;
+      font-style: normal;
+      span {
+        display: block;
+        margin-left: 0.18rem;
+        color: #333333;
+        font-size: 1rem;
+        font-weight: 500;
+      }
+      i {
+        font-style: normal;
+        margin-left: 0.5rem;
+        display: block;
+        color: #999999;
+        font-size: 0.75rem;
+        margin-top: 0.31rem;
+      }
+    }
+    .bo-delivery {
+      span {
+        font-size: 0.87rem;
+        color: #666666;
+        display: block;
+        margin-top: 0.5rem;
+      }
+    }
+  }
+  //地址列表
+   .mypersonal{
+    .my-delivery {
+      display: flex;
+      align-items: center;
+      font-style: normal;
+      span {
+        display: block;
+         font-size: 0.87rem;
+          color: #333333;
+      }
+      i {
+        font-style: normal;
+         display: block;
+         font-size: 0.87rem;
+         color: #333333;
+         margin-left: .5rem;
+      }
+    }
+    .per-delivery {
+      span {
+        font-size:0.875rem;
+        color: #666666;
+        display: block;
+        margin-top: 0.43rem;
+      }
+    }
+   }
+  
+ 
+
   .rc-margin-y--md{
     width: 100%;
 height: 80px;
@@ -39,83 +141,7 @@ margin-right: 20px;
     .rc-foo{
         display: none;
     }
-    .rc-receiving {
-      width: 100%;
-      height: 80px;
-      display: flex;
-      align-items: center;
-      em {
-          font-style: normal;
-        color: #e1001a;
-        font-size: 22px;
-        font-weight: bold;
-      }
-      span {
-        color: #666666;
-        font-size: 12px;
-        display: block;
-        margin-left: 18px;
-        width: 62%;
  
-      }
-    }
-    .delivery {
-      display: flex;
-      flex-direction: column;
-      height: 80px;
-      .to-delivery {
-        display: flex;
-        align-items: center;
-        font-style: normal;
-        span {
-          display: block;
-          margin-left: 3px;
-        }
-        i {
-          font-style: normal;
-          margin-left: 8px;
-          display: block;
-        }
-      }
-      .bo-delivery {
-        span {
-          font-size: 14px;
-
-          color: #666666;
-          display: block;
-          margin-top: 8px;
-        }
-      }
-    }
-
-    .mypersonal {
-      display: flex;
-      flex-direction: column;
-      height: 80px;
-      .my-delivery {
-        display: flex;
-        align-items: center;
-        font-style: normal;
-        span {
-          display: block;
-          margin-left: 3px;
-        }
-        i {
-          font-style: normal;
-          margin-left: 8px;
-          display: block;
-        }
-      }
-      .per-delivery {
-        span {
-          font-size: 14px;
-
-          color: #666666;
-          display: block;
-          margin-top: 8px;
-        }
-      }
-    }
 
     .rc-usermain {
       display: flex;
@@ -207,14 +233,16 @@ margin-right: 20px;
 
     .rc-merchandise {
       width: 100%;
-      margin-top: 32px;
+      margin-top: 24px;
+       padding-right: 0.7rem;
+       padding-left: 0.7rem;
 
       ul {
         width: 100%;
         display: flex;
         flex-direction: column;
         justify-content: space-between;
-        line-height: 26px;
+        line-height: 30px;
             i {
               font-style: normal;
               color: #666666;
@@ -240,10 +268,15 @@ margin-right: 20px;
           }
         }
       }
+      .useruantity{
+        padding-right: 20px;
+      }
     }
 
 
      .rc-payment{
+      padding-right: 0.7rem;
+       padding-left: 0.7rem;
       width: 100%;
       margin-top: 32px;
          .u-trackingnumber{
@@ -294,6 +327,48 @@ margin-right: 20px;
 
 //pc端
 @media screen and (min-width: 768px){
+  
+    //快递列表
+  .delivery {
+    display: flex;
+    flex-direction: column;
+    margin: 1rem 1.25rem;
+    .to-delivery {
+      margin-top: 20px;
+      img{
+        width: 24px;
+        height: 24px;
+        object-fit: contain;
+      }
+      display: flex;
+      align-items: center;
+      font-style: normal;
+      span {
+        display: block;
+        margin-left: 16px;
+        color: #333333;
+        font-size: 18px;
+        font-weight: 500;
+      }
+      i {
+        font-style: normal;
+        margin-left: 0.5rem;
+        display: block;
+        color: #999999;
+        font-size: 0.75rem;
+        margin-top: 0.31rem;
+      }
+    }
+    .bo-delivery {
+      margin-top: 16px;
+      span {
+        font-size: 0.87rem;
+        color: #666666;
+        display: block;
+        margin-top: 16px;
+      }
+    }
+  }
   .rc-margin-y--md{
     display: none;
   }
@@ -329,7 +404,6 @@ margin-right: 20px;
     .delivery {
       display: flex;
       flex-direction: column;
-      height: 140px;
       display: flex;
       justify-content: center;
       .viewdetails{

rc-busness/pages/myorder/usertion.vue

@@ -3,39 +3,64 @@
     <Myheader></Myheader>
     <div class="rc-top"></div>
     <div class="rc-main" v-for="(item, index) in goldmedal" :key="item.id">
-        <div class="rc-main rc-receiving"  >
+      <div class="online bold">
-          <em>{{item.status=='0'?'待付款':item.status=='1'?'待收货':item.status=='2'?'已完成':item.status=='3'?'已取消':'异常订单'}}</em>
+      </div>
+      <div class="rc-receiving useruantity">
+        <em>{{
+          item.status == "0"
+            ? "待付款"
+            : item.status == "1"
+            ? "待收货"
+            : item.status == "2"
+            ? "已完成"
+            : item.status == "3"
+            ? "已取消"
+            : "异常订单"
+        }}</em>
         <span>{{ orderstatus }}</span>
       </div>
-        
+       <div class="online bold">
-        <div class="delivery" v-if="isshow" >
+      </div>
+      <div class="delivery useruantity" v-if="isshow">
         <div class="to-delivery">
+          <img src="../../static/images/delivery.png" alt="">
           <span>{{ trackingstates }}</span>
+          <!-- <i>2021-1-21</i> -->
         </div>
         <div class="bo-delivery">
-            <span>{{ logisticsCompany }}</span>
+          <!-- <span> 广州天河—刘某某【15124617917】正在派送中</span>     -->
+           <!-- {{ logisticsCompany }}              -->
         </div>
         <div class="viewdetails">
           <span>查看详情</span>
           <img :src="leftico" alt="" />
         </div>
       </div>
-        <div
+       <div class="online bold">
-          class="mypersonal"
+      </div>
-        >
+      <div class="mypersonal useruantity">
         <div class="my-delivery">
           <span>{{ item.addressUserName }}</span>
           <i>{{ item.addressPhoneNumber }}</i>
         </div>
         <div class="per-delivery">
-            <span>{{ item.addressProvinceName }}{{item.addressCityName}}{{item.addressCountyName}}</span>
+          <span
+            >{{ item.addressProvinceName }}{{ item.addressCityName
+            }}{{ item.addressCountyName }}</span
+          >
         </div>
       </div>
+        <div class="online bold"></div>
       <div>
         <div class="rc-center">
-          <div class="rc-usermain" v-for="(userlist,index) in item.orderDetailList" :key="index">
+          <div
+            class="rc-usermain useruantity"
+            v-for="(userlist, index) in item.orderDetailList"
+            :key="index"
+
+          >
             <div class="rc-image">
-             <img :src= userlist.picFile alt="" />
+              <img :src="userlist.picFile" alt="" />
             </div>
             <div class="rc-right">
               <div class="rc-usercenter">
@@ -61,7 +86,9 @@
               </div> -->
             </div>
           </div>
+           <div class="online bold"></div>
         </div>
+        <div class="rc-merchandise ">
           <div class="rc-merchandise ">
           <ul>
             <li>
@@ -82,7 +109,9 @@
             </li>
           </ul>
         </div>
+        </div>
 
+        <div class="rc-payment">
           <div class="rc-payment">
           <ul>
             <li>
@@ -104,12 +133,10 @@
             <li>
               <span>快递单号:</span>
               <div class="u-trackingnumber">
-              <i>{{ logisticsNumber }}
+                <i>{{ logisticsNumber }} </i>
-                  </i>
                 <!-- <img :src="information.catimage" alt=""> -->
               </div>
             </li>
-            
           </ul>
         </div>
 
@@ -123,15 +150,17 @@
               <span @click="onceagain(item)"> {{ payorsucess }}</span>
             </div>
           </div>
-
+        </div>
       </div>
       </div>
     </div>
     <div class="rc-full-width rc-margin-y--md">
-               <i class="ts-standard-btn ts-standard-btn--two center" @click="onceagain()">
+      <i
+        class="ts-standard-btn ts-standard-btn--two center"
+        @click="onceagain()"
+      >
         {{ payorsucess }}
       </i>
-
     </div>
 
     <MyFooter></MyFooter>
@@ -142,54 +171,50 @@
 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';
+import Vue from "vue";
 let vm = new Vue();
-  import formatConversion from '../../static/js/date'
+import formatConversion from "../../static/js/date";
-    import {selectaddress,canceldanhao,generateOrderWX} from "../../ajax/getData";
+import {
+  selectaddress,
+  canceldanhao,
+  generateOrderWX,
+} from "../../ajax/getData";
 
 export default {
   data() {
     return {
       goldmedal: [],
-      userproductId:'',
+      userproductId: "",
-      logisticsDate:'',
+      logisticsDate: "",
-      addressPhoneNumber:'',
+      addressPhoneNumber: "",
-      userphone:'',
+      userphone: "",
-      logisticsNumber:'',
+      logisticsNumber: "",
-      customer:'',//联系客服或者取消订单
+      customer: "", //联系客服或者取消订单
-      payorsucess:'', //立即支付或者再次购买，
+      payorsucess: "", //立即支付或者再次购买，
       addressstype: null,
-      addressUserName:'',
+      addressUserName: "",
-      logisticsCompany:'',//物流公司
+      logisticsCompany: "", //物流公司
-      orderstatus: '',
+      orderstatus: "",
-      goldastates:'',
+      goldastates: "",
 
-      userisdelivery:'待收货',
+      userisdelivery: "待收货",
       userdelivery: "派送中",
       isshow: true,
-      usersalesAmount:'',
+      usersalesAmount: "",
       leftico: require("../../assets/image/rc-left.png"),
-      orderNumber:'',
+      orderNumber: "",
       userdata: "",
       usermessage: null,
       userid: null,
-         trackingstates:'',//运输状态
+      trackingstates: "", //运输状态
       useralllist: [],
-      delivery: [
+      delivery: [],
 
-      ],
+      useraddress: [],
 
-      useraddress: [
+      goldmedal: [],
-       
+      shopprice: {},
-      ],
-
-      goldmedal: [
-     
-      ],
-      shopprice: {
-    
-      },
       information: {
         reference: "1111111111111111",
         ordertime: "2012-12-01    11:20:00",
@@ -222,43 +247,43 @@ export default {
             },
           });
         }, 500);
-         
       }
     },
     userpay() {
-  console.log('---');
+      console.log("---");
       if (this.goldastates == 0) {
         this.canceldanhao();
- }
+      } else if ((this.customer = "联系客服申请售后")) {
- else if( this.customer='联系客服申请售后'){
         var option = {
-					customer: {id: '', name: '', email: '', mobile: '', memberId: this.userdata.data.id}
+          customer: {
-				}
+            id: "",
+            name: "",
+            email: "",
+            mobile: "",
+            memberId: this.userdata.data.id,
+          },
+        };
         dis_livchat(option);
       }
     },
     //订单支付和再次购买
     onceagain(item) {
       console.log(this.payorsucess);
-     if(this.payorsucess=='立即支付'){
+      if (this.payorsucess == "立即支付") {
-       console.log('----')
+        console.log("----");
         this.getwei(item);
-
       } else {
         this.$router.push({
           path: "/productdetails/producted",
           query: {
             stype: 1,
-					productCode: this.userproductId
+            productCode: this.userproductId,
           },
         });
-       console.log('不是立即支付');
+        console.log("不是立即支付");
       }
-
-   	
     },
     async orderquantity(orderNumber) {
-  
       let data = await userin(orderNumber);
       if (data) {
         this.goldmedal = data;
@@ -267,38 +292,37 @@ if(data){
           this.goldastates = this.goldmedal[i].status;
 
           this.userproductId = this.goldmedal[i].orderDetailList[0].productId;
-    this.logisticsNumber=this.goldmedal[i].orderDetailList[0].logisticsNumber;  //物流单号
+          this.logisticsNumber =
-     this.trackingstates=this.goldmedal[i].orderDetailList[0].status//运输状态
+            this.goldmedal[i].orderDetailList[0].logisticsNumber; //物流单号
+          this.trackingstates = this.goldmedal[i].orderDetailList[0].status; //运输状态
 
           if (this.trackingstates == 0) {
-              this.trackingstates='运输中'
+            this.trackingstates = "运输中";
           } else if (this.trackingstates == 1) {
-              this.trackingstates='已签收'
+            this.trackingstates = "已签收";
+          } else if (this.trackingstates == 2) {
+            this.trackingstates = "未发货";
           }
-      else if(this.trackingstates==2){
+          this.logisticsDate = this.formatConversion(
-              this.trackingstates='未发货'
+            this.goldmedal[i].orderDate
-     }
+          ); //时间戳
-     this.logisticsDate=this.formatConversion(this.goldmedal[i].orderDate)//时间戳
+          this.logisticsCompany =
-     this.logisticsCompany=this.goldmedal[i].orderDetailList[0].logisticsCompany; //物流公司
+            this.goldmedal[i].orderDetailList[0].logisticsCompany; //物流公司
-    this.orderNumber=this.goldmedal[i].orderNumber
+          this.orderNumber = this.goldmedal[i].orderNumber;
           this.usersalesAmount = this.goldmedal[i].salesAmount;
           this.addressUserName = this.goldmedal[i].addressUserName;
           this.addressPhoneNumber = this.goldmedal[i].addressPhoneNumber;
         }
         console.log(this.goldmedal, this.userproductId, this.usersalesAmount);
       }
- 
-
     },
     //订单立即支付
     async getwei(user) {
       console.log(user);
       let userPayData = {
-
         userprice: this.usersalesAmount,
         orderId: this.orderNumber,
-          userinformation:this.addressUserName +
+        userinformation: this.addressUserName + " " + this.addressPhoneNumber,
-            " "+this.addressPhoneNumber
       };
       this.$router.push({
         path: "/personal/userpay",
@@ -306,15 +330,13 @@ if(data){
           userData: this.orderNumber,
           stype: 1,
           userPayData: JSON.stringify(userPayData),
-
         },
       });
-        
     },
     async editaddress(user) {
       //  user.data.id=844350;
       let data = await selectaddress(this.userid);
-        let list=[]
+      let list = [];
       this.useraddress = data.data;
       for (let i = 0; i < this.useraddress.length; i++) {
         if (this.useraddress[i].isDefault == true) {
@@ -326,9 +348,6 @@ if(data){
 
       // console.log(this.list);
     },
-
-
-
   },
   mounted() {
     this.checkIsLogin();
@@ -341,34 +360,32 @@ console.log(this.userdata);
     this.addressstype = this.$route.query.stype;
 
     this.orderNumber = this.$route.query.orderNumber;
-    this.orderquantity(this.orderNumber)
+    this.orderquantity(this.orderNumber);
     if (this.addressstype == 2) {
-          this.orderstatus='您的订单已完成';
+      this.orderstatus = "您的订单已完成";
       this.isshow = false;
-          this.userisdelivery='待发货';
+      this.userisdelivery = "待发货";
-           this.customer='联系客服申请售后'
+      this.customer = "联系客服申请售后";
-           this.payorsucess='再次购买'
+      this.payorsucess = "再次购买";
       console.log(this.orderstatus);
     } else if (this.addressstype == 0) {
-         this.orderstatus='您的订单还未付款，请尽快付款！';
+      this.orderstatus = "您的订单还未付款，请尽快付款！";
       this.isshow = false;
-          this.userisdelivery='待付款';
+      this.userisdelivery = "待付款";
-           this.customer='取消订单'
+      this.customer = "取消订单";
-            this.payorsucess='立即支付'
+      this.payorsucess = "立即支付";
-    }
+    } else if (this.addressstype == 1) {
-    else if(this.addressstype==1){
+      this.orderstatus = "您的订单已发出，请耐心等候。";
-         this.orderstatus='您的订单已发出，请耐心等候。';
       this.isshow = true;
-          this.userisdelivery='待收货';
+      this.userisdelivery = "待收货";
-            this.customer='联系客服申请售后'
+      this.customer = "联系客服申请售后";
-           this.payorsucess='再次购买'
+      this.payorsucess = "再次购买";
-    }
+    } else if (this.addressstype == 3) {
-      else if(this.addressstype==3){
+      this.orderstatus = "您的订单已取消！";
-         this.orderstatus='您的订单已取消！';
       this.isshow = false;
-          this.userisdelivery='已取消';
+      this.userisdelivery = "已取消";
-           this.customer='联系客服申请售后'
+      this.customer = "联系客服申请售后";
-           this.payorsucess='再次购买'
+      this.payorsucess = "再次购买";
     }
     console.log(this.addressstype);
   },
@@ -382,5 +399,4 @@ console.log(this.userdata);
 <style lang="less" scoped>
 @import url("../../assets/css/global.less");
 @import url("../../assets/css/usertion.less");
-
 </style>