Merge branch 'depaul-plus' of…

components/home/schoolIntroduce.vue

@@ -5,7 +5,8 @@
         <div style="overflow: hidden;">
           <img src="https://webapp-pub.ezijing.com/project/depaul-plus/school_desc_2.png" class="desc-img" />
           <p>
-            北京理工大学(Beijinglnstitute of Technology) 是中华人民共和国工业和信息化部直属的一所以理工科为主千，工、理、管、文协调发展的全国重点大学，是国家”985 工程”211
+            北京理工大学(Beijing Institute of Technology)
+            是中华人民共和国工业和信息化部直属的一所以理工科为主千，工、理、管、文协调发展的全国重点大学，是国家”985 工程”211
             工程”首批重点建设高校，隶属于中华人民共和国工业和信息化部。入选高等学校学科创新引智计划、高等学校创新能力提升计划、卓越工程师教育培养计划、国家建设高水平大学公派研究生项目、国家大学生创新性实验计划、国家级大学生创新创业训练计划、新工科研究与实践项目、中国政府奖学金来华留学生接收院校、高等学校科技成果转化和技术转移基地，是工业和信息化部高校联盟、全国高等军工院校课程思政联盟、中国人工智能教育联席会、卓越联盟高校、延河高校人才培养联盟成员。
           </p>
         </div>

modules/my/account/home.vue

@@ -29,7 +29,7 @@
           <div class="welcome-content">
             <h1>欢迎您报考北理工-德保罗大学金融学硕士保研项目</h1>
             <h2>请选择您的入学日期</h2>
-            <div class="welcome-button" @click="handleStart('2023年秋季保研班')">2023年秋季保研班</div>
+            <!-- <div class="welcome-button" @click="handleStart('2023年秋季保研班')">2023年秋季保研班</div> -->
             <div class="welcome-button" @click="handleStart('2024年春季保研班')">2024年春季保研班</div>
             <!-- <div class="welcome-button" @click="handleStart">马上开始</div> -->
           </div>

modules/my/application/complete.vue

@@ -10,11 +10,7 @@
   >
     <div>
       <ul v-if="detail">
-        <li
-          v-for="(item, index) in currentOptions"
-          :class="progress(item.code) ? 'is-success' : 'is-error'"
-          :key="index"
-        >
+        <li v-for="(item, index) in currentOptions" :class="progress(item.code) ? 'is-success' : 'is-error'" :key="index">
           <span class="name">{{ item.title }}</span>
           <span class="line"></span>
           <span class="status">{{ progress(item.code) ? '已完成' : '未完成' }}</span>
@@ -94,12 +90,12 @@ export default {
               'REGISTRATION.attachments.missed_required_list.PROOF_READING'
             ],
             view: { to: { path: '/my/review', query: { active: 'admission_byzs' } } }
-          },
-          {
-            title: '申请表格',
-            code: 'INTERVIEW_APPLICATION.attachments.missed_required_list.APPLICATION_FORM',
-            view: { to: { path: '/my/review', query: { active: 'admission_form' } } }
           }
+          // {
+          //   title: '申请表格',
+          //   code: 'INTERVIEW_APPLICATION.attachments.missed_required_list.APPLICATION_FORM',
+          //   view: { to: { path: '/my/review', query: { active: 'admission_form' } } }
+          // }
         ],
         [
           {

modules/my/interview/form/index.js

@@ -3,16 +3,21 @@ import yynl from './yynl'
 // import xwzs from './xwzs'
 import ywjl from './ywjl'
 // import zp from './zp'
-import ywcjd from './ywcjd'
-import tjx from './tjx'
-import grcs from './grcs'
-import byzs from './byzs'
-import form from './form'
+// import ywcjd from './ywcjd'
+// import tjx from './tjx'
+// import grcs from './grcs'
+// import byzs from './byzs'
+// import form from './form'
 
 export default function(_this) {
   return {
     id: 'interview',
     title: '申请面试',
-    children: [ywjl(_this), cjd(_this), yynl(_this), ywcjd(_this), tjx(_this), grcs(_this), byzs(_this), form(_this)]
+    children: [
+      ywjl(_this),
+      cjd(_this),
+      yynl(_this)
+      //  ywcjd(_this), tjx(_this), grcs(_this), byzs(_this), form(_this)
+    ]
   }
 }

modules/my/review/form/byzs.js

@@ -39,19 +39,19 @@ export default function(_this) {
           return result
         }, {})
         return { basic_info: basicInfo }
+      },
+      callback() {
+        _this.changeSubmissionStage(() => {
+          this.form.options.disabled = true
+          // _this.$router.push('/my/admission')
+        })
       }
-      // callback() {
-      //   _this.changeSubmissionStage(() => {
-      //     this.form.options.disabled = true
-      //     // _this.$router.push('/my/admission')
-      //   })
-      // }
     },
     form: {
       prev: { to: { query: { active: 'admission_grcs' } }, isSubmit: true },
-      next: { to: { query: { active: 'admission_form' } }, isSubmit: true },
+      // next: { to: { query: { active: 'admission_form' } }, isSubmit: true },
       submitText: '提交申请',
-      hasButton: false,
+      hasButton: true,
       options: { 'label-position': 'top' },
       items: [
         {

modules/my/review/form/index.js

@@ -6,7 +6,7 @@ import byzs from './byzs'
 import tjx from './tjx'
 import grcs from './grcs'
 // import yynl from './yynl'
-import form from './form'
+// import form from './form'
 
 export default function(_this) {
   return {
@@ -17,8 +17,8 @@ export default function(_this) {
       cjd(_this),
       tjx(_this),
       grcs(_this),
-      byzs(_this),
-      form(_this)
+      byzs(_this)
+      // form(_this)
     ]
   }
 }

modules/my/review/index.vue

@@ -32,7 +32,7 @@
       </div>
       <template #footer>
         <!-- <el-button type="primary" @click="toPay">立即缴费</el-button> -->
-        <el-button type="primary" @click="dialogVisible = false">忽略</el-button>
+        <el-button type="primary" @click="dialogVisible = false">确定</el-button>
       </template>
     </el-dialog>
     <app-complete :type="2" v-model="completeVisible"></app-complete>
@@ -108,6 +108,7 @@ export default {
       api
         .changeSubmissionStage({ submission_stage: 'REGISTRATION' })
         .then(() => {
+          this.dialogVisible = true
           this.getApplication()
           callback && callback()
         })

package.json

@@ -17,9 +17,8 @@
     "driver.js": "^0.9.8",
     "element-ui": "^2.15.1",
     "file-saver": "^2.0.5",
-    "js-file-download": "^0.4.12",
     "lodash": "^4.17.21",
-    "nuxt": "^2.15.3",
+    "nuxt": "^2.17.3",
     "pinyin-pro": "^3.11.0",
     "qrcode.vue": "^1.7.0",
     "qs": "^6.10.1",
@@ -30,7 +29,7 @@
     "vue-i18n": "^8.24.4"
   },
   "devDependencies": {
-    "sass": "^1.32.11",
-    "sass-loader": "^10.1.1"
+    "sass": "^1.71.0",
+    "sass-loader": "^10.5.2"
   }
 }

plugins/element-ui.js

 import Vue from 'vue'
 import Element from 'element-ui'
-import locale from 'element-ui/lib/locale/lang/en'
 import VueForm from '@ezijing/vue-form'
 
-Vue.use(Element, { locale })
+Vue.use(Element)
 Vue.use(VueForm)