From 9b09e336952285cc8e4ccb25d9b1c9fae908805e Mon Sep 17 00:00:00 2001 From: JasonChen Date: Wed, 2 Aug 2023 17:30:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 12292 -> 12292 bytes README.md | 2 +- public/index.html | 11 +- src/api/coupon.js | 10 + .../GlobalHeader/AvatarDropdown.vue | 4 +- src/config/router.config.js | 4 +- src/views/coupon/Index.vue | 200 +- yarn.lock | 10595 ++++++++-------- 8 files changed, 5718 insertions(+), 5108 deletions(-) create mode 100644 src/api/coupon.js diff --git a/.DS_Store b/.DS_Store index ac07b44a3b3471a0bce8c1216be48474aac6e887..b42fc8416fd22b0ddfc0345607f6c7d530e06a8b 100644 GIT binary patch delta 36 scmZokXi1ph&*-%=U^hRb!DInO#m%|`w>dUjNM2@}*kG`kTj3`^0O>glivR!s delta 79 zcmZokXi1ph&*;4|U^hRb;bZ|u#m%|`w>fk<7>XH67!rXvlOdTwfx*Z#CqFqUCqIdS bfkA+Qfl(KT<^Ds#W>(2-Y@4|ie)0nVmqr<; diff --git a/README.md b/README.md index a643acf..358683c 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ '/static/axios.min.js' 否则报错 -# node 版本 10.23.1 +# node 版本 node-v14.21.3 # 水感应测试-存放路径 /home/wwwroot/Development/Douhuo/agent diff --git a/public/index.html b/public/index.html index 294dfcd..c2d3bfa 100644 --- a/public/index.html +++ b/public/index.html @@ -23,7 +23,7 @@
-
+
WaterFeel.manager Co.,Ltd.
@@ -32,4 +32,13 @@ <% } %> + diff --git a/src/api/coupon.js b/src/api/coupon.js new file mode 100644 index 0000000..e802712 --- /dev/null +++ b/src/api/coupon.js @@ -0,0 +1,10 @@ +import request from '@/utils/request' + +// 优惠券列表 +export function getMiddlesCoupons (parameter) { + return request({ + url: '/middles/stock/coupons', + method: 'get', + params: parameter + }) +} diff --git a/src/components/GlobalHeader/AvatarDropdown.vue b/src/components/GlobalHeader/AvatarDropdown.vue index f32b1d8..d713274 100644 --- a/src/components/GlobalHeader/AvatarDropdown.vue +++ b/src/components/GlobalHeader/AvatarDropdown.vue @@ -14,10 +14,10 @@ 修改密码 - + 退出登录 diff --git a/src/config/router.config.js b/src/config/router.config.js index f3d0d86..d5f5118 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -13,7 +13,7 @@ import { import detail from './routes/detail' import stock from './routes/stock' import user from './routes/user' -// import coupon from './routes/coupon' +import coupon from './routes/coupon' import permission from './routes/permission' import sales from './routes/sales' import cityExperienceOfficer from './routes/cityExperienceOfficer' @@ -42,7 +42,7 @@ export const asyncRouterMap = [{ ...stock, ...sales, ...user, - // ...coupon, + ...coupon, ...permission ] }, diff --git a/src/views/coupon/Index.vue b/src/views/coupon/Index.vue index 835280d..885c380 100644 --- a/src/views/coupon/Index.vue +++ b/src/views/coupon/Index.vue @@ -6,35 +6,32 @@ - - + + - - - {{ item.title }} + + + {{ item.name }} - - {{ item.title }} + + {{ item.text }} + + + + + 搜索 - 重置 - @@ -47,26 +44,29 @@ ref="table" :columns="columns" :data="loadData" - :rowKey="(row) => row.order_item_id" + :rowKey="(row) => row.stock_card_id" showPagination="auto" bordered size="default" :scroll="{ x: 1200, y: 1000 }"> -
-
zdx
+
+
{{ record.manage.nickname || '--' }}{{ record.manage.name?'('+record.manage.name+')':'' }}
-
-
14745798066
+
+
{{ record.manage.username || '--' }}
-
-
2023-11-11~2029-11-11
+
+
{{ record.user.nickname || '--' }}{{ record.user.name?'('+record.user.name+')':'' }}
+
+
+
{{ record.user.username || '--' }}
+
+
+
{{ record.created_at }}~{{ record.actived_at }}
-
-
3瓶优惠券
-
-
-
待使用
+
+ {{ record.status.text }}
{{ record.created_at }} @@ -81,31 +81,39 @@