fix

src/pages/account/login/index.vue

@@ -4,77 +4,51 @@
       <div class="form">
         <h6 class="title">欢迎使用请登录</h6>
         <ul class="tab">
-          <li v-for="(item,index) in tabList"
+          <li v-for="(item, index) in tabList" :key="index" :class="{ active: form.distinguish == item.id }"
-              :key="index"
+            @click="typeClick(item)">{{ item.label }}</li>
-              :class="{active: form.distinguish == item.id}"
-              @click="typeClick(item)">{{item.label}}</li>
         </ul>
-        <el-form :model="form"
+        <el-form :model="form" :rules="rules" ref="form" style="margin-top: 20px">
-                 :rules="rules"
-                 ref="form"
-                 style="margin-top: 20px">
           <!-- 学号工号 -->
           <div v-show="!form.distinguish">
-            <el-form-item class="school-select"
+            <el-form-item class="school-select" prop="schoolId">
-                          prop="schoolId">
               <label class="label school"></label>
-              <el-select v-model="form.schoolId"
+              <el-select v-model="form.schoolId" clearable filterable placeholder="请选择学校">
-                         clearable
+                <el-option v-for="(item, i) in schoolList" :key="i" :label="item.schoolName"
-                         filterable
+                  :value="item.schoolId"></el-option>
-                         placeholder="请选择学校">
-                <el-option v-for="(item, i) in schoolList"
-                           :key="i"
-                           :label="item.schoolName"
-                           :value="item.schoolId"></el-option>
               </el-select>
             </el-form-item>
             <div class="items">
-              <el-form-item prop="type"
+              <el-form-item prop="type" style="width: 35%;margin-right: 15px">
-                            style="width: 35%;margin-right: 15px">
                 <label class="label workNumber"></label>
-                <el-select v-model="form.type"
+                <el-select v-model="form.type" placeholder="请选择类型" @change="typeChange">
-                           placeholder="请选择类型"
+                  <el-option label="学生学号" :value="1"></el-option>
-                           @change="typeChange">
+                  <el-option label="老师工号" :value="0"></el-option>
-                  <el-option label="学生学号"
-                             :value="1"></el-option>
-                  <el-option label="老师工号"
-                             :value="0"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item class="flex-1"
+              <el-form-item class="flex-1" prop="workNumber">
-                            prop="workNumber">
                 <label class="label account"></label>
-                <el-input v-model.trim="form.workNumber"
+                <el-input v-model.trim="form.workNumber" :placeholder="'请输入' + (form.type ? '学生学号' : '老师工号')"
-                          :placeholder="'请输入' + (form.type ? '学生学号' : '老师工号')"
+                  @keyup.enter.native="submit"></el-input>
-                          @keyup.enter.native="submit"></el-input>
               </el-form-item>
             </div>
           </div>
           <!-- 手机号登录 -->
-          <el-form-item v-show="form.distinguish === 1"
+          <el-form-item v-show="form.distinguish === 1" prop="account">
-                        prop="account">
             <label class="label account"></label>
-            <el-input v-model.trim="form.account"
+            <el-input v-model.trim="form.account" placeholder="请输入账号" @keyup.enter.native="submit"></el-input>
-                      placeholder="请输入账号"
-                      @keyup.enter.native="submit"></el-input>
           </el-form-item>
           <template v-if="form.distinguish === 2">
             <el-form-item prop="account">
               <label class="label account"></label>
-              <el-input v-model.trim="form.account"
+              <el-input v-model.trim="form.account" placeholder="请输入手机号/邮箱" @keyup.enter.native="submit"></el-input>
-                        placeholder="请输入手机号/邮箱"
-                        @keyup.enter.native="submit"></el-input>
             </el-form-item>
             <el-form-item prop="code">
               <label class="label code"></label>
               <div class="ver-code">
-                <el-input v-model="form.code"
+                <el-input v-model="form.code" placeholder="请输入验证码" maxlength="6"
-                          placeholder="请输入验证码"
+                  @keyup.enter.native="submit"></el-input>
-                          maxlength="6"
+                <el-button type="text" @click="sendPhoneCodeLogin" :disabled="phoneDisabledLogin">{{ phoneBtnTextLogin
-                          @keyup.enter.native="submit"></el-input>
+                  }}
-                <el-button type="text"
-                           @click="sendPhoneCodeLogin"
-                           :disabled="phoneDisabledLogin">{{ phoneBtnTextLogin }}
                 </el-button>
               </div>
             </el-form-item>
