Merge branch 'master' of http://124.70.211.186:3000/zhangqi/yos_meida

src/HManagement/marketing/agent/modules/edit_agent.vue

@@ -38,7 +38,7 @@
                 placement="bottom"
                 width="400"
                 trigger="click">
-                <arealist @onClick="onClick" :noDefaultData="true"></arealist>
+                <arealist @onClick="onClick" :noDefaultData="false"></arealist>
                 <el-input  slot="reference" class="width-240" readonly v-model="form.areaname" suffix-icon="el-icon-arrow-down"></el-input>
               </el-popover>
             </el-form-item>

src/HManagement/marketing/area/list.vue

@@ -84,8 +84,11 @@ export default {
   },
   mounted () {
     this.query_arealist(()=>{
-      this.$emit('onClick',this.arealist[0])
-      this.setCurrentKey(this.arealist[0].sa_saleareaid)
+      console.log(this.noDefaultData)
+      if (this.noDefaultData === undefined) {
+        this.$emit('onClick',this.arealist[0])
+        this.setCurrentKey(this.arealist[0].sa_saleareaid)
+      }
     })
   }
 }