上传

src/layout/components/Setting/src/Setting.vue

@@ -12,6 +12,11 @@ import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
 import ColorRadioPicker from './components/ColorRadioPicker.vue'
 // import InterfaceDisplay from './components/InterfaceDisplay.vue'
 // import LayoutRadioPicker from './components/LayoutRadioPicker.vue'
+import { useWatermark } from '@/hooks/web/useWatermark'
+
+const { setWatermark } = useWatermark()
+
+setWatermark('安徽莳松科技有限公司')
 
 const { t } = useI18n()
 const appStore = useAppStore()

src/layout/components/Setting/src/components/InterfaceDisplay.vue

@@ -124,7 +124,6 @@ const fixedMenuChange = (show: boolean) => {
 const setWater = () => {
   setWatermark(water.value)
 }
-setWater()
 
 const layout = computed(() => appStore.getLayout)
 

src/views/Home/Index.vue

@@ -67,8 +67,61 @@
         </el-row>
       </el-skeleton>
     </el-card>
-    <el-row class="mt-10px" :gutter="10" justify="space-between">
+    <div class="mt-10px flex">
-      <!-- <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24" class="mb-10px">
+      <el-card shadow="never" class="flex-1">
+        <template #header>
+          <div class="flex justify-between">
+            <span>成交率</span>
+          </div>
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <el-skeleton :loading="loading" animated>
+            <Echart :options="lineOptionsData" :height="280" />
+          </el-skeleton>
+        </el-skeleton>
+      </el-card>
+      <el-card shadow="never" class="ml-10px">
+        <template #header>
+          <div class="flex justify-between items-center">
+            <span>跟进榜Top10</span>
+            <el-radio-group v-model="followDate" size="small" @change="getFollowList">
+              <el-radio :label="1">本日</el-radio>
+              <el-radio :label="2">本月</el-radio>
+            </el-radio-group>
+          </div>
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <ul class="follow-wrap">
+            <!-- <TransitionGroup name="flip"> -->
+            <li
+              class="follow-item number-font mb-18px text-14px"
+              v-for="(item, index) in followList"
+              :key="index"
+            >
+              <span class="mr-10px">NO.{{ index + 1 }}</span>
+              <span class="mr-10px">{{ item.username }}</span>
+              <span>已跟进{{ item.followNum }}条线索</span>
+            </li>
+            <br />
+            <!-- </TransitionGroup> -->
+          </ul>
+        </el-skeleton>
+      </el-card>
+      <el-card shadow="never" class="ml-10px">
+        <template #header>
+          <div class="flex justify-between"> 本月成交榜Top10 </div>
+        </template>
+        <el-skeleton :loading="loading" animated>
+          <el-table :data="signList" size="small">
+            <el-table-column type="index" />
+            <el-table-column prop="username" label="姓名" width="100" />
+            <el-table-column prop="followNum" label="成交数量" width="70" />
+            <el-table-column prop="deptName" label="所属组织" />
+          </el-table>
+        </el-skeleton>
+      </el-card>
+    </div>
+    <!-- <el-col :xl="6" :lg="6" :md="12" :sm="12" :xs="24" class="mb-10px">
         <el-card shadow="never">
           <template #header>
             <div class="flex justify-between ">
@@ -80,65 +133,6 @@
           </el-skeleton>
         </el-card>
       </el-col> -->
-      <el-col :xl="8" :lg="8" :md="12" :sm="12" :xs="24" class="mb-10px">
-        <el-card shadow="never">
-          <template #header>
-            <div class="flex justify-between">
-              <span>成交率</span>
-            </div>
-          </template>
-          <el-skeleton :loading="loading" animated>
-            <el-skeleton :loading="loading" animated>
-              <Echart :options="lineOptionsData" :height="280" />
-            </el-skeleton>
-          </el-skeleton>
-        </el-card>
-      </el-col>
-      <el-col :xl="8" :lg="8" :md="12" :sm="12" :xs="24" class="mb-10px">
-        <el-card shadow="never">
-          <template #header>
-            <div class="flex justify-between items-center">
-              <span>跟进榜Top10</span>
-              <el-radio-group v-model="followDate" size="small" @change="getFollowList">
-                <el-radio :label="1">本日</el-radio>
-                <el-radio :label="2">本月</el-radio>
-              </el-radio-group>
-            </div>
-          </template>
-          <el-skeleton :loading="loading" animated>
-            <ul class="follow-wrap">
-              <!-- <TransitionGroup name="flip"> -->
-              <li
-                class="follow-item number-font mb-18px text-14px"
-                v-for="(item, index) in followList"
-                :key="index"
-              >
-                <span class="mr-10px">NO.{{ index + 1 }}</span>
-                <span class="mr-10px">{{ item.username }}</span>
-                <span>已跟进{{ item.followNum }}条线索</span>
-              </li>
-              <br />
-              <!-- </TransitionGroup> -->
-            </ul>
-          </el-skeleton>
-        </el-card>
-      </el-col>
-      <el-col :xl="8" :lg="8" :md="12" :sm="12" :xs="24" class="mb-10px">
-        <el-card shadow="never">
-          <template #header>
-            <div class="flex justify-between"> 本月成交榜Top10 </div>
-          </template>
-          <el-skeleton :loading="loading" animated>
-            <el-table :data="signList" size="small">
-              <el-table-column type="index" />
-              <el-table-column prop="username" label="姓名" width="100" />
-              <el-table-column prop="followNum" label="成交数量" width="70" />
-              <el-table-column prop="deptName" label="所属组织" />
-            </el-table>
-          </el-skeleton>
-        </el-card>
-      </el-col>
-    </el-row>
   </div>
 </template>
 <script setup lang="ts" name="Home">

src/views/MiniMall/Product/add.vue

@@ -488,8 +488,8 @@ const getDetail = async () => {
       productCategory: undefined,
       productBrand: undefined,
       productIntro: undefined,
-      mainImage: 'https://ss-cloud.ahduima.com/1001/1796426117251600384.png',
+      mainImage: '',
-      carouselImages: ['https://ss-cloud.ahduima.com/1001/1796426117251600384.png'],
+      carouselImages: [],
       productSpecList: [],
       skuList: [],
       detailInfo: null,

src/views/MiniMall/Purchase/index.data.js

@@ -125,7 +125,7 @@ const crudSchemas = reactive([
     label: '备注',
     field: 'remark',
     isSearch: false,
-    isTable: true
+    isTable: false
   }
 ])
 export const { allSchemas } = useCrudSchemas(crudSchemas)