@@ -82,116 +56,73 @@
           <template v-if="form.distinguish !== 2">
             <el-form-item prop="password">
               <label class="password label"></label>
-              <el-input type="password"
+              <el-input type="password" placeholder="请输入密码" v-model.trim="form.password" @keyup.enter.native="submit">
-                        placeholder="请输入密码"
-                        v-model.trim="form.password"
-                        @keyup.enter.native="submit">
               </el-input>
             </el-form-item>
             <el-form-item prop="code">
               <label class="label code"></label>
-              <el-input placeholder="请输入验证码"
+              <el-input placeholder="请输入验证码" v-model.trim="form.code" @keyup.enter.native="submit">
-                        v-model.trim="form.code"
-                        @keyup.enter.native="submit">
               </el-input>
-              <img @click="getVerImg"
+              <img @click="getVerImg" :src="verificationIMG" class="ver-img" alt="">
-                   :src="verificationIMG"
-                   class="ver-img"
-                   alt="">
             </el-form-item>
           </template>
           <div class="bottom">
-            <el-link v-if="toMatch"
+            <el-link v-if="toMatch" :underline="false" type="primary" @click="toAccount">暂无账号？点击申请</el-link>
-                     :underline="false"
+            <el-checkbox v-show="!form.distinguish" v-model="setDefault">设置为默认学校</el-checkbox>
-                     type="primary"
-                     @click="toAccount">暂无账号？点击申请</el-link>
-            <el-checkbox v-show="!form.distinguish"
-                         v-model="setDefault">设置为默认学校</el-checkbox>
           </div>
-          <el-button class="submit"
+          <el-button class="submit" type="primary" @click="submit">登录</el-button>
-                     type="primary"
-                     @click="submit">登录</el-button>
         </el-form>
       </div>
     </div>
-    <el-dialog title="绑定手机号"
+    <el-dialog title="绑定手机号" :visible.sync="phoneVisible" :close-on-click-modal="false" width="30%">
-               :visible.sync="phoneVisible"
-               :close-on-click-modal="false"
-               width="30%">
       <div style='padding: 0 13px 20px 13px;'>
         依据国家政策法规，需绑定手机号进行网络实名才可登录使用本平台
       </div>
       <el-form label-width="60px">
         <el-form-item label="手机号">
-          <el-input style="width: 100%;"
+          <el-input style="width: 100%;" placeholder="请输入手机号" v-model="phone" maxlength="11"
-                    placeholder="请输入手机号"
+            @change="phoneChange"></el-input>
-                    v-model="phone"
-                    maxlength="11"
-                    @change="phoneChange"></el-input>
         </el-form-item>
         <el-form-item label="验证码">
           <div class="ver-code">
-            <el-input v-model="phoneCode"
+            <el-input v-model="phoneCode" placeholder="请输入验证码" maxlength="6"></el-input>
-                      placeholder="请输入验证码"
+            <el-button style="top: 1px" type="text" @click="sendPhoneCode(1)"
-                      maxlength="6"></el-input>
+              :disabled="binding === '' || phoneDisabled">{{
-            <el-button style="top: 1px"
+              phoneBtnText }}
-                       type="text"
-                       @click="sendPhoneCode(1)"
-                       :disabled="binding === '' || phoneDisabled">{{ phoneBtnText }}
             </el-button>
           </div>
         </el-form-item>
       </el-form>
-      <span slot="footer"
+      <span slot="footer" class="dialog-footer">
-            class="dialog-footer">
+        <el-button size="small" @click="phoneVisible = false">取 消</el-button>
-        <el-button size="small"
+        <el-button size="small" type="primary" @click="phoneSubmit">确 定</el-button>
-                   @click="phoneVisible = false">取 消</el-button>
-        <el-button size="small"
-                   type="primary"
-                   @click="phoneSubmit">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="请选择"
+    <el-dialog title="请选择" :visible.sync="selectVisible" :close-on-click-modal="false" custom-class="select-dia"
-               :visible.sync="selectVisible"
+      width="643px">
-               :close-on-click-modal="false"
-               custom-class="select-dia"
-               width="643px">
       <ul class="port">
