Преглед на файлове

feat(theme): 更新主题配置中的颜色和布局滚动模式

- 将 otherColor.info 颜色值修改为主题色 #f97316
- 启用 scrollMode: 'content' 并注释掉 scrollMode: 'wrapper'
- 在 overrideThemeSettings 中设置默认的 layout.mode 和 scrollMode
- 修改按钮样式从 quaternary 为 ghost 并增加 ml2 类名
- 调整订单相关字段命名及显示逻辑以匹配接口变更
zhangtao преди 4 седмици
родител
ревизия
e4e22e0e6e

+ 9 - 4
src/theme/settings.ts

@@ -6,7 +6,7 @@ export const themeSettings: App.Theme.ThemeSetting = {
   recommendColor: false,
   themeColor: '#f97316',
   otherColor: {
-    info: '#2080f0',
+    info: '#f97316',
     success: '#52c41a',
     warning: '#faad14',
     error: '#f5222d'
@@ -15,11 +15,11 @@ export const themeSettings: App.Theme.ThemeSetting = {
   resetCacheStrategy: 'refresh',
   layout: {
     mode: 'vertical', // 默认模式
-    // scrollMode: 'content'
+    scrollMode: 'content'
     // mode: 'vertical-mix',
     // scrollMode: 'wrapper'
     // mode: 'top-hybrid-sidebar-first',
-    scrollMode: 'wrapper'
+    // scrollMode: 'wrapper'
   },
   page: {
     animate: true,
@@ -95,4 +95,9 @@ export const themeSettings: App.Theme.ThemeSetting = {
  *
  * If publish new version, use `overrideThemeSettings` to override certain theme settings
  */
-export const overrideThemeSettings: Partial<App.Theme.ThemeSetting> = {};
+export const overrideThemeSettings: Partial<App.Theme.ThemeSetting> = {
+  layout: {
+    mode: 'vertical', // 默认模式
+    scrollMode: 'content'
+  }
+};

+ 2 - 2
src/typings/api.d.ts

@@ -1593,9 +1593,9 @@ declare namespace Api {
        */
       OrderOffsetPoints: number;
       /**
-       * 订单实际总值(用户实付)积分
+       * 订单实际总值
        */
-      orderActualTotal: number;
+      actualTotal: number;
       [property: string]: any;
     }
     interface OrderRefundRecord {

+ 3 - 2
src/views/delivery/after-sales-order/index.vue

@@ -194,13 +194,14 @@ const { columns, data, loading, getData, mobilePagination } = useNaivePaginatedT
       render: row => {
         return (
           <div class={'mt7'}>
-            <n-button size="small" type="primary" quaternary onClick={() => handleOpenMoadl(row)}>
+            <n-button size="small" type="primary" ghost onClick={() => handleOpenMoadl(row)}>
               查看订单
             </n-button>
             <n-button
               size="small"
+              class={'ml2'}
               type="primary"
-              quaternary
+              ghost
               onClick={() => AfterSalesModal.value?.handleOpenOrder(row.refundId)}
             >
               售后详情

+ 1 - 1
src/views/delivery/after-sales-order/order-modal.vue

@@ -95,7 +95,7 @@ function getImgFils() {
           <div>商品总额: {{ goodsMoney || '---' }}</div>
           <div>配送费(快递): {{ orderInfo.freightAmount || '---' }}元</div>
           <div>积分抵扣: {{ (orderInfo.orderOffsetPoints / 100).toFixed(2) || '---' }}元</div>
-          <div>实际付款: {{ orderInfo.orderActualTotal || '---' }}元</div>
+          <div>实际付款: {{ orderInfo.actualTotal || '---' }}元</div>
         </NDescriptionsItem>
       </NDescriptions>
       <NDivider />

+ 2 - 2
src/views/delivery/normal-order/index.vue

@@ -170,11 +170,11 @@ const { columns, data, loading, getData, mobilePagination } = useNaivePaginatedT
       render: row => {
         return (
           <div class={'mt7'}>
-            <n-button size="small" type="primary" quaternary onClick={() => handleOpenMoadl(row)}>
+            <n-button size="small" type="primary" ghost onClick={() => handleOpenMoadl(row)}>
               查看订单
             </n-button>
             {ShippingButton.includes(row.hbOrderStatus) && (
-              <n-button size="small" type="primary" quaternary onClick={() => handleDeivery(row)}>
+              <n-button size="small" class={'ml2'} type="primary" ghost onClick={() => handleDeivery(row)}>
                 {row.dvyFlowId ? '修改物流' : '发货'}
               </n-button>
             )}

+ 4 - 4
src/views/goods/desk-category/index.vue

@@ -188,23 +188,23 @@ const tableColumns: NaiveUI.TableColumn<Api.goods.ShopCategory>[] = [
     render: row => (
       <div class="flex-center gap-8px">
         {row.level == 2 && (
-          <NButton type="primary" size="small" quaternary onClick={() => add(row)}>
+          <NButton type="primary" size="small" ghost onClick={() => add(row)}>
             添加三级分类
           </NButton>
         )}
         {row.level == 3 && (
-          <NButton type="primary" size="small" quaternary onClick={() => handleOpenRelatedGoods(row)}>
+          <NButton type="primary" size="small" ghost onClick={() => handleOpenRelatedGoods(row)}>
             关联商品
           </NButton>
         )}
         {
-          <NButton type="primary" size="small" quaternary onClick={() => edit(row)}>
+          <NButton type="primary" size="small" ghost onClick={() => edit(row)}>
             编辑
           </NButton>
         }
 
         {row.level == 3 && (
-          <NButton type="primary" size="small" quaternary onClick={() => del(row)}>
+          <NButton type="primary" size="small" ghost onClick={() => del(row)}>
             删除
           </NButton>
         )}