!54 2022-1-20 Jiamin

Merge pull request !54 from Admin/sit-jiamin-v2

rc-busness/components/addressInput.vue

@@ -90,6 +90,7 @@ export default {
 		},
 		pickValue(pickId,pickName){
 			let areaObj={id:pickId,name:pickName};
+			console.log(pickId,pickName);
 			this.returnValueArr[this.curDisplayingColIndex]=areaObj;
 			this.validatePickedValues();
 			
@@ -114,6 +115,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;

rc-busness/pages/personal/mypersonal.vue

@@ -342,6 +342,7 @@ obligation(item,index){
    
       }else{
                       if(item.title=='收货地址'){
+                        
 this.$router.push({
       path: `/useraddress/openaddress/`
    })

rc-busness/pages/useraddress/addaddress.vue

@@ -25,6 +25,8 @@
 </textarea>
    </div>
       
+          <addressInput @getmenu="onGetMenu" @closeDialog = "handleClose1" :dialogInfo1="dialogInfo1"></addressInput>
+   
   </div>
     <div class="rc-button">
                 <span @click="openclose()">取消</span>
@@ -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() {

rc-busness/pages/useraddress/openaddress.vue

@@ -19,7 +19,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>
@@ -42,11 +42,9 @@
 </template>
 
 <script>
-import { areaList } from "@vant/area-data";
-import { selectaddress } from "../../ajax/getData";
-import { editdelete } from "../../ajax/getData";
-import Myheader from "~/components/header.vue";
-import { Toast } from "vant";
+
+import Myheader from '~/components/header.vue' 
+import MyFooter from '~/components/rc-footer.vue'
 export default {
   data() {
     return {
@@ -61,24 +59,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 号",
         },
       ],
-      areaList,
     };
   },
   methods: { 
+    changeadddress(item,index){
+      console.log(item)
+    },
     onEdit(item, index) {
       // let userid = item.id;
       console.log(item);