-        <li :class="{active: selectedRole === 1}"
+        <li :class="{ active: selectedRole === 1 }" @click="selectRole(1)">
-            @click="selectRole(1)">
+          <img src="@/assets/img/login/male.png" alt="">
-          <img src="@/assets/img/login/male.png"
-               alt="">
           <p>学生端</p>
         </li>
-        <li :class="{active: selectedRole === 2}"
+        <li :class="{ active: selectedRole === 2 }" @click="selectRole(2)">
-            @click="selectRole(2)">
+          <img src="@/assets/img/login/female.png" alt="">
-          <img src="@/assets/img/login/female.png"
-               alt="">
           <p>教师管理端</p>
         </li>
       </ul>
     </el-dialog>
-    <el-dialog title="请选择您要登录的用户"
+    <el-dialog title="请选择您要登录的用户" :visible.sync="userVisible" :close-on-click-modal="false" custom-class="user-dia"
-               :visible.sync="userVisible"
+      width="500px">
-               :close-on-click-modal="false"
-               custom-class="user-dia"
-               width="500px">
       <p class="tips">该手机号已绑定以下用户信息</p>
       <ul class="users">
-        <li :class="{isEnable: !user.isEnable}"
+        <li :class="{ isEnable: !user.isEnable }" v-for="(user, i) in users" :key="i" @click="chooseUser(user)">
-            v-for="(user, i) in users"
+          <span>{{ user.schoolName }}，{{ user.userName }}，{{ user.workNumber }}{{ user.isEnable ? '' : '（已禁用）' }}</span>
-            :key="i"
-            @click="chooseUser(user)">
-          <span>{{ user.schoolName }}，{{ user.userName }}，{{ user.workNumber }}{{ user.isEnable ? '' : '（已禁用）'}}</span>
           <i class="el-icon-right"></i>
         </li>
       </ul>
     </el-dialog>
-    <el-dialog :visible.sync="infoVisible"
+    <el-dialog :visible.sync="infoVisible" :close-on-click-modal="false" custom-class="info-dia" :show-close="false"
-               :close-on-click-modal="false"
+      width="400px">
-               custom-class="info-dia"
-               :show-close="false"
-               width="400px">
       <div class="info-header">
         <i class="el-icon-warning"></i>
         提示
@@ -199,115 +130,64 @@
       <div class="info-wrap">
         <p class="tips">该手机号已与以下用户绑定</p>
         <ul class="users">
-          <li v-for="(user, i) in infos"
+          <li v-for="(user, i) in infos" :key="i">
-              :key="i">
             <span>{{ user.userName }}（{{ user.schoolName }}）</span>
           </li>
         </ul>
         <div class="info-footer">
-          <el-button size="small"
+          <el-button size="small" type="primary" @click="bindPhone">是本人，继续绑定</el-button>
-                     type="primary"
+          <el-button class="unbind" size="small" @click="unbindPhone">不是本人，解绑以上用户并绑定新用户</el-button>
-                     @click="bindPhone">是本人，继续绑定</el-button>
-          <el-button class="unbind"
-                     size="small"
-                     @click="unbindPhone">不是本人，解绑以上用户并绑定新用户</el-button>
         </div>
       </div>
     </el-dialog>
     <!-- 购买弹框 -->
-    <el-dialog title="温馨提示"
+    <el-dialog title="温馨提示" :visible.sync="buyVisible" width="400px" center :close-on-click-modal="false">
-               :visible.sync="buyVisible"
-               width="400px"
-               center
-               :close-on-click-modal="false">
       <div class="buy">
         <p class="tips">您所选择的院校暂未在本平台开通组织账号，请通知院校老师联系下方二维码客服咨询。</p>
-        <img src="@/assets/img/wechat-code.jpeg"
+        <img src="@/assets/img/wechat-code.jpeg" alt="">
-             alt="">
       </div>
     </el-dialog>
 
