bug

pages/mine/company.vue

@@ -205,12 +205,12 @@ export default {
                     this.formParams.com_mobile = res.data.company_info.com_mobile;
                     this.formParams.com_mobile = res.data.company_info.com_mobile;
                     this.formParams.com_desc = res.data.company_info.com_desc;
                     this.formParams.com_desc = res.data.company_info.com_desc;
                     this.formParams.com_fax = res.data.company_info.com_fax;
                     this.formParams.com_fax = res.data.company_info.com_fax;
-                    this.formParams.com_province_id = res.data.company_info.com_province_id;
-                    this.formParams.com_city_id = res.data.company_info.com_city_id;
+                    this.formParams.com_province_id = res.data.company_info.com_province_id == 'null' ? 2 : res.data.company_info.com_province_id;
+                    this.formParams.com_city_id = res.data.company_info.com_city_id == 'null' ? 52 : res.data.company_info.com_city_id;
                     this.formParams.com_area_id = res.data.company_info.com_area_id;
                     this.formParams.com_area_id = res.data.company_info.com_area_id;
-                    this.formParams.com_address = res.data.company_info.com_address;
-                    this.formParams.type_id = res.data.company_info.type_id;
-                    this.formParams.intl_code = res.data.company_info.intl_code;
+                    this.formParams.com_address = res.data.company_info.com_address == 'null' ? '' : res.data.company_info.com_address;
+                    this.formParams.type_id = res.data.company_info.type_id; //公司类型
+                    this.formParams.intl_code = res.data.company_info.intl_code; //电话区号
 
 
                     //品牌
                     //品牌
                     if (res.data.company_info.brand_list.length > 0) {
                     if (res.data.company_info.brand_list.length > 0) {
@@ -228,16 +228,24 @@ export default {
                     }
                     }
 
 
                     //intl_code
                     //intl_code
+                    if (res.data.company_info.intl_code) {
                         let index = this.findIndex(this.array, res.data.company_info.intl_code);
                         let index = this.findIndex(this.array, res.data.company_info.intl_code);
                         this.index = index;
                         this.index = index;
+                    }
 
 
                     //公司类型
                     //公司类型
+                    if (res.data.company_info.type_id != 'null') {
                         let typeIndex = this.findIndex(this.typeArr, res.data.company_info.type_id, true);
                         let typeIndex = this.findIndex(this.typeArr, res.data.company_info.type_id, true);
                         this.typeIndex = typeIndex;
                         this.typeIndex = typeIndex;
+                    }
 
 
                     //初始化省市区
                     //初始化省市区
-                    this.getProvince(1, res.data.company_info.com_province_id);
+                    if (res.data.company_info.com_province_id != 'null') {
+                        this.getProvince(1, this.formParams.com_province_id);
                         this.selectText = `${res.data.company_info.province_name + ',' + res.data.company_info.city_name + ',' + res.data.company_info.area_name}`;
                         this.selectText = `${res.data.company_info.province_name + ',' + res.data.company_info.city_name + ',' + res.data.company_info.area_name}`;
+                    } else {
+                        this.getProvince(1, 2);
+                    }
                 } else if (res.err_code === 11012) {
                 } else if (res.err_code === 11012) {
                     uni.navigateTo({
                     uni.navigateTo({
                         url: '/login'
                         url: '/login'