From b5361277ca3be548ad2662b363ee0985e456af47 Mon Sep 17 00:00:00 2001
From: YuanHuakk <1751826683@qq.com>
Date: Sat, 14 Sep 2024 01:34:36 +0800
Subject: [PATCH 1/3] fix(custom): fix
---
.idea/workspace.xml | 185 ++++++++++++++++++++++++
src/pages/cart/index.vue | 74 ++++++----
src/pages/goods/goods_detail/index.vue | 4 +-
src/pages/goods/pay/index.scss | 192 ++++++++++++-------------
src/pages/goods/pay/index.vue | 138 +++++++++++-------
5 files changed, 420 insertions(+), 173 deletions(-)
create mode 100644 .idea/workspace.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..8d1b1b4
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,185 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {
+ "associatedIndex": 3
+}
+
+
+
+
+
+
+
+
+ {
+ "keyToString": {
+ "ASKED_ADD_EXTERNAL_FILES": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "git-widget-placeholder": "dev",
+ "last_opened_file_path": "E:/ProjectCode/jdt-user",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.stylelint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.stylelint": "E:\\ProjectCode\\jdt-user\\node_modules\\stylelint",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "npm.dev:weapp.executor": "Run",
+ "settings.editor.selected.configurable": "preferences.pluginManager",
+ "ts.external.directory.path": "E:\\ProjectCode\\jdt-user\\node_modules\\typescript\\lib",
+ "vue.rearranger.settings.migration": "true"
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1723232795882
+
+
+ 1723232795882
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/cart/index.vue b/src/pages/cart/index.vue
index 8922559..9755d00 100644
--- a/src/pages/cart/index.vue
+++ b/src/pages/cart/index.vue
@@ -3,11 +3,16 @@
- {{ itm.StoreName }}
+ {{ itm.StoreName }}
-
@@ -15,15 +20,22 @@
![]()
- {{ item.name }}
+ {{ item.name }}
- {{ item.price }}元
- +{{ item.discount_integral }}积分
+ {{ item.price }}元
+ +{{ item.discount_integral }}积分
-
@@ -32,7 +44,7 @@
-
+
@@ -42,26 +54,36 @@
总金额：
-
+
总积分：
-
+
去结算
-
+
\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 @@