From 434e52e808010a86f0e198ead79110d0dbed4156 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 20 Feb 2024 15:22:43 +0800
Subject: [PATCH] fix

---
 src/api/index.js                  |  2 +-
 src/pages/match/details/index.vue | 13 +++++++++----
 src/pages/screen/index.vue        |  8 ++++++--
 src/setting.js                    |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index a1e5f6d..40bd8fc 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -41,7 +41,7 @@ export default {
     saveLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/save',
     updateLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/update',
     maximumPracticeScoreList: 'occupationlab/occupationlab/achievement/maximumPracticeScoreList',
-    listOfGoods: `nakadai/mall/listOfGoods`,
+    websiteProductList: `nakadai/mall/websiteProductList`,
 
     // 课程笔记
     addNote: `nakadai/curriculumNotes/addNote`,
diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue
index 0d624b5..fbdaf91 100644
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@@ -302,7 +302,7 @@
                     <template v-if="status < 5">
                       <i v-if="item.edit"
                          class="el-icon-check icon"
-                         @click="submitAdvisor(item)"></i>
+                         @click="submitAdvisor(item, i)"></i>
                       <i v-else
                          class="el-icon-edit icon"
                          @click="editAdvisor(item)"></i>
@@ -793,6 +793,7 @@ export default {
         teamInstructors: []
       },
       originIns: {
+        id: '',
         position: '',
         name: '',
         phone: '',
@@ -1197,7 +1198,7 @@ export default {
       this.$set(row, 'edit', 1)
     },
     // 提交指导老师
-    submitAdvisor (row) {
+    submitAdvisor (row, i) {
       if (!row.name) return Util.errorMsg('请输入姓名')
       const { phone } = row
       if (phone && !/^1[3456789]\d{9}$/.test(phone)) return Util.errorMsg('请输入正确手机号格式')
@@ -1208,9 +1209,13 @@ export default {
         teamId: this.form.competitionRegistration ? this.form.competitionRegistration.teamId : '',
         phone: row.phone,
         position: row.position,
-      }).then(res => {
+      }).then(({ id }) => {
         Util.successMsg((row.id ? '修改' : '新增') + '成功')
-        this.getInfo()
+        if (!row.id) {
+          this.info.teamInstructors[i].id = id
+        }
+        this.info.teamInstructors[i].edit = 0
+        // this.getInfo()
       }).catch(res => { })
     },
     // 显示转让队长
diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue
index 7e44446..8984306 100644
--- a/src/pages/screen/index.vue
+++ b/src/pages/screen/index.vue
@@ -397,8 +397,12 @@ export default {
   data () {
     return {
       token: Util.local.get(Setting.tokenKey),
-      time: 0,
+      time: 2,
       times: [
+        {
+          id: 2,
+          name: '年'
+        },
         {
           id: 0,
           name: '月'
@@ -766,7 +770,7 @@ export default {
         },
       ]
       // 登录前登录后调的课程接口不一样
-      const cousrseRes = await this.$post(this.api.listOfGoods, {
+      const cousrseRes = await this.$post(this.api.websiteProductList, {
         pageNum: 1,
         pageSize: 1000,
         sort: 0,
diff --git a/src/setting.js b/src/setting.js
index 5b0b626..78844f6 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -34,7 +34,7 @@ if (isPro) {
     sandPath = `http://${location.hostname}:9520`
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 测试服
-    host = 'https://www.occupationlab.com/' // 正式服
+    // host = 'https://www.occupationlab.com/' // 正式服
     host = "http://192.168.31.217:9000/";
 } else if (isSq) {
 	zcPath = `10.20.100.204:8883`