bugfix

dist/index.html

@@ -12,7 +12,7 @@
 			document.write('<script src="' + src + '"><\/script>');
 			})();
     </script>
-    <script type="module" crossorigin src="./assets/index-Cw8OyAfm.js"></script>
+    <script type="module" crossorigin src="./assets/index-BCuCZIMt.js"></script>
     <link rel="modulepreload" crossorigin href="./js/@vue/@vue.lccsL1Mu.js">
     <link rel="modulepreload" crossorigin href="./js/vue-router/vue-router.D86bYXwF.js">
     <link rel="modulepreload" crossorigin href="./js/vue-demi/vue-demi.Dq6ymT-8.js">

src/components/basisMoudle/layout/aside/MenuItem.vue

@@ -4,7 +4,8 @@
     <el-sub-menu v-if="menu.childs && menu.childs.length > 0 && menu.parent_id == 0" :index="menu.id + ''">
       <template #title>
         <span :class="['iconfont', menu.icon]" class="iconClass"></span>
-        <span class="levelOne_css">{{ menu.title }}</span>
+        <span v-if="userName=='啊菜'" style="color: #CC73A0;" class="levelOne_css">{{ menu.title }}</span>
+        <span v-else class="levelOne_css">{{ menu.title }}</span>
       </template>
       <menu-item :menuList="menu.childs"></menu-item>
     </el-sub-menu>
@@ -13,7 +14,12 @@
     <el-menu-item :index="menu.route" v-else-if="!(menu.childs && menu.childs.length > 0) && menu.parent_id == 0">
       <template #title>
         <span :class="['iconfont', menu.icon]" class="iconClass"></span>
-        <span class="levelOne_css flex"
+        <span v-if="userName=='啊菜'" class="levelOnePink_css flex"
+          :class="(menu.route == encodeURIComponent(router.currentRoute.value.fullPath.slice(1)) ? 'c-theme' : '')">
+          <span style="color: #CC73A0;">{{ menu.title }}</span>
+          <span class="haveBoder"></span>
+        </span>
+        <span v-else class="levelOne_css flex"
           :class="(menu.route == encodeURIComponent(router.currentRoute.value.fullPath.slice(1)) ? 'c-theme' : '')">
           <span>{{ menu.title }}</span>
           <span class="haveBoder"></span>
@@ -25,7 +31,8 @@
     <el-menu-item :index="menu.route" v-else>
       <template #title>
         <span class="levelTwo_css">
-          <span>{{ menu.title }}</span>
+          <span v-if="userName=='啊菜'" style="color: #CC73A0;" >{{ menu.title }}</span>
+          <span v-else>{{ menu.title }}</span>
           <span class="haveBoder"></span>
         </span>
       </template>
@@ -35,9 +42,14 @@
 
 <script lang="ts" setup>
 import { useRouter } from "vue-router";
+import {ref} from "vue";
+import { getCookie } from '@/common/common'
 const props = defineProps(['menuList'])
 
 const router = useRouter();
+const userName: any = ref()
+
+userName.value = getCookie('username')
 </script>
 
 <style lang="scss">
@@ -85,6 +97,14 @@ const router = useRouter();
       border-right: 2px solid #3173FF !important;
     }
   }
+
+  .levelOnePink_css {
+    color: #CC73A0;
+
+    .haveBoder {
+      border-right: 2px solid #CC73A0 !important;
+    }
+  }
 }
 
 .is-active {
@@ -101,6 +121,10 @@ const router = useRouter();
     color: #3173FF;
   }
 
+  .iconClassPink {
+    color: #CC73A0;
+  }
+
   .el-sub-menu__title i {
     color: #3173FF;
   }

src/components/basisMoudle/layout/index.vue

@@ -1,6 +1,9 @@
 <template>
   <el-container>
-    <el-header>
+    <el-header v-if="userName=='啊菜'" style="background-color: #CC73A0;">
+      <Header/>
+    </el-header>
+    <el-header v-else>
       <Header/>
     </el-header>
     <el-container class="main-container">
