update

src/packages/pc/assets/themes/default/default.less

@@ -17,16 +17,16 @@
     --statusbar-height: 56px;
     /* 标签栏 */
     --tabbar-active: var(--color-primary);
-    --tabbar-hover: #eee;
+    --tabbar-hover: #eff4f9;
     --tabbar-close-hover: red;
     /* 侧边栏 */
-    --sidebar-width: 180px;
-    --sidebar-background: var(--color-primary);
+    --sidebar-width: 190px;
+    --sidebar-background: #37709d;
     --sidebar-header-height: 56px;
     --sidebar-menu-inline: #fff;
     --sidebar-menu-item: #b3d5ef;
-    --sidebar-menu-item-hover: #4786bb;
-    --sidebar-menu-item-active: #266091;
+    --sidebar-menu-item-hover: #4680b1;
+    --sidebar-menu-item-active: #2c5f87;
 
     --el-color-primary: var(--color-primary);
     --el-color-primary-light-3: #4b95ce;
@@ -92,35 +92,30 @@
             align-items: center;
             background-color: #fff;
             box-shadow: 0 2px 16px 0 rgba(0, 0, 0, .1);
-            padding: 8px 20px 0 20px;
 
             &:empty {
                 display: none;
             }
 
             .tabs {
+                padding: 0 20px;
+
                 &-item {
-                    height: 40px;
-                    line-height: 40px;
                     color: #777;
-                    border-top-left-radius: 4px;
-                    border-top-right-radius: 4px;
                     cursor: pointer;
-                    padding: 0 20px;
-
-                    &:not(:first-child) {
-                        margin-left: 4px;
-                    }
+                    border-bottom: 3px solid transparent;
+                    padding: 12px 20px;
 
                     &:hover {
-                        color: inherit;
+                        color: var(--tabbar-active);
                         background-color: var(--tabbar-hover);
                     }
 
                     &.is-active {
-                        color: #fff !important;
-                        background-color: var(--tabbar-active);
-                        border-bottom: 0;
+                        color: var(--tabbar-active);
+                        font-weight: bold;
+                        background-color: var(--tabbar-hover);
+                        border-bottom: 3px solid var(--tabbar-active);
                     }
                 }
             }

src/packages/pc/components/layouts/header/index.less

@@ -62,24 +62,5 @@
                 }
             }
         }
-
-        .user-dropdown {
-            margin-left: 20px;
-
-            &__link {
-                display: flex;
-                align-items: center;
-                font-weight: bold;
-                cursor: pointer;
-            }
-
-            .g-image--avatar {
-                width: 32px;
-                height: 32px;
-                border-radius: 50%;
-                font-size: 0;
-                margin-right: 4px;
-            }
-        }
     }
 }

src/packages/pc/components/layouts/header/index.vue

@@ -24,20 +24,6 @@
                 <app-icon icon="g-icon--minimize" @click="exitFullSreen" v-if="fullScreen" />
                 <app-icon icon="g-icon--maximize" @click="setFullSreen" v-else />
             </div>
-            <el-dropdown class="user-dropdown" trigger="click">
-                <span class="user-dropdown__link">
-                    <img class="g-image--avatar" :title="accountName" />
-                    <span v-if="!isMobile">{{ accountName }}</span>
-                    <app-icon class="el-icon--right" icon="ArrowDown" />
-                </span>
-                <template #dropdown>
-                    <el-dropdown-menu>
-                        <!-- <el-dropdown-item icon="Key">修改密码</el-dropdown-item> -->
-                        <el-dropdown-item icon="SwitchButton"
-                            @click="eventBus.$emit('LogoutNotify')">退出登录</el-dropdown-item>
-                    </el-dropdown-menu>
-                </template>
-            </el-dropdown>
         </div>
         <component :is="componentMap.get(componentId)" v-bind="{ dataList }" @closed="closeComponent" v-if="componentId" />
     </div>
@@ -46,10 +32,9 @@
 <script lang="ts" setup>
 import { ref, onMounted, defineAsyncComponent } from 'vue'
 import { useRouter } from 'vue-router'