-    <el-dialog title="账号申请"
+    <el-dialog title="账号申请" :visible.sync="accountVisible" :close-on-click-modal="false" width="500px"
-               :visible.sync="accountVisible"
+      @close="accountClose">
-               :close-on-click-modal="false"
+      <el-form class="dia-form" ref="accountForm" label-width="110px" :model="accountForm" :rules="accountRules">
-               width="500px"
+        <el-form-item prop="schoolId" label="所属院校">
-               @close="accountClose">
+          <el-select class="w-100" v-model="accountForm.schoolId" filterable placeholder="请选择院校" @change="schoolChange">
-      <el-form class="dia-form"
+            <el-option v-for="(item, i) in schoolList" :key="i" :label="item.schoolName"
-               ref="accountForm"
+              :value="item.schoolId"></el-option>
-               label-width="110px"
-               :model="accountForm"
-               :rules="accountRules">
-        <el-form-item prop="schoolId"
-                      label="所属院校">
-          <el-select class="w-100"
-                     v-model="accountForm.schoolId"
-                     filterable
-                     placeholder="请选择院校"
-                     @change="schoolChange">
-            <el-option v-for="(item, i) in schoolList"
-                       :key="i"
-                       :label="item.schoolName"
-                       :value="item.schoolId"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="workNumber"
+        <el-form-item prop="workNumber" label="学号">
-                      label="学号">
+          <el-input placeholder="申请后无法修改，请确认填写正确" v-model="accountForm.workNumber"
-          <el-input placeholder="申请后无法修改，请确认填写正确"
+            @change="workNumberChange"></el-input>
-                    v-model="accountForm.workNumber"
-                    @change="workNumberChange"></el-input>
         </el-form-item>
-        <el-form-item prop="userName"
+        <el-form-item prop="userName" label="姓名">
-                      label="姓名">
+          <el-input placeholder="请输入姓名" v-model="accountForm.userName" :disabled="formEnable"></el-input>
-          <el-input placeholder="请输入姓名"
-                    v-model="accountForm.userName"
-                    :disabled="formEnable"></el-input>
         </el-form-item>
-        <el-form-item prop="phone"
+        <el-form-item prop="phone" label="手机号">
-                      label="手机号">
+          <el-input placeholder="请输入手机号" maxlength="11" v-model.trim="accountForm.phone"
-          <el-input placeholder="请输入手机号"
+            :disabled="formEnable"></el-input>
-                    maxlength="11"
-                    v-model.trim="accountForm.phone"
-                    :disabled="formEnable"></el-input>
         </el-form-item>
-        <el-form-item prop="code"
+        <el-form-item prop="code" label="验证码">
-                      label="验证码">
           <div class="ver-code">
-            <el-input v-model="accountForm.code"
+            <el-input v-model="accountForm.code" placeholder="请输入验证码" maxlength="6" :disabled="formEnable"></el-input>
-                      placeholder="请输入验证码"
+            <el-button style="top: 1px" type="text" @click="sendCode" :disabled="phoneDisabled && formEnable">{{
-                      maxlength="6"
+              phoneBtnText }}
-                      :disabled="formEnable"></el-input>
-            <el-button style="top: 1px"
-                       type="text"
-                       @click="sendCode"
-                       :disabled="phoneDisabled && formEnable">{{ phoneBtnText }}
             </el-button>
           </div>
         </el-form-item>
-        <el-form-item prop="password"
+        <el-form-item prop="password" label="登录密码">
-                      label="登录密码">
+          <el-input placeholder="请输入登录密码" type="password" maxlength="6" v-model="accountForm.password"
-          <el-input placeholder="请输入登录密码"
+            :disabled="formEnable"></el-input>
-                    type="password"
-                    maxlength="6"
-                    v-model="accountForm.password"
-                    :disabled="formEnable"></el-input>
         </el-form-item>
-        <el-form-item prop="rePassword"
+        <el-form-item prop="rePassword" label="确认登录密码">
-                      label="确认登录密码">
+          <el-input placeholder="请再次输入登录密码" type="password" maxlength="6" v-model="accountForm.rePassword"
-          <el-input placeholder="请再次输入登录密码"
+            :disabled="formEnable"></el-input>
-                    type="password"
-                    maxlength="6"
-                    v-model="accountForm.rePassword"
-                    :disabled="formEnable"></el-input>
         </el-form-item>
       </el-form>
