11

src/components/index/SignUp/referInfo.vue

@@ -155,7 +155,6 @@
               v-model="referForm.id_card"
               placeholder="填写真实身份证号"
               size="small"
-             
               :disabled="true"
             />
           </el-form-item>
@@ -965,14 +964,17 @@ export default {
       this.fileList = JSON.parse(signUpFile);
     }
     this.getSchool();
-    this.getProAndCity();
+    // this.getProAndCity();
     this.getTenYear();
     this.getAccount(); // 页面信息个人获取
     this.configJson = this.$store.state.configJson;
+    if (this.configJson.jiguanCity == 1 || this.configJson.school == 1) {
+      this.getProAndCity();
+    }
   },
   watch: {
     referForm(val) {
-      // console.log(val, "val");
+      console.log(val, "val");
       for (var k in val) {
         if (val[k] == null || !val[k]) {
           val[k] = this.referForm[k];
@@ -995,7 +997,11 @@ export default {
         this.start_grade = val.start_school_date.slice(5, 8); //年级
       }
       //籍贯
-      if (val.jiguan_city !== null && val.jiguan_province !== null) {
+      if (
+        val.jiguan_city !== null &&
+        val.jiguan_province !== null &&
+        this.configJson.jiguanCity == 1
+      ) {
         if (this.referForm.jiguan_city) {
         }
         this.jgProvinceCode = Number(val.jiguan_province);
@@ -1007,7 +1013,8 @@ export default {
       if (
         val.school_province !== null &&
         val.school_city !== null &&
-        val.school !== null
+        val.school !== null &&
+        this.configJson.school == 1
       ) {
         this.referForm.school_province = Number(val.school_province);
         this.referForm.school_city = Number(val.school_city);

src/config/server.js

@@ -12,11 +12,11 @@
 // export const SERVER_WS_URL = 'wss://api1.testgate.cn' // websocket
 
 // 正式
-// export const SERVER_URL = "https://api.campcenter.cn/"; // 正式环境
-// export const DEVELOPMENT_SERVER_URL = "https://api.campcenter.cn/"; //开发环境
-// export const SERVER_WS_URL = "wss://api.campcenter.cn"; // websocket
+export const SERVER_URL = "https://api.campcenter.cn/"; // 正式环境
+export const DEVELOPMENT_SERVER_URL = "https://api.campcenter.cn/"; //开发环境
+export const SERVER_WS_URL = "wss://api.campcenter.cn"; // websocket
 
 // 测试
-export const SERVER_URL = "https://ying-test.campcenter.cn"; // 正式环境
-export const DEVELOPMENT_SERVER_URL = "https://ying-test.campcenter.cn/"; //开发环境
-export const SERVER_WS_URL = "wss://ying-test.campcenter.cn"; // websocket
+// export const SERVER_URL = "https://ying-test.campcenter.cn"; // 正式环境
+// export const DEVELOPMENT_SERVER_URL = "https://ying-test.campcenter.cn/"; //开发环境
+// export const SERVER_WS_URL = "wss://ying-test.campcenter.cn"; // websocket