From d3682fa241a7fd09063d865164328cf86f90e3b2 Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Thu, 20 Jan 2022 12:12:53 +0800
Subject: [PATCH 1/2] =?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/addaddress.vue  | 186 +++++++++++------
 rc-busness/pages/useraddress/editaddress.vue | 204 +++++++++++--------
 2 files changed, 239 insertions(+), 151 deletions(-)

diff --git a/rc-busness/pages/useraddress/addaddress.vue b/rc-busness/pages/useraddress/addaddress.vue
index c422c2f5..0bb677c6 100644
--- a/rc-busness/pages/useraddress/addaddress.vue
+++ b/rc-busness/pages/useraddress/addaddress.vue
@@ -1,81 +1,137 @@
 <template>
-  <van-address-edit
-  :area-list="areaList"
-  show-postal
-  show-delete
-  show-set-default
-  show-search-result
-  :search-result="searchResult"
-  :area-columns-placeholder="['请选择', '请选择', '请选择']"
-  @save="onSave"
-  @delete="onDelete"
-  @change-detail="onChangeDetail"
-/>
+<div>
+<Myheader></Myheader>
+   <div class="rc-top"></div>
+ <div class="usercontend">
+  <div class="rc-max-width--xl">
+      <h2>新增收货地址</h2>
+   <div class="rc-max-width--xl rc-people">
+      <span>收货人:</span>
+        <input type="text" placeholder="请输入收货人姓名">
+   </div>
+  <div class="rc-max-width--xl rc-phone">
+      <span>手机号码:</span>
+        <input type="text" placeholder="请输入11位手机号码">
+   </div>
+     <div class="rc-max-width--xl rc-address">
+      <span>所在地区:</span>
+        <input type="text" placeholder="请选择所在地区">
+   </div>
+     <div class="rc-max-width--xl rc-useaddress">
+      <span>详细地址:</span>
+        <input type="text" placeholder="小区、门牌号等" class="userinput">
+        <textarea rows="10" cols="30" placeholder="请输入详细地址">
+  
+</textarea>
+   </div>
+   
+  </div>
+    <div class="rc-button">
+                <span @click="openclose()">取消</span>
+                <em @click="openclose()">确认</em>
+              </div>
+  </div>
+     <!-- <div class="rc-button">
+      <div class="rc-footbutton" @click="onAdd()">
+        <span>新增收货地址</span>
+      </div>
+    </div> -->
+      
+              <MyFooter></MyFooter>
+  </div>
+
 </template>
 
 <script>