-import { loginStore, globalStore } from '@/stores'
+import { globalStore } from '@/stores'
 import { useComponent } from '@/hooks/component'
 import { useNotice } from '@/business/notice'
-import eventBus from '@/services/bus'
 import AppIcon from '@pc/components/base/icon/index.vue'
 
 const componentMap = new Map<string, unknown>([
@@ -61,7 +46,6 @@ const componentMap = new Map<string, unknown>([
 const { componentId, openComponent, closeComponent } = useComponent()
 const { dataList, unreadList, getNoticeList } = useNotice()
 const { isMobile } = globalStore.$mapState()
-const { accountName } = loginStore.$mapGetters()
 const router = useRouter()
 const fullScreen = ref(false)
 

src/packages/pc/components/layouts/sidebar/index.less

@@ -24,7 +24,6 @@
 
     &__header {
         align-items: center;
-        background-color: #184e97;
         padding: 0 20px;
 
         &:not(.is-hide) {
@@ -32,8 +31,24 @@
             min-height: var(--sidebar-header-height);
         }
 
-        .logo {
-            font-weight: bold;
+        .user-dropdown {
+            color: #fff;
+
+            &__link {
+                display: flex;
+                align-items: center;
+                font-weight: bold;
+                cursor: pointer;
+            }
+
+            .g-image--avatar {
+                width: 36px;
+                height: 36px;
+                border-radius: 50%;
+                font-size: 0;
+                margin-right: 4px;
+                border: 2px solid #fff;
+            }
         }
     }
 

src/packages/pc/components/layouts/sidebar/index.vue

@@ -1,7 +1,19 @@
 <template>
   <el-scrollbar :class="['app-sidebar', collapse && 'is-hide']" view-class="app-sidebar__view">
-    <div :class="['app-sidebar__header', isMobile ? 'is-show' : collapse && 'is-hide']" v-if="false">
-      <span class="logo">{{ $t('app.name') }}</span>
+    <div :class="['app-sidebar__header', isMobile ? 'is-show' : collapse && 'is-hide']">
+      <el-dropdown class="user-dropdown" trigger="click">
+        <span class="user-dropdown__link">
+          <img class="g-image--avatar" :title="accountName" />
+          <span>{{ accountName }}</span>
+          <app-icon class="el-icon--right" icon="ArrowDown" />
+        </span>
+        <template #dropdown>
+          <el-dropdown-menu>
+            <!-- <el-dropdown-item icon="Key">修改密码</el-dropdown-item> -->
+            <el-dropdown-item icon="SwitchButton" @click="eventBus.$emit('LogoutNotify')">退出登录</el-dropdown-item>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
     </div>
     <div class="app-sidebar__menu">
       <app-sidemenu :collapse="isMobile ? false : collapse" @click="routerTo" />
@@ -16,8 +28,10 @@
 <script lang="ts" setup>
 import { watch } from 'vue'
 import { useMenu } from '@/hooks/menu'
-import { globalStore } from '@/stores'
+import { globalStore, loginStore } from '@/stores'
+import eventBus from '@/services/bus'
 import AppSidemenu from '../sidemenu/index.vue'
+import AppIcon from '@pc/components/base/icon/index.vue'
 
 const emit = defineEmits(['update:collapse'])
 
@@ -28,6 +42,7 @@ defineProps({
 
 const { router, getChildrenMenus } = useMenu()
 const { isMobile } = globalStore.$mapState()
+const { accountName } = loginStore.$mapGetters()
 const year = new Date().getFullYear()
 
 const hideSidebar = () => {

src/packages/pc/views/centralize/list/components/details/index.vue

@@ -22,7 +22,7 @@
         <app-table-details title="钻石参考信息" :label-width="140" :data="selectedRow" :cell-props="details2" :column="2">
             <!-- 生产方式 -->
             <template #ysproductionmode="{ value }">
-                {{ getYSProductionModeName(value) }}
+                {{ handleNumberValue(getYSProductionModeName(value)) }}
             </template>
             <!-- 图片 -->
             <template #pictureurls>
@@ -41,7 +41,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, reactive, PropType, onMounted, defineAsyncComponent } from 'vue'
-import { getFileUrl, parsePercent } from '@/filters'
+import { getFileUrl, parsePercent,handleNumberValue } from '@/filters'
 import { getWRPresaleStatusName, getYSProductionModeName } from '@/constants/presale'
 import { useRequest } from '@/hooks/request'
 import { queryPresaleorderapplyprice } from '@/services/api/presale'

src/packages/pc/views/centralize/mine/components/apply/details.vue

@@ -18,7 +18,7 @@
         <app-table-details title="钻石参考信息" :label-width="140" :data="selectedRow" :cell-props="details2" :column="2">
             <!-- 生产方式 -->
             <template #ysproductionmode="{ value }">
-                {{ getYSProductionModeName(value) }}
+                {{ handleNumberValue(getYSProductionModeName(value)) }}
             </template>
             <!-- 图片 -->
             <template #pictureurls>
@@ -32,7 +32,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, reactive, PropType, onMounted } from 'vue'
-import { getFileUrl, parsePercent } from '@/filters'
+import { getFileUrl, parsePercent, handleNumberValue } from '@/filters'
 import { getInOutApplyStatusName, getYSProductionModeName } from '@/constants/presale'
 import { performanceStore } from '@/stores'
 import AppDrawer from '@pc/components/base/drawer/index.vue'

src/packages/pc/views/centralize/mine/components/details/index.vue

@@ -22,7 +22,7 @@
         <app-table-details title="钻石参考信息" :label-width="140" :data="selectedRow" :cell-props="details2" :column="2">
             <!-- 生产方式 -->
             <template #ysproductionmode="{ value }">
-                {{ getYSProductionModeName(value) }}
+                {{ handleNumberValue(getYSProductionModeName(value)) }}
             </template>
             <!-- 图片 -->
             <template #pictureurls>
@@ -45,7 +45,7 @@
 <script lang="ts" setup>
 import { shallowRef, reactive, PropType, onMounted } from 'vue'
 import { ElMessage } from 'element-plus'
-import { getFileUrl, parsePercent } from '@/filters'
+import { getFileUrl, parsePercent,handleNumberValue } from '@/filters'
 import { getWRPresaleStatusName, getYSProductionModeName } from '@/constants/presale'
 import { useRequest } from '@/hooks/request'
 import { performanceStore } from '@/stores'

src/packages/pc/views/centralize/partake/components/details/index.vue

@@ -10,7 +10,7 @@
         <app-table-details title="钻石参考信息" :label-width="140" :data="selectedRow" :cell-props="details2" :column="2">
             <!-- 生产方式 -->
             <template #ysproductionmode="{ value }">
-                {{ getYSProductionModeName(value) }}
+                {{ handleNumberValue(getYSProductionModeName(value)) }}
             </template>
             <!-- 图片 -->
             <template #pictureurls>
@@ -24,7 +24,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, reactive, PropType, onMounted } from 'vue'
-import { getFileUrl, parsePercent } from '@/filters'
+import { getFileUrl, parsePercent, handleNumberValue } from '@/filters'
 import { getYSProductionModeName } from '@/constants/presale'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppTableDetails from '@pc/components/base/table-details/index.vue'

src/packages/pc/views/home/main/index.less

@@ -81,23 +81,23 @@
                 }
 
                 &:nth-child(1) {
-                    background: linear-gradient(0deg, #4DB5FA 0%, #1E79F6 100%);
+                    background: #4DB5FA;
                 }
 
                 &:nth-child(2) {
-                    background: linear-gradient(0deg, #3FBCFB 0%, #4ECEB1 100%);
+                    background: #4ECEB1;
                 }
 
                 &:nth-child(3) {
-                    background: linear-gradient(0deg, #FB6FA6 0%, #FD565C 100%);
+                    background: #FD565C;
                 }
 
                 &:nth-child(4) {
-                    background: linear-gradient(0deg, #F6AE70 0%, #F1884C 100%);
+                    background: #F1884C;
                 }
 
                 &:nth-child(5) {
-                    background: linear-gradient(0deg, #D274F8 0%, #9B69F4 100%);
+                    background: #9B69F4;
                 }
             }
         }

src/packages/pc/views/presale/list/components/details/index.vue

@@ -18,7 +18,7 @@
         <app-table-details title="钻石参考信息" :label-width="140" :data="selectedRow" :cell-props="details2" :column="2">
             <!-- 生产方式 -->
             <template #ysproductionmode="{ value }">
-                {{ getYSProductionModeName(value) }}
+                {{ handleNumberValue(getYSProductionModeName(value)) }}
             </template>
             <!-- 图片 -->
             <template #pictureurls>
@@ -37,7 +37,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, reactive, PropType, onMounted, defineAsyncComponent } from 'vue'
-import { getFileUrl, parsePercent } from '@/filters'
+import { getFileUrl, parsePercent,handleNumberValue } from '@/filters'
 import { getWRPresaleStatusName, getYSProductionModeName } from '@/constants/presale'
 import { performanceStore } from '@/stores'
 import AppDrawer from '@pc/components/base/drawer/index.vue'

src/packages/pc/views/presale/mine/components/apply/details.vue

@@ -18,7 +18,7 @@
         <app-table-details title="钻石参考信息" :label-width="140" :data="selectedRow" :cell-props="details2" :column="2">
             <!-- 生产方式 -->
             <template #ysproductionmode="{ value }">
-                {{ getYSProductionModeName(value) }}
+                {{ handleNumberValue(getYSProductionModeName(value)) }}
             </template>
             <!-- 图片 -->
             <template #pictureurls>
@@ -32,7 +32,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, reactive, PropType, onMounted } from 'vue'
-import { getFileUrl, parsePercent } from '@/filters'
+import { getFileUrl, parsePercent, handleNumberValue } from '@/filters'
 import { getInOutApplyStatusName, getYSProductionModeName } from '@/constants/presale'
 import { performanceStore } from '@/stores'
 import AppDrawer from '@pc/components/base/drawer/index.vue'

src/packages/pc/views/presale/mine/components/details/index.vue

@@ -18,7 +18,7 @@
         <app-table-details title="钻石参考信息" :label-width="140" :data="selectedRow" :cell-props="details2" :column="2">
             <!-- 生产方式 -->
             <template #ysproductionmode="{ value }">
-                {{ getYSProductionModeName(value) }}
+                {{ handleNumberValue(getYSProductionModeName(value)) }}
             </template>
             <!-- 图片 -->
             <template #pictureurls>
@@ -41,7 +41,7 @@
 <script lang="ts" setup>
 import { shallowRef, reactive, PropType, onMounted } from 'vue'
 import { ElMessage } from 'element-plus'
-import { getFileUrl, parsePercent } from '@/filters'
+import { getFileUrl, parsePercent, handleNumberValue } from '@/filters'
 import { getWRPresaleStatusName, getYSProductionModeName } from '@/constants/presale'
 import { useRequest } from '@/hooks/request'
 import { performanceStore } from '@/stores'

src/packages/pc/views/presale/partake/components/details/index.vue

@@ -10,7 +10,7 @@
         <app-table-details title="钻石参考信息" :label-width="140" :data="selectedRow" :cell-props="details2" :column="2">
             <!-- 生产方式 -->
             <template #ysproductionmode="{ value }">
-                {{ getYSProductionModeName(value) }}
+                {{ handleNumberValue(getYSProductionModeName(value)) }}
             </template>
             <!-- 图片 -->
             <template #pictureurls>
@@ -24,7 +24,7 @@
 
 <script lang="ts" setup>
 import { shallowRef, reactive, PropType, onMounted } from 'vue'
-import { getFileUrl, parsePercent } from '@/filters'
+import { getFileUrl, parsePercent, handleNumberValue } from '@/filters'
 import { getYSProductionModeName } from '@/constants/presale'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import AppTableDetails from '@pc/components/base/table-details/index.vue'