Merge branch 'feature/7月迭代' into dev

src/components/linktools/linktoolspage.vue

@@ -129,7 +129,7 @@
     <el-dialog title="游戏列表" :close-on-click-modal="false" :visible.sync="gameProps.gameListVisible">
       <game-list v-if="gameProps.gameListVisible" ref="gameList" :game-type="gameProps.gameType"></game-list>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="onSelectGame">确 定</el-button>
+        <el-button type="primary" @click="onSelectGame" :loading="btnLoading">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -149,23 +149,6 @@ import GameList from './game-list.vue';
 
 import { generateMiniProgramLink } from '@/service/api/gameApi.js';
 
-const getgameStatus = val => {
-  console.log(val);
-  let text = '已结束';
-  switch (val) {
-    case 1:
-      text = '进行中';
-      break;
-    case 0:
-      text = '未开始';
-      break;
-    default:
-      text = '已结束';
-      break;
-  }
-  return text;
-};
-
 export default {
   name: 'links',
   props: ['linkToolsVisible', 'showType', 'projectName', 'activeName'],
@@ -178,6 +161,7 @@ export default {
       threeLevelVisible: false, // 三级整个
       // 链接类型
       linksType: '',
+      btnLoading: false,
       linksTypeOptions: [
         // {
         //   id: '1',
@@ -400,25 +384,29 @@ export default {
     onSelectGame() {
       if (this.$refs.gameList && this.$refs.gameList.seletedItem) {
         const gameItem = this.$refs.gameList.seletedItem;
-
-        generateMiniProgramLink({ id: gameItem.gameId || gameItem.gameActivityId, linkId: this.gameProps.gameType }).then(res => {
-          this.gameProps.showGameInfo = true;
-          this.gameProps.gameListVisible = false;
-
-          this.gameInfo = {
-            title: gameItem.gameName,
-            id: gameItem.gameId || gameItem.gameActivityId,
-            gameStartTime: gameItem.gameStartTime,
-            gameEndTime: gameItem.gameEndTime,
-            gameStatus: 'gameStatusName' in gameItem ? gameItem.gameStatusName : getgameStatus(gameItem.activityStatus)
-          };
-
-          this.selectLinkObj.id = this.gameProps.gameType;
-          this.selectLinkObj.url = res.result.link;
-          this.selectLinkObj.name = gameItem.gameName;
-          console.log(this.selectLinkObj);
-          this.$emit('linkSelect', this.selectLinkObj);
-        });
+        this.btnLoading = true;
+        generateMiniProgramLink({ id: gameItem.gameId || gameItem.gameActivityId, linkId: this.gameProps.gameType })
+          .then(res => {
+            this.gameProps.showGameInfo = true;
+            this.gameProps.gameListVisible = false;
+
+            this.gameInfo = {
+              title: gameItem.gameName,
+              id: gameItem.gameId || gameItem.gameActivityId,
+              gameStartTime: gameItem.gameStartTime || gameItem.startDate,
+              gameEndTime: gameItem.gameEndTime || gameItem.endDate,
+              gameStatus: '进行中'
+            };
+
+            this.selectLinkObj.id = this.gameProps.gameType;
+            this.selectLinkObj.url = res.result.link;
+            this.selectLinkObj.name = gameItem.gameName;
+            console.log(this.selectLinkObj);
+            this.$emit('linkSelect', this.selectLinkObj);
+          })
+          .finally(() => {
+            this.btnLoading = false;
+          });
       } else {
         this.$message.warning('请添加游戏');
       }