fix

src/pages/account/login/index.vue

@@ -13,7 +13,7 @@
           <div v-show="!form.distinguish && !verCodeLogin" class="items">
             <el-form-item class="flex-1" prop="workNumber">
               <label class="label account"></label>
-              <el-input v-model.trim="form.workNumber" placeholder="请输入账号/手机号" @keyup.enter.native="submit"></el-input>
+              <el-input v-model.trim="form.workNumber" placeholder="请输入学号/工号" @keyup.enter.native="submit"></el-input>
             </el-form-item>
           </div>
           <!-- 手机号邮箱登录 -->
@@ -246,6 +246,7 @@ export default {
       selectVisible: false,
       selectedRole: '',
       token: '',
+      curUser: {},
       userVisible: false,
       users: [],
       accountIds: [],
@@ -358,9 +359,16 @@ export default {
     },
     // 选择用户回调
     chooseUser (user) {
-      user.isEnable && this.$post(`${this.api.getToken}?id=${user.id}&platform=${Setting.platformId}`).then(({ data }) => {
+      this.curUser = user
+      user.isEnable && this.$post(`${this.api.getToken}?id=${user.id}&platform=${Setting.platformId}`).then(({ status, data }) => {
+        if (status === 30001) { // 未实名
+          this.phoneVisible = true
+          this.getVerImg()
+          form.code = ''
+        } else if (data) {
           this.token = data.token
           user.typeName === '学生端' ? this.setLogin() : this.toMang()
+        }
       }).catch(res => { })
     },
     // 处理登录成功
@@ -604,7 +612,7 @@ export default {
     phoneChange () {
       this.$post(`${this.api.getOtherAccountByPhone}?phone=${this.phone}&platform=${Setting.platformId}`).then(({ userAccounts }) => {
         const list = userAccounts
-        if (list) {
+        if (list && list.length) {
           list.map(e => {
             const { userName } = e
             if (userName.length > 1) e.userName = userName[0] + '*' + userName.substring(2)
@@ -692,7 +700,8 @@ export default {
           opener: this.phoneOpener,
           platform: Setting.platformId,
           account: workNumber,
-          schoolId
+          schoolId,
+          accountId: this.curUser.id || '',
         }).then(({ token }) => {
           this.token = token
           this.setLogin()
@@ -765,7 +774,7 @@ export default {
 
   .form {
     width: 436px;
-    padding: 57px 38px 60px;
+    padding: 38px 38px 60px;
     margin: 0 auto 0;
     border-radius: 6px;
     background-color: #fff;

src/pages/match/details/index.vue

@@ -374,57 +374,24 @@
         <el-button size="small" @click="peopleSignupVisible = false">取消</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="报名" :visible.sync="enterVisible" :close-on-click-modal="false" width="850px"
+    <el-dialog title="报名" :visible.sync="enterVisible" :close-on-click-modal="false" width="300px" @close="enterClose">
-      custom-class="enter-dia" @close="enterClose">
+      <el-form class="dia-form">
-      <div class="flex">
+        <p style="margin-bottom: 5px">请选择要加入的团队</p>
-        <el-form class="dia-form" label-width="90px">
+        <el-form-item>
-          <el-form-item label="姓名">
-            <el-input disabled v-model="userName"></el-input>
-          </el-form-item>
-          <el-form-item label="来自学校">
-            <el-select v-model="enterForm.studentAffiliatedInstitutionId" filterable style="width: 100%">
-              <el-option v-for="(item, i) in schools" :key="i" :label="item.schoolName"
-                :value="item.schoolId"></el-option>
-            </el-select>
-          </el-form-item>
-          <p class="m-t-20 m-b-5">请选择要加入的团队</p>
-          <el-form-item label="团队">
           <el-select class="w-100" v-model="enterForm.teamId" filterable>
             <el-option v-for="(item, i) in teams" :key="i" :label="item.teamName" :value="item.teamId"></el-option>
           </el-select>
         </el-form-item>
-          <el-form-item label="团队邀请码">
+        <el-form-item>
           <el-input placeholder="请输入团队邀请码" maxlength="6" v-model="enterForm.invitationCode"></el-input>
         </el-form-item>
-          <el-form-item label="大赛邀请码" v-if="form.completeCompetitionSetup.isNeedCode">
+        <el-form-item v-if="form.completeCompetitionSetup.isNeedCode">
           <el-input placeholder="请输入大赛邀请码" maxlength="6" v-model="enterForm.registrationInvitationCode"></el-input>
         </el-form-item>
         <p class="tips">
           查找不到团队？点击 <el-link :underline="false" type="primary" @click="toTeam">创建团队</el-link>
         </p>
       </el-form>
-        <div class="agree">
-          <div class="agreement">
-            <h6>指导老师承诺书</h6>
-            <div class="text">
-              <p class="line">本人自愿参加2024年安徽省大学生金融投资创新大赛工作，为进一步提高廉洁自律意识，客观公正的履行职责，我以参赛团队领队/指导教师的身份和荣誉郑重作出如下承诺：</p>
-              <p class="line">1.尊重大赛组委会及秘书处，尊重专家和仲裁，尊重其他参赛单位和选手，认真指导学生参加安徽省大学生金融投资创新大赛，客观、公正地履行职责。</p>
-              <p class="line">
-                2.遵守道德，遵守大赛纪律，在确定大赛指导教师身份后至大赛结束前，不私下接触其他参赛单位和团队成员、专家、裁判员、仲裁员，不参与以大赛名义举办的收费培训。不收受他人的财物或其他好处。
-              </p>
-              <p class="line">3.遵守公正、公平原则，不干预裁判员、仲裁员等工作，影响比赛成绩。</p>
-              <p class="line">4.不为所带队学生的违纪行为说情、解脱。</p>
-              <p class="line">5.不发表、不传播没有根据并对大赛产生不利影响的言论。</p>
-              <p class="line">6.不隐瞒按规定应该回避的事项。</p>
-              <p class="line">7.对于涉嫌泄密事宜，愿接受、协助、配合相关部门的监督检查，并履行举证义务。</p>
-              <p class="line">8.如若发生上述问题，自愿承担相关责任。</p>
-              <p class="line">特此承诺！</p>
-              <p class="line">勾选后才可登录和注册！</p>
-            </div>
-          </div>
-          <el-checkbox class="m-t-15 m-l-20" v-model="agreeCheck">同意，我已阅读</el-checkbox>
-        </div>
-      </div>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" type="primary" @click="enterSubmit">报名</el-button>
         <el-button size="small" @click="enterVisible = false">取消</el-button>
@@ -623,8 +590,6 @@ export default {
         registrationInvitationCode: '',
         whetherSignUp: 1
       },
-      schools: [],
-      agreeCheck: false,
 
       teamVisible: false,
       teams: [],
@@ -696,7 +661,7 @@ export default {
   },
   computed: {
     ...mapState("user", [
-      "userId", 'account', 'logView', 'userName'
+      "userId", 'account', 'logView'
     ]),
   },
   components: {
@@ -1309,7 +1274,6 @@ export default {
     },
     // 团队报名提交
     enterSubmit () {
-      if (!this.agreeCheck) return Util.errorMsg('请勾选同意，才可继续报名！')
       const form = this.enterForm
       if (!form.teamId) return Util.errorMsg('请选择团队')
       if (!form.invitationCode) return Util.errorMsg('请输入团队邀请码')
@@ -2202,32 +2166,4 @@ export default {
     }
   }
 }
-
-/deep/.enter-dia {
-  .agree {
-    width: 500px;
-    margin-left: 20px;
-  }
-
-  .agreement {
-    max-height: 300px;
-    padding: 10px 20px;
-    box-shadow: 0 0 7px rgba(235, 235, 235, .8);
-    overflow: auto;
-
-    h6 {
-      font-size: 20px;
-      font-weight: 600;
-      text-align: center;
-    }
-
-    .text {
-      line-height: 1.6;
-    }
-
-    .line {
-      margin-top: 7px;
-    }
-  }
-}
 </style>

src/setting.js

@@ -30,7 +30,7 @@ if (isDev) {
   host = "http://121.37.12.51/"; // 测试服
   // host = 'https://www.occupationlab.com/' // 正式服
   const ip = localStorage.getItem('localIp')
-  const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'http://121.37.12.51/']
+  const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'https://izhixinyun.com/']
   host = ips[+ip]
   // host = 'http://192.168.31.51:9000/'
 } else if (isSq) {