From 4d41716532a1b8398b0ddc2c0006834eb79ebd87 Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Thu, 20 Jan 2022 14:04:43 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rc-busness/pages/personal/mypersonal.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rc-busness/pages/personal/mypersonal.vue b/rc-busness/pages/personal/mypersonal.vue
index 9c9fb4e0..43a70c62 100644
--- a/rc-busness/pages/personal/mypersonal.vue
+++ b/rc-busness/pages/personal/mypersonal.vue
@@ -342,6 +342,7 @@ obligation(item,index){
    
       }else{
                       if(item.title=='收货地址'){
+                        
 this.$router.push({
       path: `/useraddress/openaddress/`
    })

From 5cf7ebfe00049f539a7786b6c36d0c18fe775a49 Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Thu, 20 Jan 2022 14:10:19 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E7=9A=84=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rc-busness/components/addressInput.vue       |  6 +++++-
 rc-busness/pages/useraddress/addaddress.vue  | 15 ++++++++++++++-
 rc-busness/pages/useraddress/openaddress.vue |  3 +--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/rc-busness/components/addressInput.vue b/rc-busness/components/addressInput.vue
index bb83bd81..8fb5f83f 100644
--- a/rc-busness/components/addressInput.vue
+++ b/rc-busness/components/addressInput.vue
@@ -89,6 +89,7 @@ export default {
 		},
 		pickValue(pickId,pickName){
 			let areaObj={id:pickId,name:pickName};
+			console.log(pickId,pickName);
 			this.returnValueArr[this.curDisplayingColIndex]=areaObj;
 			this.validatePickedValues();
 			
@@ -113,6 +114,9 @@ export default {
 		onChange(picker,values) { //values = [{id:this.columns[0].id, name:this.columns[0].name},{id:this.columns[1].id, name:this.columns[1].name},{id:this.columns[3].id, name:this.columns[3].name}];
 			//Support single choice only , index = 0 province, index = 1 city, index = 2 area
 			let curSelection={'province':'','city':'','area':''};
+			// console.log(picker,values);
+			this.$emit('getmenu',values)
+			this.$emit("closeDialog");
 			if(!values)
 				return;
 			let _self=this;
@@ -201,7 +205,7 @@ export default {
 			this.hideAddress();
 		},
 		onCancel() {
-			
+			  
 		},
 		fitlerValuesInArray(stringStartWith,dataColArea){
 			let result=[];
diff --git a/rc-busness/pages/useraddress/addaddress.vue b/rc-busness/pages/useraddress/addaddress.vue
index 0bb677c6..97ac548f 100644
--- a/rc-busness/pages/useraddress/addaddress.vue
+++ b/rc-busness/pages/useraddress/addaddress.vue
@@ -24,6 +24,8 @@
   
 </textarea>
    </div>
+      
+          <addressInput @getmenu="onGetMenu" @closeDialog = "handleClose1" :dialogInfo1="dialogInfo1"></addressInput>
    
   </div>
     <div class="rc-button">
@@ -38,6 +40,8 @@
     </div> -->
       
               <MyFooter></MyFooter>
+           
+              
   </div>
 
 </template>
@@ -46,6 +50,7 @@
 
 import Myheader from '~/components/header.vue' 
 import MyFooter from '~/components/rc-footer.vue'
+import addressInput from '~/components/addressInput.vue'
 export default {
   data() {
     return {
@@ -53,6 +58,7 @@ export default {
       checked: true,
       userid: null,
       usermessage:null,
+      dialogInfo1:false,
       list: [
         {
           id: 1,
@@ -77,6 +83,12 @@ export default {
     };
   },
   methods: { 
+    onGetMenu(values){
+  console.log(values,+'111111');
+    },
+    handleClose1(){
+  this.dialogInfo1 = false
+    },
     onEdit(item, index) {
       // let userid = item.id;
       console.log(item);
@@ -119,7 +131,8 @@ export default {
   },
   components: {
    Myheader,
-   MyFooter
+   MyFooter,
+   addressInput
   },
 
   mounted() {
diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue
index b393e09d..7c1a1f95 100644
--- a/rc-busness/pages/useraddress/openaddress.vue
+++ b/rc-busness/pages/useraddress/openaddress.vue
@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import { areaList } from '@vant/area-data';
+
 import Myheader from '~/components/header.vue' 
 import MyFooter from '~/components/rc-footer.vue'
 export default {
@@ -94,7 +94,6 @@ export default {
           address: "浙江省杭州市拱墅区莫干山路 50 号",
         },
       ],
-      areaList,
     };
   },
   methods: { 

From 1af28b2843512321af03f57cf1e65c07917fe289 Mon Sep 17 00:00:00 2001
From: Admin <376654749@qq.com>
Date: Thu, 20 Jan 2022 06:23:25 +0000
Subject: [PATCH 3/7] update rc-busness/assets/css/index.less.

---
 rc-busness/assets/css/index.less | 79 ++++++++++++++++++++++++++------
 1 file changed, 66 insertions(+), 13 deletions(-)

diff --git a/rc-busness/assets/css/index.less b/rc-busness/assets/css/index.less
index 063e45a2..77f4b563 100644
--- a/rc-busness/assets/css/index.less
+++ b/rc-busness/assets/css/index.less
@@ -5,10 +5,29 @@
 /deep/.van-swipe__indicator--active{
 	background-color: #E1001A;
 }
-.rc-ma{
-	.ul-zhuan{
-		li{
-			background: unset;;
+
+.ts-carousel-indicator{
+	/deep/.swiper-pagination-bullet{
+		margin-left:.5rem;
+	}
+	/deep/.swiper-pagination-bullet-active{
+		background:#E2001A;
+	}
+	&.center{
+		width:100%;
+		text-align: center;
+	}
+}
+.ts-position-identifier{
+
+}
+.ul-zhuan,.ul-dog{
+	li{
+		background: unset;
+		img{
+			border-radius: 50%;
+		}
+		&.active {
 			img{
 				border: 3px solid #E2001A;
 			}
@@ -31,6 +50,30 @@
 		width:auto;
 	}
 }
+.ul-dog{
+	width: 100%;
+	display: flex;
+	justify-content: center;
+	flex-wrap: wrap;
+	flex-direction: row;
+
+	span{
+		margin-top: .5rem;
+		display: block;
+	}
+	img{
+		width: 9.5rem;
+		height: auto;
+		display: block;
+	}
+	li{
+		cursor: pointer;
+		font-size: 16px;
+		text-align: center;
+		margin-top:3rem;
+		margin-left:3rem;
+	}
+}
 @media screen and (max-width:768px){
 	.ul-dog{
 		justify-content: space-evenly;
@@ -174,7 +217,6 @@
 	.uservideo{
 		width: 100%;
 		height:auto;
-		max-height: 15.68rem;
 		display: block;
 		video{
 			max-width:100%;
@@ -222,6 +264,10 @@
 			-webkit-box-orient: vertical;
 			max-width: 60%;
 			text-align: center;
+			word-break: keep-all;
+			height: 2.625rem;
+			display: flex;
+			align-items: center;
 		}
 		em{
 			font-style: normal;
@@ -327,14 +373,21 @@
 	.rc-selection{
 		display: none;
 	}
-  .sw-center{
-    display: none;
-  }
-.useraimg{
-width: 100%;
-// height: 29.31rem;
-object-fit: cover;
-}
+	.sw-center{
+		display: none;
+	}
+	.useraimg{
+		width: 100%;
+		// height: 29.31rem;
+		object-fit: cover;
+	}
+	.ts-banner-swiper-container{
+		position:relative;
+		.ts-carousel-indicator{
+			position:absolute;
+			bottom:.4rem;
+		}
+	}
 .van-swipe-item {
   color: #fff;
   height: 100%;

From ab916cbde974a72a71dec2f4ce8ef046e461abdd Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Thu, 20 Jan 2022 14:28:17 +0800
Subject: [PATCH 4/7] =?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/pages/useraddress/openaddress.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue
index 7c1a1f95..1a6cad96 100644
--- a/rc-busness/pages/useraddress/openaddress.vue
+++ b/rc-busness/pages/useraddress/openaddress.vue
@@ -23,7 +23,7 @@
       </div>
       <div class="rc-footer">
         <div class="rc-foot">
-           <img src="../../assets/image/userselect.png" alt="">
+           <img :src="item.isDefault?require('../../assets/image/userred.png'):require('../../assets/image/userselect.png')" @click="changeadddress(item,index)"/>
           <span>设置为默认收货地址</span>
 
         </div>
@@ -80,23 +80,29 @@ export default {
           tel: "13000000000",
           address: "浙江省杭州市西湖区文三路 138 号",
           isDefault: true,
+
         },
         {
           id: 2,
           name: "李四",
           tel: "1310000000",
+          isDefault: false,
           address: "浙江省杭州市拱墅区莫干山路 50 号",
         },
            {
           id: 3,
           name: "李四",
           tel: "1310000000",
+          isDefault: false,
           address: "浙江省杭州市拱墅区莫干山路 50 号",
         },
       ],
     };
   },
   methods: { 
+    changeadddress(item,index){
+      console.log(item)
+    },
     onEdit(item, index) {
       // let userid = item.id;
       console.log(item);

From bf3dd9219e9dac6f4842ce356e326ee14e125a15 Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Thu, 20 Jan 2022 14:30:09 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../image/{Forms-Switch-On@3x.png => userred.png}   | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename rc-busness/assets/image/{Forms-Switch-On@3x.png => userred.png} (100%)

diff --git a/rc-busness/assets/image/Forms-Switch-On@3x.png b/rc-busness/assets/image/userred.png
similarity index 100%
rename from rc-busness/assets/image/Forms-Switch-On@3x.png
rename to rc-busness/assets/image/userred.png

From 309e2036f84ba88961f926a7f4eca3cccb67db16 Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Thu, 20 Jan 2022 14:35:53 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rc-busness/assets/css/openaddress.less       |  1 +
 rc-busness/pages/useraddress/openaddress.vue | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/rc-busness/assets/css/openaddress.less b/rc-busness/assets/css/openaddress.less
index 265696d3..4b7c8568 100644
--- a/rc-busness/assets/css/openaddress.less
+++ b/rc-busness/assets/css/openaddress.less
@@ -300,6 +300,7 @@ img{
            }
            span:first-child {
              margin-right: 16px;
+             
            }
          }
        }
diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue
index 1a6cad96..28030973 100644
--- a/rc-busness/pages/useraddress/openaddress.vue
+++ b/rc-busness/pages/useraddress/openaddress.vue
@@ -135,13 +135,13 @@ export default {
     // },
 
     //查询人的所有地址
-    // async editaddress(user) {
-    //  user.data.id=844350
-    //     let data = await selectaddress(user.data.id);
-    //     this.list=data.data;
-    //     console.log(this.list);
-    //   console.log(data);
-    // },
+    async editaddress(user) {
+     user.data.id=844350
+        let data = await selectaddress(user.data.id);
+        this.list=data.data;
+        console.log(this.list);
+      console.log(data);
+    },
   },
   components: {
    Myheader,
@@ -150,9 +150,9 @@ export default {
 
   mounted() {
     //地址的查询
-    // this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
-    //    this.editaddress(this.usermessage);
-    // this.userid = this.usermessage.data.id;
+    this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
+       this.editaddress(this.usermessage);
+    this.userid = this.usermessage.data.id;
   },
 };
 </script>

From afee12993f94a61e7732925e01a0a54a9d57ab2c Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Thu, 20 Jan 2022 14:41:22 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rc-busness/pages/useraddress/openaddress.vue | 61 ++++++++++++--------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue
index 5215da2e..e618473d 100644
--- a/rc-busness/pages/useraddress/openaddress.vue
+++ b/rc-busness/pages/useraddress/openaddress.vue
@@ -1,8 +1,12 @@
 <template>
 <div>
-    <Myheader></Myheader>
-  <div class="usermain">
-    <div class="rc-main" v-for="(item, index) in list" :key="index">
+<Myheader></Myheader>
+   <div class="rc-top"></div>
+   <div class="online bold"></div>
+    <div class="usercontshow rc-max-width--xl">
+ <div class="usercontend" v-for="(item, index) in list" :key="index">
+  <div class="usercontshow usermain" >
+    <div class="rc-cat" >
         <div class="rc-center">
       <div class=" rc-title">
         <em>
@@ -19,7 +23,7 @@
       </div>
       <div class="rc-footer">
         <div class="rc-foot">
-           <img :src="item.isDefault?require('../../assets/image/userred.png'):require('../../assets/image/userselect.png')" @click="changeadddress(item,index)"/>
+          <img :src="item.isDefault?require('../../assets/image/userred.png'):require('../../assets/image/userselect.png')" @click="changeadddress(item,index)"/>
           <span>设置为默认收货地址</span>
 
         </div>
@@ -29,20 +33,36 @@
         </div>
       </div>
     </div>
-
+      
  
     </div>
+      
   </div>
+   <div class="online bold rc-md-down"></div>
+  <!-- <div class="usercontend useradd">
+      <img src="../../assets/image/userselect.png" alt="">
+      <span>添加收货地址</span>
+  </div> -->
+  
+ </div>
+ 
+    <div class="usercontshow useredit">
+
+      <img src="../../assets/image/userselect.png" alt="">
+      <span>添加收货地址</span>
+    </div>
      <div class="rc-button">
       <div class="rc-footbutton" @click="onAdd()">
         <span>新增收货地址</span>
       </div>
     </div>
+
   </div>
+    <MyFooter></MyFooter>
+</div>
 </template>
 
 <script>
-
 import Myheader from '~/components/header.vue' 
 import MyFooter from '~/components/rc-footer.vue'
 export default {
@@ -59,29 +79,23 @@ export default {
           tel: "13000000000",
           address: "浙江省杭州市西湖区文三路 138 号",
           isDefault: true,
-
         },
         {
           id: 2,
           name: "李四",
           tel: "1310000000",
-          isDefault: false,
           address: "浙江省杭州市拱墅区莫干山路 50 号",
         },
            {
           id: 3,
           name: "李四",
           tel: "1310000000",
-          isDefault: false,
           address: "浙江省杭州市拱墅区莫干山路 50 号",
         },
       ],
     };
   },
   methods: { 
-    changeadddress(item,index){
-      console.log(item)
-    },
     onEdit(item, index) {
       // let userid = item.id;
       console.log(item);
@@ -114,23 +128,24 @@ export default {
     // },
 
     //查询人的所有地址
-    async editaddress(user) {
-     user.data.id=844350
-        let data = await selectaddress(user.data.id);
-        this.list=data.data;
-        console.log(this.list);
-      console.log(data);
-    },
+    // async editaddress(user) {
+    //  user.data.id=844350
+    //     let data = await selectaddress(user.data.id);
+    //     this.list=data.data;
+    //     console.log(this.list);
+    //   console.log(data);
+    // },
   },
   components: {
-    Myheader,
+   Myheader,
+   MyFooter
   },
 
   mounted() {
     //地址的查询
-    this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
-       this.editaddress(this.usermessage);
-    this.userid = this.usermessage.data.id;
+    // this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
+    //    this.editaddress(this.usermessage);
+    // this.userid = this.usermessage.data.id;
   },
 };
 </script>