From a2a6ca14bd019102b47aada5a0d251a3b02a027c Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Mon, 24 Jan 2022 19:29:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rc-busness/assets/css/global.less     |   4 +
 rc-busness/assets/css/usertion.less   | 234 +++++++-----
 rc-busness/pages/myorder/usertion.vue | 498 +++++++++++++-------------
 rc-busness/static/images/delivery.png | Bin 0 -> 4984 bytes
 4 files changed, 415 insertions(+), 321 deletions(-)
 create mode 100644 rc-busness/static/images/delivery.png

diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less
index f9ca05fc..cd1b7348 100644
--- a/rc-busness/assets/css/global.less
+++ b/rc-busness/assets/css/global.less
@@ -10,6 +10,7 @@ body {
 	border:unset;
 }
 
+
 .rc-menu--xs .rc-screen-reader{
 	left:28%;
 }
@@ -141,6 +142,9 @@ picture {
 	margin-left: auto;
 	margin-right: auto;
 }
+.useruantity{
+	margin: 1rem 1.25rem;
+}
 
 .ts-remove {
 	text-decoration: line-through;
diff --git a/rc-busness/assets/css/usertion.less b/rc-busness/assets/css/usertion.less
index e337189e..3b51b56d 100644
--- a/rc-busness/assets/css/usertion.less
+++ b/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) and (max-width: 1920px) {
+  
+    //快递列表
+  .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{
diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue
index 5a7e5d30..e066f05e 100644
--- a/rc-busness/pages/myorder/usertion.vue
+++ b/rc-busness/pages/myorder/usertion.vue
@@ -2,40 +2,65 @@
   <div class="user-main">
     <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"  >
-          <em>{{item.status=='0'?'待付款':item.status=='1'?'待收货':item.status=='2'?'已完成':item.status=='3'?'已取消':'异常订单'}}</em>
-          <span>{{orderstatus}}</span>
+    <div class="rc-main" v-for="(item, index) in goldmedal" :key="item.id">
+      <div class="online bold">
+      </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>
+      <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="delivery" v-if="isshow" >
-          <div class="to-delivery">
-            <span>{{ trackingstates}}</span>
-          </div>
-          <div class="bo-delivery">
-            <span>{{ logisticsCompany }}</span>
-          </div>
-           <div class="viewdetails">
-             <span>查看详情</span>
-                <img :src="leftico" alt="" /> 
-           </div>
+        <div class="bo-delivery">
+          <!-- <span> 广州天河—刘某某【15124617917】正在派送中</span>     -->
+           <!-- {{ logisticsCompany }}              -->
         </div>
-        <div
-          class="mypersonal"
-        >
-          <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>
-          </div>
+        <div class="viewdetails">
+          <span>查看详情</span>
+          <img :src="leftico" alt="" />
         </div>
-        <div >
+      </div>
+       <div class="online bold">
+      </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
+          >
+        </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">
@@ -47,13 +72,13 @@
               <div class="rc-userbottom">
                 <span>数量:{{ userlist.pcs }}件</span>
                 <i>￥{{ userlist.ecPrice }}</i>
-                 <div class="rc-bottom">
-            <span @click="userpay()">{{customer}}</span>
-          </div>
+                <div class="rc-bottom">
+                  <span @click="userpay()">{{ customer }}</span>
+                </div>
+              </div>
+              <div class="rc-bottomm">
+                <span @click="userpay()">{{ customer }}</span>
               </div>
-                  <div class="rc-bottomm">
-            <span @click="userpay()">{{customer}}</span>
-          </div>
               <!-- <div class="rc-userbottomm">
                 <i>￥{{ item.userprice }}</i>
                 <span>{{ item.orderstype }}</span>
@@ -61,8 +86,10 @@
               </div> -->
             </div>
           </div>
+           <div class="online bold"></div>
         </div>
-        <div class="rc-merchandise">
+        <div class="rc-merchandise ">
+          <div class="rc-merchandise ">
           <ul>
             <li>
               <span>商品总价:</span>
@@ -82,8 +109,10 @@
             </li>
           </ul>
         </div>
+        </div>
 
-            <div class="rc-payment">
+        <div class="rc-payment">
+          <div class="rc-payment">
           <ul>
             <li>
               <span>订单编号::</span>
@@ -104,271 +133,259 @@
             <li>
               <span>快递单号:</span>
               <div class="u-trackingnumber">
-              <i>{{ logisticsNumber }}
-                  </i>
-                   <!-- <img :src="information.catimage" alt=""> -->
-                  </div>
+                <i>{{ logisticsNumber }} </i>
+                <!-- <img :src="information.catimage" alt=""> -->
+              </div>
             </li>
-            
           </ul>
         </div>
 
         <div class="rc-foot">
           <div class="rc-foo">
-              <div style="padding-top:55px">
+            <div style="padding-top: 55px">
               <i>合计金额:</i>
-               <em>￥{{usersalesAmount}}</em>
-               </div>
-               <div style="padding-bottom:40px;cursor: pointer">
-               <span @click="onceagain(item)"> {{payorsucess}}</span>
-               </div>
+              <em>￥{{ usersalesAmount }}</em>
+            </div>
+            <div style="padding-bottom: 40px; cursor: pointer">
+              <span @click="onceagain(item)"> {{ payorsucess }}</span>
+            </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()">
-                 {{payorsucess}}
-               </i>
+      </div>
+    </div>
+    <div class="rc-full-width rc-margin-y--md">
+      <i
+        class="ts-standard-btn ts-standard-btn--two center"
+        @click="onceagain()"
+      >
+        {{ payorsucess }}
+      </i>
+    </div>
 
-         </div>
-
-  <MyFooter></MyFooter>
+    <MyFooter></MyFooter>
   </div>
 </template>
 
 <script>
 import Myheader from "~/components/header.vue";
 import { mapMutations } from "vuex";
-  import { userin} from "../../ajax/getData";
-  import MyFooter from '~/components/rc-footer.vue';
-  import Vue from 'vue';
+import { userin } from "../../ajax/getData";
+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";
+import formatConversion from "../../static/js/date";
+import {
+  selectaddress,
+  canceldanhao,
+  generateOrderWX,
+} from "../../ajax/getData";
 
 export default {
   data() {
     return {
-      goldmedal:[],
-      userproductId:'',
-      logisticsDate:'',
-      addressPhoneNumber:'',
-      userphone:'',
-      logisticsNumber:'',
-      customer:'',//联系客服或者取消订单
-      payorsucess:'', //立即支付或者再次购买，
+      goldmedal: [],
+      userproductId: "",
+      logisticsDate: "",
+      addressPhoneNumber: "",
+      userphone: "",
+      logisticsNumber: "",
+      customer: "", //联系客服或者取消订单
+      payorsucess: "", //立即支付或者再次购买，
       addressstype: null,
-      addressUserName:'',
-      logisticsCompany:'',//物流公司
-      orderstatus: '',
-      goldastates:'',
-      
-      userisdelivery:'待收货',
+      addressUserName: "",
+      logisticsCompany: "", //物流公司
+      orderstatus: "",
+      goldastates: "",
+
+      userisdelivery: "待收货",
       userdelivery: "派送中",
-      isshow:true,
-      usersalesAmount:'',
+      isshow: true,
+      usersalesAmount: "",
       leftico: require("../../assets/image/rc-left.png"),
-      orderNumber:'',
-      userdata:"",
-       usermessage:null,
-         userid: null,
-         trackingstates:'',//运输状态
-      useralllist:[],
-      delivery: [
-      
-      ],
+      orderNumber: "",
+      userdata: "",
+      usermessage: null,
+      userid: null,
+      trackingstates: "", //运输状态
+      useralllist: [],
+      delivery: [],
 
-      useraddress: [
-       
-      ],
+      useraddress: [],
 
-      goldmedal: [
-     
-      ],
-      shopprice: {
-    
-      },
+      goldmedal: [],
+      shopprice: {},
       information: {
         reference: "1111111111111111",
         ordertime: "2012-12-01    11:20:00",
         paymentmethod: "微信支付",
         distribution: "快递",
         trackingnumber: "11111111111111",
-         catimage: require("../../assets/image/rc-left.png"),
+        catimage: require("../../assets/image/rc-left.png"),
       },
     };
   },
   methods: {
-...mapMutations(["checkIsLogin"]),
-	refreshDesktopNav:function(){
-		RCDL.navigation.currentState=null;
-		RCDL.navigation.rebuild();
-	},
+    ...mapMutations(["checkIsLogin"]),
+    refreshDesktopNav: function () {
+      RCDL.navigation.currentState = null;
+      RCDL.navigation.rebuild();
+    },
     //取消订单
-        async canceldanhao(orderNumber) {
-      let data = await canceldanhao(this.userphone,this.orderNumber);
+    async canceldanhao(orderNumber) {
+      let data = await canceldanhao(this.userphone, this.orderNumber);
       if (data) {
         this.$message({
           type: "warning",
           message: "取消订单成功",
         });
         setTimeout(() => {
-                this.$router.push({
-          path: "/personal/useraddress",
-          query: {
-            stype: 1,
-          },
-        });
+          this.$router.push({
+            path: "/personal/useraddress",
+            query: {
+              stype: 1,
+            },
+          });
         }, 500);
-         
       }
     },
-userpay(){
-  console.log('---');
- if(this.goldastates==0){
-    this.canceldanhao();
- }
- else if( this.customer='联系客服申请售后'){
-    	var option = {
-					customer: {id: '', name: '', email: '', mobile: '', memberId: this.userdata.data.id}
-				}
-				dis_livchat(option);
- }
-},
-//订单支付和再次购买
-   onceagain(item){
-     console.log(this.payorsucess);
-     if(this.payorsucess=='立即支付'){
-       console.log('----')
-      this.getwei(item);
-
-     }else{
-       this.$router.push({
-				path: "/productdetails/producted",
-				query: {
-					stype: 1,
-					productCode: this.userproductId
-				},
-			});
-       console.log('不是立即支付');
-     }
-
-   	
-   },
-    async orderquantity(orderNumber){
-  
- let data=await userin(orderNumber);
-if(data){
-  this.goldmedal=data;
-  console.log(this.goldmedal);
-  for(let i=0;i<this.goldmedal.length;i++){
-    this.goldastates=this.goldmedal[i].status;
-
-    this.userproductId=this.goldmedal[i].orderDetailList[0].productId;
-    this.logisticsNumber=this.goldmedal[i].orderDetailList[0].logisticsNumber;  //物流单号
-     this.trackingstates=this.goldmedal[i].orderDetailList[0].status//运输状态
-
-     if( this.trackingstates==0){
-              this.trackingstates='运输中'
-     }else if(this.trackingstates==1){
-              this.trackingstates='已签收'
-     }
-      else if(this.trackingstates==2){
-              this.trackingstates='未发货'
-     }
-     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;
-    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 +
-            " "+this.addressPhoneNumber
+    userpay() {
+      console.log("---");
+      if (this.goldastates == 0) {
+        this.canceldanhao();
+      } else if ((this.customer = "联系客服申请售后")) {
+        var option = {
+          customer: {
+            id: "",
+            name: "",
+            email: "",
+            mobile: "",
+            memberId: this.userdata.data.id,
+          },
         };
-          this.$router.push({
-          path: "/personal/userpay",
+        dis_livchat(option);
+      }
+    },
+    //订单支付和再次购买
+    onceagain(item) {
+      console.log(this.payorsucess);
+      if (this.payorsucess == "立即支付") {
+        console.log("----");
+        this.getwei(item);
+      } else {
+        this.$router.push({
+          path: "/productdetails/producted",
           query: {
-            userData:this.orderNumber,
-            stype:1,
-           userPayData: JSON.stringify(userPayData),
-
+            stype: 1,
+            productCode: this.userproductId,
           },
         });
-        
+        console.log("不是立即支付");
+      }
     },
-        async editaddress(user) {
-    //  user.data.id=844350;
-        let data = await selectaddress(this.userid);
-        let list=[]
-        this.useraddress=data.data;
-        for(let i =0;i<this.useraddress.length;i++){
-          if(this.useraddress[i].isDefault==true){
-            list.push(this.useraddress[i]);
+    async orderquantity(orderNumber) {
+      let data = await userin(orderNumber);
+      if (data) {
+        this.goldmedal = data;
+        console.log(this.goldmedal);
+        for (let i = 0; i < this.goldmedal.length; i++) {
+          this.goldastates = this.goldmedal[i].status;
+
+          this.userproductId = this.goldmedal[i].orderDetailList[0].productId;
+          this.logisticsNumber =
+            this.goldmedal[i].orderDetailList[0].logisticsNumber; //物流单号
+          this.trackingstates = this.goldmedal[i].orderDetailList[0].status; //运输状态
+
+          if (this.trackingstates == 0) {
+            this.trackingstates = "运输中";
+          } else if (this.trackingstates == 1) {
+            this.trackingstates = "已签收";
+          } else if (this.trackingstates == 2) {
+            this.trackingstates = "未发货";
           }
+          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;
+          this.addressUserName = this.goldmedal[i].addressUserName;
+          this.addressPhoneNumber = this.goldmedal[i].addressPhoneNumber;
         }
-        this.useraddress=list;
-        console.log( this.useraddress[0].recipient);
-
-        // console.log(this.list);
+        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 + " " + this.addressPhoneNumber,
+      };
+      this.$router.push({
+        path: "/personal/userpay",
+        query: {
+          userData: this.orderNumber,
+          stype: 1,
+          userPayData: JSON.stringify(userPayData),
+        },
+      });
+    },
+    async editaddress(user) {
+      //  user.data.id=844350;
+      let data = await selectaddress(this.userid);
+      let list = [];
+      this.useraddress = data.data;
+      for (let i = 0; i < this.useraddress.length; i++) {
+        if (this.useraddress[i].isDefault == true) {
+          list.push(this.useraddress[i]);
+        }
+      }
+      this.useraddress = list;
+      console.log(this.useraddress[0].recipient);
 
-
-
+      // console.log(this.list);
+    },
   },
   mounted() {
     this.checkIsLogin();
-this.userdata=this.$store.state.userInfo;
-console.log(this.userdata);
+    this.userdata = this.$store.state.userInfo;
+    console.log(this.userdata);
     this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
-       this.userid = this.usermessage.data.id;
-       this.userphone=this.usermessage.data.mobile;
-       this.editaddress(this.userid);
+    this.userid = this.usermessage.data.id;
+    this.userphone = this.usermessage.data.mobile;
+    this.editaddress(this.userid);
     this.addressstype = this.$route.query.stype;
 
-    this.orderNumber=this.$route.query.orderNumber;
-    this.orderquantity(this.orderNumber)
-    if(this.addressstype==2){
-          this.orderstatus='您的订单已完成';
-          this.isshow=false;
-          this.userisdelivery='待发货';
-           this.customer='联系客服申请售后'
-           this.payorsucess='再次购买'
-          console.log( this.orderstatus);
-    }else if(this.addressstype==0){
-         this.orderstatus='您的订单还未付款，请尽快付款！';
-          this.isshow=false;
-          this.userisdelivery='待付款';
-           this.customer='取消订单'
-            this.payorsucess='立即支付'
-    }
-    else if(this.addressstype==1){
-         this.orderstatus='您的订单已发出，请耐心等候。';
-          this.isshow=true;
-          this.userisdelivery='待收货';
-            this.customer='联系客服申请售后'
-           this.payorsucess='再次购买'
-    }
-      else if(this.addressstype==3){
-         this.orderstatus='您的订单已取消！';
-          this.isshow=false;
-          this.userisdelivery='已取消';
-           this.customer='联系客服申请售后'
-           this.payorsucess='再次购买'
+    this.orderNumber = this.$route.query.orderNumber;
+    this.orderquantity(this.orderNumber);
+    if (this.addressstype == 2) {
+      this.orderstatus = "您的订单已完成";
+      this.isshow = false;
+      this.userisdelivery = "待发货";
+      this.customer = "联系客服申请售后";
+      this.payorsucess = "再次购买";
+      console.log(this.orderstatus);
+    } else if (this.addressstype == 0) {
+      this.orderstatus = "您的订单还未付款，请尽快付款！";
+      this.isshow = false;
+      this.userisdelivery = "待付款";
+      this.customer = "取消订单";
+      this.payorsucess = "立即支付";
+    } else if (this.addressstype == 1) {
+      this.orderstatus = "您的订单已发出，请耐心等候。";
+      this.isshow = true;
+      this.userisdelivery = "待收货";
+      this.customer = "联系客服申请售后";
+      this.payorsucess = "再次购买";
+    } else if (this.addressstype == 3) {
+      this.orderstatus = "您的订单已取消！";
+      this.isshow = false;
+      this.userisdelivery = "已取消";
+      this.customer = "联系客服申请售后";
+      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>
\ No newline at end of file
diff --git a/rc-busness/static/images/delivery.png b/rc-busness/static/images/delivery.png
new file mode 100644
index 0000000000000000000000000000000000000000..256126bfa8ba481d042557f468a79d8985d0a2ad
GIT binary patch
literal 4984
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
baUd}%@Lp0lr;(fWlm?g@TA>>ZuHF3)V@@;P

literal 0
HcmV?d00001