11

src/components/index/SignUp/referInfo.vue

@@ -818,7 +818,7 @@ export default {
           { validator: validator.validateEmail, trigger: "blur" },
         ],
       },
-      EducationArrs: ["初中", "高中", "大学","硕士","博士"],
+      EducationArrs: ["初中", "高中", "大学", "硕士", "博士"],
       countryList: area.country, //国籍
       selectProvince: [], //省份
       CityName: {}, //根据省份筛选出所有城市的对象
@@ -978,6 +978,7 @@ export default {
         this.changeProvince(2, this.referForm.school_province, true);
         // console.log(this.referForm.school_city, 12322);
         this.changeCity(this.referForm.school_city, true);
+                // console.log(this.referForm.school_city, 12322);
       }
     },
   },
@@ -1140,6 +1141,13 @@ export default {
     // 返回当前城市下的学校列表
     getCurrentSchoolLists(val) {
       let currentSchool = [];
+      let baseSchool = this.$store.state.baseSchool;
+      if (baseSchool && baseSchool == 1) {
+        currentSchool.unshift({
+          id: 0,
+          name: "其他",
+        });
+      }
       // console.log(this.schoolName);
       if (
         this.schoolName == null ||
@@ -1157,6 +1165,7 @@ export default {
                 "schoolName" + code,
                 JSON.stringify(res.data.list)
               );
+
               for (let key in this.schoolName) {
                 if (this.schoolName[key].city_id == val) {
                   currentSchool.push(this.schoolName[key]);

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

src/router/index.js

@@ -145,6 +145,9 @@ function checkCam(code, cb) {
     if (res.data.is_qinghua==1) {
       store.state.human = 1;
     }
+    if (res.data.base_school==1) {
+      store.state.baseSchool = 1;
+    }
 
     cb && cb(true);
   }).catch(() => {

src/store/index.js

@@ -14,7 +14,8 @@ let state = {
   data: [],
   token: '',
   indexIdentity:"",
-  human:0,
+  human:0,//清华人文学院
+  baseSchool:0,//基地
   work_context:"",
   enclosure_url:"",