Merge branch 'feature/3月迭代' of http://git.gicdev.com/marketing-web/marketing into feature/3月迭代

src/views/ai/manage.vue

@@ -42,9 +42,9 @@
             <template v-else>
               <div v-for="item in el.decisionItemRecordDTOList" :key="item.id" class="sound-record">
                 <div class="temp-detail-desc">{{ item.knowledge || '--' }}</div>
-                <template v-if="item.realKnowledgeOssUrl">
+                <template v-if="item.realKnowledgeOssUrl || item.ttsKnowledgeOssUrl">
                   <el-button type="text" @click="onPlay(item, `player-${el.decisionId}-${item.id}`)" :loading="item.playing">{{ item.playing ? '播放中...' : '播放' }}</el-button>
-                  <audio :id="`player-${el.decisionId}-${item.id}`" :src="item.ttsKnowledgeOssUrl"></audio>
+                  <audio :id="`player-${el.decisionId}-${item.id}`" :src="item.realKnowledgeOssUrl || item.ttsKnowledgeOssUrl"></audio>
                 </template>
               </div>
             </template>
@@ -146,6 +146,19 @@ export default {
         player.removeEventListener('error', handleError);
         player.removeEventListener('ended', handleEnded);
       };
+      this.tempDetail.tempData.forEach(el => {
+        if (Array.isArray(el.decisionItemRecordDTOList)) {
+          el.decisionItemRecordDTOList.forEach(item => {
+            if (item.playing) {
+              const player = document.getElementById(`player-${el.decisionId}-${item.id}`);
+              player.pause();
+              player.currentTime = 0;
+              this.$set(item, 'playing', false);
+            }
+          });
+        }
+      });
+
       this.$set(data, 'playing', true);
       const player = document.getElementById(playerId);
       player.addEventListener('error', handleError);

src/views/recharge/consume.vue

@@ -275,14 +275,14 @@
             <span>{{ row.storeGroupName }}</span>
           </p>
         </el-table-column>
+        <el-table-column label="活动名称" prop="sourceName" min-width="120" :formatter="(row, col, val) => val || '--'"></el-table-column>
+        <el-table-column label="活动创建人" prop="sourceCreatorName" min-width="90" :formatter="(row, col, val) => val || '--'"></el-table-column>
         <template v-if="isMoreAccount">
-          <el-table-column label="活动名称" prop="sourceName" min-width="120" :formatter="(row, col, val) => val || '--'"></el-table-column>
-          <el-table-column label="活动创建人" prop="sourceCreatorName" min-width="90" :formatter="(row, col, val) => val || '--'"></el-table-column>
           <el-table-column label="扣费规则" prop="accountRule" min-width="120">
             <template slot-scope="{ row }">{{ accountRule(row.accountRule) }}</template>
           </el-table-column>
+          <el-table-column label="费用归属部门" prop="accountDepartName" min-width="120" :formatter="(row, col, val) => val || '--'"></el-table-column>
         </template>
-        <el-table-column label="费用归属部门" prop="accountDepartName" min-width="120" :formatter="(row, col, val) => val || '--'"></el-table-column>
         <el-table-column label="时间(秒)" prop="aiDurationSec" min-width="90" :formatter="(row, col, val) => val || '--'"></el-table-column>
         <el-table-column label="消费金额(元)" prop="aiFeeYuan" min-width="90" :formatter="(row, col, val) => val || '--'"></el-table-column>
       </el-table>