From de8b55f99a687aa6fd505715ff74c72b4002ef9f Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Fri, 21 Jan 2022 10:47:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rc-busness/assets/css/orderquantity.less     | 366 ++++++++++++++++++
 rc-busness/components/addressInput.vue       |   2 +-
 rc-busness/pages/personal/useraddress.vue    | 378 +------------------
 rc-busness/pages/useraddress/addaddress.vue  |   4 -
 rc-busness/pages/useraddress/editaddress.vue |   1 -
 5 files changed, 378 insertions(+), 373 deletions(-)
 create mode 100644 rc-busness/assets/css/orderquantity.less

diff --git a/rc-busness/assets/css/orderquantity.less b/rc-busness/assets/css/orderquantity.less
new file mode 100644
index 00000000..0698f7a2
--- /dev/null
+++ b/rc-busness/assets/css/orderquantity.less
@@ -0,0 +1,366 @@
+
+
+
+
+@media screen and (max-width:768px){
+    .active {
+        font-size: 14px;
+        color: #e2001a;
+        cursor: pointer;
+      }
+      .unactive {
+        font-size: 14px;
+        color: #444444;
+        cursor: pointer;
+      }
+        
+      
+      .usercontshow{
+          padding: 0 1.5rem;
+          .online{
+              margin: 0;
+              &.bold{
+              height: 0.5rem;
+              }
+          }
+        .rc-usermaina{
+            width: 100%;
+            height: 100%;
+          }
+            .rc-headera {
+              display: flex;
+              justify-content: space-between;
+              height: 64px;
+              align-items: center;
+            }
+            .rc-userheader{
+              display: none;
+            }
+      
+            .rc-center {
+              width: 100%;
+              height: 245px;
+              margin-top: 8px;
+              .rc-usermain {
+                  .pc-bottom{
+                    display: none;
+                  }
+      
+                display: flex;
+                .rc-image {
+                    border: 1px solid #D8D8D8;
+          margin-top: 17px;
+      ;
+                  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: flex;
+                align-items: center;
+                justify-content: center;
+                margin-top: 24px;
+                span {
+                  display: block;
+                  width: 130px;
+                  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;
+                }
+                span:last-child{
+                    margin-left: 15px;
+                }
+              }
+            }
+      
+            .rc-title {
+              height: 52px;
+              display: flex;
+              align-items: center;
+              border-bottom: 1px solid #d8d8d8;
+              justify-content: space-between;
+              span{
+                  font-size: 14px;
+                 color: #999999;
+                 margin-left: 8px;
+              }
+              em{
+                  font-style: normal;
+                  font-size: 14px;
+      
+      color: #333333;
+              }
+              i{
+                  font-style: normal;
+                  font-size: 14px;
+      
+      color: #333333;
+              }
+              .rc-usertitle strong{
+                display: none;
+              }
+            }
+          
+      }
+      
+        
+
+}
+@media screen and (min-width: 769px)
+{ 
+    .active {
+        font-size: 18px;
+        color: #e2001a;
+        cursor: pointer;
+        // margin-left: 40px;
+      }
+      .unactive {
+        font-size: 18px;
+        color: #444444;
+        cursor: pointer;
+        // margin-left: 80px;
+      }
+      .usercontshow{
+        .rc-headera {
+            display: flex;
+            height: 64px;
+            align-items: center;
+            border: 1px solid #D7D7D7;
+            border-radius: 3px 3px 0px 0px;
+            font-size: 18px;
+            span:first-child{
+             margin-left: 40px;
+            }
+            span{
+              margin-left: 80px;
+            }
+          }
+    
+          .rc-userheader{
+            width: 100%;
+            height: 64px;
+            background: #F6F6F6;
+            border: 1px solid #D7D7D7;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            font-size: 18px;
+          span:first-child{
+            margin-left: 173px;
+          }
+             span:last-child{
+            margin-right: 87px;
+          }
+          }
+    
+          .rc-center {
+            width: 100%;
+            height: 220px;
+            border: 1px solid #D7D7D7;
+            .rc-usermain {
+              display: flex;
+              justify-content: space-between;
+              align-items: center;
+              height: 164px;
+              .rc-usercenter{
+                width: 25%;
+                em{
+                  font-size: 18px;
+                }
+              }
+              .rc-image {
+                  border: 1px solid #D8D8D8;
+                   margin-left: 40px;
+       
+                img {
+                  width: 96px;
+                  height: 96px;
+                  display: block;
+    
+                }
+              }
+    
+              .rc-right {
+                .rc-userbottom{
+                  display: none;
+                }
+                display: flex;
+               
+                width: 100%;
+                margin-left: 16px;
+    
+                em
+                {
+                    font-style: normal;
+                   font-weight: bold;
+                    font-size: 16px;
+                    margin-top: 18px;
+            
+    color: #E1001A;
+                }
+              }
+              .rc-userright {
+                display: flex;
+                flex-direction: column;
+                color: #666666;
+                font-size: 16px;
+                span{
+                    display: block;
+                    margin-top: 6px;
+                }
+              }
+              .rc-userbottomm {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                width: 58%;
+                font-size: 20px;
+                 color: #E1001A;
+                 font-weight: bold;
+                i{
+                    font-style: normal;
+                   
+                   
+                }
+              }
+    
+                 .pc-bottom {
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              flex-direction: column;
+              margin-right: 40px;
+          
+              span {
+                display: block;
+                width: 130px;
+                cursor: pointer;
+                display: flex;
+                align-items: center;
+                line-height: 40px;
+                font-weight: bold;
+                text-align: center;
+                color: #e2001a;
+                height: 40px;
+                border: 2px solid #e2001a;
+             justify-content: center;
+                border-radius: 30px;
+              }
+              span:last-child{
+                  margin-top: 15px;
+              }
+            }
+            }
+    
+            .rc-bottom {
+             display: none;
+            }
+          }
+    
+          .rc-title {
+            height: 55px;
+            display: flex;
+            align-items: center;
+            border-bottom: 1px solid #d8d8d8;
+            justify-content: space-between;
+            span{
+                font-size: 16px;
+               color: #999999;
+               margin-left: 8px;
+            }
+            strong{
+              font-style: normal;
+              font-size: 16px;
+              color: #444444;
+            }
+            em{
+                font-style: normal;
+                font-size: 16px;
+    
+    color: #333333;
+            }
+            i{
+                font-style: normal;
+                font-size: 16px;
+                margin-left: 40px;
+    
+    color: #333333;
+            }
+            .rc-usertitle{
+              margin-right: 73px;
+              display: flex;
+              align-items: center;
+              em{
+                display: block;
+                margin-left: 8px;
+              }
+            }
+          }
+        
+
+      }
+     
+        
+
+
+
+}
\ No newline at end of file
diff --git a/rc-busness/components/addressInput.vue b/rc-busness/components/addressInput.vue
index 6caaa531..d3dc23b1 100644
--- a/rc-busness/components/addressInput.vue
+++ b/rc-busness/components/addressInput.vue
@@ -303,7 +303,7 @@ export default {
 		}
 	},
 	mounted(){
-
+         console.log(this.defaultValues);
 	},
 	components:{
 
diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue
index c9a878dc..3bbf2525 100644
--- a/rc-busness/pages/personal/useraddress.vue
+++ b/rc-busness/pages/personal/useraddress.vue
@@ -2,8 +2,8 @@
   <div>
     <Myheader></Myheader>
       <div class="rc-top"></div>
-    <div class="rc-header">
-      <div class="rc-main">
+         <div class="online bold"></div>
+      <div class="usercontshow rc-max-width--xl">
         <div class="rc-headera">
           <span
             v-for="(item, index) in discountlist"
@@ -15,6 +15,7 @@
           </span>
      
         </div>
+         <div class="online bold"></div>
         <div class="rc-userheader">
          <span  v-for="(item, index) in message" :key="index">
            {{item.title}}
@@ -22,7 +23,7 @@
        
         </div>
         <div class="rc-center" v-for="(item, index) in goldmedal" :key="index">
-          <div class="rc-usermaina" v-for="(userlist,index) in item.orderDetailList" :key="index" >
+          <div class="rc-usermaina" >
           <div class="rc-title">
               <div>
             <i>订单编号:</i><span>{{ item.orderNumber }}</span>
@@ -41,15 +42,13 @@
               <div class="rc-usercenter">
               <em>{{ item.usereat }}</em>
               <div class="rc-userright">
-                <span>规格:{{ userlist.num }}</span>
+                <span>规格:{{ item.num }}</span>
               </div>
               </div>
               <div class="rc-userbottom">
-                <span>数量:{{ userlist.pcs}}件</span>
-                <i>￥{{ userlist.ecPrice }}</i>
+                <span>数量:{{ item.pcs}}件</span>
+                <i>￥{{ item.ecPrice }}</i>
               </div>
-
-
                   <div class="rc-userbottomm">
                <i>￥{{ item.userprice }}</i>
                  <span>{{item.orderstype}}</span>
@@ -62,14 +61,13 @@
             <span @click="userfind()">查看订单</span>
           </div>
           </div>
-          <!-- <div class="rc-bottom">
+          <div class="rc-bottom">
             <span @click="userpay(item,index)">{{item.status=='0'?'取消订单':item.status=='1'?'确认收货':item.status=='2'?'再次购买':item.status=='3'?'再次购买':'异常订单'}}</span>
             <span @click="userfind(item)">{{item.status=='0'?'立即支付':item.status=='1'?'查看订单':item.status=='2'?'查看订单':item.status=='3'?'查看订单':'异常订单'}}</span>
-          </div> -->
+          </div>
         </div>
         </div>
       </div>
-    </div>
   </div>
 </template>
 
@@ -300,360 +298,6 @@ async canceldanhao(orderNumber){
 </script>
 
 <style lang="less" scoped>
-
-// 手机端
-@media screen and(min-width: 320px) and(max-width:768px) {
-  .active {
-  font-size: 14px;
-  color: #e2001a;
-  cursor: pointer;
-}
-.unactive {
-  font-size: 14px;
-  color: #444444;
-  cursor: pointer;
-}
-  .rc-header {
-
-
-    width: 100%;
-    .rc-main {
-      width: 92%;
-      margin: 0 auto;
-    .rc-usermaina{
-      width: 100%;
-      height: 100%;
-    }
-      .rc-headera {
-        display: flex;
-        justify-content: space-between;
-        height: 64px;
-        align-items: center;
-      }
-      .rc-userheader{
-        display: none;
-      }
-
-      .rc-center {
-        width: 100%;
-        height: 245px;
-        margin-top: 8px;
-        .rc-usermain {
-            .pc-bottom{
-              display: none;
-            }
-
-          display: flex;
-          .rc-image {
-              border: 1px solid #D8D8D8;
-    margin-top: 17px;
-;
-            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: flex;
-          align-items: center;
-          justify-content: center;
-          margin-top: 24px;
-          span {
-            display: block;
-            width: 130px;
-            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;
-          }
-          span:last-child{
-              margin-left: 15px;
-          }
-        }
-      }
-
-      .rc-title {
-        height: 52px;
-        display: flex;
-        align-items: center;
-        border-bottom: 1px solid #d8d8d8;
-        justify-content: space-between;
-        span{
-            font-size: 14px;
-           color: #999999;
-           margin-left: 8px;
-        }
-        em{
-            font-style: normal;
-            font-size: 14px;
-
-color: #333333;
-        }
-        i{
-            font-style: normal;
-            font-size: 14px;
-
-color: #333333;
-        }
-        .rc-usertitle strong{
-          display: none;
-        }
-      }
-    }
-  }
-}
-//    /* 最小768px最大1920 *pc端/
-@media screen and (min-width: 768px) and (max-width: 1920px) {
-  .active {
-  font-size: 18px;
-  color: #e2001a;
-  cursor: pointer;
-  // margin-left: 40px;
-}
-.unactive {
-  font-size: 18px;
-  color: #444444;
-  cursor: pointer;
-  // margin-left: 80px;
-}
- .rc-header {
-    .rc-main {
-      width: 92%;
-      margin: 0 auto;
-
-      .rc-headera {
-        display: flex;
-        height: 64px;
-        align-items: center;
-        border: 1px solid #D7D7D7;
-        border-radius: 3px 3px 0px 0px;
-        font-size: 18px;
-        span:first-child{
-         margin-left: 40px;
-        }
-        span{
-          margin-left: 80px;
-        }
-      }
-
-      .rc-userheader{
-        width: 100%;
-        height: 64px;
-        background: #F6F6F6;
-        border: 1px solid #D7D7D7;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        font-size: 18px;
-      span:first-child{
-        margin-left: 173px;
-      }
-         span:last-child{
-        margin-right: 87px;
-      }
-      }
-
-      .rc-center {
-        width: 100%;
-        height: 220px;
-        border: 1px solid #D7D7D7;
-        .rc-usermain {
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          height: 164px;
-          .rc-usercenter{
-            width: 25%;
-            em{
-              font-size: 18px;
-            }
-          }
-          .rc-image {
-              border: 1px solid #D8D8D8;
-               margin-left: 40px;
-   
-            img {
-              width: 96px;
-              height: 96px;
-              display: block;
-
-            }
-          }
-
-          .rc-right {
-            .rc-userbottom{
-              display: none;
-            }
-            display: flex;
-           
-            width: 100%;
-            margin-left: 16px;
-
-            em
-            {
-                font-style: normal;
-               font-weight: bold;
-                font-size: 16px;
-                margin-top: 18px;
-        
-color: #E1001A;
-            }
-          }
-          .rc-userright {
-            display: flex;
-            flex-direction: column;
-            color: #666666;
-            font-size: 16px;
-            span{
-                display: block;
-                margin-top: 6px;
-            }
-          }
-          .rc-userbottomm {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            width: 58%;
-            font-size: 20px;
-             color: #E1001A;
-             font-weight: bold;
-            i{
-                font-style: normal;
-               
-               
-            }
-          }
-
-             .pc-bottom {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          flex-direction: column;
-          margin-right: 40px;
-      
-          span {
-            display: block;
-            width: 130px;
-            cursor: pointer;
-            display: flex;
-            align-items: center;
-            line-height: 40px;
-            font-weight: bold;
-            text-align: center;
-            color: #e2001a;
-            height: 40px;
-            border: 2px solid #e2001a;
-         justify-content: center;
-            border-radius: 30px;
-          }
-          span:last-child{
-              margin-top: 15px;
-          }
-        }
-        }
-
-        .rc-bottom {
-         display: none;
-        }
-      }
-
-      .rc-title {
-        height: 55px;
-        display: flex;
-        align-items: center;
-        border-bottom: 1px solid #d8d8d8;
-        justify-content: space-between;
-        span{
-            font-size: 16px;
-           color: #999999;
-           margin-left: 8px;
-        }
-        strong{
-          font-style: normal;
-          font-size: 16px;
-          color: #444444;
-        }
-        em{
-            font-style: normal;
-            font-size: 16px;
-
-color: #333333;
-        }
-        i{
-            font-style: normal;
-            font-size: 16px;
-            margin-left: 40px;
-
-color: #333333;
-        }
-        .rc-usertitle{
-          margin-right: 73px;
-          display: flex;
-          align-items: center;
-          em{
-            display: block;
-            margin-left: 8px;
-          }
-        }
-      }
-    }
-  }
-}
+@import url("../../assets/css/global.less");
+@import url("../../assets/css/orderquantity.less");
 </style>
\ No newline at end of file
diff --git a/rc-busness/pages/useraddress/addaddress.vue b/rc-busness/pages/useraddress/addaddress.vue
index e93045f0..2e787f4f 100644
--- a/rc-busness/pages/useraddress/addaddress.vue
+++ b/rc-busness/pages/useraddress/addaddress.vue
@@ -89,12 +89,8 @@ export default {
   methods: { 
     onGetMenu(values){
   console.log(values,+'111111');
- 
      let user=values[2].id;
      user=user.split('-');
-     for(let i in user){
-       console.log(user[i]);
-     }
      this.provinceId=user[0];
      this.cityId=user[1];
      this.districtId=user[2];
diff --git a/rc-busness/pages/useraddress/editaddress.vue b/rc-busness/pages/useraddress/editaddress.vue
index ac09554b..67751d79 100644
--- a/rc-busness/pages/useraddress/editaddress.vue
+++ b/rc-busness/pages/useraddress/editaddress.vue
@@ -171,7 +171,6 @@ export default {
     let provinceId=this.$route.query.provinceId;
     let districtNameid=this.$route.query.districtId;
     let cityId=this.$route.query.cityId;
-    debugger;
     this.defaultValues=[
       {
         id:provinceId,