冲突解决

src/layout/component/Aside.vue

@@ -17,7 +17,7 @@ watch(
   }
 );
 
-//点击有二级菜单的默认打开第一个
+// 点击有二级菜单的默认打开第一个
 const submenuEvent = (index)=>{
   let tem=null
   menuList.forEach(_item=>{

src/router/index.js

@@ -241,7 +241,7 @@ const routes=[
         component:()=>import('@/views/sandBox/List.vue'),
         meta: {
           title: "沙盘推演",
-          keepAlive:false,
+          keepAlive:true,
           isRoot:true
         }
       }

src/views/question/List.vue

@@ -301,10 +301,23 @@ const goSettingHandle = () => {
   showNicklog.value = false;
   router.push('/user/setinfo')
 }
+// <<<<<<< HEAD
 /* 不在提醒弹窗 */
 const setCancelNickHandle = async() => {
   showNicklog.value = false;
   await apiCanelNickTip()
+// =======
+// // 等待 网络差时等待资源加载
+// const audioWaiting = (item)=>{
+//   item.audio_status.loading = true
+// }
+// // 可以播放 
+// const audioCanPlay = (item,index)=>{
+//   item.audio_status.loading = false
+//   if(!audio.value[index].played){
+//     play(item,index)
+//   }
+// >>>>>>> CD_bugFix
 }
 
 

src/views/sandBox/List.vue

@@ -1,109 +1,3 @@
-<template>
-    <template v-if="sandBox.noAuthor ==1 && sandBox.isRequestFinished">
-        <div class="sandbox-noAuthor">
-            <img :src="$store.state.globalImgUrls.activityNoAuth" />
-            <span style="margin-top: 34px;">您在暂无权限查看沙盘推演</span>
-            <span style="margin-top: 10px;">若想查看可以申请开通</span>
-            <div class="apply-button" @click="toApply">立即申请</div>
-            <!-- <template v-else>
-                <img :src="$store.state.globalImgUrls.activityNoAuth" />
-                <span style="margin-top: 34px;">您已提交过申请</span>
-                <span style="margin-top: 10px;">请等待销售人员与您联系</span>
-                <div class="apply-button" @click="$router.back()">返回</div>
-            </template> -->
-        </div>
-    </template>
-    <template v-if="sandBox.noAuthor ==2 && sandBox.isRequestFinished">
-        <view class="sandbox-noAuthor">
-            <img :src="$store.state.globalImgUrls.activityNoAuth" />
-            <span style="margin-top: 34px;">您在暂无权限查看沙盘推演</span>
-            <span style="margin: 10px 0 4px 0;">若想查看请联系对口销售</span>
-            <div>
-                <span>{{sandBox.salesData.name}}：</span>
-                <span class="sales-mobile" @click="callToSales">{{sandBox.salesData.phone}}</span>
-            </div>
-        </view>
-    </template>
-    <!-- 部分有权限 分享进来没有权限 -->
-    <template v-if="sandBox.noAuthor ==4 && sandBox.isRequestFinished" >
-        <!-- 显示空白 一秒钟后跳转至有权限的沙盘图-->
-    </template>
-    <div class="sandBox-contain" v-if="sandBox.noAuthor ==0 && sandBox.isRequestFinished">
-        <div class="classify-box">
-            <div class="firstClassify-box">
-                <div :class="['firstClassfy-item',item.id==sandBox.selectedFirstId?'firstClassfy-actice':'']" 
-                v-for="item in sandBox.classifyList" :key="item.id" @click="selectFirstClassify(item)">
-                    <span>{{item.classify_name}}</span>
-                </div>
-            </div>
-            <div class="sec-nav-box" v-show="sandBox.secondClassifyList.length>0">
-                <span
-                    :class="['sec-item',item.chart_permission_id==sandBox.selectedSecondId?'active':'']"
-                    v-for="item in sandBox.secondClassifyList.slice(0,6)"
-                    :key="item.chart_permission_id"
-                    @click="selectSecondClassify(item)"
-                >{{item.chart_permission_name}}</span>
-                <el-popover
-                    :width="500"
-                    trigger="click"
-                >
-                    <template #reference>
-                        <img v-if="sandBox.secondClassifyList.length>6" style="width:16px;transform: rotate(90deg);cursor: pointer" src="@/assets/icon-more.png" alt="">
-                    </template>
-                    <template #default>
-                        <div class="flex top-nav-filter-box">
-                            <div 
-                                :class="['item',item.chart_permission_id == sandBox.selectedSecondId&&'active']" 
-                                v-for="item in sandBox.secondClassifyList.slice(6)" 
-                                :key="item.chart_permission_id"
-                                @click="selectSecondClassify(item)"
-                            >{{item.chart_permission_name}}</div>
-                        </div>
-                    </template>
-                </el-popover>
-            </div>
-        </div>
-        <SelfList
-        :finished="sandBox.isTotalData" 
-        :isEmpty="sandBox.list.length===0&&sandBox.isTotalData"
-        :loading="sandBox.isLoading"
-        :count="sandBox.list.length"
-        @listOnload="onLoad">
-            <div class="sandBox-content">
-                <div class="sandBox-item" v-for="(item,index) in sandBox.list" :key="item.sandbox_id">
-                    <div class="sandBox-item-header">
-                        <span>{{item.name}}</span>
-                        <el-popover
-                        :width="200"
-                        :height="200"
-                        trigger="hover"
-                        @show="showMiniShare(item)"
-                        popper-class="miniprogram-code">
-                        <!-- popper-style="" -->
-                            <template #reference>
-                                <div class="sandBox-item-miniP"></div>
-                            </template>
-                            <div class="miniprogram-code">
-                                <img :src="item.miniCodeImg" alt="小程序码" v-show="item.miniCodeImg" />
-                            </div>
-                        </el-popover>
-                    </div>
-                    <div class="sandBox-image">
-                        <img :src="item.pic_url" :alt="item.name" @click="previewImage(index)"/>
-                    </div>
-                </div>
-            </div>
-        </SelfList>
-    </div>
-    
-    <!-- 图片预览 -->
-    <el-image-viewer
-        v-if="showPreViewImg"
-        :initial-index="preViewImgIndex"
-        @close="cancelPreview"
-        :url-list="previewImageList"
-    />
-</template>
 <script setup>
 import {h, reactive,computed,ref,onMounted,onActivated} from 'vue'
 import {useRouter,useRoute} from "vue-router"
@@ -511,6 +405,113 @@ onActivated(()=>{
 
 </script>
 
+<template>
+    <template v-if="sandBox.noAuthor ==1 && sandBox.isRequestFinished">
+        <div class="sandbox-noAuthor">
+            <img :src="$store.state.globalImgUrls.activityNoAuth" />
+            <span style="margin-top: 34px;">您在暂无权限查看沙盘推演</span>
+            <span style="margin-top: 10px;">若想查看可以申请开通</span>
+            <div class="apply-button" @click="toApply">立即申请</div>
+            <!-- <template v-else>
+                <img :src="$store.state.globalImgUrls.activityNoAuth" />
+                <span style="margin-top: 34px;">您已提交过申请</span>
+                <span style="margin-top: 10px;">请等待销售人员与您联系</span>
+                <div class="apply-button" @click="$router.back()">返回</div>
+            </template> -->
+        </div>
+    </template>
+    <template v-if="sandBox.noAuthor ==2 && sandBox.isRequestFinished">
+        <view class="sandbox-noAuthor">
+            <img :src="$store.state.globalImgUrls.activityNoAuth" />
+            <span style="margin-top: 34px;">您在暂无权限查看沙盘推演</span>
+            <span style="margin: 10px 0 4px 0;">若想查看请联系对口销售</span>
+            <div>
+                <span>{{sandBox.salesData.name}}：</span>
+                <span class="sales-mobile" @click="callToSales">{{sandBox.salesData.phone}}</span>
+            </div>
+        </view>
+    </template>
+    <!-- 部分有权限 分享进来没有权限 -->
+    <template v-if="sandBox.noAuthor ==4 && sandBox.isRequestFinished" >
+        <!-- 显示空白 一秒钟后跳转至有权限的沙盘图-->
+    </template>
+    <div class="sandBox-contain" v-if="sandBox.noAuthor ==0 && sandBox.isRequestFinished">
+        <div class="classify-box">
+            <div class="firstClassify-box">
+                <div :class="['firstClassfy-item',item.id==sandBox.selectedFirstId?'firstClassfy-actice':'']" 
+                v-for="item in sandBox.classifyList" :key="item.id" @click="selectFirstClassify(item)">
+                    <span>{{item.classify_name}}</span>
+                </div>
+            </div>
+            <div class="sec-nav-box" v-show="sandBox.secondClassifyList.length>0">
+                <span
+                    :class="['sec-item',item.chart_permission_id==sandBox.selectedSecondId?'active':'']"
+                    v-for="item in sandBox.secondClassifyList.slice(0,6)"
+                    :key="item.chart_permission_id"
+                    @click="selectSecondClassify(item)"
+                >{{item.chart_permission_name}}</span>
+                <el-popover
+                    :width="500"
+                    trigger="click"
+                >
+                    <template #reference>
+                        <img v-if="sandBox.secondClassifyList.length>6" style="width:16px;transform: rotate(90deg);cursor: pointer" src="@/assets/icon-more.png" alt="">
+                    </template>
+                    <template #default>
+                        <div class="flex top-nav-filter-box">
+                            <div 
+                                :class="['item',item.chart_permission_id == sandBox.selectedSecondId&&'active']" 
+                                v-for="item in sandBox.secondClassifyList.slice(6)" 
+                                :key="item.chart_permission_id"
+                                @click="selectSecondClassify(item)"
+                            >{{item.chart_permission_name}}</div>
+                        </div>
+                    </template>
+                </el-popover>
+            </div>
+        </div>
+        <SelfList
+        :finished="sandBox.isTotalData" 
+        :isEmpty="sandBox.list.length===0&&sandBox.isTotalData"
+        :loading="sandBox.isLoading"
+        :count="sandBox.list.length"
+        @listOnload="onLoad">
+            <div class="sandBox-content">
+                <div class="sandBox-item" v-for="(item,index) in sandBox.list" :key="item.sandbox_id">
+                    <div class="sandBox-item-header">
+                        <span>{{item.name}}</span>
+                        <el-popover
+                        :width="200"
+                        :height="200"
+                        trigger="hover"
+                        @show="showMiniShare(item)"
+                        popper-class="miniprogram-code">
+                        <!-- popper-style="" -->
+                            <template #reference>
+                                <div class="sandBox-item-miniP"></div>
+                            </template>
+                            <div class="miniprogram-code">
+                                <img :src="item.miniCodeImg" alt="小程序码" v-show="item.miniCodeImg" />
+                            </div>
+                        </el-popover>
+                    </div>
+                    <div class="sandBox-image">
+                        <img :src="item.pic_url" :alt="item.name" @click="previewImage(index)"/>
+                    </div>
+                </div>
+            </div>
+        </SelfList>
+    </div>
+    
+    <!-- 图片预览 -->
+    <el-image-viewer
+        v-if="showPreViewImg"
+        :initial-index="preViewImgIndex"
+        @close="cancelPreview"
+        :url-list="previewImageList"
+    />
+</template>
+
 <style lang="scss" scoped>
 .top-nav-filter-box{
     flex-wrap: wrap;