update: dist

src/assets/style/components/index.scss

@@ -249,12 +249,12 @@
 .el-tooltip__popper {
   max-width: 400px !important;
 }
-.member-group-dialog-wrap {
+.dialog-wrap {
   display: flex;
   align-items: center;
   justify-content: center;
 }
-.member-group-dialog {
+.custom-class-dialog {
   margin: 0 !important;
   padding: 0 4px 4px;
   max-height: 700px;

src/components/dm-new-member-group/index.vue

@@ -17,7 +17,7 @@
         <span class="groupName"> {{ item.groupName }}</span>
       </div>
     </div>
-    <el-dialog title="选择客户分组" :visible.sync="visiable" width="1000px" :before-close="close" custom-class="member-group-dialog" class="member-group-dialog-wrap">
+    <el-dialog title="选择客户分组" :visible.sync="visiable" width="1000px" :before-close="close" custom-class="custom-class-dialog" class="dialog-wrap">
       <div class="member-group">
         <div class="left">
           <el-tabs v-model="activeName">

src/components/linktools-fulls/game-list.vue

@@ -21,19 +21,25 @@
               {{scope.row.activityStatus === 0 ? '未开始' : '已结束'}}
             </div>
           </template>
+             <template v-else-if="'status' in scope.row">
+            <div v-if="scope.row.status === 1"><span class="dm-status--primary--flash"></span>进行中</div>
+            <div v-else :class="scope.row.status === 0 ? 'dm-status--warning' : 'dm-status--info'">
+              {{ scope.row.status === 0 ? '未开始' : '已结束' }}
+            </div>
+          </template>
         </template>
       </el-table-column>
       <el-table-column label="开始时间">
-        <div slot-scope="scope" style="line-height: normal">
-          <p>{{ formatDateTimeByType(scope.row.gameStartTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
-          <p>{{ formatDateTimeByType(scope.row.gameStartTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
-        </div>
+        <template slot-scope="{ row }">
+          <p>{{ formatDateTimeByType(row.gameStartTime || row.startDate, 'yyyy-MM-dd') }}</p>
+          <p>{{ formatDateTimeByType(row.gameStartTime || row.startDate, 'HH:mm:ss') }}</p>
+        </template>
       </el-table-column>
       <el-table-column label="结束时间">
-        <div slot-scope="scope" style="line-height: normal">
-          <p>{{ formatDateTimeByType(scope.row.gameEndTime, 'yyyy-MM-dd-HH-mm-ss', true).y }}</p>
-          <p>{{ formatDateTimeByType(scope.row.gameEndTime, 'yyyy-MM-dd-HH-mm-ss', true).h }}</p>
-        </div>
+        <template slot-scope="{ row }">
+          <p>{{ formatDateTimeByType(row.gameEndTime || row.endDate, 'yyyy-MM-dd') }}</p>
+          <p>{{ formatDateTimeByType(row.gameEndTime || row.endDate, 'HH:mm:ss') }}</p>
+        </template>
       </el-table-column>
     </el-table>
     <el-pagination
@@ -102,17 +108,20 @@
       getList(gameType) {
         const setResponse = (res, type) => {
           //type 0 大转盘/刮刮卡 ----- 1 其他游戏
-          const { errorCode, message, result } = res.data || {}
-          if (errorCode != 0) {
+          const { errorCode, message, result , code} = res.data || {}
+          if (errorCode != 0&& code != 0) {
             return this.$message.error(message)
           } else {
             if (type === 0) {
               this.list = result.page.result || [];
               this.total = result.page.totalCount || 0;
-            } else {
-              this.list = (result.result || []).map(item => ({...item, gameId: item.gameActivityId}));
-              this.total = result.totalCount || 0;
-            }
+            }else if (type === 1) {
+            this.list = (result.result || []).map(item => ({ ...item, gameId: item.gameActivityId }));
+            this.total = result.totalCount || 0;
+          } else if (type === 2) {
+            this.list = result.list || [];
+            this.total = result.total || 0;
+          }
           }
         }
         switch(gameType) {
@@ -141,6 +150,17 @@
               setResponse(res, 1);
             })
             break;
+           case 'GAME_LINK_XYMH':
+           const para = {
+            gameName: this.query.searchParam,
+            pageNum: this.query.currentPage,
+            pageSize: 6,
+            status: 1
+          };
+          this.axios.post(`/api-marketing/game-pro/page?requestProject=marketing`, para).then(res => { 
+            setResponse(res, 2);
+          });
+           break;
         }
       }
     },

src/components/linktools-fulls/index.vue

@@ -1875,12 +1875,25 @@ export default {
               const selectedGame = this.$refs.gameList.seletedItem
               this.selectLinkObj.gameId =  selectedGame.gameId;
               this.selectLinkObj.name =  selectedGame.gameName;
-              let url = selectedGame.gameUrl
-              // const reg = /(?<=(redirect_uri=)).+(?=(&response_type=))/
+    
+           if(this.selectLinkObj.threeLevelValue=="GAME_LINK_XYMH"){
+                this.axios.get(`/api-marketing/game-pro/get-qr-game?requestProject=gic-web&id=${selectedGame.gameId}`).then(res=>{
+                  if(res.data.code==0){  
+                    const {result} = res.data;
+                    this.selectLinkObj.url = result.link
+                    this.transData()
+                  }else{
+                    this.$message.error(res.data.message)
+                  }
+                })      
+              }else if( selectedGame.gameUrl){
+               let url = selectedGame.gameUrl
               const index1 = url.indexOf('redirect_uri=')
               const index2 = url.indexOf('&response_type=')
               this.selectLinkObj.url = decodeURIComponent(url.slice(index1 + ('redirect_uri=').length, index2))
-              this.transData()
+                this.transData()
+              }
+            
             } else if(this.gameProps.gameId) {
               this.selectLinkObj.gameId =  this.linkData.gameId;
               this.selectLinkObj.name =  this.linkData.name;

src/components/game-list.vue → src/components/linktools/game-list.vue

@@ -107,6 +107,8 @@ export default {
           }
         }
       };
+      console.log(this.gameType);
+      console.log(this.gameId);
       switch (gameType) {
         case 'GAME_LINK_DZP':
           this.axios.post(`/api-marketing/page-lottery-game`, qs.stringify({ ...this.query, gameType: 1 })).then(res => {
@@ -133,6 +135,16 @@ export default {
             setResponse(res, 1);
           });
           break;
+        case 'GAME_LINK_XYMH':
+          const para = { ...this.query };
+          para.status = 1;
+          console.log(para);
+          // delete para.gameStatus
+          this.axios.post(`/api-marketing/game-pro/page`, qs.stringify(para)).then(res => {
+            console.log(res);
+            setResponse(res, 1);
+          });
+          break;
       }
     }
   },
@@ -141,6 +153,7 @@ export default {
       handler() {
         this.query.currentPage = 1;
         this.query.searchParam = '';
+        console.log(this.query);
         this.getList(this.gameType);
       },
       immediate: true

src/components/linktools/linktoolspage.vue

@@ -145,7 +145,7 @@ import qs from 'qs';
 
 import { formatDateTimeByType } from '@/utils/index.js';
 
-import GameList from '../game-list.vue';
+import GameList from './game-list.vue';
 
 import { generateMiniProgramLink } from '@/service/api/gameApi.js';
 

src/views/ai/ai-data-detail.vue

@@ -87,7 +87,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog title="通话记录" :visible.sync="recordVisible" width="600px" class="member-group-dialog-wrap">
+    <el-dialog title="通话记录" :visible.sync="recordVisible" width="600px" class="dialog-wrap">
       <div v-html="aiTelRecordText" class="recordContent"></div>
     </el-dialog>
     <vue-gic-export-excel :dialogVisible.sync="dialogVisible" :dataArr="tableData" :type="2" :excelUrl="excelUrl" :params="params" :projectName="projectName"></vue-gic-export-excel>

src/views/ecm/marketing-event/components/game-list.vue

@@ -21,18 +21,24 @@
               {{ scope.row.activityStatus === 0 ? '未开始' : '已结束' }}
             </div>
           </template>
+          <template v-else-if="'status' in scope.row">
+            <div v-if="scope.row.status === 1"><span class="dm-status--primary--flash"></span>进行中</div>
+            <div v-else :class="scope.row.status === 0 ? 'dm-status--warning' : 'dm-status--info'">
+              {{ scope.row.status === 0 ? '未开始' : '已结束' }}
+            </div>
+          </template>
         </template>
       </el-table-column>
       <el-table-column label="开始时间">
-        <template slot-scope="scope">
-          <p>{{ formatDateTimeByType(scope.row.gameStartTime, 'yyyy-MM-dd') }}</p>
-          <p>{{ formatDateTimeByType(scope.row.gameStartTime, 'HH:mm:ss') }}</p>
+        <template slot-scope="{ row }">
+          <p>{{ formatDateTimeByType(row.gameStartTime || row.startDate, 'yyyy-MM-dd') }}</p>
+          <p>{{ formatDateTimeByType(row.gameStartTime || row.startDate, 'HH:mm:ss') }}</p>
         </template>
       </el-table-column>
       <el-table-column label="结束时间">
-        <template slot-scope="scope">
-          <p>{{ formatDateTimeByType(scope.row.gameEndTime, 'yyyy-MM-dd') }}</p>
-          <p>{{ formatDateTimeByType(scope.row.gameEndTime, 'HH:mm:ss') }}</p>
+        <template slot-scope="{ row }">
+          <p>{{ formatDateTimeByType(row.gameEndTime || row.endDate, 'yyyy-MM-dd') }}</p>
+          <p>{{ formatDateTimeByType(row.gameEndTime || row.endDate, 'HH:mm:ss') }}</p>
         </template>
       </el-table-column>
     </el-table>
@@ -94,16 +100,19 @@ export default {
     getList(gameType) {
       const setResponse = (res, type) => {
         //type 0 大转盘/刮刮卡 ----- 1 其他游戏
-        const { errorCode, message, result } = res.data || {};
-        if (errorCode != 0) {
+        const { errorCode, message, result, code } = res.data || {};
+        if (errorCode != 0 && code != 0) {
           return this.$message.error(message);
         } else {
           if (type === 0) {
             this.list = result.page.result || [];
             this.total = result.page.totalCount || 0;
-          } else {
+          } else if (type === 1) {
             this.list = (result.result || []).map(item => ({ ...item, gameId: item.gameActivityId }));
             this.total = result.totalCount || 0;
+          } else if (type === 2) {
+            this.list = result.list || [];
+            this.total = result.total || 0;
           }
         }
       };
@@ -130,7 +139,19 @@ export default {
           break;
         case 'GAME_LINK_KLFL':
           this.axios.post(`/api-marketing/page-klfl-game`, qs.stringify({ ...this.query })).then(res => {
-            setResponse(res, 1);
+            setResponse(res, 2);
+          });
+          break;
+        case 'GAME_LINK_XYMH':
+          const para = {
+            gameName: this.query.searchParam,
+            pageNum: this.query.currentPage,
+            pageSize: 6,
+            status: 1
+          };
+          this.axios.post(`/api-marketing/game-pro/page?requestProject=marketing`, para).then(res => {
+            console.log(res);
+            setResponse(res, 2);
           });
           break;
       }

src/views/ecm/marketing-event/components/lib-wxa.vue

@@ -302,6 +302,7 @@ export default {
       }
     },
     changeThreeValue(val) {
+      console.log(val);
       if (val.startsWith('GAME_LINK')) {
         this.selectedGame = null;
         this.wechatContent.type = val;