diff --git a/sub-operation-service/src/layouts/component/Header/index.vue b/sub-operation-service/src/layouts/component/Header/index.vue
index 79465b1..eb9ce77 100644
--- a/sub-operation-service/src/layouts/component/Header/index.vue
+++ b/sub-operation-service/src/layouts/component/Header/index.vue
@@ -149,7 +149,7 @@ const toUserCenter = () => {
};
const toCart = () => {
- router.push('/sub-operation-service/userCenter?from=toCart');
+ router.push('/sub-operation-service/shoppingCarts');
};
diff --git a/sub-operation-service/src/router/index.js b/sub-operation-service/src/router/index.js
index d93fc99..bbf008b 100644
--- a/sub-operation-service/src/router/index.js
+++ b/sub-operation-service/src/router/index.js
@@ -37,11 +37,17 @@ export const constantRoutes = [
redirect: '/sub-operation-service/userCenter',
meta: { title: '个人中心' },
children: [
+ // {
+ // path: '/sub-operation-service/userCenter',
+ // component: () => import('@/views/userCenter/shoppingCart.vue'),
+ // name: 'shoppingCart',
+ // meta: { title: '我的购物车' },
+ // },
{
path: '/sub-operation-service/userCenter',
- component: () => import('@/views/userCenter/shoppingCart.vue'),
- name: 'shoppingCart',
- meta: { title: '我的购物车' },
+ component: () => import('@/views/userCenter/userOrders.vue'),
+ name: 'userOrders',
+ meta: { title: '我的订单', keepAlive: true },
},
{
path: '/sub-operation-service/sureOrder',
@@ -67,12 +73,6 @@ export const constantRoutes = [
name: 'paySuccess',
meta: { title: '支付成功' },
},
- {
- path: '/sub-operation-service/userOrders',
- component: () => import('@/views/userCenter/userOrders.vue'),
- name: 'userOrders',
- meta: { title: '我的订单', keepAlive: true },
- },
{
path: '/sub-operation-service/orderDetails',
component: () => import('@/views/userCenter/orderDetails.vue'),
@@ -106,6 +106,46 @@ export const constantRoutes = [
],
},
+ {
+ path: '/sub-operation-service/shoppingCarts',
+ name: 'shoppingCarts',
+ // component: Layout,
+ redirect: '/sub-operation-service/shoppingCarts',
+ meta: { title: '购物车' },
+ children: [
+ {
+ path: '/sub-operation-service/shoppingCarts',
+ component: () => import('@/views/shoppingCarts/shoppingCarts.vue'),
+ name: 'shoppingCartss',
+ meta: { title: '购物车' },
+ },
+ {
+ path: '/sub-operation-service/sureOrders',
+ component: () => import('@/views/shoppingCarts/sureOrders.vue'),
+ name: 'sureOrders',
+ meta: { title: '结算' },
+ },
+ {
+ path: '/sub-operation-service/addressLists',
+ component: () => import('@/views/shoppingCarts/addressLists.vue'),
+ name: 'addressLists',
+ meta: { title: '我的地址' },
+ },
+ {
+ path: '/sub-operation-service/orderSuccesss',
+ component: () => import('@/views/shoppingCarts/orderSuccesss.vue'),
+ name: 'orderSuccesss',
+ meta: { title: '提交订单' },
+ },
+ {
+ path: '/sub-operation-service/paySuccesss',
+ component: () => import('@/views/shoppingCarts/paySuccesss.vue'),
+ name: 'paySuccesss',
+ meta: { title: '支付成功' },
+ },
+ ],
+ },
+
{
path: '/sub-operation-service',
name: 'layout',
diff --git a/sub-operation-service/src/views/shoppingCarts/addressLists.vue b/sub-operation-service/src/views/shoppingCarts/addressLists.vue
new file mode 100644
index 0000000..d6c9a78
--- /dev/null
+++ b/sub-operation-service/src/views/shoppingCarts/addressLists.vue
@@ -0,0 +1,763 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+ {{ slotProps.row.isDefault == '1' ? '是' : '否' }}
+
+
+
+
+
+ {{ slotProps.row.postArea.join(',') }}{{ slotProps.row.postAddress }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-operation-service/src/views/shoppingCarts/components/common.vue b/sub-operation-service/src/views/shoppingCarts/components/common.vue
new file mode 100644
index 0000000..4a581bf
--- /dev/null
+++ b/sub-operation-service/src/views/shoppingCarts/components/common.vue
@@ -0,0 +1,59 @@
+
+
+
+
+
diff --git a/sub-operation-service/src/views/shoppingCarts/components/ischeck.vue b/sub-operation-service/src/views/shoppingCarts/components/ischeck.vue
new file mode 100644
index 0000000..8446af9
--- /dev/null
+++ b/sub-operation-service/src/views/shoppingCarts/components/ischeck.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
diff --git a/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue b/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue
new file mode 100644
index 0000000..da046b4
--- /dev/null
+++ b/sub-operation-service/src/views/shoppingCarts/components/leftMenu.vue
@@ -0,0 +1,137 @@
+
+
+
+
+
diff --git a/sub-operation-service/src/views/shoppingCarts/components/tableComponent.vue b/sub-operation-service/src/views/shoppingCarts/components/tableComponent.vue
new file mode 100644
index 0000000..6b10cc7
--- /dev/null
+++ b/sub-operation-service/src/views/shoppingCarts/components/tableComponent.vue
@@ -0,0 +1,335 @@
+
+
+
+
+
+
+
+
+ 条
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-operation-service/src/views/shoppingCarts/components/userHeader.vue b/sub-operation-service/src/views/shoppingCarts/components/userHeader.vue
new file mode 100644
index 0000000..82ce71c
--- /dev/null
+++ b/sub-operation-service/src/views/shoppingCarts/components/userHeader.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+ multiple lines
second line
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-operation-service/src/views/shoppingCarts/orderSuccesss.vue b/sub-operation-service/src/views/shoppingCarts/orderSuccesss.vue
new file mode 100644
index 0000000..fa46a0e
--- /dev/null
+++ b/sub-operation-service/src/views/shoppingCarts/orderSuccesss.vue
@@ -0,0 +1,357 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ '订单提交成功' }}
+
+
+
+
+
请您及时付款,以便订单尽快完成!
+
请您在提交订单后 0时29分59秒 内完成支付,否则订单会自动取消。
+
+
+
+
+ 实付款: {{ totalAmout.toFixed(2) }}
+
+ 交易订单:JY20250101000001
+
+
+
+
+
+
支付方式
+
+ 点击模拟支付
+
+
+
+
+
+
+
+
{{ s.title + '支付' || '--' }}
+
+
+
+
+
+
+
+
+ {{ currentIndex > -1 ? styleList[currentIndex].title + '扫码' : '扫码' }},支付
+
+
{{ totalAmout.toFixed(2) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-operation-service/src/views/shoppingCarts/paySuccesss.vue b/sub-operation-service/src/views/shoppingCarts/paySuccesss.vue
new file mode 100644
index 0000000..0ce84ae
--- /dev/null
+++ b/sub-operation-service/src/views/shoppingCarts/paySuccesss.vue
@@ -0,0 +1,99 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
恭喜,支付成功!
+
查看订单详情,请前往“个人中心”的“我的订单”
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue b/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue
new file mode 100644
index 0000000..eb54efa
--- /dev/null
+++ b/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue
@@ -0,0 +1,625 @@
+
+
+
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+
{{ g.productName || '--' }}
+
+
+
+
+
{{ g.price }} / {{ g.unit }}
+
{{ (g.price * g.quantity).toFixed(2) }}
+
+
+
+
+ {{ g.unit }}
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+ 合计
+ {{ totalAmout.toFixed(2) }}
+
+
+ 结算
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-operation-service/src/views/shoppingCarts/sureOrders.vue b/sub-operation-service/src/views/shoppingCarts/sureOrders.vue
new file mode 100644
index 0000000..b291c56
--- /dev/null
+++ b/sub-operation-service/src/views/shoppingCarts/sureOrders.vue
@@ -0,0 +1,601 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ item.postArea || '--' }}
+
{{ item.postAddress || '--' }}
+
+ {{ item.receiverName }} {{ item.receiverPhone }} 当前选中
+
+
+
+
+
+
+
+
+
+
确认订单信息
+
+
+
+
+
+
+
+ {{ n.shop }}
+
+
+
+
+
+
![]()
+
+
+
+
+
{{ g.productName || '--' }}
+
+
+
+
+
{{ g.unitPrice }} / {{ g.unit }}
+
{{ g.unitPrice }}
+
+
+
+
+ {{ g.unit }}
+
+
+
+
+
+ {{ (g.unitPrice * g.quantity).toFixed(2) }}
+
+
+
+
+
+
+
+
+
+
+ 共
+ {{ totalNum }}件商品
+
+
+
+ 商品总价:
+ {{ totalAmout.toFixed(2) }}
+
+
+ 运费:
+ {{ carriage.toFixed(2) }}
+
+
+
+
+
+
+
+ 实付款
+ {{ (totalAmout + carriage).toFixed(2) }}
+
+
+ 提交订单
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-operation-service/src/views/userCenter/components/leftMenu.vue b/sub-operation-service/src/views/userCenter/components/leftMenu.vue
index d1f2552..5ef4b66 100644
--- a/sub-operation-service/src/views/userCenter/components/leftMenu.vue
+++ b/sub-operation-service/src/views/userCenter/components/leftMenu.vue
@@ -31,8 +31,8 @@ const props = defineProps({
});
const leftMenu = reactive([
- { name: 'agricultural', title: '我的购物车', icon: 'menu1.png', path: '/sub-operation-service/userCenter' },
- { name: 'supplier', title: '我的订单', icon: 'menu2-1.png', path: '/sub-operation-service/userOrders' },
+ // { name: 'agricultural', title: '我的购物车', icon: 'menu1.png', path: '/sub-operation-service/userCenter' },
+ { name: 'supplier', title: '我的订单', icon: 'menu2-1.png', path: '/sub-operation-service/userCenter' },
// { name: 'purchaser', title: '我的土地', icon: 'menu3-1.png', path: '/sub-operation-service/userLands' },
{ name: 'mySource', title: '我的溯源', icon: 'menu4-1.png', path: '/sub-operation-service/mySource' },
// { name: 'myFinance', title: '我的金融', icon: 'menu5-1.png', path: '/sub-operation-service/myFinance' },
diff --git a/sub-operation-service/src/views/userCenter/paySuccess.vue b/sub-operation-service/src/views/userCenter/paySuccess.vue
index 073d48f..8f904f9 100644
--- a/sub-operation-service/src/views/userCenter/paySuccess.vue
+++ b/sub-operation-service/src/views/userCenter/paySuccess.vue
@@ -16,7 +16,7 @@