From b3572257035e128704a810b0704c58ad1094d137 Mon Sep 17 00:00:00 2001 From: chenghuan Date: Mon, 24 Nov 2025 10:21:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A=E6=88=91=E7=9A=84?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=85=BC=E5=AE=B9=E5=A4=9A=E7=A7=8D=E5=95=86?= =?UTF-8?q?=E5=93=81=E8=AE=A2=E5=8D=95=EF=BC=88=E7=94=B5=E5=AD=90=E4=B9=A6?= =?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B=E3=80=81vip=EF=BC=89=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/order/GoodsSelector.vue | 12 +- components/order/ProductInfo.vue | 110 ++++++++++++ package.json | 4 +- pages/book/detail.vue | 2 +- pages/book/index.vue | 4 +- pages/order/confirmOrder.vue | 0 pages/user/order/index.vue | 258 ++++++++++++++--------------- static/jifen.png | Bin 0 -> 6382 bytes static/vip.png | Bin 0 -> 4289 bytes style/tailwind.css | 41 +++++ tailwind.config.js | 8 +- types/order.d.ts | 12 ++ types/user.ts | 17 -- utils/index.ts | 4 +- 14 files changed, 307 insertions(+), 165 deletions(-) create mode 100644 components/order/ProductInfo.vue create mode 100644 pages/order/confirmOrder.vue create mode 100644 static/jifen.png create mode 100644 static/vip.png diff --git a/components/order/GoodsSelector.vue b/components/order/GoodsSelector.vue index 1f00c70..0f3a675 100644 --- a/components/order/GoodsSelector.vue +++ b/components/order/GoodsSelector.vue @@ -9,7 +9,7 @@ {{ goods[selectedIndex].productName }} - NZ$ {{ selectedGoodsPrice }} + {{ selectedGoodsPrice }} 天医币 @@ -30,21 +30,21 @@ - NZ$ {{ parseFloat(item.vipPrice).toFixed(2) }} + {{ parseFloat(item.vipPrice).toFixed(2) }} 天医币 VIP到手价 - NZ$ {{ parseFloat(item.price).toFixed(2) }} + {{ parseFloat(item.price).toFixed(2) }} 天医币 - NZ$ {{ parseFloat(item.activityPrice).toFixed(2) }} + {{ parseFloat(item.activityPrice).toFixed(2) }} 天医币 活动价 - NZ$ {{ parseFloat(item.price).toFixed(2) }} + {{ parseFloat(item.price).toFixed(2) }} 天医币 - NZ$ {{ parseFloat(item.price).toFixed(2) }} + {{ parseFloat(item.price).toFixed(2) }} 天医币 diff --git a/components/order/ProductInfo.vue b/components/order/ProductInfo.vue new file mode 100644 index 0000000..2ef02a4 --- /dev/null +++ b/components/order/ProductInfo.vue @@ -0,0 +1,110 @@ + + + + + \ No newline at end of file diff --git a/package.json b/package.json index e40383c..2c41b17 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,10 @@ "太湖国际", "中医学 国学 心理学" ], - "scripts": { + "scripts": { "tailwind-dev": "npx @tailwindcss/cli -i ./tailwind-input.css -o ./style/tailwind.css --watch", "tailwind-build": "npx @tailwindcss/cli -i ./tailwind-input.css -o ./style/tailwind.css" - }, + }, "dcloudext": { "sale": { "regular": { diff --git a/pages/book/detail.vue b/pages/book/detail.vue index 9541d61..affc6d1 100644 --- a/pages/book/detail.vue +++ b/pages/book/detail.vue @@ -238,7 +238,7 @@ async function loadBookInfo() { productId: bookId.value, productName: bookInfo.value.name, productImages: bookInfo.value.images, - price: bookInfo.value.priceData?.dictValue || 0, + price: bookInfo.value.abroadPrice || 0, vipPrice: null, activityPrice: null, isVipPrice: 0, diff --git a/pages/book/index.vue b/pages/book/index.vue index 584db7e..5fb4c92 100644 --- a/pages/book/index.vue +++ b/pages/book/index.vue @@ -162,9 +162,7 @@ > {{ item.name }} - {{ - formatPrice(item) - }} + {{ item.abroadPrice }} 天医币 {{ formatStats(item) }} diff --git a/pages/order/confirmOrder.vue b/pages/order/confirmOrder.vue new file mode 100644 index 0000000..e69de29 diff --git a/pages/user/order/index.vue b/pages/user/order/index.vue index be873ad..bea0649 100644 --- a/pages/user/order/index.vue +++ b/pages/user/order/index.vue @@ -10,34 +10,32 @@ - - - {{ order.bookEntity.name }} - - - - {{ order.orderMoney }} - NZD + + + + + + + + + 实付款:{{ order.orderMoney }} 天医币 + + + @@ -45,8 +43,10 @@ diff --git a/static/jifen.png b/static/jifen.png new file mode 100644 index 0000000000000000000000000000000000000000..5319e4de942ad1f7eb91f695e4424e5f0669ad06 GIT binary patch literal 6382 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 DpBz5g literal 0 HcmV?d00001 diff --git a/style/tailwind.css b/style/tailwind.css index b734602..057e99a 100644 --- a/style/tailwind.css +++ b/style/tailwind.css @@ -8,6 +8,8 @@ --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --color-red-500: oklch(63.7% 0.237 25.331); + --color-white: #fff; + --spacing: 0.25rem; --ease-in-out: cubic-bezier(0.4, 0, 0.2, 1); --default-transition-duration: 150ms; --default-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); @@ -203,6 +205,30 @@ max-width: 96rem; } } + .\!ml-2 { + margin-left: calc(var(--spacing) * 2) !important; + } + .\!ml-12 { + margin-left: calc(var(--spacing) * 12) !important; + } + .\!ml-\[10px\] { + margin-left: 10px !important; + } + .ml-1 { + margin-left: calc(var(--spacing) * 1); + } + .ml-1\! { + margin-left: calc(var(--spacing) * 1) !important; + } + .ml-2 { + margin-left: calc(var(--spacing) * 2); + } + .ml-2\.5\! { + margin-left: calc(var(--spacing) * 2.5) !important; + } + .ml-12 { + margin-left: calc(var(--spacing) * 12); + } .block { display: block; } @@ -236,6 +262,9 @@ .flex-shrink { flex-shrink: 1; } + .border-collapse { + border-collapse: collapse; + } .transform { transform: var(--tw-rotate-x,) var(--tw-rotate-y,) var(--tw-rotate-z,) var(--tw-skew-x,) var(--tw-skew-y,); } @@ -249,6 +278,9 @@ border-style: var(--tw-border-style); border-width: 1px; } + .bg-\[\#e55f18\] { + background-color: #e55f18; + } .bg-\[blue\] { background-color: blue; } @@ -258,6 +290,9 @@ .bg-\[transparent\] { background-color: transparent; } + .bg-red-500 { + background-color: var(--color-red-500); + } .pt-\[40px\] { padding-top: 40px; } @@ -273,6 +308,9 @@ .text-\[red\] { color: red; } + .text-white { + color: var(--color-white); + } .lowercase { text-transform: lowercase; } @@ -283,6 +321,9 @@ --tw-ordinal: ordinal; font-variant-numeric: var(--tw-ordinal,) var(--tw-slashed-zero,) var(--tw-numeric-figure,) var(--tw-numeric-spacing,) var(--tw-numeric-fraction,); } + .underline { + text-decoration-line: underline; + } .ring { --tw-ring-shadow: var(--tw-ring-inset,) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color, currentcolor); box-shadow: var(--tw-inset-shadow), var(--tw-inset-ring-shadow), var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow); diff --git a/tailwind.config.js b/tailwind.config.js index f7231b3..b5d2c11 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -15,10 +15,10 @@ module.exports = { // 指定要处理的文件 content: [ - './pages/**/*.{vue,js}', - './components/**/*.{vue,js}', - './main.js', - './App.vue', + './pages/**/*.{vue,js,ts}', + './components/**/*.{vue,js,ts}', + './main.js', + './App.vue', './index.html' ], theme: { diff --git a/types/order.d.ts b/types/order.d.ts index d42e550..764c247 100644 --- a/types/order.d.ts +++ b/types/order.d.ts @@ -13,6 +13,18 @@ export interface IGoods { delFlag?: number // 删除标记 -1-已下架 } +/** + * 订单接口 + */ +export interface IOrder { + id: number + orderSn: string + orderMoney: number + paymentMethod: string // '4'-虚拟货币, '5'-真实货币 + createTime: string + [key: string]: any +} + /** * 订单创建参数接口 */ diff --git a/types/user.ts b/types/user.ts index e319a5e..4497965 100644 --- a/types/user.ts +++ b/types/user.ts @@ -68,23 +68,6 @@ export interface IVipInfo { [key: string]: any } -/** - * 订单接口 - */ -export interface IOrder { - id: number - orderSn: string - bookEntity: { - id: number - name: string - images: string - } - orderMoney: number - paymentMethod: string // '4'-虚拟货币, '5'-真实货币 - createTime: string - [key: string]: any -} - /** * VIP套餐接口 */ diff --git a/utils/index.ts b/utils/index.ts index 7e6f05a..dbb5a0f 100644 --- a/utils/index.ts +++ b/utils/index.ts @@ -43,7 +43,7 @@ export const makePhoneCall = (phoneNumber: string, title: string) => { /** * 复制到剪贴板 */ -export const copyToClipboard = (content: string, title: string, t: Function) => { +export const copyToClipboard = (content: string, title: string = '') => { uni.setClipboardData({ data: content, success: () => { @@ -52,7 +52,7 @@ export const copyToClipboard = (content: string, title: string, t: Function) => icon: 'none' }) }, - fail: (error) => { + fail: (error: any) => { console.error('复制失败:', error) } })