- {{ locker.statusClass === 'available' ? '空闲' : '占用' }}
-
diff --git a/src/pages/order/index.vue b/src/pages/order/index.vue
index 12b3736..5a43bc5 100644
--- a/src/pages/order/index.vue
+++ b/src/pages/order/index.vue
@@ -1,10 +1,11 @@
@@ -62,15 +74,26 @@ onMounted(() => {
/>
-
- {{ item.goodsInfo.goodsName }}
-
-
- ¥{{ item.goodsInfo.price.toFixed(2) }}
+
+
+ {{ item.goodsInfo.goodsName }}
+
+
+ ¥{{ item.orderGoods.price.toFixed(2) }}
+
数量: {{ item.orderGoods.quantity }}
小计: ¥{{ (item.orderGoods.price * item.orderGoods.quantity).toFixed(2) }}
+
+ 退还
+
@@ -121,9 +144,39 @@ goods-info {
flex: 1;
}
+.product-name-price {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 8px;
+}
+
+.product-name {
+ flex: 1;
+ margin-right: 10px;
+}
+
+.product-price {
+ color: #ee0a24;
+ font-weight: 500;
+}
.not-found {
padding: 40px;
text-align: center;
color: #999;
}
+
+.refund-btn {
+ margin-left: auto;
+ color: #fff;
+ background: #ee0a24;
+ border-radius: 15px;
+ padding: 0 12px;
+}
+
+.action-row {
+ display: flex;
+ gap: 8px;
+ align-items: center;
+}
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index a4b414e..77d785d 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -29,6 +29,11 @@ export const systemRoutes: RouteRecordRaw[] = [
/** 业务页面 */
export const routes: RouteRecordRaw[] = [
+ {
+ path: '/approval/submit',
+ component: () => import('@/pages/approval/submit.vue'),
+ meta: { requiresAuth: true }
+ },
{
path: '/order-success',
name: 'OrderSuccess',
@@ -64,11 +69,11 @@ export const routes: RouteRecordRaw[] = [
}
},
{
- path: "/",
- component: () => import("@/pages/product/ProductList.vue"),
- name: "ProductList",
+ path: '/cabinet',
+ component: () => import('@/pages/cabinet/index.vue'),
+ name: "Cabinet",
meta: {
- title: "商品列表",
+ title: '柜机管理',
keepAlive: true,
layout: {
navBar: {
@@ -76,18 +81,18 @@ export const routes: RouteRecordRaw[] = [
showLeftArrow: false
},
tabbar: {
- showTabbar: true,
+ showTabbar: false,
icon: "home-o"
}
}
}
},
{
- path: '/cabinet',
- component: () => import('@/pages/cabinet/index.vue'),
- name: "Cabinet",
+ path: "/",
+ component: () => import("@/pages/product/ProductList.vue"),
+ name: "ProductList",
meta: {
- title: '柜机管理',
+ title: "商品列表",
keepAlive: true,
layout: {
navBar: {
@@ -122,6 +127,11 @@ export const routes: RouteRecordRaw[] = [
]
/* export const routes: RouteRecordRaw[] = [
+ {
+ path: '/approval/submit',
+ component: () => import('@/pages/approval/submit.vue'),
+ meta: { requiresAuth: true }
+ },
{
path: '/order-success',
name: 'OrderSuccess',