Merge branch 'feature/zjx' into 'develop'

Feature/zjx

See merge request !110

src/components/pickArea/index.vue

@@ -65,7 +65,7 @@ export default {
       cityList: [],
       countyList:[],
       loading: true,
-      result:{}
+      result:null
     };
   },
   watch: {
@@ -73,6 +73,7 @@ export default {
       async handler(nv, ov) {
         console.log('locationAreaCode', nv, ov);
         if (nv) {
+          this.result = store.get('geolocation');
           this.provinceList = await this.getProvinceList();
           this.cityList = await this.getCityList(nv[0]);
           this.countyList = await this.getCountyList(nv[1]);
@@ -86,8 +87,8 @@ export default {
             this.$emit('confirm', data);
           }
         }
-
       },
+      deep:true,
       immediate:true
     },
     projectEquityNo: {