添加地址修改

src/components/lcw-select-address/lcw-select-address.vue

@@ -214,7 +214,9 @@ export default {
 			activeArea: { name: '' }, // 选中的区县
 			activeStreet: { name: '' }, // 选中的乡镇
 			//  0 1 2 3 当前正在选择 省 市 区 镇
-			selectStatus: 0
+			selectStatus: 0,
+
+			regional_code: [],
 		};
 	},
 	computed: {
@@ -279,6 +281,7 @@ export default {
 		// 选择省
 		changeProvinvial(i) {
 			if (i.name !== this.address.province) {
+				this.regional_code[0] = i.code
 				this.activeProvinvial = i;
 				this.activeCity = {};
 				this.activeArea = {};
@@ -301,6 +304,7 @@ export default {
 		// 选择市
 		changeCity(i) {
 			if (i.name !== this.address.city) {
+				this.regional_code[1] = i.code
 				this.activeCity = i;
 				this.activeArea = {};
 				this.activeStreet = {};
@@ -320,12 +324,14 @@ export default {
 		// 选择区县
 		changeArea(i) {
 			if (i.name !== this.address.area) {
+				this.regional_code[2] = i.code
 				this.activeArea = i;
 				this.activeStreet = {};
 				const newAddress = {
 					province: this.address.province,
 					city: this.address.city,
-					area: i.name
+					area: i.name,
+					regional_code: this.regional_code.join()
 				};
 				if ('street' in this.address) {
 					newAddress.street = '';
@@ -345,10 +351,12 @@ export default {
 		// 选择乡镇
 		changeStreet(i) {
 			if (i.name !== this.address.street) {
+				this.regional_code[3] = i.code
 				this.activeStreet = i;
 				this.$emit('change', {
 					...this.address,
-					street: i.name
+					street: i.name,
+					regional_code: this.regional_code.join()
 				});
 			}
 			this.close();
@@ -357,7 +365,8 @@ export default {
 		getProvinvial() {
 			post('user/areaConfig',{type:'provinces'}).then(res=>{
 				if(res.code == 0){
-					let da = JSON.parse(res.data.data)
+					let da = res.data.data
+					// let da = JSON.parse(res.data.data)
 					this.provinvial = da;
 					this.setActiveProvinvial();
 					this.getCity();
@@ -378,7 +387,8 @@ export default {
 		getCity() {
 			post('user/areaConfig',{type:'cities'}).then(res=>{
 				if(res.code == 0){
-					let da = JSON.parse(res.data.data)
+					let da = res.data.data
+					// let da = JSON.parse(res.data.data)
 					this.cityData = da;
 					this.setActiveCity();
 					this.getArea();
@@ -409,7 +419,8 @@ export default {
 		getArea() {
 			post('user/areaConfig',{type:'areas'}).then(res=>{
 				if(res.code == 0){
-					let da = JSON.parse(res.data.data)
+					let da = res.data.data
+					// let da = JSON.parse(res.data.data)
 					this.areaData = da;
 					this.setActiveArea();
 					if ('street' in this.address) {
@@ -440,7 +451,8 @@ export default {
 		getStreets() {
 			post('user/areaConfig',{type:'streets'}).then(res=>{
 				if(res.code == 0){
-					let da = JSON.parse(res.data.data)
+					let da = res.data.data
+					// let da = JSON.parse(res.data.data)
 					this.streetsData = da;
 					this.setActiveStreet();
 				}

src/pages/to-pay-list/index.vue

@@ -2,13 +2,7 @@
   <view class="container">
     <!-- 收货地址 -->
     <view class="address" v-if="Data.is_sell != 1 && Data.prom_type == 0">
-      <block
-        v-if="
-          DefaultAddress != '' &&
-          DefaultAddress.name != '' &&
-          DefaultAddress.name != undefined
-        "
-      >
+      <block v-if="DefaultAddress.name != ''" >
         <view class="add_head flex_r flex_ac flex_jb">
           <view class="user_info flex_r flex_ac">
             <view class="user_name">{{ DefaultAddress.name }}</view>
@@ -26,10 +20,7 @@
         <view class="add_name mar_t20">{{ DefaultAddress.address }}</view>
       </block>
       <block v-else>
-        <view
-          class="add_address flex_c flex_ac flex_jc"
-          @tap="chooseWXaddress('add')"
-        >
+        <view class="add_address flex_c flex_ac flex_jc" @tap="chooseWXaddress('add')">
           <image class="add_icon" src="/static/img/add.png" mode=""></image>
           <view class="add_text">添加收货地址</view>
         </view>
@@ -193,7 +184,7 @@ export default {
             } else this.DefaultAddress = da[0];
           }
           // #ifdef  MP-WEIXIN
-          if (!da.length && this.Data.is_sell != 1) this.getwexinAddress();
+          // if (!da.length && this.Data.is_sell != 1) this.getwexinAddress();
           // #endif
         }
       });
@@ -235,20 +226,21 @@ export default {
     },
     // 支付
     payment() {
-      // #ifdef  H5
       let type = "H5";
+      // #ifdef  H5
+      type = "H5";
       // #endif
       // #ifdef  APP
-      let type = "app";
+      type = "app";
       // #endif
       // #ifdef  MP-WEIXIN
-      let type = "jsapi";
+      type = "jsapi";
       // #endif
 
-      if (!this.DefaultAddress.id) {
-        appEv.errTips("请选择地址");
-        return;
-      }
+      // if (!this.DefaultAddress.id) {
+      //   appEv.errTips("请选择地址");
+      //   return;
+      // }
       let that = this
       if (that.obligation == 0) {
         uni.showModal({
@@ -261,7 +253,8 @@ export default {
             if (res.confirm) {
               post("goods/submitOrder", {
                 ...that.Data,
-                address_id: that.DefaultAddress.id,
+                address_id: that.DefaultAddress.id || '',
+					      regional_code: that.DefaultAddress.regional_code || '',
                 trade_type: type,
                 price: that.goodsInfo.cost_price,
               }).then((res) => {
@@ -303,7 +296,8 @@ export default {
       } else {
         post("goods/submitOrder", {
           ...that.Data,
-          address_id: that.DefaultAddress.id,
+          address_id: that.DefaultAddress.id || '',
+          regional_code: that.DefaultAddress.regional_code || '',
           trade_type: type,
           price: that.goodsInfo.cost_price,
         }).then((res) => {

src/pages/xghc-addrress/userAddress.vue

@@ -118,7 +118,7 @@ export default {
             this.address = address;
             this.userAddress.region = ""
             for (const i in address) {
-                this.userAddress.region += address[i] + " "
+                if(i != "regional_code") this.userAddress.region += address[i] + " "
             }
         },