diff --git a/.claude/settings.local.json b/.claude/settings.local.json
index b67efe0..19a1f86 100644
--- a/.claude/settings.local.json
+++ b/.claude/settings.local.json
@@ -8,7 +8,11 @@
"Bash(mkdir -p 'E:\\code\\智柜宝\\wx\\src\\pages\\home\\components')",
"Bash(cp 'E:\\code\\智柜宝\\wx\\doc\\thirdParty\\src\\pages\\product\\components\\checkout.vue' 'E:\\code\\智柜宝\\wx\\src\\pages\\index\\components\\checkout.vue')",
"Bash(cp 'E:\\code\\智柜宝\\wx\\doc\\thirdParty\\src\\pages\\product\\components\\RentingCabinetContainer.vue' 'E:\\code\\智柜宝\\wx\\src\\pages\\index\\components\\renting-cabinet-container.vue')",
- "Bash(test -f 'E:\\code\\智柜宝\\wx\\src\\pages\\index\\components\\product-container.vue')"
+ "Bash(test -f 'E:\\code\\智柜宝\\wx\\src\\pages\\index\\components\\product-container.vue')",
+ "Bash(ls -la 'E:\\\\code\\\\智柜宝\\\\wx\\\\src\\\\pages\\\\me')",
+ "Bash(mkdir -p 'E:\\\\code\\\\智柜宝\\\\wx\\\\src\\\\pages\\\\me')",
+ "Bash(ls -la 'E:\\\\code\\\\智柜宝\\\\wx\\\\static')",
+ "Bash(ls -la 'E:\\\\code\\\\智柜宝\\\\wx\\\\src\\\\static')"
],
"deny": [],
"ask": []
diff --git a/doc/迁移指令.md b/doc/迁移指令.md
index 0ce4140..40133da 100644
--- a/doc/迁移指令.md
+++ b/doc/迁移指令.md
@@ -5,6 +5,6 @@
。仅参考语法,api需要使用原ProductList.vue中已经移植到本项目的相应api,stores也需要使用移植后的pinia。生成的代码写到
@src\pages\home\ 文件夹下
-参考已迁移至本项目的代码 @src\pages\index\ 。将 @doc\thirdParty\src\pages\product\components\
- 下的另外两个component也迁移到本项目。注意thirdParty下的是H5项目,现在需要改为微信小程序uni-app。api需要使用原Product
- List.vue中已经移植到本项目的相应api,stores也需要使用移植后的pinia。
\ No newline at end of file
+参考已迁移至本项目的代码 @src\pages\index\ 。将 @doc\thirdParty\src\pages\me\index.vue
+ “我的”页面也迁移到本项目。注意thirdParty下的是H5项目,现在需要改为微信小程序uni-app。api需要使用原Product
+ List.vue中已经移植到本项目的相应api,stores也需要使用移植后的pinia。生成的代码写到 @src\pages\me\ 文件夹下
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 7f38c4a..d1e689a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -63,10 +63,7 @@
},
{
"path": "pages/index/checkout",
- "type": "page",
- "style": {
- "navigationBarTitleText": "订单结算"
- }
+ "type": "page"
},
{
"path": "pages/login/faceLogin",
@@ -98,13 +95,6 @@
"navigationBarTitleText": "我的"
}
},
- {
- "path": "pages/order/index",
- "type": "page",
- "style": {
- "navigationBarTitleText": "订单"
- }
- },
{
"path": "pages/QrScanner/index",
"type": "page",
@@ -112,36 +102,6 @@
"navigationBarTitleText": "扫码",
"navigationStyle": "custom"
}
- },
- {
- "path": "pages/me/personal-profile/index",
- "type": "page",
- "style": {
- "navigationBarTitleText": "个人资料"
- }
- },
- {
- "path": "pages/me/promote-with-courtesy/index",
- "type": "page",
- "style": {
- "navigationBarTitleText": "推广有礼",
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/order/detail/index",
- "type": "page",
- "style": {
- "navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "pages/order/refund-confirmation/index",
- "type": "page",
- "style": {
- "navigationBarTitleText": "退款确认"
- }
}
],
"subPackages": []
diff --git a/src/pages/me/index.vue b/src/pages/me/index.vue
index 6c85c4e..580c019 100644
--- a/src/pages/me/index.vue
+++ b/src/pages/me/index.vue
@@ -1,381 +1,413 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ loginUser.name || '用户' }}
-
-
-
-
-
-
+
+
+
+
-
-
-
- {{ loginUser.name }}
-
-
-
-
- 普卡会员
-
-
-
-
-
-
+
+
+
+ {{ name }}
+
+
+
+
+
+
+
+
+ 借呗信息
+
+
+
+
-
-
+
+ 借呗总额
+ {{ balanceLimit }}
+
+
+
+
+ 未还借呗
+ {{ useBalance }}
+
+
+
+
+ 剩余借呗
+ {{ balance }}
-
-
-
-
- {{ 0 }}
-
-
-
-
- {{ 0 }}
-
-
-
-
- {{ 0 }}
-
-
-
-
- {{ 0 }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 我的订单
-
-
- 全部
-
+
+
+
+ 个人中心
+
+
+
+ 订单列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 我的功能
+
+
+ 我的柜子
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 柜机管理
+
+
+
+
+
+ 审批中心
+
+
+
+ 耗材核销
+
+
-
diff --git a/src/pages/me/personal-profile/index.vue b/src/pages/me/personal-profile/index.vue
deleted file mode 100644
index f3659fd..0000000
--- a/src/pages/me/personal-profile/index.vue
+++ /dev/null
@@ -1,279 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- 昵称:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/me/promote-with-courtesy/index.vue b/src/pages/me/promote-with-courtesy/index.vue
deleted file mode 100644
index 970a091..0000000
--- a/src/pages/me/promote-with-courtesy/index.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- 你还不是推广员
-
- 成为推广员
-
-
-
-
-
-
-
diff --git a/src/pages/order/detail/index.vue b/src/pages/order/detail/index.vue
deleted file mode 100644
index ddeb3af..0000000
--- a/src/pages/order/detail/index.vue
+++ /dev/null
@@ -1,590 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 订单号:{{ orderNo }}
-
- {{
- orderDetail.status == 0 ? '订单待支付,请尽快完成支付' :
- orderDetail.status == 2 ? '订单已完成,感谢您的购买' :
- orderDetail.status == 6 ? '订单已取消' :
- orderDetail.status == 5 ? '订单已退款,款项将原路返回' :
- orderDetail.status == 7 ? '退款申请已提交,请耐心等待' : ''
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 商品信息
-
-
-
-
-
-
- 加载失败
-
-
-
- {{ item.product.name }}
- {{ item.product.spec }}
-
- ¥{{ item.product.price ? item.product.price : getPrice(item.product)}}
- x{{ item.amount }}
-
-
-
-
-
-
-
-
-
- 订单信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 费用明细
-
-
-
-
-
-
-
-
-
-
-
- 申请退款
- 取消退款
- 付款
-
-
-
-
-
-
diff --git a/src/pages/order/index.vue b/src/pages/order/index.vue
deleted file mode 100644
index 01c02a5..0000000
--- a/src/pages/order/index.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-
-
-
-
-
-
-
-
- {{ option.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 支付中
- 已支付
- 支付失败
- 超时未支付
- 已退款
- 已取消
- 待商家审核
-
-
-
-
-
- 加载失败
-
-
-
-
-
-
-
-
-
- 服务
- 商品
- 优惠卷:{{ items?.manualDiscount != '0' ? '手动改价-' + items?.manualDiscount + '元' : '不使用' }}
- {{ item.createTime }}
-
-
- ¥{{ items?.amount * items?.actualPrice }}
- x{{items.amount}}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/pages/order/refund-confirmation/index.vue b/src/pages/order/refund-confirmation/index.vue
deleted file mode 100644
index a3c1817..0000000
--- a/src/pages/order/refund-confirmation/index.vue
+++ /dev/null
@@ -1,364 +0,0 @@
-
-
-
-
-
-
-
- 加载中...
-
-
-
-
-
-
-
- 退款信息
-
-
-
-
- 退款金额:
- ¥{{ refundAmount }}
-
-
-
- 退款原因:
-
-
-
-
-
-
-
- 退款提示
-
- 1. 退款申请提交后,将在1-3个工作日内处理
- 2. 退款金额将原路返回到您的支付账户
- 3. 如有疑问,请联系客服
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-