From 8e119162f1d44b3d3b5f237905b7857ac3425f0c Mon Sep 17 00:00:00 2001
From: YuanHuakk <1751826683@qq.com>
Date: Tue, 24 Sep 2024 16:02:44 +0800
Subject: [PATCH] build(deps): update deps
---
.idea/codeStyles/Project.xml | 57 +
.idea/codeStyles/codeStyleConfig.xml | 5 +
.idea/git_toolbox_blame.xml | 6 +
.idea/inspectionProfiles/Project_Default.xml | 7 +
.idea/shelf/___.xml | 4 +
.../shelved.patch | 1457 +++++++++++++++++
.idea/vcs.xml | 6 +
.idea/workspace.xml | 26 +-
components.d.ts | 96 +-
package.json | 2 +-
src/components/Cart.vue | 49 +-
src/pages/admin/add_order/add_menu/index.vue | 31 +-
src/pages/admin/order_manage/detail/index.vue | 52 +-
src/pages/admin/order_manage/list/index.vue | 77 +-
src/pages/admin/verify/verify_list/index.vue | 39 +-
src/pages/admin/withdrawal/index.vue | 76 +-
src/pages/goods/pay/index.scss | 194 +--
src/pages/goods/pay/index.vue | 5 +-
src/pages/index/index.vue | 50 +-
src/pages/mer/mer_detail/index.vue | 90 +-
src/pages/users/order_list/index.vue | 129 +-
src/pages/users/order_list_detail/index.vue | 131 +-
22 files changed, 2212 insertions(+), 377 deletions(-)
create mode 100644 .idea/codeStyles/Project.xml
create mode 100644 .idea/codeStyles/codeStyleConfig.xml
create mode 100644 .idea/git_toolbox_blame.xml
create mode 100644 .idea/inspectionProfiles/Project_Default.xml
create mode 100644 .idea/shelf/___.xml
create mode 100644 .idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch
create mode 100644 .idea/vcs.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..a49b161
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..307554b
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/git_toolbox_blame.xml b/.idea/git_toolbox_blame.xml
new file mode 100644
index 0000000..04ede99
--- /dev/null
+++ b/.idea/git_toolbox_blame.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..7c4836f
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/shelf/___.xml b/.idea/shelf/___.xml
new file mode 100644
index 0000000..f6f8aa1
--- /dev/null
+++ b/.idea/shelf/___.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch b/.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch
new file mode 100644
index 0000000..f456234
--- /dev/null
+++ b/.idea/shelf/在变基之前未提交的更改_[更改]/shelved.patch
@@ -0,0 +1,1457 @@
+Index: components.d.ts
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>// generated by unplugin-vue-components\n// We suggest you to commit this file into source control\n// Read more: https://github.com/vuejs/core/pull/3399\nimport '@vue/runtime-core'\n\nexport {}\n\ndeclare module '@vue/runtime-core' {\n export interface GlobalComponents {\n Auth: typeof import('./src/components/Auth.vue')['default']\n Back: typeof import('./src/components/Back.vue')['default']\n Cart: typeof import('./src/components/Cart.vue')['default']\n MerList: typeof import('./src/components/MerList.vue')['default']\n NutAvatar: typeof import('@nutui/nutui-taro')['Avatar']\n NutBacktop: typeof import('@nutui/nutui-taro')['Backtop']\n NutButton: typeof import('@nutui/nutui-taro')['Button']\n NutCalendar: typeof import('@nutui/nutui-taro')['Calendar']\n NutCell: typeof import('@nutui/nutui-taro')['Cell']\n NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup']\n NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox']\n NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup']\n NutDialog: typeof import('@nutui/nutui-taro')['Dialog']\n NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis']\n NutEmpty: typeof import('@nutui/nutui-taro')['Empty']\n NutForm: typeof import('@nutui/nutui-taro')['Form']\n NutFormItem: typeof import('@nutui/nutui-taro')['FormItem']\n NutGrid: typeof import('@nutui/nutui-taro')['Grid']\n NutGridItem: typeof import('@nutui/nutui-taro')['GridItem']\n NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview']\n NutInput: typeof import('@nutui/nutui-taro')['Input']\n NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber']\n NutOverlay: typeof import('@nutui/nutui-taro')['Overlay']\n NutPagination: typeof import('@nutui/nutui-taro')['Pagination']\n NutPicker: typeof import('@nutui/nutui-taro')['Picker']\n NutPopover: typeof import('@nutui/nutui-taro')['Popover']\n NutPopup: typeof import('@nutui/nutui-taro')['Popup']\n NutPrice: typeof import('@nutui/nutui-taro')['Price']\n NutRadio: typeof import('@nutui/nutui-taro')['Radio']\n NutRadioGroup: typeof import('@nutui/nutui-taro')['RadioGroup']\n NutRate: typeof import('@nutui/nutui-taro')['Rate']\n NutSwiper: typeof import('@nutui/nutui-taro')['Swiper']\n NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem']\n NutSwitch: typeof import('@nutui/nutui-taro')['Switch']\n NutTable: typeof import('@nutui/nutui-taro')['Table']\n NutTabPane: typeof import('@nutui/nutui-taro')['TabPane']\n NutTabs: typeof import('@nutui/nutui-taro')['Tabs']\n NutTextarea: typeof import('@nutui/nutui-taro')['Textarea']\n NutUploader: typeof import('@nutui/nutui-taro')['Uploader']\n Pay: typeof import('./src/components/Pay.vue')['default']\n Popup: typeof import('./src/components/Popup.vue')['default']\n RichEditor: typeof import('./src/components/RichEditor.vue')['default']\n StoreList: typeof import('./src/components/StoreList.vue')['default']\n Ucharts: typeof import('./src/components/Ucharts.vue')['default']\n Upload: typeof import('./src/components/Upload.vue')['default']\n UserModal: typeof import('./src/components/UserModal.vue')['default']\n }\n}\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/components.d.ts b/components.d.ts
+--- a/components.d.ts (revision 097029128cd2749b71a445397d04a48d9ddaba1a)
++++ b/components.d.ts (date 1727095397349)
+@@ -1,57 +1,57 @@
+ // generated by unplugin-vue-components
+ // We suggest you to commit this file into source control
+ // Read more: https://github.com/vuejs/core/pull/3399
+-import '@vue/runtime-core'
++import '@vue/runtime-core';
+
+-export {}
++export {};
+
+ declare module '@vue/runtime-core' {
+ export interface GlobalComponents {
+- Auth: typeof import('./src/components/Auth.vue')['default']
+- Back: typeof import('./src/components/Back.vue')['default']
+- Cart: typeof import('./src/components/Cart.vue')['default']
+- MerList: typeof import('./src/components/MerList.vue')['default']
+- NutAvatar: typeof import('@nutui/nutui-taro')['Avatar']
+- NutBacktop: typeof import('@nutui/nutui-taro')['Backtop']
+- NutButton: typeof import('@nutui/nutui-taro')['Button']
+- NutCalendar: typeof import('@nutui/nutui-taro')['Calendar']
+- NutCell: typeof import('@nutui/nutui-taro')['Cell']
+- NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup']
+- NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox']
+- NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup']
+- NutDialog: typeof import('@nutui/nutui-taro')['Dialog']
+- NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis']
+- NutEmpty: typeof import('@nutui/nutui-taro')['Empty']
+- NutForm: typeof import('@nutui/nutui-taro')['Form']
+- NutFormItem: typeof import('@nutui/nutui-taro')['FormItem']
+- NutGrid: typeof import('@nutui/nutui-taro')['Grid']
+- NutGridItem: typeof import('@nutui/nutui-taro')['GridItem']
+- NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview']
+- NutInput: typeof import('@nutui/nutui-taro')['Input']
+- NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber']
+- NutOverlay: typeof import('@nutui/nutui-taro')['Overlay']
+- NutPagination: typeof import('@nutui/nutui-taro')['Pagination']
+- NutPicker: typeof import('@nutui/nutui-taro')['Picker']
+- NutPopover: typeof import('@nutui/nutui-taro')['Popover']
+- NutPopup: typeof import('@nutui/nutui-taro')['Popup']
+- NutPrice: typeof import('@nutui/nutui-taro')['Price']
+- NutRadio: typeof import('@nutui/nutui-taro')['Radio']
+- NutRadioGroup: typeof import('@nutui/nutui-taro')['RadioGroup']
+- NutRate: typeof import('@nutui/nutui-taro')['Rate']
+- NutSwiper: typeof import('@nutui/nutui-taro')['Swiper']
+- NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem']
+- NutSwitch: typeof import('@nutui/nutui-taro')['Switch']
+- NutTable: typeof import('@nutui/nutui-taro')['Table']
+- NutTabPane: typeof import('@nutui/nutui-taro')['TabPane']
+- NutTabs: typeof import('@nutui/nutui-taro')['Tabs']
+- NutTextarea: typeof import('@nutui/nutui-taro')['Textarea']
+- NutUploader: typeof import('@nutui/nutui-taro')['Uploader']
+- Pay: typeof import('./src/components/Pay.vue')['default']
+- Popup: typeof import('./src/components/Popup.vue')['default']
+- RichEditor: typeof import('./src/components/RichEditor.vue')['default']
+- StoreList: typeof import('./src/components/StoreList.vue')['default']
+- Ucharts: typeof import('./src/components/Ucharts.vue')['default']
+- Upload: typeof import('./src/components/Upload.vue')['default']
+- UserModal: typeof import('./src/components/UserModal.vue')['default']
++ Auth: typeof import('./src/components/Auth.vue')['default'];
++ Back: typeof import('./src/components/Back.vue')['default'];
++ Cart: typeof import('./src/components/Cart.vue')['default'];
++ MerList: typeof import('./src/components/MerList.vue')['default'];
++ NutAvatar: typeof import('@nutui/nutui-taro')['Avatar'];
++ NutBacktop: typeof import('@nutui/nutui-taro')['Backtop'];
++ NutButton: typeof import('@nutui/nutui-taro')['Button'];
++ NutCalendar: typeof import('@nutui/nutui-taro')['Calendar'];
++ NutCell: typeof import('@nutui/nutui-taro')['Cell'];
++ NutCellGroup: typeof import('@nutui/nutui-taro')['CellGroup'];
++ NutCheckbox: typeof import('@nutui/nutui-taro')['Checkbox'];
++ NutCheckboxGroup: typeof import('@nutui/nutui-taro')['CheckboxGroup'];
++ NutDialog: typeof import('@nutui/nutui-taro')['Dialog'];
++ NutEllipsis: typeof import('@nutui/nutui-taro')['Ellipsis'];
++ NutEmpty: typeof import('@nutui/nutui-taro')['Empty'];
++ NutForm: typeof import('@nutui/nutui-taro')['Form'];
++ NutFormItem: typeof import('@nutui/nutui-taro')['FormItem'];
++ NutGrid: typeof import('@nutui/nutui-taro')['Grid'];
++ NutGridItem: typeof import('@nutui/nutui-taro')['GridItem'];
++ NutImagePreview: typeof import('@nutui/nutui-taro')['ImagePreview'];
++ NutInput: typeof import('@nutui/nutui-taro')['Input'];
++ NutInputNumber: typeof import('@nutui/nutui-taro')['InputNumber'];
++ NutOverlay: typeof import('@nutui/nutui-taro')['Overlay'];
++ NutPagination: typeof import('@nutui/nutui-taro')['Pagination'];
++ NutPicker: typeof import('@nutui/nutui-taro')['Picker'];
++ NutPopover: typeof import('@nutui/nutui-taro')['Popover'];
++ NutPopup: typeof import('@nutui/nutui-taro')['Popup'];
++ NutPrice: typeof import('@nutui/nutui-taro')['Price'];
++ NutRadio: typeof import('@nutui/nutui-taro')['Radio'];
++ NutRadioGroup: typeof import('@nutui/nutui-taro')['RadioGroup'];
++ NutRate: typeof import('@nutui/nutui-taro')['Rate'];
++ NutSwiper: typeof import('@nutui/nutui-taro')['Swiper'];
++ NutSwiperItem: typeof import('@nutui/nutui-taro')['SwiperItem'];
++ NutSwitch: typeof import('@nutui/nutui-taro')['Switch'];
++ NutTable: typeof import('@nutui/nutui-taro')['Table'];
++ NutTabPane: typeof import('@nutui/nutui-taro')['TabPane'];
++ NutTabs: typeof import('@nutui/nutui-taro')['Tabs'];
++ NutTextarea: typeof import('@nutui/nutui-taro')['Textarea'];
++ NutUploader: typeof import('@nutui/nutui-taro')['Uploader'];
++ Pay: typeof import('./src/components/Pay.vue')['default'];
++ Popup: typeof import('./src/components/Popup.vue')['default'];
++ RichEditor: typeof import('./src/components/RichEditor.vue')['default'];
++ StoreList: typeof import('./src/components/StoreList.vue')['default'];
++ Ucharts: typeof import('./src/components/Ucharts.vue')['default'];
++ Upload: typeof import('./src/components/Upload.vue')['default'];
++ UserModal: typeof import('./src/components/UserModal.vue')['default'];
+ }
+ }
+Index: src/components/Cart.vue
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>\n\n\n \n \n \n \n \n \n \n 0\">\n {{ cartInfo.count }}\n \n \n \n 总金额: {{ cartInfo.discount_price.toFixed(2) }}元\n ，积分抵扣: {{ cartInfo.discount_integral.toFixed(2) }}\n \n \n \n 0\" class=\"payBtn\" @click.stop=\"create_order\">去结算\n \n \n \n \n \n \n \n \n \n \n {{ item.name }}\n\n \n 现金:{{ item.price }}\n 0\" class=\"ml-2\">积分:{{ item.discount_integral }}\n \n \n \n onAdd(item)\"\n @reduce=\"() => onReduce(item)\">\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n\n\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/components/Cart.vue b/src/components/Cart.vue
+--- a/src/components/Cart.vue (revision 097029128cd2749b71a445397d04a48d9ddaba1a)
++++ b/src/components/Cart.vue (date 1727095401820)
+@@ -1,10 +1,10 @@
+ \n\n\n \n \n \n \n {{ item.title }}\n \n \n \n \n \n 0\">\n \n \n 订单号：{{ item.oid }}\n {{\n item.status === 0\n ? '待付款'\n : item.status === 1\n ? '待使用'\n : item.status === 2\n ? '已使用'\n : '已失效'\n }}\n \n \n \n \n \n \n \n {{ itm.Goods?.name }}\n \n {{ itm.Goods.discount_price }}元\n 0\">+{{ itm.Goods.exchange }}积分\n \n \n \n \n x{{ itm.number }}\n \n \n \n \n \n 共{{ item.count }}件商品\n \n {{ item.status !== 0 ? '实' : '应' }}付款:\n {{ item.discount_price }} (元)\n 0\">积分抵扣: {{ item.exchange }}\n \n \n \n \n 取消订单\n \n \n 立即付款\n \n 出示核销码\n \n \n \n \n \n \n \n \n 核销码\n \n \n \n \n \n \n \n \n\n\n\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/pages/users/order_list/index.vue b/src/pages/users/order_list/index.vue
+--- a/src/pages/users/order_list/index.vue (revision 097029128cd2749b71a445397d04a48d9ddaba1a)
++++ b/src/pages/users/order_list/index.vue (date 1727095403246)
+@@ -1,9 +1,9 @@
+ \n\n\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/pages/admin/order_manage/list/index.vue b/src/pages/admin/order_manage/list/index.vue
+--- a/src/pages/admin/order_manage/list/index.vue (revision 097029128cd2749b71a445397d04a48d9ddaba1a)
++++ b/src/pages/admin/order_manage/list/index.vue (date 1727095402342)
+@@ -1,37 +1,52 @@
+
+
+
+-
+- {{ item.text }}
+-
++
++ {{ item.text }}
++
+
+
+
+-
++
+
+ 订单号：{{ item.oid }}
+- {{
+- item.status === 0
+- ? '待付款'
+- : item.status === 1
++ ? '#333333'
++ : '#9C9C9C',
++ }"
++ >{{
++ item.status === 0
++ ? '待付款'
++ : item.status === 1
+ ? '待使用'
+ : item.status === 2
+- ? '已使用'
+- : '已失效'
+- }}
++ ? '已使用'
++ : '已失效'
++ }}
+
+
+
+@@ -41,8 +56,11 @@
+
+ {{ itm.Goods?.name }}
+
+- {{ itm.pay_price }}元
+- +{{ itm.pay_integral }}积分
++ {{ itm.pay_price }}元
++ +{{ itm.pay_integral }}积分
+
+
+
+@@ -51,9 +69,12 @@
+
+
+
+-
++
+ 共{{ item.count }}件商品
+- {{ item.status !== 0 ? '实' : '应' }}付款:
++ {{ item.status !== 0 ? '实' : '应' }}付款:
+ {{ item.discount_price }} (元)
+ 积分抵扣: {{ item.exchange }}
+
+@@ -65,9 +86,9 @@
+
+
+ \n\n\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/pages/admin/add_order/add_menu/index.vue b/src/pages/admin/add_order/add_menu/index.vue
+--- a/src/pages/admin/add_order/add_menu/index.vue (revision 097029128cd2749b71a445397d04a48d9ddaba1a)
++++ b/src/pages/admin/add_order/add_menu/index.vue (date 1727095402052)
+@@ -2,9 +2,19 @@
+
+
+
+-
+-
++
+
+
+
+@@ -23,7 +33,10 @@
+ >
+ -->
+
+-
++
+
+
+
+@@ -40,16 +53,20 @@
+
+
+
+-
++
+
+
+
+ \n\n\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
+--- a/src/pages/index/index.vue (revision 097029128cd2749b71a445397d04a48d9ddaba1a)
++++ b/src/pages/index/index.vue (date 1727095402805)
+@@ -1,12 +1,14 @@
+
+
+-
++
+
+
+ {{ address }}
+
+
+-
++
+
+ 搜索
+
+@@ -14,18 +16,36 @@
+
+
+
+
+
+-
++
+
+ {{ item.name }}
+
+
+-
++
+
+
+
+@@ -34,8 +54,8 @@
+
+
+
+Index: src/pages/admin/order_manage/detail/index.vue
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.BaseRevisionTextPatchEP
+<+>\n \n \n \n \n \n \n \n \n \n {{ item.Goods?.name }}\n \n {{ item.pay_price }}元\n 0\">+{{ item.pay_integral }}积分\n \n \n \n \n x{{ item.number }}\n \n \n \n {{ `共${info.count}件商品` }}\n {{ info.status !== 0 ? '实' : '应' }}付款:\n {{ info.discount_price }} (元)\n 0\">积分抵扣: {{ info.exchange }}\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n\n\n\n\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/pages/admin/order_manage/detail/index.vue b/src/pages/admin/order_manage/detail/index.vue
+--- a/src/pages/admin/order_manage/detail/index.vue (revision 097029128cd2749b71a445397d04a48d9ddaba1a)
++++ b/src/pages/admin/order_manage/detail/index.vue (date 1727095402268)
+@@ -5,13 +5,19 @@
+
+
+
+-
++
+
+
+ {{ item.Goods?.name }}
+
+- {{ item.pay_price }}元
+- +{{ item.pay_integral }}积分
++ {{ item.pay_price }}元
++ +{{ item.pay_integral }}积分
+
+
+
+@@ -19,11 +25,15 @@
+ x{{ item.number }}
+
+
+-
++
+ {{ `共${info.count}件商品` }}
+- {{ info.status !== 0 ? '实' : '应' }}付款:
++ {{ info.status !== 0 ? '实' : '应' }}付款:
+ {{ info.discount_price }} (元)
+- 积分抵扣: {{ info.exchange }}
++ 积分抵扣: {{ info.exchange }}
+
+
+
+@@ -32,11 +42,14 @@
+
+
+
+-
+@@ -44,16 +57,25 @@
+
+
+
+-
+-
+-
++
++
++
+
+
+
+
+ \n\n\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/pages/admin/verify/verify_list/index.vue b/src/pages/admin/verify/verify_list/index.vue
+--- a/src/pages/admin/verify/verify_list/index.vue (revision 097029128cd2749b71a445397d04a48d9ddaba1a)
++++ b/src/pages/admin/verify/verify_list/index.vue (date 1727095402430)
+@@ -3,22 +3,31 @@
+
+ 订单号：{{ goodInfo.oid }}
+
+-
++
+
+
+ {{ item.Goods.name }}
+ {{
+ item.Goods.profile || '此商品暂无描述'
+- }}
++ }}
+
+ x{{ item.number }}
+
+
+-
+- 共{{ goodInfo.count }}件商品
+- 实付款:
+- {{ goodInfo.discount_price }} (元)
+- 积分抵扣: {{ goodInfo.exchange }}
++
++ 共{{ goodInfo.count }}件商品
++ 实付款: {{ goodInfo.discount_price }} (元)
++ 积分抵扣: {{ goodInfo.exchange }}
+
+
+
+@@ -30,22 +39,28 @@
+
+
+
+-
++
+
+
+-
++
+
+
+
+- 确定核销
++ 确定核销
+
+
+
+
+ \n\n\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/pages/users/order_list_detail/index.vue b/src/pages/users/order_list_detail/index.vue
+--- a/src/pages/users/order_list_detail/index.vue (revision 097029128cd2749b71a445397d04a48d9ddaba1a)
++++ b/src/pages/users/order_list_detail/index.vue (date 1727095403201)
+@@ -27,7 +27,8 @@
+ 订单待使用
+
+
+- 订单剩余
++ 订单剩余
+ {{ timeStr }}
+ 过期，请尽快核销！
+
+@@ -49,27 +50,37 @@
+
+
+
+-
++
+
+ {{ goodInfo.Store?.name }}
+-
+-
++
++
+ {{ goodInfo.Store?.address }}
+
+
+- 距离您{{
+- calculateDistance(
+- userLocalNum.t,
+- userLocalNum.l,
+- Number(goodInfo.Store?.lat),
+- Number(goodInfo.Store?.lon),
+- )
+- }}
++ 距离您{{
++ calculateDistance(
++ userLocalNum.t,
++ userLocalNum.l,
++ Number(goodInfo.Store?.lat),
++ Number(goodInfo.Store?.lon),
++ )
++ }}
+
+
+-
+-
+
+
+@@ -81,13 +92,19 @@
+
+
+
+-
++
+
+
+ {{ item.Goods?.name }}
+
+- {{ item.Goods.discount_price }}元
+- +{{ item.Goods.exchange }}积分
++ {{ item.Goods.discount_price }}元
++ +{{ item.Goods.exchange }}积分
+
+
+
+@@ -95,12 +112,17 @@
+ x{{ item.number }}
+
+
+-
+- {{ `共${goodInfo.count}件商品` }}
++
++ {{ `共${goodInfo.count}件商品` }}
+
+- {{ goodInfo.status !== 0 ? '实' : '应' }}付款:
++ {{ goodInfo.status !== 0 ? '实' : '应' }}付款:
+ {{ goodInfo.discount_price }} (元)
+- 积分抵扣: {{ goodInfo.exchange }}
++ 积分抵扣: {{ goodInfo.exchange }}
+
+
+
+@@ -109,27 +131,44 @@
+
+
+
+-
++
+
+-
+
+
+
+- 继续付款
++ 继续付款
+
+- 出示核销码
++ 出示核销码
+
+
+
+@@ -160,30 +199,46 @@
+ -->
+
+
+-
++
+
+ 核销码
+
+
+-
++
+
+
+
+-
++
+
+
+
+ \n\n\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/pages/mer/mer_detail/index.vue b/src/pages/mer/mer_detail/index.vue
+--- a/src/pages/mer/mer_detail/index.vue (revision 097029128cd2749b71a445397d04a48d9ddaba1a)
++++ b/src/pages/mer/mer_detail/index.vue (date 1727095402907)
+@@ -1,56 +1,85 @@
+
+
+-
++
+
+
+
+-
++
+
+- ![]()
++ ![]()
+
+
+
+
+ {{ mer_info.name }}
+
+-
++
+ 销量：10000
+- 营业时间：{{ mer_info.week_start }}-{{ mer_info.week_end }}
++ 营业时间：{{ mer_info.week_start }}-{{ mer_info.week_end }}
+
+
+
+
+-
++
+
+ {{ mer_info.address || '暂无商家地址' }}
+- 距离您{{
+- calculateDistance(
+- userLocalNum.t,
+- userLocalNum.l,
+- Number(mer_info.lat),
+- Number(mer_info.lon),
+- )
+- }}
++ 距离您{{
++ calculateDistance(
++ userLocalNum.t,
++ userLocalNum.l,
++ Number(mer_info.lat),
++ Number(mer_info.lon),
++ )
++ }}
+
+
+
+
+-
++
+
+
+-
++
+
+
+
+
+
+
+-
+-
++
++
+
+
+
+@@ -59,18 +88,25 @@
+ {{ item.name }}
+
+
+- {{ item.discount_price }}元
+- +{{ item.exchange }}积分
++ {{ item.discount_price }}元
++ +{{ item.exchange }}积分
+
+
+
+
+
+
+- 剩余:{{ item.stock }}
++ 剩余:{{ item.stock }}
+
+
+-
++
+
+
+
+@@ -98,10 +134,10 @@
+
+ \n\n\n \n \n \n \n {{ row }}\n 可提现余额\n \n \n \n \n \n \n \n 余额提现\n \n \n \n \n \n \n 全部\n \n \n \n \n 立即提现\n \n\n \n \n 提现记录\n \n\n 0\">\n \n \n 到账金额\n {{\n item.status === 1\n ? '已打款'\n : item.status === 2\n ? '已拒绝'\n : '待审核'\n }}\n \n \n ￥{{ item.number }}\n 提现金额：{{ item.integral }}\n 信息服务费：{{ item.commission }}\n 手续费：{{ item.commission_number }}%\n 时间：{{ item.add_time }}\n 备注：\n 点我查看回执单\n \n \n \n \n \n \n \n\n \n \n \n 积分和人民币兑换比例为\n 100:1\n 平台收取10%服务费和0.038%手续费\n \n \n \n \n\n\n\n
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/src/pages/admin/withdrawal/index.vue b/src/pages/admin/withdrawal/index.vue
+--- a/src/pages/admin/withdrawal/index.vue (revision 097029128cd2749b71a445397d04a48d9ddaba1a)
++++ b/src/pages/admin/withdrawal/index.vue (date 1727095402467)
+@@ -1,7 +1,7 @@
+
diff --git a/src/pages/mer/mer_detail/index.vue b/src/pages/mer/mer_detail/index.vue
index 7590ccc..3b3dee6 100644
--- a/src/pages/mer/mer_detail/index.vue
+++ b/src/pages/mer/mer_detail/index.vue
@@ -1,56 +1,85 @@
-
+
-
+
- ![]()
+ ![]()
{{ mer_info.name }}
-
+
销量：10000
- 营业时间：{{ mer_info.week_start }}-{{ mer_info.week_end }}
+ 营业时间：{{ mer_info.week_start }}-{{ mer_info.week_end }}
-
+
{{ mer_info.address || '暂无商家地址' }}
- 距离您{{
- calculateDistance(
- userLocalNum.t,
- userLocalNum.l,
- Number(mer_info.lat),
- Number(mer_info.lon),
- )
- }}
+ 距离您{{
+ calculateDistance(
+ userLocalNum.t,
+ userLocalNum.l,
+ Number(mer_info.lat),
+ Number(mer_info.lon),
+ )
+ }}
-
+
-
+
-
-
+
+
@@ -59,18 +88,25 @@
{{ item.name }}
- {{ item.discount_price }}元
- +{{ item.exchange }}积分
+ {{ item.discount_price }}元
+ +{{ item.exchange }}积分
- 剩余:{{ item.stock }}
+ 剩余:{{ item.stock }}
-
+
@@ -98,10 +134,10 @@