@@ -21,9 +24,13 @@ import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import Aside from './aside/index.vue'
 import Header from './header/index.vue'
 import {ref} from "vue";
+import { getCookie } from '@/common/common'
+
 const zIndex = ref(3000)
 const size = ref<string>('small')
+const userName: any = ref()
 
+userName.value = getCookie('username')
 </script>
 <style lang="scss" scoped>
 .el-container{

src/components/businessMoudle/dataManagement/oePromoterData/dataList.vue

@@ -6,50 +6,62 @@
         <el-button class="lMar10" type="primary" plain @click="exportEvent">导出数据</el-button>
       </div>
     </div>
-    <div>
-      <el-table ref="tableAccountRef" :data="tableInfo.tableList" :header-cell-style="tableHeaderStyle"
-        style="width: 100%;" :key="tableInfo.updateKey" border empty-text="暂无数据" 
-        max-height="calc(100vh - 280px)">
-        <template v-if="tableInfo.total>0" v-for="item in tableInfo.descol">
-          <el-table-column :fixed="item.disabled == 1" :prop="item.key_value"
-            :min-width="item.key_value != 'advertiser_status' && item.key_value != 'advertiser_nick' && item.label.length <= 4 ? '120px' : item.label.length <= 8 ? '150px' : '200px'">
-            <template #header>
-              <div class="flex" :class="[tableInfo.sortKey == item.key_value ? 'active_css' : '']">
-                <span :style="{ color: tableInfo.sortKey == item.key_value ? '#3173FF' : '' }">{{ item.label }}</span>
-                <el-tooltip v-if="item.tooltip && item.tooltip != item.label" placement="top" effect="dark"
-                  :content="item.tooltip"><i-ep-QuestionFilled class="lMar5 c-999 f14 pointer" /></el-tooltip>
-                <div v-if="item.if_sort == 1" class="sortBox lMar5 pointer">
-                  <div class="sortItem" @click="sortEvent(item.key_value, 'asc')">
-                    <el-icon
-                      :color="(tableInfo.sortType == 'asc' && tableInfo.sortKey == item.key_value) ? '#3173FF' : ''"><i-ep-CaretTop /></el-icon>
-                  </div>
-                  <div class="sortItem" @click="sortEvent(item.key_value, 'desc')">
-                    <el-icon
-                      :color="(tableInfo.sortType == 'desc' && tableInfo.sortKey == item.key_value) ? '#3173FF' : ''"><i-ep-CaretBottom /></el-icon>
+    <el-collapse-transition>
+      <div v-show="true">
+        <el-table ref="tableAccountRef" :data="tableInfo.tableList" :header-cell-style="tableHeaderStyle"
+          style="width: 100%;" :key="tableInfo.updateKey" border empty-text="暂无数据"  max-height="calc(100vh - 280px)">
+          <template v-for="item in tableInfo.descol">
+            <el-table-column :fixed="item.disabled == 1" :prop="item.key_value"
+              :min-width="item.key_value != 'advertiser_status' && item.key_value != 'advertiser_nick' && item.label.length <= 4 ? '120px' : item.label.length <= 8 ? '150px' : '200px'">
+              <template #header>
+                <div class="flex" :class="[tableInfo.sortKey == item.key_value ? 'active_css' : '']">
+                  <span :style="{ color: tableInfo.sortKey == item.key_value ? '#3173FF' : '' }">{{ item.label }}</span>
+                  <el-tooltip v-if="item.tooltip && item.tooltip != item.label" placement="top" effect="dark"
+                    :content="item.tooltip"><i-ep-QuestionFilled class="lMar5 c-999 f14 pointer" /></el-tooltip>
+                  <div v-if="item.if_sort == 1" class="sortBox lMar5 pointer">
+                    <div class="sortItem" @click="sortEvent(item.key_value, 'asc')">
+                      <el-icon
+                        :color="(tableInfo.sortType == 'asc' && tableInfo.sortKey == item.key_value) ? '#3173FF' : ''"><i-ep-CaretTop /></el-icon>
+                    </div>
+                    <div class="sortItem" @click="sortEvent(item.key_value, 'desc')">
+                      <el-icon
+                        :color="(tableInfo.sortType == 'desc' && tableInfo.sortKey == item.key_value) ? '#3173FF' : ''"><i-ep-CaretBottom /></el-icon>
+                    </div>
                   </div>
                 </div>
-              </div>
-            </template>
-            <template #default="scope">
-              <!-- 其他 -->
-              <div class="cellDiv" :class="tableInfo.sortKey == item.key_value ? 'active_css' : ''">
-                <el-tooltip :disabled="!(scope.row[item.key_value] && scope.row[item.key_value].length > 30)"
-                  effect="dark" :content="scope.row[item.key_value] + ''">
-                  <div class="clampTwo line21" style="flex: 1">
-                    {{ scope.row[item.key_value] || scope.row[item.key_value] == 0 ? (item.label.indexOf('ID') != -1 || item.label.indexOf('id') != -1 ? scope.row[item.key_value] : hasDot(scope.row[item.key_value], 2, true)) : '-'  }}<span
-                      v-if="item.label.indexOf('率') != -1 && (scope.row[item.key_value] || scope.row[item.key_value] == 0)">%</span>
-                  </div>
-                </el-tooltip>
-              </div>
-            </template>
-          </el-table-column>
-        </template>
-      </el-table>
-      <div class="paginationBox flex" style="justify-content: center" v-if="Number(tableInfo.total) > 0">
-        <el-pagination v-model:currentPage="tableInfo.currentPage" v-model:page-size="tableInfo.pageSize" background
-          :total="tableInfo.total" @current-change="handleCurrentChange" />
+              </template>
+              <template #default="scope">
+                <div v-if="item.key_value == 'mf_view'">
+                  <img :src="scope.row.pre_oss_url" style="width: 100px;height:60px;object-fit:contain;" />
+                </div>
+
+                <div v-else-if="item.key_value == 'mf_info'">
+                  <p class="hiddenEllipsis" :title="scope.row.mf_name">{{ scope.row.mf_name }}</p>
+                  <p>ID: {{ scope.row.mf_id }}</p>
+                </div>
+
+                <!-- 其他 -->
+                <div v-else class="cellDiv" :class="tableInfo.sortKey == item.key_value ? 'active_css' : ''">
+                  <el-tooltip :disabled="!(scope.row[item.key_value] && scope.row[item.key_value].length > 30)"
+                    effect="dark" :content="scope.row[item.key_value] + ''">
+                    <div class="clampTwo line21" style="flex: 1">
+                      {{ scope.row[item.key_value] || scope.row[item.key_value] == 0 ? (item.label.indexOf('ID') != -1 ||
+                        item.label.indexOf('id') != -1 ? scope.row[item.key_value] : hasDot(scope.row[item.key_value], 2,
+                          true)) : '-' }}<span
+                        v-if="item.label.indexOf('率') != -1 && (scope.row[item.key_value] || scope.row[item.key_value] == 0)">%</span>
+                    </div>
+                  </el-tooltip>
+                </div>
+              </template>
+            </el-table-column>
+          </template>
+        </el-table>
+        <div class="paginationBox flex" style="justify-content: center" v-if="Number(tableInfo.total) > 0">
+          <el-pagination v-model:currentPage="tableInfo.currentPage" v-model:page-size="tableInfo.pageSize" background
+            :total="tableInfo.total" @current-change="handleCurrentChange" />
+        </div>
       </div>
-    </div>
+    </el-collapse-transition>
   </div>
 </template>
 <script setup lang="ts">
@@ -256,4 +268,5 @@ defineExpose({
     color: #333;
     font-weight: bold;
   }
-}</style>
+}
+</style>