官网活动地址选择修改

src/views/xxOfficialWebsite/activityList.vue

@@ -138,7 +138,8 @@
 import {
 	getActivityList,
 	isShowStatus,
-	isPublishStatus
+	isPublishStatus,
+	deleteActivityTag
 } from '../../api/officialWebsit/activity';
   import Element1 from "../admin/menu/components/element";
   import ElRow from "element-ui/packages/row/src/row";

src/views/xxOfficialWebsite/modal/campsiteModal.vue

@@ -344,9 +344,8 @@
 				  });
 				  return;
 				}
-				console.log(this.listQuery)
-        this.form.provinceCode = this.listQuery.addrProvince;
-        this.form.cityCode = this.listQuery.addrCity;
+        this.form.province = this.listQuery.addrProvince;
+        this.form.city = this.listQuery.addrCity;
 				this.form.townCode = this.listQuery.addrTown
         set[formName].validate(valid => {
           if (valid) {

src/views/xxOfficialWebsite/modal/oneCampsiteModal.vue

@@ -303,6 +303,7 @@
       },
 			
 isExistCampsiteShop(type, datas){
+				console.log(datas)
 			  if(type == "update"){//编辑
 			        this.toUpdate(datas);
 			  }
@@ -480,11 +481,16 @@ create(formName){
         this.showCampsiteVisible = false;
         if(obj){
           this.campsiteObj = obj;
+					console.log(obj)
+					debugger
           let provinceObj = getRegionByCodes([obj.province]);
           let cityObj = getRegionByCodes([obj.city]);
+					let townObj = getRegionByCodes([obj.townCode])
           this.campsiteObj.provinceName = provinceObj[0].name;
           this.campsiteObj.cityName = cityObj[0].name;
-          this.form.addressStr = this.campsiteObj.provinceName + this.campsiteObj.cityName + this.campsiteObj.address;
+					this.campsiteObj.town = townObj[0].name
+					this.campsiteObj.townCode = obj.townCode
+          this.form.addressStr = this.campsiteObj.provinceName + this.campsiteObj.cityName + this.campsiteObj.town + this.campsiteObj.address;
           console.log(this.campsiteObj);
         }
       },
@@ -493,33 +499,12 @@ create(formName){
        * */
       selectDestination(){
         let that = this;
+				console.log(this.campsiteObj)
         this.campsiteObj.showTitle = "活动地址编辑";
         this.campsiteObj.eventName ='campsiteEvent';
         this.campsiteObj.keyword = this.campsiteObj.address;
         this.showCampsiteVisible = true;
       },
-      /**
-       * 关闭营地标签弹框
-       * */
-      tourLabelEvent(obj){
-        let that = this;
-        this.editLableVisible = false;
-        let arr = [];
-        let ckeckList = [];
-        if(obj){
-          this.allLabelList.map(function(item){
-            obj.map(function(b){
-              if(item.name == b){
-                arr.push(item);
-                ckeckList.push(b);
-              }
-            });
-          });
-          this.form.campsiteTagListVos = arr;
-          this.checkList = ckeckList;
-          console.log(obj);
-        }
-      },
       /**
        * 获取一条营地
        * */
@@ -533,8 +518,6 @@ create(formName){
             provinceName: response.data.province,
             city: response.data.cityCode,
             cityName: response.data.city,
-						townCode:response.data.townCode,
-						town:response.data.town,
             latitude: response.data.latitude,
             longitude: response.data.longitude,
 						 townCode:response.data.townCode,