-      <span slot="footer"
+      <span slot="footer" class="dialog-footer">
-            class="dialog-footer">
+        <el-button v-if="!formEnable" size="small" type="primary" @click="accountSubmit">申请</el-button>
-        <el-button v-if="!formEnable"
+        <el-button size="small" @click="accountVisible = false">取消</el-button>
-                   size="small"
-                   type="primary"
-                   @click="accountSubmit">申请</el-button>
-        <el-button size="small"
-                   @click="accountVisible = false">取消</el-button>
       </span>
     </el-dialog>
     <v-footer ref="footer"></v-footer>
@@ -441,6 +321,7 @@ export default {
     vFooter
   },
   mounted () {
+    localStorage.removeItem('opened')
     this.getVerImg()
     this.getSchool()
     // 页面离开的时候销毁手机和邮箱验证码定时器
@@ -874,278 +755,332 @@ export default {
 
 <style scoped lang="scss">
 .wrap {
-    min-height: 100%;
+  min-height: 100%;
-    background-color: #f3f6fa;
+  background-color: #f3f6fa;
 }
+
 .ver-code {
-    position: relative;
+  position: relative;
-    .el-button {
+
-        position: absolute;
+  .el-button {
-        top: 10px;
+    position: absolute;
-        right: 10px;
+    top: 10px;
-    }
+    right: 10px;
+  }
 }
+
 .login {
-    min-height: calc(100vh - 43px);
+  min-height: calc(100vh - 43px);
-    padding-top: calc((100vh - 584px) / 2);
+  padding-top: calc((100vh - 584px) / 2);
-    background: url(../../../assets/img/shapes/shape1.png) (0 123px) / auto no-repeat,
+  background: url(../../../assets/img/shapes/shape1.png) (0 123px) / auto no-repeat,
-        url(../../../assets/img/shapes/shape2.png) (35px 238px) / auto no-repeat,
+    url(../../../assets/img/shapes/shape2.png) (35px 238px) / auto no-repeat,
-        url(../../../assets/img/shapes/shape3.png) (0 485px) / auto no-repeat,
+    url(../../../assets/img/shapes/shape3.png) (0 485px) / auto no-repeat,
-        url(../../../assets/img/shapes/shape4.png) (right 50%) / auto no-repeat,
+    url(../../../assets/img/shapes/shape4.png) (right 50%) / auto no-repeat,
-        url(../../../assets/img/shapes/shape5.png) (right 80%) / auto no-repeat,
+    url(../../../assets/img/shapes/shape5.png) (right 80%) / auto no-repeat,
-        url(../../../assets/img/shapes/shape6.png) (right bottom) / auto no-repeat;
+    url(../../../assets/img/shapes/shape6.png) (right bottom) / auto no-repeat;
-    .tab {
+
-        display: flex;
+  .tab {
-        justify-content: space-between;
+    display: flex;
-        align-items: center;
+    justify-content: space-between;
-        margin-bottom: 24px;
+    align-items: center;
-        border-bottom: 2px solid #e1e6f2;
+    margin-bottom: 24px;
-        li {
+    border-bottom: 2px solid #e1e6f2;
-            padding: 18px 0;
+
-            margin-bottom: -1px;
+    li {
-            font-size: 16px;
+      padding: 18px 0;
-            color: #555;
+      margin-bottom: -1px;
-            cursor: pointer;
+      font-size: 16px;
-            border-bottom: 4px solid transparent;
+      color: #555;
-            &:last-child {
+      cursor: pointer;
-                margin-right: 0;
+      border-bottom: 4px solid transparent;
-            }
+
-            &.active {
+      &:last-child {
-                color: $main-color;
+        margin-right: 0;
-                border-bottom-color: $main-color;
+      }
-            }
+
-        }
+      &.active {
-    }
+        color: $main-color;
-    .items {
+        border-bottom-color: $main-color;
-        display: flex;
+      }
-        align-items: center;
-    }
-    .form {
-        width: 436px;
-        padding: 38px 38px 60px;
-        margin: 0 auto 0;
-        border-radius: 6px;
-        background-color: #fff;
-        .title {
-            margin-bottom: 25px;
-            font-size: 26px;
-            color: #0b1d30;
-            letter-spacing: 4px;
-        }
-    }
-    /deep/.el-form-item {
-        margin-bottom: 20px;
-    }
-    /deep/.el-input__inner {
-        position: relative;
-        height: 52px;
-        padding: 0 20px 0 34px;
-        line-height: 50px;
-        background-color: #fbfbfb;
-        border: 1px solid #e1e6f2;
-        border-radius: 4px !important;
-    }
-    .bottom {
-        display: flex;
-        justify-content: space-between;
-    }
-    .el-select {
-        width: 100%;
-    }
-    .label {
-        z-index: 1;
-        position: absolute;
-        top: 17px;
-        left: 11px;
-        width: 18px;
-        height: 18px;
-        background: url(../../../assets/img/login/account.png) 0 0/100% 100% no-repeat;
-    }
-    .school {
-        background-image: url(../../../assets/img/login/school.png);
-    }
-    .workNumber {
-        width: 17px;
-        background-image: url(../../../assets/img/login/workNumber.png);
-    }
-    .password {
-        top: 18px;
-        background-image: url(../../../assets/img/login/password.png);
-    }
-    .code {
-        top: 18px;
-        background-image: url(../../../assets/img/login/code.png);
-    }
-    .ver-img {
-        position: absolute;
-        top: 1px;
-        right: 1px;
-    }
-    /deep/.el-form-item__error {
-        top: 105%;
-        left: auto;
-        right: 0;
-        color: #ffa94e;
     }
-    .submit {
+  }
-        width: 100%;
+
-        height: 48px;
+  .items {
-        margin-top: 30px;
+    display: flex;
-        line-height: 48px;
+    align-items: center;
-        padding: 0;
+  }
-        font-size: 20px;
+
-        background-color: $main-color;
+  .form {
-        border-radius: 4px;
+    width: 436px;
-        border: 0;
+    padding: 38px 38px 60px;
+    margin: 0 auto 0;
+    border-radius: 6px;
+    background-color: #fff;
+
+    .title {
+      margin-bottom: 25px;
+      font-size: 26px;
+      color: #0b1d30;
+      letter-spacing: 4px;
     }
+  }
+
+  /deep/.el-form-item {
+    margin-bottom: 20px;
+  }
+
+  /deep/.el-input__inner {
+    position: relative;
+    height: 52px;
+    padding: 0 20px 0 34px;
+    line-height: 50px;
+    background-color: #fbfbfb;
+    border: 1px solid #e1e6f2;
+    border-radius: 4px !important;
+  }
+
+  .bottom {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .el-select {
+    width: 100%;
+  }
+
+  .label {
+    z-index: 1;
+    position: absolute;
+    top: 17px;
+    left: 11px;
+    width: 18px;
+    height: 18px;
+    background: url(../../../assets/img/login/account.png) 0 0/100% 100% no-repeat;
+  }
+
+  .school {
+    background-image: url(../../../assets/img/login/school.png);
+  }
+
+  .workNumber {
+    width: 17px;
+    background-image: url(../../../assets/img/login/workNumber.png);
+  }
+
+  .password {
+    top: 18px;
+    background-image: url(../../../assets/img/login/password.png);
+  }
+
+  .code {
+    top: 18px;
+    background-image: url(../../../assets/img/login/code.png);
+  }
+
+  .ver-img {
+    position: absolute;
+    top: 1px;
+    right: 1px;
+  }
+
+  /deep/.el-form-item__error {
+    top: 105%;
+    left: auto;
+    right: 0;
+    color: #ffa94e;
+  }
+
+  .submit {
+    width: 100%;
+    height: 48px;
+    margin-top: 30px;
+    line-height: 48px;
+    padding: 0;
+    font-size: 20px;
+    background-color: $main-color;
+    border-radius: 4px;
+    border: 0;
+  }
 }
+
 .copyright {
-    padding: 18px 0;
+  padding: 18px 0;
+  font-size: 12px;
+  text-align: center;
+  background-color: #f3f6fa;
+
+  a {
+    color: #b1b4b8;
     font-size: 12px;
-    text-align: center;
+
-    background-color: #f3f6fa;
+    &:hover {
-    a {
+      opacity: 0.8;
-        color: #b1b4b8;
-        font-size: 12px;
-        &:hover {
-            opacity: 0.8;
-        }
     }
+  }
 }
+
 .port {
-    display: flex;
+  display: flex;
-    justify-content: center;
+  justify-content: center;
-    padding: 60px 0;
+  padding: 60px 0;
-    li {
+
-        text-align: center;
+  li {
-        cursor: pointer;
+    text-align: center;
-        &:first-child {
+    cursor: pointer;
-            margin-right: 86px;
+
-        }
+    &:first-child {
-        &:hover img {
+      margin-right: 86px;
-            opacity: 0.9;
-        }
-        &.active p,
-        &:hover p {
-            background-color: #9278ff;
-        }
     }
-    img {
+
-        width: 122px;
+    &:hover img {
-        margin-bottom: 20px;
+      opacity: 0.9;
     }
-    p {
+
-        width: 88px;
+    &.active p,
-        margin: 0 auto;
+    &:hover p {
-        line-height: 21px;
+      background-color: #9278ff;
-        color: #fff;
-        background-color: #e8e3ff;
-        border-radius: 4px;
     }
+  }
+
+  img {
+    width: 122px;
+    margin-bottom: 20px;
+  }
+
+  p {
+    width: 88px;
+    margin: 0 auto;
+    line-height: 21px;
+    color: #fff;
+    background-color: #e8e3ff;
+    border-radius: 4px;
+  }
 }
+
 /deep/.select-dia {
-    margin-top: calc((100vh - 383px) / 2) !important;
+  margin-top: calc((100vh - 383px) / 2) !important;
 }
+
 /deep/.user-dia {
-    .tips {
+  .tips {
-        margin-bottom: 20px;
+    margin-bottom: 20px;
-        text-align: center;
+    text-align: center;
-        color: #666;
+    color: #666;
-    }
+  }
-    .users {
+
-        li {
+  .users {
-            display: flex;
+    li {
-            justify-content: space-between;
+      display: flex;
-            align-items: center;
+      justify-content: space-between;
-            padding: 0 15px;
+      align-items: center;
-            margin-bottom: 10px;
+      padding: 0 15px;
-            line-height: 40px;
+      margin-bottom: 10px;
-            font-size: 14px;
+      line-height: 40px;
-            background-color: #ebeef5;
+      font-size: 14px;
-            cursor: pointer;
+      background-color: #ebeef5;
-            &.isEnable {
+      cursor: pointer;
-                color: #c0c4cc;
+
-                background-color: #f5f7fa;
+      &.isEnable {
-                cursor: not-allowed;
+        color: #c0c4cc;
-            }
+        background-color: #f5f7fa;
-            &:last-child {
+        cursor: not-allowed;
-                margin-bottom: 0;
+      }
-            }
+
-            &:hover {
+      &:last-child {
-                background-color: #d3e0ff;
+        margin-bottom: 0;
-            }
+      }
-            i {
+
-                font-size: 16px;
+      &:hover {
-            }
+        background-color: #d3e0ff;
-        }
+      }
+
+      i {
+        font-size: 16px;
+      }
     }
+  }
 }
+
 /deep/.info-dia {
-    .el-dialog__header {
+  .el-dialog__header {
-        border-bottom: 0;
+    border-bottom: 0;
-    }
+  }
-    .info-header {
+
-        position: absolute;
+  .info-header {
-        top: 20px;
+    position: absolute;
-        display: flex;
+    top: 20px;
-        align-items: center;
+    display: flex;
-        font-size: 16px;
+    align-items: center;
-        color: #333;
+    font-size: 16px;
-    }
+    color: #333;
-    .el-icon-warning {
+  }
-        margin-right: 10px;
+
-        color: #e6a23c;
+  .el-icon-warning {
-        font-size: 24px;
+    margin-right: 10px;
-    }
+    color: #e6a23c;
-    .info-wrap {
+    font-size: 24px;
-        padding: 10px 33px;
+  }
-    }
+
-    .users {
+  .info-wrap {
-        max-height: 125px;
+    padding: 10px 33px;
-        margin-top: 20px;
+  }
-        overflow: auto;
+
-        li {
+  .users {
-            margin: 5px;
+    max-height: 125px;
-            font-size: 14px;
+    margin-top: 20px;
-            color: #333;
+    overflow: auto;
-        }
+
-    }
+    li {
-    .info-footer {
+      margin: 5px;
-        display: flex;
+      font-size: 14px;
-        justify-content: space-between;
+      color: #333;
-        margin-top: 20px;
-    }
-    .el-button {
-        width: 142px;
-    }
-    .unbind {
-        white-space: normal;
-        line-height: 1.6;
     }
+  }
+
+  .info-footer {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 20px;
+  }
+
+  .el-button {
+    width: 142px;
+  }
+
+  .unbind {
+    white-space: normal;
+    line-height: 1.6;
+  }
 }
+
 /deep/.dia-form {
-    .w-100 {
+  .w-100 {
-        width: 100%;
+    width: 100%;
-    }
+  }
-    .tips {
+
-        display: flex;
+  .tips {
-        justify-content: center;
+    display: flex;
-        align-items: center;
+    justify-content: center;
-    }
+    align-items: center;
+  }
 }
+
 .buy {
-    text-align: center;
+  text-align: center;
-    .tips {
+
-        margin-bottom: 10px;
+  .tips {
-        font-size: 14px;
+    margin-bottom: 10px;
-    }
+    font-size: 14px;
-    img {
+  }
-        width: 85%;
+
-    }
+  img {
+    width: 85%;
+  }
 }
+
 @media (max-height: 680px) {
-    .wrap .login {
+  .wrap .login {
-        padding: 40px 0;
+    padding: 40px 0;
-    }
+  }
 }
 </style>

src/pages/station/list/index.vue

@@ -21,7 +21,8 @@
               <div v-else class="cover" :style="{ backgroundImage: 'url(' + item.coverUrl + ')' }"></div>
               <div class="bottom">
                 <p class="text"><span>{{ item.goodsName || item.curriculumName }}</span></p>
-                <a>{{ item.isInEffect ? '进入实验' : '续费' }}</a>
+                <a v-if="!item.isInEffect">续费</a>
+                <a v-else-if="item.cid">进入实验</a>
               </div>
             </div>
           </template>
@@ -55,7 +56,7 @@ export default {
       isZj: location.host === '10.60.32.76', // 浙江万里
       isSq: Setting.isSq,
       keyword: this.$route.query.keyword || '',
-      active: +this.$route.query.active || '',
+      active: +this.$route.query.active || 0,
       searchTimer: null,
       tabs: [],
       products: [],
@@ -78,15 +79,15 @@ export default {
     async getTab () {
       const { data } = await this.$get(this.api.getSchoolCourseAuthority)
       this.tabs = [
+        {
+          classificationId: 0,
+          classificationName: '最近使用',
+        },
         {
           classificationId: '',
           classificationName: '全部',
         },
         ...data,
-        {
-          classificationId: 0,
-          classificationName: '最近使用',
-        },
       ]
       this.getList()
     },
@@ -99,7 +100,7 @@ export default {
           pageSize: 100,
           goodsName: this.keyword,
         })
-        this.curriculumList = page.records
+        this.products = page.records
       } else {
         const { data } = await this.$get(this.api.schoolCourse, {
           authority: this.active,

src/pages/station/product/index.vue

@@ -120,6 +120,7 @@
 
 <script>
 import breadcrumb from '@/components/breadcrumb'
+import Util from "@/libs/util";
 export default {
   components: { breadcrumb },
   data () {
@@ -290,6 +291,7 @@ export default {
           dangerouslyUseHTMLString: true,
         })
         await this.$post(`${this.api.requestRenewalNotice}?mallId=${this.id}`)
+        Util.successMsg('续费申请提交成功！')
       } catch (e) { }
     },
     // 热门产品