diff --git a/rc-busness/ajax/getData.js b/rc-busness/ajax/getData.js
index c90de64d..ab6a7621 100644
--- a/rc-busness/ajax/getData.js
+++ b/rc-busness/ajax/getData.js
@@ -283,10 +283,11 @@ export const userin = (orderNumber,) => {
 
 
 //取消订单
-export const canceldanhao = (orderNumber) => {
+export const canceldanhao = (phoneNumber,orderNumber) => {
   var data = {
-   
+    phoneNumber:phoneNumber,
     orderNumber:orderNumber,
+
   }
   return fetch('cancelOrder/', data, 'POST' )
 }
diff --git a/rc-busness/assets/css/orderquantity.less b/rc-busness/assets/css/orderquantity.less
index 4b8fc3e6..68bf3653 100644
--- a/rc-busness/assets/css/orderquantity.less
+++ b/rc-busness/assets/css/orderquantity.less
@@ -3,7 +3,12 @@
 
 
 @media screen and (max-width:768px){
-
+  .online{
+    margin: 0;
+    &.bold{
+    height: 8px;
+    }
+}
     .active {
         font-size: 14px;
         color: #e2001a;
@@ -16,16 +21,17 @@
       }
       .usercontshow{
           padding: 0 1.5rem;
+          .online{
+            margin: 0;
+            &.bold{
+            height: 8px;
+            margin-top: 1.5rem;
+            }
+        }
         .rc-usermaina{
             width: 100%;
             height: 100%;
-            .online{
-              margin: 0;
-              margin-top: 1.5rem;
-              &.bold{
-              height: 0.5rem;
-              }
-          }
+         
           .rc-price{
             display: flex;
             justify-content: space-between;
@@ -211,6 +217,13 @@
 }
 @media screen and (min-width: 769px)
 { 
+  .online{
+    margin: 0;
+    display: none;
+}
+.rc-usermaina{
+  border: 1px solid #D7D7D7;
+}
     .active {
         font-size: 18px;
         color: #e2001a;
@@ -258,8 +271,6 @@
     
           .rc-center {
             width: 100%;
-            height: 220px;
-            border: 1px solid #D7D7D7;
             .rc-usermain {
               display: flex;
               justify-content: space-between;
@@ -358,6 +369,52 @@
             .rc-bottom {
              display: none;
             }
+            .rc-price{
+              height: 60px;
+              display: flex;
+              align-items: center;
+              border-top: 1px solid #D7D7D7;
+              .priceleft{
+                margin-left: 40px;
+                font-size: 16px;
+                color: #333333;
+                em{
+                  font-style: normal;
+                  list-style: none;
+                }
+                strong{
+                  font-style: normal;
+                  list-style: none;
+                }
+                i{
+                  font-style: normal;
+                  list-style: none;
+                }
+               
+              }
+              .priceright{
+                margin-right: 45px;
+                font-style: normal;
+                list-style: none;
+                em{
+                  font-style: normal;
+                  list-style: none;
+                }
+                strong{
+                  font-style: normal;
+                  list-style: none;
+                  font-size: 18px;
+                  color: #333333;
+                }
+                i{
+                  font-style: normal;
+                  list-style: none;
+                  font-size: 20px;
+                  color: #E1001A;
+                  
+                }
+              }
+            }
           }
     
           .rc-title {
diff --git a/rc-busness/assets/css/usertion.less b/rc-busness/assets/css/usertion.less
new file mode 100644
index 00000000..ce27413d
--- /dev/null
+++ b/rc-busness/assets/css/usertion.less
@@ -0,0 +1,602 @@
+ul li ol li em strong i {
+    list-style: none;
+    font-style: normal;
+  }
+  //手机端
+@media screen and (max-width: 768px) {
+  .rc-main {
+    padding: 20px 17px;
+   margin-top: 90px;
+    .rc-userbottom{
+        display: none;
+    }
+    .viewdetails{
+        display: none;
+    }
+    .rc-foo{
+        display: none;
+    }
+    .rc-receiving {
+      width: 100%;
+      height: 80px;
+      display: flex;
+      align-items: center;
+      em {
+          font-style: normal;
+        color: #e1001a;
+        font-size: 22px;
+      }
+      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;
+      .rc-image {
+        border: 1px solid #d8d8d8;
+        margin-top: 17px;
+        height: 96px;
+        img {
+          width: 96px;
+          height: 96px;
+          display: block;
+        }
+      }
+
+      .rc-right {
+        .rc-userbottomm {
+          display: none;
+        }
+        display: flex;
+        flex-direction: column;
+        width: 100%;
+        margin-left: 16px;
+        justify-content: center;
+        em {
+          font-style: normal;
+          display: block;
+          font-size: 16px;
+          margin-top: 18px;
+          font-weight: bold;
+
+          color: #e1001a;
+        }
+      }
+      .rc-userright {
+        display: flex;
+        flex-direction: column;
+        color: #666666;
+        font-size: 14px;
+        span {
+          display: block;
+          margin-top: 16px;
+        }
+      }
+      .rc-userbottom {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 8px;
+        span {
+          color: #666666;
+          font-size: 14px;
+        }
+        i {
+          font-style: normal;
+          color: #e1001a;
+          font-size: 18px;
+          font-weight: bold;
+        }
+        .rc-bottom{
+            display: none;
+        }
+      }
+          .rc-bottomm {
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      margin-top: 24px;
+      span {
+        display: block;
+        width: 130px;
+        display: flex;
+        align-items: center;
+        line-height: 40px;
+        text-align: center;
+        color: #e2001a;
+        height: 40px;
+        font-size: 12px;
+        border: 2px solid #e2001a;
+        justify-content: center;
+        border-radius: 30px;
+        font-weight: bold;
+      }
+      span:last-child {
+        margin-left: 15px;
+      }
+    }
+    }
+
+
+    .rc-merchandise {
+      width: 100%;
+      margin-top: 32px;
+
+      ul {
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        line-height: 26px;
+            i {
+              font-style: normal;
+              color: #666666;
+              font-size: 14px;
+            }
+        li {
+          list-style: none;
+          font-style: normal;
+          display: flex;
+          justify-content: space-between;
+          span {
+            font-size: 14px;
+
+            color: #333333;
+        
+          }
+        }
+        li:last-child {
+          i {
+            color: #e1001a;
+            font-size: 16px;
+            font-style: normal;
+          }
+        }
+      }
+    }
+
+
+     .rc-payment{
+      width: 100%;
+      margin-top: 32px;
+         .u-trackingnumber{
+             display: flex;
+             align-items: center;
+                  i {
+            font-size: 14px;
+            font-style: normal;
+            margin-right: 16px;
+         
+          }
+                  img{
+                width: 8px;
+                height: 16px;
+            }
+         }
+      ul {
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        line-height: 26px;
+            i {
+              font-style: normal;
+              color: #666666;
+              font-size: 14px;
+            }
+        li {
+          list-style: none;
+          font-style: normal;
+          display: flex;
+          justify-content: space-between;
+          span {
+            font-size: 14px;
+
+            color: #333333;
+        
+          }
+        }
+   
+      }
+    }
+      
+  }
+}
+
+
+
+//pc端
+@media screen and (min-width: 768px) and (max-width: 1920px) {
+
+  .rc-main {
+    margin: 0 auto;
+    margin-top: 90px;
+
+    .rc-userbottomm{
+        display: none;
+    }
+    .rc-border{
+        width: 100%;
+        border-bottom: 1px solid #D7D7D7;
+        margin-top: 32px;
+    }
+    .rc-receiving {
+      width: 100%;
+      height: 80px;
+      display: flex;
+      flex-direction: column;
+      em {
+          font-style: normal;
+        color: #E1001A;
+        font-size: 26px;
+      }
+      span {
+        color: #666666;
+        font-size: 16px;
+        display: block;
+        margin-top: 25px;
+      }
+    }
+    .delivery {
+      display: flex;
+      flex-direction: column;
+      height: 140px;
+      display: flex;
+      justify-content: center;
+      .viewdetails{
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          span{
+              color:#444444;
+              font-size: 18px;
+              display: block;
+              margin-right: 8px;
+          }
+          img{
+              width: 8px;
+              height: 16px;
+          }
+      }
+    
+      .to-delivery {
+        display: flex;
+        align-items: center;
+        font-style: normal;
+        span {
+          display: block;
+        //   margin-left: 16px;
+          font-size: 18px;
+          color: #333333;
+        }
+        i {
+          font-style: normal;
+          margin-left: 8px;
+          display: block;
+          font-size: 18px;
+          color: #999999;
+        }
+      }
+      .bo-delivery {
+        span {
+          font-size: 16px;
+          color: #666666;
+          display: block;
+          margin-top: 16px;
+        }
+      }
+    }
+
+    .mypersonal {
+      display: flex;
+      flex-direction: column;
+      height: 140px;
+      justify-content: center;
+      .my-delivery {
+        display: flex;
+        align-items: center;
+        font-style: normal;
+        span {
+          display: block;
+          margin-left: 3px;
+           font-size: 18px;
+              color: #333333;
+        }
+        i {
+          font-style: normal;
+          margin-left: 8px;
+          display: block;
+           font-size: 18px;
+           color: #333333;
+        }
+      }
+      .per-delivery {
+        span {
+          font-size: 18px;
+          color: #666666;
+          display: block;
+          margin-top: 16px;
+        }
+      }
+    }
+
+    .rc-usermain {
+      display: flex;
+      .rc-image {
+        border: 1px solid #d8d8d8;
+        margin-top: 17px;
+        img {
+          width: 96px;
+          height: 96px;
+          display: block;
+        }
+      }
+
+      .rc-right {
+          .rc-bottomm{
+              display: none;
+          }
+  .rc-usercenter{
+      display: flex;
+      justify-content: center;
+      flex-direction: column;
+            em {
+          font-style: normal;
+          display: block;
+          font-size: 18px;
+          font-weight: bold;
+          margin-top: 17px;
+          color: #e1001a;
+        }
+  }
+     
+        display: flex;
+      
+        width: 100%;
+        margin-left: 16px;
+      
+  
+      }
+      .rc-userright {
+        display: flex;
+        flex-direction: column;
+        color: #666666;
+        font-size: 16px;
+        span {
+          display: block;
+          margin-top: 16px;
+          font-size: 16px;
+        }
+      }
+      .rc-userbottom {
+     display: flex;
+
+    width: 80%;
+    justify-content: space-between;
+    align-items: center;
+    margin-left: 119px;
+        span {
+          color: #E1001A;
+          font-size: 20px;
+        }
+        i {
+          font-style: normal;
+          color: #e1001a;
+          font-size: 20px;
+          font-weight: bold;
+        }
+            .rc-bottom {
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      margin-top: 24px;
+      span {
+        display: block;
+        width: 164px;
+        display: flex;
+        align-items: center;
+        line-height: 40px;
+        text-align: center;
+        color: #e2001a;
+        height: 40px;
+        border: 2px solid #e2001a;
+        justify-content: center;
+        border-radius: 30px;
+        font-weight: bold;
+        font-size: 14px;
+      }
+ 
+    }
+
+      }
+    }
+
+    .rc-merchandise {
+      width: 100%;
+      margin-top: 32px;
+
+      ul {
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        line-height: 40px;
+        font-size: 18px;
+            i {
+              font-style: normal;
+              color: #666666;
+              
+            }
+        li {
+          list-style: none;
+          font-style: normal;
+          display: flex;
+          justify-content: space-between;
+          span {
+            color: #333333;
+        
+          }
+        }
+        li:last-child {
+          i {
+            color: #e1001a;
+            font-size: 20px;
+            font-style: normal;
+          }
+        }
+      }
+    }
+
+
+     .rc-payment{
+      width: 100%;
+      margin-top: 80px;
+         .u-trackingnumber{
+             display: flex;
+             align-items: center;
+                  i {
+            font-size: 18px;
+            font-style: normal;
+            margin-right: 16px;
+         
+          }
+                  img{
+                width: 8px;
+                height: 16px;
+            }
+         }
+      ul {
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        line-height: 40px;
+           font-size: 18px;
+            i {
+              font-style: normal;
+              color: #666666;
+              display: block;
+           
+            }
+        li {
+          list-style: none;
+          font-style: normal;
+          display: flex;
+          justify-content: space-between;
+          span {
+          
+
+            color: #333333;
+        
+          }
+        }
+   
+      }
+    }
+          .rc-foot{
+        display: flex;
+        flex-direction: column;
+          .rc-foo{
+              display: flex;
+    justify-content: flex-end;
+    flex-direction: column;
+ align-items: self-end;
+              i{
+                  font-style: normal;
+                  color:#333333;
+                  font-size: 20px;
+                  margin-right: 20px;
+
+              }
+              em{
+                  font-style: normal;
+                   color: #E1001A;
+                   font-size: 26px;
+
+              }
+               span{
+                   display: block;
+                   width: 164px;
+                   margin-top: 36px;
+                   background: #E2001A;
+                   line-height: 48px;
+                   text-align: center;
+                   color: white;
+                   font-size: 16px;
+
+height: 48px;
+         
+border-radius: 30px;
+               }
+
+          }
+    }
+
+  }
+
+
+
+
+}
\ No newline at end of file
diff --git a/rc-busness/pages/myorder/usertion.vue b/rc-busness/pages/myorder/usertion.vue
index 5310d762..02e0ef4a 100644
--- a/rc-busness/pages/myorder/usertion.vue
+++ b/rc-busness/pages/myorder/usertion.vue
@@ -1,9 +1,7 @@
 <template>
   <div>
     <Myheader></Myheader>
-
-    <div class="rc-header">
-      <div class="rc-main"  v-for="(item,index) in goldmedal" :key="index" >
+      <div class="rc-main"  v-for="(item,index) in goldmedal" :key="item.id" >
         <div class="rc-receiving"  >
           <em>{{item.status=='0'?'待付款':item.status=='1'?'待收货':item.status=='2'?'已完成':item.status=='3'?'已取消':'异常订单'}}</em>
           <span>{{orderstatus}}</span>
@@ -27,20 +25,20 @@
 </div>
         <div
           class="mypersonal"
-          v-for="(dataaddress, index) in useraddress"
-          :key="index"
+          v-for="(datddress, index) in useraddress"
+          :key="datddress.id"
         >
           <div class="my-delivery">
-            <span>{{ dataaddress.state }}</span>
-            <i>{{ dataaddress.tel }}</i>
+            <span>{{ datddress.recipient }}</span>
+            <i>{{ datddress.recipientPhone }}</i>
           </div>
           <div class="per-delivery">
-            <span>{{ dataaddress.address }}</span>
+            <span>{{ datddress.provinceName }}{{datddress.cityName}}{{datddress.districtName}}{{datddress.detailAddress}}</span>
           </div>
         </div>
-        <div v-for="(userlist,index) in item.orderDetailList" :key="index">
+        <div >
         <div class="rc-center">
-          <div class="rc-usermain">
+          <div class="rc-usermain" v-for="(userlist,index) in item.orderDetailList" :key="index">
             <div class="rc-image">
              <img :src="item.catimage" alt="" /> 
             </div>
@@ -68,14 +66,12 @@
               </div> -->
             </div>
           </div>
-         
         </div>
-
         <div class="rc-merchandise">
           <ul>
             <li>
               <span>商品总价:</span>
-              <i>{{ shopprice.price }}</i>
+              <i>￥{{ item.salesAmount }}</i>
             </li>
             <li>
               <span>配送费用:</span>
@@ -96,11 +92,11 @@
           <ul>
             <li>
               <span>订单编号::</span>
-              <i>{{ information.reference }}</i>
+              <i>{{ item.orderNumber }}</i>
             </li>
             <li>
               <span>下单时间::</span>
-              <i>{{ information.ordertime }}</i>
+              <i>{{ item.orderDate }}</i>
             </li>
             <li>
               <span>付款方式::</span>
@@ -113,9 +109,9 @@
             <li>
               <span>快递单号:</span>
               <div class="u-trackingnumber">
-              <i>{{ userlist.logisticsNumber }}
-                  </i>
-                   <img :src="information.catimage" alt="">
+              <!-- <i>{{ userlist.logisticsNumber }}
+                  </i> -->
+                   <!-- <img :src="information.catimage" alt=""> -->
                   </div>
             </li>
             
@@ -136,13 +132,14 @@
         </div>
         </div>
       </div>
-    </div>
+  
   </div>
 </template>
 
 <script>
 import Myheader from "~/components/header.vue";
   import { userin} from "../../ajax/getData";
+    import {selectaddress} from "../../ajax/getData";
 export default {
   data() {
     return {
@@ -154,40 +151,22 @@ export default {
       isshow:true,
       leftico: require("../../assets/image/rc-left.png"),
       orderNumber:'',
-
+       usermessage:null,
+         userid: null,
+      useralllist:[],
       delivery: [
-        {
-          state: "派送中",
-          time: "2021-11-21",
-          address: "广州天河—刘某某【15124617917】正在派送中",
-        },
+      
       ],
 
       useraddress: [
-        {
-          state: "李某某",
-          tel: "15124117917",
-          address: "广东省 广州市 天河区 天河客运站118号",
-        },
+       
       ],
 
       goldmedal: [
-        {
-          ordernumber: "1111111111111111111",
-          orderstype: 1,
-          index:0,
-          usereat: "英国短毛猫成猫全价湿粮",
-          num: "5kg",
-          specification: "1",
-          userprice: "167.00",
-          catimage: require("../../assets/image/rc-win.png"),
-        },
+     
       ],
       shopprice: {
-        price: "￥197.00",
-        distribution: "￥0.00",
-        promotion: "-￥30.00",
-        payment: "￥167.00",
+    
       },
       information: {
         reference: "1111111111111111",
@@ -203,12 +182,40 @@ export default {
 
     async canceldanhao(orderNumber){
  let data=await userin(orderNumber);
- console.log(data);
  this.goldmedal=data;
- console.log(this.goldmedal);
+ console.log(this.goldmedal[0].orderDetailList);
+
+ for(let i =0;i<this.goldmedal[i].length;i++){
+   console.log(this.goldmedal[i].orderDetailList);
+  //  this.useralllist.push(this.goldmedal[i].orderDetailList);
+ }
+ console.log(this.useralllist);
 },
+   //查询人的所有地址
+    async editaddress(user) {
+    //  user.data.id=844350;
+        let data = await selectaddress(this.userid);
+        console.log(data);
+        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(list);
+        // console.log(this.list);
+    },
+
+
+
   },
   mounted() {
+    this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
+       this.userid = this.usermessage.data.id;
+       console.log(this.userid);
+       this.editaddress(this.userid);
     this.addressstype = this.$route.query.stype;
     this.orderNumber=this.$route.query.orderNumber;
     this.canceldanhao(this.orderNumber)
@@ -242,602 +249,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-ul li ol li em strong i {
-  list-style: none;
-  font-style: normal;
-}
-.rc-header {
-  width: 100%;
-}
-//手机端
-@media screen and (max-width: 768px) {
-  .rc-main {
-    width: 92%;
-    margin: 0 auto;
-    .rc-userbottom{
-        display: none;
-    }
-    .viewdetails{
-        display: none;
-    }
-    .rc-foo{
-        display: none;
-    }
-    .rc-receiving {
-      width: 100%;
-      height: 80px;
-      display: flex;
-      align-items: center;
-      em {
-          font-style: normal;
-        color: #e1001a;
-        font-size: 22px;
-      }
-      span {
-        color: #666666;
-        font-size: 12px;
-        display: block;
-        margin-left: 18px;
-        width: 62%;
+@import url("../../assets/css/global.less");
+@import url("../../assets/css/usertion.less");
 
-      }
-    }
-    .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;
-      .rc-image {
-        border: 1px solid #d8d8d8;
-        margin-top: 17px;
-        height: 96px;
-        img {
-          width: 96px;
-          height: 96px;
-          display: block;
-        }
-      }
-
-      .rc-right {
-        .rc-userbottomm {
-          display: none;
-        }
-        display: flex;
-        flex-direction: column;
-        width: 100%;
-        margin-left: 16px;
-        justify-content: center;
-        em {
-          font-style: normal;
-          display: block;
-          font-size: 16px;
-          margin-top: 18px;
-          font-weight: bold;
-
-          color: #e1001a;
-        }
-      }
-      .rc-userright {
-        display: flex;
-        flex-direction: column;
-        color: #666666;
-        font-size: 14px;
-        span {
-          display: block;
-          margin-top: 16px;
-        }
-      }
-      .rc-userbottom {
-        display: flex;
-        justify-content: space-between;
-        margin-top: 8px;
-        span {
-          color: #666666;
-          font-size: 14px;
-        }
-        i {
-          font-style: normal;
-          color: #e1001a;
-          font-size: 18px;
-          font-weight: bold;
-        }
-        .rc-bottom{
-            display: none;
-        }
-      }
-          .rc-bottomm {
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
-      margin-top: 24px;
-      span {
-        display: block;
-        width: 130px;
-        display: flex;
-        align-items: center;
-        line-height: 40px;
-        text-align: center;
-        color: #e2001a;
-        height: 40px;
-        font-size: 12px;
-        border: 2px solid #e2001a;
-        justify-content: center;
-        border-radius: 30px;
-        font-weight: bold;
-      }
-      span:last-child {
-        margin-left: 15px;
-      }
-    }
-    }
-
-
-    .rc-merchandise {
-      width: 100%;
-      margin-top: 32px;
-
-      ul {
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        line-height: 26px;
-            i {
-              font-style: normal;
-              color: #666666;
-              font-size: 14px;
-            }
-        li {
-          list-style: none;
-          font-style: normal;
-          display: flex;
-          justify-content: space-between;
-          span {
-            font-size: 14px;
-
-            color: #333333;
-        
-          }
-        }
-        li:last-child {
-          i {
-            color: #e1001a;
-            font-size: 16px;
-            font-style: normal;
-          }
-        }
-      }
-    }
-
-
-     .rc-payment{
-      width: 100%;
-      margin-top: 32px;
-         .u-trackingnumber{
-             display: flex;
-             align-items: center;
-                  i {
-            font-size: 14px;
-            font-style: normal;
-            margin-right: 16px;
-         
-          }
-                  img{
-                width: 8px;
-                height: 16px;
-            }
-         }
-      ul {
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        line-height: 26px;
-            i {
-              font-style: normal;
-              color: #666666;
-              font-size: 14px;
-            }
-        li {
-          list-style: none;
-          font-style: normal;
-          display: flex;
-          justify-content: space-between;
-          span {
-            font-size: 14px;
-
-            color: #333333;
-        
-          }
-        }
-   
-      }
-    }
-      
-  }
-}
-//pc端
-@media screen and (min-width: 768px) and (max-width: 1920px) {
-
-      .rc-main {
-    width: 92%;
-    margin: 0 auto;
-    .rc-userbottomm{
-        display: none;
-    }
-    .rc-border{
-        width: 100%;
-        border-bottom: 1px solid #D7D7D7;
-        margin-top: 32px;
-    }
-    .rc-receiving {
-      width: 100%;
-      height: 80px;
-      display: flex;
-      flex-direction: column;
-      em {
-          font-style: normal;
-        color: #E1001A;
-        font-size: 26px;
-      }
-      span {
-        color: #666666;
-        font-size: 16px;
-        display: block;
-        margin-top: 25px;
-      }
-    }
-    .delivery {
-      display: flex;
-      flex-direction: column;
-      height: 140px;
-      display: flex;
-      justify-content: center;
-      .viewdetails{
-          display: flex;
-          align-items: center;
-          justify-content: flex-end;
-          span{
-              color:#444444;
-              font-size: 18px;
-              display: block;
-              margin-right: 8px;
-          }
-          img{
-              width: 8px;
-              height: 16px;
-          }
-      }
-    
-      .to-delivery {
-        display: flex;
-        align-items: center;
-        font-style: normal;
-        span {
-          display: block;
-        //   margin-left: 16px;
-          font-size: 18px;
-          color: #333333;
-        }
-        i {
-          font-style: normal;
-          margin-left: 8px;
-          display: block;
-          font-size: 18px;
-          color: #999999;
-        }
-      }
-      .bo-delivery {
-        span {
-          font-size: 16px;
-          color: #666666;
-          display: block;
-          margin-top: 16px;
-        }
-      }
-    }
-
-    .mypersonal {
-      display: flex;
-      flex-direction: column;
-      height: 140px;
-      justify-content: center;
-      .my-delivery {
-        display: flex;
-        align-items: center;
-        font-style: normal;
-        span {
-          display: block;
-          margin-left: 3px;
-           font-size: 18px;
-              color: #333333;
-        }
-        i {
-          font-style: normal;
-          margin-left: 8px;
-          display: block;
-           font-size: 18px;
-           color: #333333;
-        }
-      }
-      .per-delivery {
-        span {
-          font-size: 18px;
-          color: #666666;
-          display: block;
-          margin-top: 16px;
-        }
-      }
-    }
-
-    .rc-usermain {
-      display: flex;
-      .rc-image {
-        border: 1px solid #d8d8d8;
-        margin-top: 17px;
-        img {
-          width: 96px;
-          height: 96px;
-          display: block;
-        }
-      }
-
-      .rc-right {
-          .rc-bottomm{
-              display: none;
-          }
-  .rc-usercenter{
-      display: flex;
-      justify-content: center;
-      flex-direction: column;
-            em {
-          font-style: normal;
-          display: block;
-          font-size: 18px;
-          font-weight: bold;
-          margin-top: 17px;
-          color: #e1001a;
-        }
-  }
-     
-        display: flex;
-      
-        width: 100%;
-        margin-left: 16px;
-      
-  
-      }
-      .rc-userright {
-        display: flex;
-        flex-direction: column;
-        color: #666666;
-        font-size: 16px;
-        span {
-          display: block;
-          margin-top: 16px;
-          font-size: 16px;
-        }
-      }
-      .rc-userbottom {
-     display: flex;
-
-    width: 80%;
-    justify-content: space-between;
-    align-items: center;
-    margin-left: 119px;
-        span {
-          color: #E1001A;
-          font-size: 20px;
-        }
-        i {
-          font-style: normal;
-          color: #e1001a;
-          font-size: 20px;
-          font-weight: bold;
-        }
-            .rc-bottom {
-      display: flex;
-      align-items: center;
-      justify-content: flex-end;
-      margin-top: 24px;
-      span {
-        display: block;
-        width: 164px;
-        display: flex;
-        align-items: center;
-        line-height: 40px;
-        text-align: center;
-        color: #e2001a;
-        height: 40px;
-        border: 2px solid #e2001a;
-        justify-content: center;
-        border-radius: 30px;
-        font-weight: bold;
-        font-size: 14px;
-      }
- 
-    }
-
-      }
-    }
-
-    .rc-merchandise {
-      width: 100%;
-      margin-top: 32px;
-
-      ul {
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        line-height: 40px;
-        font-size: 18px;
-            i {
-              font-style: normal;
-              color: #666666;
-              
-            }
-        li {
-          list-style: none;
-          font-style: normal;
-          display: flex;
-          justify-content: space-between;
-          span {
-            color: #333333;
-        
-          }
-        }
-        li:last-child {
-          i {
-            color: #e1001a;
-            font-size: 20px;
-            font-style: normal;
-          }
-        }
-      }
-    }
-
-
-     .rc-payment{
-      width: 100%;
-      margin-top: 80px;
-         .u-trackingnumber{
-             display: flex;
-             align-items: center;
-                  i {
-            font-size: 18px;
-            font-style: normal;
-            margin-right: 16px;
-         
-          }
-                  img{
-                width: 8px;
-                height: 16px;
-            }
-         }
-      ul {
-        width: 100%;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        line-height: 40px;
-           font-size: 18px;
-            i {
-              font-style: normal;
-              color: #666666;
-              display: block;
-           
-            }
-        li {
-          list-style: none;
-          font-style: normal;
-          display: flex;
-          justify-content: space-between;
-          span {
-          
-
-            color: #333333;
-        
-          }
-        }
-   
-      }
-    }
-          .rc-foot{
-        display: flex;
-        flex-direction: column;
-          .rc-foo{
-              display: flex;
-    justify-content: flex-end;
-    flex-direction: column;
- align-items: self-end;
-              i{
-                  font-style: normal;
-                  color:#333333;
-                  font-size: 20px;
-                  margin-right: 20px;
-
-              }
-              em{
-                  font-style: normal;
-                   color: #E1001A;
-                   font-size: 26px;
-
-              }
-               span{
-                   display: block;
-                   width: 164px;
-                   margin-top: 36px;
-                   background: #E2001A;
-                   line-height: 48px;
-                   text-align: center;
-                   color: white;
-                   font-size: 16px;
-
-height: 48px;
-         
-border-radius: 30px;
-               }
-
-          }
-    }
-
-  }
-
-}
 </style>
\ No newline at end of file
diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue
index 8bd2a8a4..e9e29a13 100644
--- a/rc-busness/pages/personal/useraddress.vue
+++ b/rc-busness/pages/personal/useraddress.vue
@@ -14,7 +14,7 @@
           {{ item.title }}
         </span>
       </div>
-      <div class="online bold"></div>
+      <div class="online bold" style="height:8px;margin-top:0"></div>
       <div class="rc-userheader">
         <span v-for="(item, index) in message" :key="index">
           {{ item.title }}
@@ -54,7 +54,7 @@
               </div>
               <div class="rc-userbottom">
                 <span>数量:{{ item.pcs }}件</span>
-                <i>￥{{ item.salesAmount }}</i>
+                <i>￥{{  }}</i>
               </div>
               <div class="rc-userbottomm">
                 <i>￥{{ item.userprice }}</i>
@@ -68,11 +68,11 @@
               <span @click="userfind()">查看订单</span>
             </div>
           </div>
-           <div class="online"></div>
+           <div class="online" style="display:none"></div>
             <div class="rc-usermain rc-price">
                <div class="rc-price priceleft">
                  <span>数量:</span>
-                 <em>共1件商品</em>
+                 <em>共{{item.lengthnum}}件商品</em>
                </div>
                <div class="rc-price priceright">
                  <strong>总计:</strong>
@@ -106,6 +106,9 @@
             }}</span>
           </div>
         </div>
+
+      <div class="online bold"></div>
+ 
       </div>
     </div>
   </div>
@@ -262,23 +265,27 @@ export default {
         this.useralllist[i].orderNumber = this.goldmedal[i].orderNumber;
         this.useralllist[i].status = this.goldmedal[i].status;
         this.useralllist[i].salesAmount = this.goldmedal[i].salesAmount;
-        
+        this.useralllist[i].lengthnum=this.goldmedal[i].orderDetailList.length
       }
       console.log(this.useralllist);
     },
 
     async canceldanhao(orderNumber) {
-      let data = await canceldanhao(orderNumber);
+      let data = await canceldanhao(this.userdata,orderNumber);
       if (data) {
         this.$message({
           type: "warning",
           message: "取消订单成功",
         });
-        this.indet(this.userdata.data.mobile);
+        setTimeout(() => {
+            this.indet();
+        }, 500);
+         
       }
     },
 
     userpay(item, index) {
+      console.log(item)
       if (item.status == 0) {
         this.canceldanhao(item.orderNumber);
       }
@@ -289,13 +296,14 @@ export default {
             stype: 1,
           },
         });
-      } else if (item.buttontitle == "再次购买") {
-        this.$router.push({
-          path: "/myorder/userrecord",
-          query: {
-            stype: 1,
-          },
-        });
+      } else if (item.status == 3) {
+       	this.$router.push({
+				path: "/productdetails/producted",
+				query: {
+					stype: 1,
+					productCode:item.productId
+				},
+			});
       }
     },
     selectGoods(item, index) {