Browse Source

feat(config): 更新项目标题和描述配置

zhangtao 4 tuần trước cách đây
mục cha
commit
1f15773862

+ 2 - 2
.env

@@ -2,9 +2,9 @@
 # if use a sub directory, it must be end with "/", like "/admin/" but not "/admin"
 VITE_BASE_URL=/
 
-VITE_APP_TITLE=中数未来管理系统
+VITE_APP_TITLE=中数星闪豹管理系统
 
-VITE_APP_DESC=中数未来管理系统 admin template
+VITE_APP_DESC=中数星闪豹管理系统 admin template
 
 # the prefix of the icon name
 VITE_ICON_PREFIX=icon

+ 2 - 2
.env.test

@@ -1,10 +1,10 @@
 # backend service base url, test environment
 # VITE_SERVICE_BASE_URL=http://74949mkfh190.vicp.fun
-VITE_SERVICE_BASE_URL=http://192.168.1.253:8114 #付
+# VITE_SERVICE_BASE_URL=http://192.168.1.253:8114 #付
 # VITE_SERVICE_BASE_URL=http://192.168.0.157:8114 #王
 # VITE_SERVICE_BASE_URL=http://192.168.1.166:8114 #张
 # VITE_SERVICE_BASE_URL=https://mock.apifox.cn/m1/3109515-0-default
-# VITE_SERVICE_BASE_URL=https://shop.platform.zswlgz.com #服务器
+VITE_SERVICE_BASE_URL=https://shop.platform.zswlgz.com #服务器
 
 
 # other backend service base url, test environment

+ 1 - 1
src/locales/langs/en-us.ts

@@ -1,6 +1,6 @@
 const local: App.I18n.Schema = {
   system: {
-    title: 'SoybeanAdmin',
+    title: 'zswlxshapex admin',
     updateTitle: 'System Version Update Notification',
     updateContent: 'A new version of the system has been detected. Do you want to refresh the page immediately?',
     updateConfirm: 'Refresh immediately',

+ 1 - 1
src/locales/langs/zh-cn.ts

@@ -1,6 +1,6 @@
 const local: App.I18n.Schema = {
   system: {
-    title: '中数未来 管理系统',
+    title: '中数星闪豹 管理系统',
     updateTitle: '系统版本更新通知',
     updateContent: '检测到系统有新版本发布,是否立即刷新页面?',
     updateConfirm: '立即刷新',

+ 2 - 2
src/theme/settings.ts

@@ -14,11 +14,11 @@ export const themeSettings: App.Theme.ThemeSetting = {
   isInfoFollowPrimary: true,
   resetCacheStrategy: 'refresh',
   layout: {
-    // mode: 'vertical',默认模式
+    mode: 'vertical', // 默认模式
     // scrollMode: 'content'
     // mode: 'vertical-mix',
     // scrollMode: 'wrapper'
-    mode: 'top-hybrid-sidebar-first',
+    // mode: 'top-hybrid-sidebar-first',
     scrollMode: 'wrapper'
   },
   page: {

+ 4 - 0
src/typings/api.d.ts

@@ -1026,6 +1026,10 @@ declare namespace Api {
       [property: string]: any;
     }
     interface deliveryOrder {
+      /**
+       * 取消原因
+       */
+      cancelReason?: string;
       /**
        * 实际总值
        */

+ 2 - 2
src/views/delivery/normal-order/component/normal-modal.vue

@@ -5,7 +5,7 @@ import { fetchGetNomalOrderInfo } from '@/service/api/delivery/normal-orde';
 import { useAppStore } from '@/store/modules/app';
 import { copyTextToClipboard } from '@/utils/zt';
 import { useModal } from '@/components/zt/Modal/hooks/useModal';
-import { closeStatus, dvyStatus, orderColumns, orderStatusEnum } from '../normal-order';
+import { dvyStatus, orderColumns, orderStatusEnum } from '../normal-order';
 import DeliveryModal from './delivery-modal.vue';
 const [registerModal, { openModal, setModalLoading }] = useModal({
   title: '订单详情',
@@ -125,7 +125,7 @@ function handleCopy() {
             </template>
             <template v-if="orderInfo.hbOrderStatus == orderStatusEnum.ORDER_CANCEL">
               <div class="text-16px font-semibold">已取消</div>
-              <div>取消原因:{{ closeStatus[orderInfo.closeType as keyof typeof closeStatus] || '未知取消原因' }}</div>
+              <div>取消原因:{{ orderInfo.cancelReason || '未知取消原因' }}</div>
             </template>
             <template v-if="orderInfo.hbOrderStatus == orderStatusEnum.ORDER_COMPLETE">
               <div class="text-16px font-semibold">交易成功</div>

+ 0 - 7
src/views/delivery/normal-order/normal-order.ts

@@ -143,13 +143,6 @@ export const dvyStatus = {
   3: '及时配送'
 };
 
-export const closeStatus = {
-  1: '超时未支付',
-  2: '退款关闭',
-  3: '买家取消',
-  4: '已通过货到付款交易'
-};
-
 export const orderColumns: NaiveUI.TableColumn<Api.delivery.OrderItemElement>[] = [
   {
     title: '商品',