Merge branch 'kingbase' of http://git.cc-lotus.info/Information/technique_admin into kingbase

src/views/user/user/parts/company.vue

@@ -43,8 +43,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="所在地区" prop="region">
-            <el-cascader v-model="form.area" :props="{ value: 'label', label: 'label' }" :options="cityList" clearable placeholder="请选择所在地区" style="width: 100%" />
+          <el-form-item label="所在地区" prop="area">
+            <el-cascader v-model="form.area" :props="{ value: 'name', label: 'name' }" :options="cityList" clearable placeholder="请选择所在地区" style="width: 100%" />
           </el-form-item>
         </el-col>
       </el-row>

src/views/user/user/parts/expert.vue

@@ -56,7 +56,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="所在地区" prop="region">
-            <el-cascader v-model="form.area" :props="{ value: 'label', label: 'label' }" :options="cityList" clearable placeholder="请选择所在地区" style="width: 100%" />
+            <el-cascader v-model="form.area" :props="{ value: 'name', label: 'name' }" :options="cityList" clearable placeholder="请选择所在地区" style="width: 100%" />
           </el-form-item>
         </el-col>
       </el-row>