bug修改

.env.dev

@@ -8,9 +8,9 @@ VUE_APP_TITLE = 爱思系统
 # 赵培清
 # VUE_APP_BASE_API = 'http://192.168.100.213:48080'
 # 王东坡
-VUE_APP_BASE_API = 'http://192.168.100.64:48081'
+# VUE_APP_BASE_API = 'http://192.168.100.64:48081'
 # 测试
-# VUE_APP_BASE_API = 'http://47.103.79.143:48081'
+VUE_APP_BASE_API = 'http://47.103.79.143:48081'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/mayout/index.vue

@@ -165,6 +165,8 @@ export default {
               this.joinOrCreateVisible = false;
               this.getOwnJoinTenantList();
               this.getOwnCreateTenantList();  
+            }).catch(() => { 
+              this.loading = false;
             });
             
           }
@@ -175,6 +177,8 @@ export default {
               this.joinOrCreateVisible = false;
               this.getOwnJoinTenantList();
               this.getOwnCreateTenantList();  
+            }).catch(() => { 
+              this.loading = false;
             });
            
           }

src/views/index.vue

@@ -95,7 +95,7 @@
           <el-input v-model="form.name" placeholder='请输入你的企业/团队名称'></el-input>
         </el-form-item>
         <el-form-item label="邀请码" prop="tenantId" v-if="corpTitle == '加入'">
-          <el-input v-model="form.url" placeholder='请输入你的邀请码'></el-input>
+          <el-input v-model="form.tenantId" placeholder='请输入你的邀请码'></el-input>
         </el-form-item>
         <el-button size="small" type="primary" style="text-align: center;width: 100%;margin-top: 10px;"
           @click="submitForm('ruleForm')">
@@ -342,7 +342,9 @@ export default {
               })
                 .catch(() => { });
 
-            });
+            }).catch(() => { 
+              this.loading = false;
+             });
           }
           else {
             joinTenant({ accountMode: 1, corpId: this.form.tenantId }).then(response => {
@@ -357,6 +359,8 @@ export default {
                   .catch(() => { });
               })
                 .catch(() => { });
+            }).catch(() => { 
+              this.loading = false;
             });
           }