diff --git a/apps/web-antd/public/img/traditional-chinese-medicine.jpg b/apps/web-antd/public/img/traditional-chinese-medicine.jpg new file mode 100644 index 00000000..92534e61 Binary files /dev/null and b/apps/web-antd/public/img/traditional-chinese-medicine.jpg differ diff --git a/apps/web-antd/src/preferences.ts b/apps/web-antd/src/preferences.ts index 7c7002b5..9c2bf3c1 100644 --- a/apps/web-antd/src/preferences.ts +++ b/apps/web-antd/src/preferences.ts @@ -1,5 +1,13 @@ import { defineOverridesPreferences } from '@vben/preferences'; - +// { +// "app": { +// "layout": "sidebar-nav" +// } +// }{ +// "tabbar": { +// "enable": false +// } +// } /** * @description 项目配置文件 * 只需要覆盖项目中的一部分配置,不需要的配置不用覆盖,会自动使用默认配置 @@ -9,7 +17,8 @@ export const overridesPreferences = defineOverridesPreferences({ // overrides app: { name: import.meta.env.VITE_APP_TITLE, - layout: 'sidebar-mixed-nav', + // layout: 'sidebar-mixed-nav', + layout: 'sidebar-nav', // 登录过期模式 // loginExpiredMode: 'modal', loginExpiredMode: 'page', @@ -18,7 +27,8 @@ export const overridesPreferences = defineOverridesPreferences({ enableRefreshToken: false, defaultAvatar: 'https://yanydy.oss-cn-hangzhou.aliyuncs.com/uploads/20241219/2b38e38414a2b9383b8643983e3f69d7.png', - watermark: true, + watermark: false, + // watermark: true, // 是否开启检查更新 enableCheckUpdates: true, // 检查更新的时间间隔,单位为分钟 @@ -49,4 +59,7 @@ export const overridesPreferences = defineOverridesPreferences({ icp: '浙ICP备19041368号-2', icpLink: 'https://beian.miit.gov.cn/#/Integrated/recordQuery', }, + tabbar: { + enable: false, + }, }); diff --git a/apps/web-antd/src/store/auth.ts b/apps/web-antd/src/store/auth.ts index 01277549..ef6f3ff1 100644 --- a/apps/web-antd/src/store/auth.ts +++ b/apps/web-antd/src/store/auth.ts @@ -62,19 +62,19 @@ export const useAuthStore = defineStore('auth', () => { : await router.push(userInfo.home_path || DEFAULT_HOME_PATH); } - if (userInfo?.nick_name) { - // 这里修改水印内容 - await updateWatermark({ - contentType: 'multi-line-text', - // 水印内容 - content: `${userInfo?.nick_name}\r\n${userInfo?.phone}`, - }); - notification.success({ - description: `${$t('authentication.loginSuccessDesc')}:${userInfo?.nick_name}`, - duration: 3, - message: $t('authentication.loginSuccess'), - }); - } + // if (userInfo?.nick_name) { + // // 这里修改水印内容 + // await updateWatermark({ + // contentType: 'multi-line-text', + // // 水印内容 + // content: `${userInfo?.nick_name}\r\n${userInfo?.phone}`, + // }); + // notification.success({ + // description: `${$t('authentication.loginSuccessDesc')}:${userInfo?.nick_name}`, + // duration: 3, + // message: $t('authentication.loginSuccess'), + // }); + // } } } finally { loginLoading.value = false; diff --git a/apps/web-antd/src/views/business/order/prescription/index.vue b/apps/web-antd/src/views/business/order/prescription/index.vue index 0357691c..d9399b04 100644 --- a/apps/web-antd/src/views/business/order/prescription/index.vue +++ b/apps/web-antd/src/views/business/order/prescription/index.vue @@ -111,14 +111,14 @@ const openPrescriptionSourceModal = (id) => { { label: '查看处方', type: 'link', - icon: 'ri:send-plane-fill', + icon: 'marketeq:eye', // auth: ['超级订单', 'sys:user:save'], onClick: openPrescriptionDetail.bind(null, row.id), }, { label: '处方溯源', type: 'link', - icon: 'ri:send-plane-fill', + icon: 'marketeq:eye', // auth: ['超级订单', 'sys:user:save'], onClick: openPrescriptionSourceModal.bind(null, row.id), }, diff --git a/apps/web-antd/src/views/business/order/product-order/components/detail.vue b/apps/web-antd/src/views/business/order/product-order/components/detail.vue index 87efb3a5..dec93fc4 100644 --- a/apps/web-antd/src/views/business/order/product-order/components/detail.vue +++ b/apps/web-antd/src/views/business/order/product-order/components/detail.vue @@ -109,7 +109,16 @@ function getColor(status: any) { {{ data.free_ship === 1 ? '是' : '否' }} - {{ data.status === 0 ? '待处理' : '已处理' }} + 待支付 + 待发货 + 待收货 + 待评价 + 已退款 + 退款中 + 已收货 + 确认收货 + 拒绝退款 + 已取消 {{ deliveryMethod === 0 ? '快递到家' : '药店自提' }} @@ -158,8 +167,21 @@ function getColor(status: any) {

订单商品

+
+
    +
  • + 【{{ item.drug.drug_number }}】 {{ item.drug_name }} (* + {{ item.number * (item.dosage > 0 ? item.dosage : 1) }}) +
  • +
+
@@ -167,7 +189,12 @@ function getColor(status: any) {
- /img/empty.png + /img/empty.png

{{ item.drug_name }}

@@ -256,6 +283,34 @@ function getColor(status: any) { diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/logo/logo.vue b/packages/@core/ui-kit/shadcn-ui/src/components/logo/logo.vue index 7f64fe81..abb6eb8e 100644 --- a/packages/@core/ui-kit/shadcn-ui/src/components/logo/logo.vue +++ b/packages/@core/ui-kit/shadcn-ui/src/components/logo/logo.vue @@ -63,9 +63,9 @@ withDefaults(defineProps(), { class="app-version text-foreground truncate text-nowrap font-semibold" > {{ text }} - - V {{ version }} - + + +