-import { editaddress } from "../../ajax/getData";
-import { Toast } from 'vant';
-import { areaList } from '@vant/area-data';
+
+import Myheader from '~/components/header.vue' 
+import MyFooter from '~/components/rc-footer.vue'
 export default {
-  data(){
-      return{
-         areaList,
-      searchResult: [],
-      userid:null,
-      addressdetail:'',
-      }
+  data() {
+    return {
+      chosenAddressId: "1",
+      checked: true,
+      userid: null,
+      usermessage:null,
+      list: [
+        {
+          id: 1,
+          name: "张三",
+          tel: "13000000000",
+          address: "浙江省杭州市西湖区文三路 138 号",
+          isDefault: true,
+        },
+        {
+          id: 2,
+          name: "李四",
+          tel: "1310000000",
+          address: "浙江省杭州市拱墅区莫干山路 50 号",
+        },
+           {
+          id: 3,
+          name: "李四",
+          tel: "1310000000",
+          address: "浙江省杭州市拱墅区莫干山路 50 号",
+        },
+      ],
+    };
   },
-  methods:{
-  async onSave(content) {
-    //   Toast('save');
-    console.log(content);
-    let recipient=content.name;
-    let tel=content.tel;
-    let provinceId=Number(content.areaCode.substring(0,2)+'0000')//省份id
-    let cityId=Number(content.areaCode.substring(0,4)+'00') //城市id
-    let districtId=Number(content.areaCode);//区域编码
-    console.log(provinceId,cityId,districtId);
-     console.log(content.areaCode.substring(0,2)+'0000');//城市编码
-       console.log(content.areaCode.substring(0,4)+'00'); //市区id
-       console.log(content.areaCode) //区域编码
-                                      //id     详细地址   /收货人姓名 电话号码 省份id/城市id/区域编码
-       let data = await editaddress(this.userid,this.addressdetail,recipient,tel,provinceId,cityId,districtId);
-
-       if(data){
-             this.$message({
-                                type: 'warning',
-                                message: '地址保存成功'
-                            });
-       }
-       console.log(data);
+  methods: { 
+    onEdit(item, index) {
+      // let userid = item.id;
+      console.log(item);
+      this.$router.push({
+        path: "/useraddress/editaddress",
+        query: {
+          id: item,
+        },
+      });
     },
-     onDelete() {
-       
-      Toast('delete');
+       onAdd(item, index) {
+      // let userid = item.id;
+      // console.log(item);
+      this.$router.push({
+        path: "/useraddress/addaddress",
+        // query: {
+        //   id: userid,
+        // },
+      });
     },
-    onChangeDetail(val){
-        this.addressdetail=val;
-  
-    }
 
 
 
+    //删除地址
+    // async userdelete(item) {
+    //   console.log(item.memberId);
+    //   let data = await editdelete(this.userid, item.id);
+    //  this.editaddress(this.usermessage);
+    //   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);
+    // },
   },
-  mounted(){
-      let user= JSON.parse(localStorage.getItem("userInfo"));
-      // this.userid=user.data.id;
-      this.userid=3242
-
+  components: {
+   Myheader,
+   MyFooter
   },
-  components:{
-  
-  },
-  
 
-}
+  mounted() {
+    //地址的查询
+    // this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
+    //    this.editaddress(this.usermessage);
+    // this.userid = this.usermessage.data.id;
+  },
+};
 </script>
 
-<style>
-
-</style>
\ No newline at end of file
+<style lang="less" scoped >
+@import url("../../assets/css/global.less");
+@import url("../../assets/css/addaddress.less");
+</style>
diff --git a/rc-busness/pages/useraddress/editaddress.vue b/rc-busness/pages/useraddress/editaddress.vue
index c0ce8fa5..bd7e2e7d 100644
--- a/rc-busness/pages/useraddress/editaddress.vue
+++ b/rc-busness/pages/useraddress/editaddress.vue
@@ -1,99 +1,131 @@
 <template>
-  <van-address-edit
-  :area-list="areaList"
-  show-postal
-  show-set-default
-  show-search-result
-  :search-result="searchResult"
-    :address-info="AddressInfo"
-  :area-columns-placeholder="['请选择', '请选择', '请选择']"
-  @save="onSave"
-  @change-detail="onChangeDetail"
->
-<!-- <div class="main">
-  <span>我的</span>
+<div>
+<Myheader></Myheader>
+   <div class="rc-top"></div>
 
-</div> -->
-       
-</van-address-edit>
+  <div class="rc-max-width--xl rc-main">
+   <div class="rc-max-width--xl rc-people">
+      <span>收货人:</span>
+        <input type="text" placeholder="李某某">
+   </div>
+  <div class="rc-max-width--xl rc-phone">
+      <span>手机号码:</span>
+        <input type="text" placeholder="15279944631">
+   </div>
+     <div class="rc-max-width--xl rc-address">
+      <span>所在地区:</span>
+        <input type="text" placeholder="请选择所在地区">
+   </div>
+     <div class="rc-max-width--xl rc-useaddress">
+      <span>详细地址:</span>
+        <input type="text" placeholder="天河客运站">
+   </div>
+    
+  </div>
+     <!-- <div class="rc-button">
+      <div class="rc-footbutton" @click="onAdd()">
+        <span>新增收货地址</span>
+      </div>
+    </div> -->
+       <div class="rc-button">
+                <span @click="openclose()">取消</span>
+                <em @click="openclose()">确认</em>
+              </div>
+    <!-- <MyFooter></MyFooter> -->
+              
+  </div>
 </template>
 
 <script>
-import { Toast } from 'vant';
-import { areaList } from '@vant/area-data';
-import { editupdate } from "../../ajax/getData";
+
+import Myheader from '~/components/header.vue' 
+import MyFooter from '~/components/rc-footer.vue'
 export default {
-  data(){
-      return{
-         areaList,
-      searchResult: [],
-      AddressInfo:{//收货人信息初始值
-                    name:'',//姓名
-                    tel:'',//电话
-                    province:'',//省份
-                    city:'',//城市
-                    country:'',//区县
-                    address:'',
-                    areaCode:'',//地址code：ID
-                    addressDetail:'',//详细地址
-                    isDefault:false,//是否选择默认
-                },
-
-      }
+  data() {
+    return {
+      chosenAddressId: "1",
+      checked: true,
+      userid: null,
+      usermessage:null,
+      list: [
+        {
+          id: 1,
+          name: "张三",
+          tel: "13000000000",
+          address: "浙江省杭州市西湖区文三路 138 号",
+          isDefault: true,
+        },
+        {
+          id: 2,
+          name: "李四",
+          tel: "1310000000",
+          address: "浙江省杭州市拱墅区莫干山路 50 号",
+        },
+           {
+          id: 3,
+          name: "李四",
+          tel: "1310000000",
+          address: "浙江省杭州市拱墅区莫干山路 50 号",
+        },
+      ],
+    };
   },
-  methods:{
-
-      valf(){
-       setTimeout(()=>{
-            let s=this.$route.query.id;
-       console.log(s);
-                 this.AddressInfo.name= s.recipient,
-                  this.AddressInfo.tel=s.recipientPhone,
-                  this.AddressInfo.province=s.name
-                    this.AddressInfo.city=s.name
-                    this.AddressInfo.addressDetail=s.detailAddress
-                    this.AddressInfo.isDefault=s.isDefault,
-                  this.AddressInfo.country='江西省'
-                 this.AddressInfo.address='江西省'
-
-       },100)
-      },
-  async onSave(content) {
-       let data = await editupdate(this.tel);
-       console.log(data);
-     console.log(content);
-    //   Toast('save');
-      console.log(content.areaCode.substring(0,2)+'0000');//城市编码
-       console.log(content.areaCode.substring(0,4)+'00'); //市区id
-       console.log(content.areaCode) //区域编码
-
+  methods: { 
+    onEdit(item, index) {
+      // let userid = item.id;
+      console.log(item);
+      this.$router.push({
+        path: "/useraddress/editaddress",
+        query: {
+          id: item,
+        },
+      });
     },
-     onDelete() {
-      Toast('delete');
+       onAdd(item, index) {
+      // let userid = item.id;
+      // console.log(item);
+      this.$router.push({
+        path: "/useraddress/addaddress",
+        // query: {
+        //   id: userid,
+        // },
+      });
     },
-    onChangeDetail(val){
 
-        console.log(this.searchResult);
-        console.log(val);
-    }
-  },
-  mounted(){
-       this.valf();
-       this.searchResult = [
-          {
-            name: '黄龙万科中心',
-            address: '杭州市西湖区',
-          },
-        ];
-  },
-  components:{
-  
-  },
-  
 
-}
+
+    //删除地址
+    // async userdelete(item) {
+    //   console.log(item.memberId);
+    //   let data = await editdelete(this.userid, item.id);
+    //  this.editaddress(this.usermessage);
+    //   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,
+   		MyFooter,
+  },
+
+  mounted() {
+    //地址的查询
+    // this.usermessage = JSON.parse(localStorage.getItem("userInfo"));
+    //    this.editaddress(this.usermessage);
+    // this.userid = this.usermessage.data.id;
+  },
+};
 </script>
 
-<style>
-
-</style>
\ No newline at end of file
+<style lang="less" scoped >
+@import url("../../assets/css/global.less");
+@import url("../../assets/css/editaddress.less");
+</style>

From b907a6292ca4f59c790b650fa61c9f54c50906a4 Mon Sep 17 00:00:00 2001
From: "952108534@qq.com" <952108534@qq.com>
Date: Thu, 20 Jan 2022 12:13:02 +0800
Subject: [PATCH 2/2] =?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/assets/css/addaddress.less         | 212 ++++++++++++++++
 rc-busness/assets/css/editaddress.less        |  89 +++++++
 rc-busness/assets/css/global.less             |  32 +--
 rc-busness/assets/css/index.less              |  79 +-----
 rc-busness/assets/css/integral.less           |   5 +-
 rc-busness/assets/css/product-list.less       | 139 +++++++----
 rc-busness/assets/css/search.less             |  90 ++++---
 .../pages/productdetails/productlist.vue      |  56 +++--
 rc-busness/pages/useraddress/openaddress.vue  | 232 +++---------------
 rc-busness/pages/usersearch/search.vue        |  30 ++-
 10 files changed, 574 insertions(+), 390 deletions(-)
 create mode 100644 rc-busness/assets/css/addaddress.less
 create mode 100644 rc-busness/assets/css/editaddress.less

diff --git a/rc-busness/assets/css/addaddress.less b/rc-busness/assets/css/addaddress.less
new file mode 100644
index 00000000..471c5f6f
--- /dev/null
+++ b/rc-busness/assets/css/addaddress.less
@@ -0,0 +1,212 @@
+
+   
+
+@media screen and (max-width:768px){
+    .usercontend{
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+        .rc-useaddress{
+            textarea{
+                display: none;
+            }
+        }
+        .rc-button{
+            display: flex;
+            justify-content: center;
+            font-size: 14px;
+            width: 100%;
+            box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
+            height: 80px;
+            align-items: center;
+            padding:0 20px 0 20px;
+            span
+            {
+              width: 160px;
+              height: 48px;
+              border: 2px solid #E2001A;
+              border-radius: 30px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              color: #E2001A;
+            }
+            em{
+              font-style: normal;
+              width: 164px;
+              height: 48px;
+              background: #E2001A;
+              cursor: pointer;
+              border-radius: 30px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              color: #FFFFFF;
+              margin-left: 40px;
+            }
+          }
+        .rc-max-width--xl{
+            h2{
+                  display: none;
+            }
+        }
+        
+    }
+
+.rc-max-width--xl{
+    margin-top: 16px;
+    input{
+        width: 258px;
+        height: 34px;
+        border: none;
+        border-bottom: 1px solid #808285;
+        color: #999999;
+        font-size: 16px;
+        margin-left: 2px;
+    }
+    span{
+        font-size: 16px;
+        font-weight: bold;
+        width: 22%;
+        text-align: center;
+        color: #333333;
+        margin-top: 2px;
+       }
+   .rc-people{
+       width: 100%;
+       display: flex;
+       align-items: center;
+       span{
+           text-align: left;
+       }
+   }
+//    .rc-phone{
+
+//    }
+//    .rc-address{
+       
+// }
+// .rc-useaddress{
+       
+// }
+
+
+   
+}
+
+
+}
+
+@media screen and (min-width: 769px)
+{ 
+    .usercontend{
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        position: relative;
+        flex-direction: column;
+        .rc-button{
+            display: flex;
+            justify-content: center;
+            font-size: 14px;
+            width: 100%;
+            box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
+            height: 80px;
+            align-items: center;
+          
+            padding:0 20px 0 20px;
+            span
+            {
+              width: 160px;
+              height: 48px;
+              border: 2px solid #E2001A;
+              border-radius: 30px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              color: #E2001A;
+            }
+            em{
+              font-style: normal;
+              width: 164px;
+              height: 48px;
+              background: #E2001A;
+              cursor: pointer;
+              border-radius: 30px;
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              color: #FFFFFF;
+              margin-left: 40px;
+            }
+          }
+        h2{
+            font-size: 26px;
+            color: #333333;
+            text-align: center;
+            font-weight: bold;
+        }
+        .rc-useaddress{
+            display: flex;
+            align-items: center;
+            textarea{
+                width: 680px;
+                height: 118px;
+                background: #FFFFFF;
+                border: 1px solid #808285;
+                opacity: 1;
+                border-radius: 0px;
+                padding-top: 12px;
+                padding-left: 16px;
+            }
+   
+.userinput{
+    display: none;
+}
+        }
+    }
+ 
+
+.rc-max-width--xl{
+    margin-top: 16px;
+    input{
+        width: 680px;
+        height: 45px;
+        border: 1px solid #808285;
+        color: #999999;
+        font-size: 16px;
+        margin-left: 2px;
+        padding-left: 16px;
+    }
+    span{
+        font-size: 16px;
+        font-weight: bold;
+        width: 10%;
+        text-align: center;
+        color: #333333;
+        margin-top: 2px;
+       }
+   .rc-people{
+       width: 100%;
+       display: flex;
+       align-items: center;
+       
+   }
+   
+//    .rc-phone{
+
+//    }
+//    .rc-address{
+       
+// }
+// .rc-useaddress{
+       
+// }
+
+
+   
+}
+
+
+}
\ No newline at end of file
diff --git a/rc-busness/assets/css/editaddress.less b/rc-busness/assets/css/editaddress.less
new file mode 100644
index 00000000..269b6de2
--- /dev/null
+++ b/rc-busness/assets/css/editaddress.less
@@ -0,0 +1,89 @@
+@media screen and (max-width:768px){
+    .rc-button{
+        display: flex;
+        justify-content: center;
+        font-size: 14px;
+        width: 100%;
+        box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
+        height: 80px;
+        align-items: center;
+        position: absolute;
+        bottom: 0;
+        padding:0 20px 0 20px;
+        span
+        {
+          width: 160px;
+          height: 48px;
+          border: 2px solid #E2001A;
+          border-radius: 30px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          color: #E2001A;
+        }
+        em{
+          font-style: normal;
+          width: 164px;
+          height: 48px;
+          background: #E2001A;
+          cursor: pointer;
+          border-radius: 30px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          color: #FFFFFF;
+          margin-left: 40px;
+        }
+      }
+.rc-max-width--xl{
+    margin-top: 16px;
+    input{
+        width: 258px;
+        height: 34px;
+        border: none;
+        border-bottom: 1px solid #808285;
+        color: #999999;
+        font-size: 16px;
+        margin-left: 2px;
+    }
+    span{
+        font-size: 16px;
+        font-weight: bold;
+        width: 22%;
+        text-align: center;
+        color: #333333;
+        margin-top: 2px;
+       }
+   .rc-people{
+       width: 100%;
+       display: flex;
+       align-items: center;
+       span{
+           text-align: left;
+       }
+    
+    
+   }
+//    .rc-phone{
+
+//    }
+//    .rc-address{
+       
+// }
+// .rc-useaddress{
+       
+// }
+
+
+   
+}
+
+
+}
+
+@media screen and (min-width: 769px)
+{
+
+
+
+}
\ No newline at end of file
diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less
index 8a669da3..8da2ca1c 100644
--- a/rc-busness/assets/css/global.less
+++ b/rc-busness/assets/css/global.less
@@ -8,30 +8,6 @@ body{
 .fade-leave-active {
   opacity: 0;
 }
-
-.ts-mask{
-	width:100%;
-	height:100%;
-	position: fixed;
-	top:0;
-	left:0;
-	display:flex;
-	flex-direction: column;
-	justify-content: center;
-	align-items: center;
-	z-index:99;
-	
-	.ts-mask-bg{
-		background-color:#000;
-		opacity:.6;
-		width:100%;
-		height:100%;
-		z-index:0;
-		position:absolute;
-		left:0;
-		top:0;
-	}
-}
 .userloding {
     position: fixed;
     left: 50%;
@@ -402,12 +378,15 @@ img, picture {
 		}
 		.ts-scrollable{
 			li{
-				// width: 4.125rem;
+				width: 6rem;
+				overflow: hidden;
 				padding: 0 0.62rem;
 				height: 1.625rem;
 				margin-left: .5rem;
 				font-size:.75rem;
-				line-height: 1.375rem;
+				text-overflow:ellipsis;
+				white-space:nowrap;
+				line-height: 1.625rem;
 			}
 			&::-webkit-scrollbar{
 				display:none;
@@ -419,6 +398,7 @@ img, picture {
   /* pc端 */
 @media screen and (min-width: 769px) 
 {
+	
 	/deep/.van-tabs__wrap
 	{
 		max-width: 768px;
diff --git a/rc-busness/assets/css/index.less b/rc-busness/assets/css/index.less
index 67008c80..fc6f260e 100644
--- a/rc-busness/assets/css/index.less
+++ b/rc-busness/assets/css/index.less
@@ -5,29 +5,10 @@
 /deep/.van-swipe__indicator--active{
 	background-color: #E1001A;
 }
-
-.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 {
+.rc-ma{
+	.ul-zhuan{
+		li{
+			background: unset;;
 			img{
 				border-radius: 50%;
 			}
@@ -54,30 +35,6 @@
 		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{
 		display: none;
@@ -215,6 +172,7 @@
 	.uservideo{
 		width: 100%;
 		height:auto;
+		max-height: 15.68rem;
 		display: block;
 		video{
 			max-width:100%;
@@ -261,10 +219,6 @@
 			-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;
@@ -370,21 +324,14 @@
 	.rc-selection{
 		display: none;
 	}
-	.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;
-		}
-	}
+  .sw-center{
+    display: none;
+  }
+.useraimg{
+width: 100%;
+// height: 29.31rem;
+object-fit: cover;
+}
 .van-swipe-item {
   color: #fff;
   height: 100%;
diff --git a/rc-busness/assets/css/integral.less b/rc-busness/assets/css/integral.less
index e461175d..cf1c9309 100644
--- a/rc-busness/assets/css/integral.less
+++ b/rc-busness/assets/css/integral.less
@@ -26,10 +26,7 @@ span{
 }
 }
     }
-.rc-usermain{
-    width: 92%;
-    margin: 0 auto;
-
+.rc-max-width--xl{
     ul{
         height: 70px;
         display: block;
diff --git a/rc-busness/assets/css/product-list.less b/rc-busness/assets/css/product-list.less
index cf1e3bef..b1fd2b92 100644
--- a/rc-busness/assets/css/product-list.less
+++ b/rc-busness/assets/css/product-list.less
@@ -9,10 +9,18 @@ ul li ol li em strong i {
 	//rc-main start
 	margin-top:.23rem;
 	.usersearch {
+		.ts-scrollable-container{
+            	h2{
+					font-weight: bold;
+					color: #333333;
+				}
+		}
+	
 		margin: 0 auto;
 		overflow: hidden;
 	
 	}
+	
 	 //rc-main end
 }
 
@@ -24,6 +32,53 @@ ul li ol li em strong i {
 
 	.usercontentshow{
 		position: relative;
+		.rc-productcat {
+			display: flex;
+			align-items: center;
+			flex-wrap: nowrap;
+			ol{
+				display: flex;
+				align-items: center;
+				flex-flow: row;
+				.ts-standard-btn{
+				  width: 7.87rem;
+				  height: 2.25rem;
+		  background: #FFFFFF;
+		  border-radius: 6.25rem;
+		  background: none;
+		  display: flex;
+		  align-items: center;
+		  justify-content: center;
+		  margin-left: 1rem;
+		  color: #999999;
+		  img {
+		  height: 1rem;
+		  }
+		  span {
+		  margin-left: 0.18rem;
+		  }
+				}
+			  }
+			.userrccat{
+				width: 32%;
+				height: 34px;
+				background: #ffffff;
+				border-radius: 100px;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-left: 0;
+				font-size: 14px;
+				span {
+					margin-left: 3px;
+				}
+				img {
+					width: 24px;
+					height: 16px;
+				}
+				border: 2px solid #E2001A;
+			}
+		}
 		.userrccat{
 			width: 32%;
 			height: 34px;
@@ -93,48 +148,7 @@ ul li ol li em strong i {
     height: 617px;
     background: white;
     z-index: 999;
-	.rc-productcat {
-		display: flex;
-		align-items: center;
-		flex-wrap: nowrap;
-		.rc-cat {
-			width: 32%;
-			height: 34px;
-			background: #ffffff;
-			border-radius: 100px;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			margin-left: 0;
-			font-size: 14px;
-			span {
-				margin-left: 3px;
-			}
-			img {
-				width: 24px;
-				height: 16px;
-			}
-		}
-		.userrccat{
-			width: 32%;
-			height: 34px;
-			background: #ffffff;
-			border-radius: 100px;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			margin-left: 0;
-			font-size: 14px;
-			span {
-				margin-left: 3px;
-			}
-			img {
-				width: 24px;
-				height: 16px;
-			}
-			border: 2px solid #E2001A;
-		}
-	}
+
 
 }
 
@@ -219,6 +233,7 @@ ul li ol li em strong i {
 		justify-content: center;
 		font-size: .14rem;
 		margin-right:.2rem;
+		margin-left: 16px;
 		span {
 			margin-left: 3px;
 		}
@@ -303,6 +318,7 @@ ul li ol li em strong i {
 
 //pc端
 @media screen and (min-width: 768px){
+
 	.userrccat{
 		width: 327px;
     height: 48px;
@@ -328,6 +344,7 @@ ul li ol li em strong i {
 	}
 	.online{
 		width:100%;
+		margin-top: 17px;
 	   &.bold{
 		   height:0.5rem;
 		   margin-top: 5rem;
@@ -378,7 +395,13 @@ ul li ol li em strong i {
 	}
 
 .rc-bottom{
-      .rc-productcat {  
+      .rc-productcat { 
+		ol{
+			display: flex;
+			align-items: center;
+			flex-flow: row;
+	
+		  }
     display: flex;
     align-items: center;
     flex-wrap: nowrap;
@@ -485,7 +508,7 @@ border-radius: 30px;
 			margin-left: 16px;
 		}
 		span {
-			margin-left: 0px;
+			margin-left: 4px;
 		}
 		img {
 			width: 24px;
@@ -542,18 +565,38 @@ border-radius: 30px;
   }
 */
 .ts-scrollable-container{
-	overflow-y: hidden;
-	overflow-x: clip;
+
 	width: 100%;
+	margin-top: 18px;
    h2{
 	   display: flex;
 	   align-items: center;
 	   width: 4%;
    }
 	.ts-scrollable{
-		overflow-y: hidden;
-	overflow-x: clip;
 	width: 100%;
+	ol{
+		display: flex;
+		align-items: center;
+	}
+	.ts-standard-btn{
+		width: 237px;
+		height: 48px;
+background: #FFFFFF;
+border-radius: 30px;
+background: none;
+display: flex;
+align-items: center;
+justify-content: center;
+margin-left: 40px;
+img {
+width: 24px;
+height: 24px;
+}
+span {
+margin-left: 8px;
+}
+	  }
 	}
 	}
 	
diff --git a/rc-busness/assets/css/search.less b/rc-busness/assets/css/search.less
index 27cce00e..e843f622 100644
--- a/rc-busness/assets/css/search.less
+++ b/rc-busness/assets/css/search.less
@@ -14,15 +14,6 @@ ul li ol li em strong i {
   position: relative;
   margin-top: 5.25rem;
 
-  .usersearch {
-    width: 100%;
-    margin: 0 auto;
-    overflow: hidden;
-    margin-top: 20px;
-    .rc-padding--md{
-      padding: 0;
-    }
-  }
   .active{
     border: 2px solid #E2001A;
     color: #E2001A;
@@ -38,6 +29,22 @@ ul li ol li em strong i {
 }
 //手机端
 @media screen and (max-width: 768px) {
+  .usersearch {
+    width: 100%;
+    margin: 0 auto;
+    overflow: hidden;
+    margin-top: 20px;
+    .ts-scrollable-container{
+      h2{
+  font-weight: bold;
+  color: #333333;
+
+}
+}
+    .rc-padding--md{
+      padding: 0;
+    }
+  }
   .rc-button
   {
     display: flex;
@@ -47,6 +54,9 @@ ul li ol li em strong i {
     box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
     height: 80px;
     align-items: center;
+    position: absolute;
+    bottom: 0;
+    padding:0 20px 0 20px;
     span
     {
       width: 160px;
@@ -129,8 +139,9 @@ strong{
   color: #333333;
   margin-top: 1.5rem;
   h2{
-    font-size: 18px;
+    font-size: 16px;
     font-weight: bold;
+    color: #333333;
   }
   span {
     font-size: 14px;
@@ -168,6 +179,9 @@ strong{
 //  我想搜
 .usercontentshow{
   position: relative;
+  .rc-column{
+    padding-bottom: 0;
+  }
   .rc-productcat {
     display: flex;
     align-items: center;
@@ -189,13 +203,15 @@ justify-content: center;
 margin-left: 1rem;
 color: #999999;
 img {
-width: 1.5rem;
 height: 1rem;
 }
 span {
 margin-left: 0.18rem;
 }
       }
+      li:first-child{
+        margin-left: 0;
+      }
     }
 //筛选
     .userselect{
@@ -220,7 +236,7 @@ margin-left: 0.18rem;
   
   }
   .ts-scrollable-container{
-    margin-top: 0.93rem;
+    margin-top: 1rem;
   }
 
 }
@@ -236,6 +252,7 @@ margin-left: 0.18rem;
   }
   h2{
     margin-left: 0;
+    font-weight: bold;
   }
 }
 
@@ -275,22 +292,10 @@ border-radius: 100px;
 .rc-bottom{
   position: fixed;
     background: white;
+    height: 617px;
     bottom: 0;
     left: 0;
     z-index: 9;
-  ol li{
-    background: none;
-    width: 7.87rem;
-      height: 2.25rem;
-      background: #FFFFFF;
-      border-radius: 6.25rem;
-      background: none;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      margin-left: 1rem;
-  }
-
 }
   
 .rc-bottoma{
@@ -376,7 +381,25 @@ border-radius: 100px;
 }
 //pc端
 @media screen and (min-width: 768px){
+  .usersearch {
+    width: 100%;
+    margin: 0 auto;
+    overflow: hidden;
+    margin-top: 40px;
+    .ts-scrollable-container{
+      h2{
+  font-weight: bold;
+  color: #333333;
 
+}
+}
+    .rc-padding--md{
+      padding: 0;
+    }
+  }
+ .online{
+   margin-top: 47px;
+ }
   /deep/.el-dialog__header {
      padding: 0;
      margin: 0;
@@ -392,6 +415,7 @@ border-radius: 100px;
        display: flex;
        align-items: center;
        width: 6%;
+       color: #333333;
      }
     .ts-scrollable{
     //   overflow-y: hidden;
@@ -501,9 +525,10 @@ margin-left: 8px;
     color: #333333;
     margin-top: 12px;
     h2 {
-      font-size: 18px;
+      font-size: 26px;
+      font-weight: bold;
       color: #333333;
-      margin-left: 12px;
+      margin: 0;
     }
     span {
       font-size: 14px;
@@ -597,13 +622,16 @@ border-radius: 30px;
   /deep/.van-search__content--square{
    background: white;
   }
+  /deep/.van-search{
+    padding-left: 0;
+  }
   .van-search__content--square{
         display: flex;
         align-items: center;
         justify-content: center;
         background: white;
         border: 1px solid #D7D7D7;
-        height: 80px;
+        height: 50px;
         width: 1200px;
         border-radius: 200px;
   }
@@ -648,9 +676,11 @@ border-radius: 30px;
   }
   .rc-product {
     h2 {
-      font-size: 18px;
+      font-size: 26px;
+      font-weight: bold;
       color: #333333;
-      margin-left: 12px;
+      margin: 0;
+   
     }
   }
   .rc-productcat {
diff --git a/rc-busness/pages/productdetails/productlist.vue b/rc-busness/pages/productdetails/productlist.vue
index 8c8ed82c..862c457d 100644
--- a/rc-busness/pages/productdetails/productlist.vue
+++ b/rc-busness/pages/productdetails/productlist.vue
@@ -11,17 +11,19 @@
         <div class="usercontentshow" ref="usercontent">
           <div class="rc-product ts-scrollable-container">
             <div class="rc-productcat ts-scrollable">
-              <div
-                class="rc-cat"
-                v-for="(item, index) in userproduct"
-                :key="index"
-                ref="userclicks"
-                @click="selectGoods(item, index)"
-                :class="activeIndex == index ? 'active' : 'unactive'"
-              >
-                <img :src="item.catimage" alt="" />
-                <span>{{ item.title }}</span>
-              </div>
+                     <ol>
+                  <li
+                    v-for="(item, index) in userproduct"
+                    :key="index"
+                     @click="selectGoods(item, index)"
+                   :class="activeIndex == index ? 'active' : 'unactive'"
+                    class="ts-standard-btn"
+                    ref="userstandard"
+                  >
+                    <img :src="item.catimage" alt="" />
+                    <span>{{ item.title }}</span>
+                  </li>
+                </ol>
             </div>
           </div>
           <div class="online rc-md-up"></div>
@@ -297,11 +299,13 @@
         <em>确认</em>
       </div>
     </el-dialog>
+       <MyFooter></MyFooter>
   </div>
 </template>
 
 <script>
 import Myheader from "~/components/header.vue";
+import MyFooter from '~/components/rc-footer.vue'
 import {
   userstype,
   biaome,
@@ -314,7 +318,7 @@ export default {
       value: "",
       isLoading: true,
       userstype: [],
-      activeIndex: "0",
+      activeIndex: "-1",
       allacindex: 0,
       userishwo: true,
       userishwo1: true,
@@ -504,16 +508,20 @@ export default {
   },
   components: {
     Myheader,
+    MyFooter
   },
   mounted() {
     let stype = this.$route.query.stype;
+        this.$nextTick(() => {
+        this.$refs.userstandard[0].style.margin = 0 + "px";
+      });
     this.userst();
-    this.activeIndex = stype;
-    if (stype !== "" && stype !== undefined) {
-      this.onmessage(stype);
-    } else {
-      this.usetmessage();
-    }
+    // this.activeIndex = stype;
+    // if (stype !== "" && stype !== undefined) {
+    //   this.onmessage(stype);
+    // } else {
+    //   this.usetmessage();
+    // }
   },
   methods: {
     async usersearch(stype, usertype) {
@@ -743,6 +751,9 @@ export default {
       this.activeIndexa = index;
     },
     selectage(item, index) {
+         if(this.activeIndex=='-1'){
+         this.activeIndex=0;
+       }
       let tagUsedAge = {};
       this.activeIndexc = index;
       this.userishwo1 = !this.userishwo1;
@@ -766,6 +777,9 @@ export default {
     },
     selectagc(item, index) {
       // let tagFunction = {};
+         if(this.activeIndex=='-1'){
+         this.activeIndex=0;
+       }
       this.activeIndexd = index;
       this.userishwo2 = !this.userishwo2;
       if (item.checked == false) {
@@ -796,6 +810,9 @@ export default {
       this.usersearch(this.userserachlist, this.activeIndex1);
     },
     selectagd(item, index) {
+         if(this.activeIndex=='-1'){
+         this.activeIndex=0;
+       }
       let tagBreed = {};
       this.activeIndexe = index;
       this.userishwo3 = !this.userishwo3;
@@ -818,6 +835,9 @@ export default {
       this.usersearch(this.userserachlist, this.activeIndex1);
     },
     selectproduct(item, index) {
+         if(this.activeIndex=='-1'){
+         this.activeIndex=0;
+       }
       this.activeIndexb = index;
       //  console.log(this.userishwo=!this.userishwo)
       if (item.checked == false) {
diff --git a/rc-busness/pages/useraddress/openaddress.vue b/rc-busness/pages/useraddress/openaddress.vue
index c0bbb947..b393e09d 100644
--- a/rc-busness/pages/useraddress/openaddress.vue
+++ b/rc-busness/pages/useraddress/openaddress.vue
@@ -8,24 +8,24 @@
   <div class="usercontshow usermain" >
     <div class="rc-cat" >
         <div class="rc-center">
-      <div class="rc-header">
+      <div class=" rc-title">
         <em>
-          {{ item.recipient }}
+          {{ item.name }}
         </em>
         <span>
-          {{ item.recipientPhone }}
+          {{ item.tel }}
         </span>
       </div>
       <div class="rc-address">
         <span>
-          {{ item.detailAddress }}
+          {{ item.address }}
         </span>
       </div>
       <div class="rc-footer">
         <div class="rc-foot">
+           <img src="../../assets/image/userselect.png" alt="">
           <span>设置为默认收货地址</span>
 
-          <!-- <van-switch v-model="checked" /> -->
         </div>
         <div class="rc-right">
           <span @click="onEdit(item, index)">编辑</span>
@@ -97,14 +97,9 @@ export default {
       areaList,
     };
   },
-  methods: {
-    onAdd() {
-      Toast("新增地址");
-
-      this.$router.push({ path: "/useraddress/addaddress" });
-    },
+  methods: { 
     onEdit(item, index) {
-      let userid = item.id;
+      // let userid = item.id;
       console.log(item);
       this.$router.push({
         path: "/useraddress/editaddress",
@@ -113,22 +108,35 @@ export default {
         },
       });
     },
-    //删除地址
-    async userdelete(item) {
-      console.log(item.memberId);
-      let data = await editdelete(this.userid, item.id);
-     this.editaddress(this.usermessage);
-      console.log(data);
+       onAdd(item, index) {
+      // let userid = item.id;
+      // console.log(item);
+      this.$router.push({
+        path: "/useraddress/addaddress",
+        // query: {
+        //   id: userid,
+        // },
+      });
     },
 
+
+
+    //删除地址
+    // async userdelete(item) {
+    //   console.log(item.memberId);
+    //   let data = await editdelete(this.userid, item.id);
+    //  this.editaddress(this.usermessage);
+    //   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);
-    },
+    // 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,
@@ -137,178 +145,14 @@ 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>
 
 <style lang="less" scoped >
-.rc-main {
-  width: 93%;
-  margin: 0 auto;
-  margin-top: 8px;
-}
-//手机端
-@media screen and(min-width: 320px) and(max-width:768px) {
-  .rc-button {
-    height: 80px;
-    background: #ffffff;
-    box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
-    opacity: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .rc-footbutton {
-      width: 164px;
-      height: 48px;
-      border: 2px solid #e2001a;
-      opacity: 1;
-      border-radius: 30px;
-      display: flex;
-      align-items: center;
-      background: #e2001a;
-      span {
-        display: block;
-        text-align: center;
-        color: white;
-        font-size: 16px;
-        width: 100%;
-      }
-    }
-  }
-  .rc-header {
-    display: flex;
-    align-items: center;
-    color: #333333;
-    em {
-      font-style: normal;
-      font-size: 14px;
-    }
-    span {
-      display: block;
-      margin-left: 8px;
-    }
-  }
-  .rc-address {
-    margin-top: 8px;
-    text-overflow: -o-ellipsis-lastline;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    line-clamp: 2;
-    -webkit-box-orient: vertical;
-    font-size: 14px;
-    color: #333333;
-  }
-  .rc-footer {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding-bottom: 20px;
-    margin-top: 8px;
-    .rc-right {
-      span {
-        border-bottom: 1px solid #666666;
-      }
-      span:first-child {
-        margin-right: 16px;
-      }
-    }
-  }
-}
-//pc端
-@media screen and (min-width: 768px) and (max-width: 1920px) {
-    .usermain{
-     
-        width: 90%;
-        margin: 0 auto;
-    }
-    .rc-main{
-       width: 45%;
-height: 164px;
-margin-top: 60px;
-background: #FFFFFF;
-border: 1px solid #D7D7D7;
-opacity: 1;
-border-radius: 3px;
-margin-left: 40px;
-float: left;
-.rc-center{
-    margin-top: 24px;
-    margin-left: 24px;
-}
-    }
-  .rc-button {
-    height: 80px;
-    background: #ffffff;
-    box-shadow: 0px -3px 6px rgba(0, 0, 0, 0.1);
-    opacity: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    display: block;
-
-    .rc-footbutton {
-      width: 164px;
-      height: 48px;
-      border: 2px solid #e2001a;
-      opacity: 1;
-      border-radius: 30px;
-      display: flex;
-      align-items: center;
-      background: #e2001a;
-      span {
-        display: block;
-        text-align: center;
-        color: white;
-        font-size: 16px;
-        width: 100%;
-      }
-    }
-  }
-  .rc-header {
-    display: flex;
-    align-items: center;
-    color: #333333;
-    em {
-      font-style: normal;
-      font-size: 14px;
-    }
-    span {
-      display: block;
-      margin-left: 8px;
-    }
-  }
-  .rc-address {
-    margin-top: 8px;
-    text-overflow: -o-ellipsis-lastline;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: -webkit-box;
-    -webkit-line-clamp: 2;
-    line-clamp: 2;
-    -webkit-box-orient: vertical;
-    font-size: 14px;
-    color: #333333;
-  }
-  .rc-footer {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding-bottom: 20px;
-    margin-top: 8px;
-    .rc-right {
-      span {
-        border-bottom: 1px solid #666666;
-      }
-      span:first-child {
-        margin-right: 16px;
-      }
-    }
-  }
-}
+@import url("../../assets/css/global.less");
+@import url("../../assets/css/openaddress.less");
 </style>
diff --git a/rc-busness/pages/usersearch/search.vue b/rc-busness/pages/usersearch/search.vue
index 8091d6c6..c933d390 100644
--- a/rc-busness/pages/usersearch/search.vue
+++ b/rc-busness/pages/usersearch/search.vue
@@ -34,7 +34,7 @@
               v-for="(item, index) in searchdata"
               :key="index"
               @click="selectsearch(item, index)"
-              :class="activeIndexa == index ? 'active' : 'unactive'"
+              :class="activeIndexa == index"
             >
               {{ item.title }}
             </li>
@@ -219,12 +219,13 @@
                   </li>
                 </ol>
               </div>
-              <div class="rc-button">
+           
+            </div>
+          </div>
+             <div class="rc-button">
                 <span @click="openclose()">取消</span>
                 <em @click="openclose()">确认</em>
               </div>
-            </div>
-          </div>
         </div>
       </div>
       <el-dialog :visible.sync="dialogInfo1" hegight="700px" v-if="!isadrond">
@@ -312,11 +313,13 @@
       </el-dialog>
     </div>
     <!-- rc-main end -->
+      <MyFooter></MyFooter>
   </div>
 </template>
 
 <script>
 import Myheader from "~/components/header.vue";
+import MyFooter from '~/components/rc-footer.vue'
 import { biaome, userstype, searchchanpin } from "../../ajax/getData";
 export default {
   data() {
@@ -520,6 +523,7 @@ export default {
   },
   components: {
     Myheader,
+    MyFooter
   },
   mounted() {
     this.usetmessage();
@@ -595,9 +599,13 @@ export default {
         if (element.name == "品种") {
           pinzhong.push(element);
           this.catageb = pinzhong;
+           this.catageb=this.catageb.sort((n1,n2)=>{
+                    return n1.sort-n2.sort;
+                    })
           this.catageb.forEach((element) => {
             element.checked = false;
           });
+          // console.log(this.catageb);
         }
         if (element.name == "功能") {
           gonneg.push(element);
@@ -605,6 +613,7 @@ export default {
           this.catagea.forEach((element) => {
             element.checked = false;
           });
+           console.log(this.catagea);
         }
         if (element.name == "年龄") {
           age.push(element);
@@ -831,6 +840,9 @@ export default {
       this.usetmessage(item.title);
     },
     selectage(item, index) {
+        if(this.activeIndex=='-1'){
+         this.activeIndex=0;
+       }
       // debugger;
       // this.userishwo1 = !this.userishwo1;
       let tagUsedAge = {};
@@ -863,6 +875,9 @@ export default {
       this.activeIndexc = index;
     },
     selectagc(item, index) {
+        if(this.activeIndex=='-1'){
+         this.activeIndex=0;
+       }
       // let tagFunction = {
       //   petType: this.activeIndex1,
       //   tagFunction: item.tagName,
@@ -886,6 +901,9 @@ export default {
       this.activeIndexd = index;
     },
     selectagd(item, index) {
+        if(this.activeIndex=='-1'){
+         this.activeIndex=0;
+       }
       let tagBreed = {};
       if (item.checked == false) {
         item.checked = true;
@@ -916,6 +934,10 @@ export default {
     },
     selectproduct(item, index) {
       this.activeIndexb = index;
+       console.log(this.activeIndex);
+       if(this.activeIndex=='-1'){
+         this.activeIndex=0;
+       }
       if (item.checked == false) {
         item.checked = true;
         this.$refs.chosebox[index].className = "active";