Merge branch 'iteration-20240627-public' into 11/24SAAS

src/utils/auth.js

@@ -22,7 +22,7 @@ function getCookieDomain() {
 
 // 获取token关键字
 function getKeyWordKey() {
-  const origin = window.location.origin;
+  const origin = window.location.host;
   return origin.indexOf("online.") >= 0 || origin === "gym.lexiaoya.cn"
     ? "dy_admin_token"
     : "dy_admin_token_test";

src/views/teamBuild/components/teamBaseInfo.vue

@@ -73,7 +73,7 @@
         >
           <el-select
             v-model.trim="topFrom.school"
-            :disabled="!topFrom.section || basdisabled"
+            :disabled="!topFrom.section || basdisabled || cooperDisabled"
             @change="chioseSchool"
             filterable
             clearable
@@ -772,6 +772,7 @@ export default {
       isInit: false,
       technician: [],
       basdisabled: false,
+      cooperDisabled: false, // 合作单位状态
       // 整合报名中
       paymentExpireDate: "",
       applyExpireDate: null,
@@ -815,6 +816,7 @@ export default {
       this.onReset();
     }
 
+    console.log("12121212");
     this.init();
   },
   activated() {
@@ -849,6 +851,11 @@ export default {
     } else {
       this.basdisabled = false;
     }
+    if (this.team_status == "PROGRESS" || this.team_status == "PAUSE") {
+      this.cooperDisabled = true;
+    } else {
+      this.cooperDisabled = false;
+    }
   },
   deactivated() {},
   // async beforeDestroy() {
@@ -984,6 +991,13 @@ export default {
       } else {
         this.basdisabled = false;
       }
+
+      if (this.team_status == "PROGRESS" || this.team_status == "PAUSE") {
+        this.cooperDisabled = true;
+      } else {
+        this.cooperDisabled = false;
+      }
+
       if (this.$route.query.id) {
         // 单团修改
         this.teamid = this.$route.query.id;