11wqe1 1 month ago
parent
commit
b2e84e9770

+ 1 - 0
src/components/sidebarL.vue

@@ -159,6 +159,7 @@ import { myMixin } from "@/mixins/mixin.js"
             async gotoKanban(){
                 // 重新获取基础数据
                 await store.dispatch('user/getschPerInfo')
+                // 清除数据让数据看板中的埋点正常(不能这样写,那点返回校区的话就完蛋了)
                 // await store.commit('user/SET_USERINFO2', {})
                 let num = this.userinfo.type == 1 && this.userinfo.role == 1 && this.userinfo.rrole == 1 ? 1 : 2
                 this.$router.push({

+ 3 - 3
src/components/topPage.vue

@@ -117,9 +117,9 @@
                     <div class="footListCon6" v-for="(item,index) in CocoFlowList" @click="openNewWindow(item)" :key="index+'4p'">
                         <div class="footListConimg">
                             <!-- <img style="margin-bottom: 12px;height: 24px;width: 22px;" :src="JSON.parse(item.json).icon" alt=""> -->
-                            <img v-if="fromL.admin.cocoFlow2[index].setIcon" 
-                            class="footListConimgPic"
-                            :src="fromL.admin.cocoFlow2[index].setIcon" alt="">
+                            <img v-if="fromL.admin.cocoFlow2[index] && fromL.admin.cocoFlow2[index].setIcon" 
+                                class="footListConimgPic"
+                                :src="fromL.admin.cocoFlow2[index].setIcon" alt="">
                             <img v-else class="footListConimgPic" :src="item.json.icon" alt="">
                             
                             <!-- <img v-else class="footListConimgPic" :src="require('../assets/img/cocoflow2.svg')" alt=""> -->

+ 3 - 3
src/views/kanBan/components/AschoolFeature.vue

@@ -109,8 +109,8 @@
                 </div>
             </div>
 
-            <div class="AppStoreList" :class="{ 'AppStoreList2': CampusF.appList.length === 0 }">
-                <template v-if="CampusF.appList.length">
+            <div class="AppStoreList" :class="{ 'AppStoreList2': CampusF.appList && CampusF.appList.length === 0 }">
+                <template v-if="CampusF.appList && CampusF.appList.length">
                     <div class="AppStore" v-for="(i, index) in CampusF.appList" :key="index" @click="openNewWindow(i)">
                         <!-- <img style="width: 24px;" src="../../../assets/img/bianji.svg" alt=""> -->
                         <div class="AppStoreCon">
@@ -131,7 +131,7 @@
                     暂无数据
                 </div>
                 <div class="AppStore" v-if="userinfo.role == 1 && userinfo.type == 1" @click="editregion(3)"
-                    :style="{ maxWidth: CampusF.appList.length === 0 ? '301px' : 'auto' }">
+                    :style="{ maxWidth:CampusF.appList && CampusF.appList.length === 0 ? '301px' : 'auto' }">
                     <!-- <div style="height: 24px;"></div> -->
                     <div class="AppAdd">
                         <img src="../../../assets/img/add.svg" alt="" />