From 6379a3b93f14a4febdcb184e175449953427dd40 Mon Sep 17 00:00:00 2001 From: shenyuan Date: Fri, 3 Feb 2023 16:57:37 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/src/permission.js | 3 +- .../shopping/components/Header/HeaderView.vue | 6 +- .../views/shopping/pages/gerenzhongxin.vue | 2 +- .../src/views/shopping/pages/orderDetails.vue | 262 +++++++++++++++++- .../src/views/shopping/shopHome.vue | 36 ++- 5 files changed, 288 insertions(+), 21 deletions(-) diff --git a/ant-design-vue-jeecg/src/permission.js b/ant-design-vue-jeecg/src/permission.js index 7c37e9c2..11fee8c4 100644 --- a/ant-design-vue-jeecg/src/permission.js +++ b/ant-design-vue-jeecg/src/permission.js @@ -18,7 +18,8 @@ const whiteList = ['/user/login','/userequip/loginequip','/user/sgin', '/gygl/gyglzxt','/sykesjk/sykcsjkzxt','/scrysjk/scrysjkzxt','/jxrysjk/jxrysjkzxt','/jxzz/jxzzglsjkzxt','/scys/scyssjkzxt', '/sckz/sckzzxt','/sbjm/sbjmsjkzxt','/jxgl/jxglsjkzxt','/szls/szlssjkzxt','/jxdsj/jxdsjzszxt', '/ybgl/ybglsjkzxt','/mflgl/mflglsjkzxt','/ddcl/ddclzxt','/ddgl/ddglzxt','/dyhsc/dyhsczxt','/znyy/znyysczhgkzzrj', - '/znyyjc/znyycjrjxt','/gdgz/gdgzzxt','/shopping/shopHome','/shopping/clothType','/shopping/sirendingzhi','/shopping/ClothDetail','/shopping/person','/shopping/person','/shopping/order'] // no redirect whitelist + '/znyyjc/znyycjrjxt','/gdgz/gdgzzxt','/shopping/shopHome','/shopping/clothType','/shopping/sirendingzhi', + '/shopping/ClothDetail','/shopping/person','/shopping/person','/shopping/order'] // no redirect whitelist router.beforeEach((to, from, next) => { NProgress.start() // start progress bar diff --git a/ant-design-vue-jeecg/src/views/shopping/components/Header/HeaderView.vue b/ant-design-vue-jeecg/src/views/shopping/components/Header/HeaderView.vue index 429a792f..50b7937d 100644 --- a/ant-design-vue-jeecg/src/views/shopping/components/Header/HeaderView.vue +++ b/ant-design-vue-jeecg/src/views/shopping/components/Header/HeaderView.vue @@ -6,10 +6,10 @@
首页 - 服装类型 - 私人定制 --> - + 总计:¥ {{item.total}} 立即支付 - 查看详情 + 查看详情

diff --git a/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue index 8373aeda..b35197b3 100644 --- a/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue +++ b/ant-design-vue-jeecg/src/views/shopping/pages/orderDetails.vue @@ -6,11 +6,117 @@
- 上级页面 - 上级页面 - 上级页面 + 上级页面 + 上级页面 + 上级页面 - + +
+
+
+

已发货

+ 查看发票详情 +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+ 订单号#6789086655|2022-08-19 +
数量价格总计
+
+
+
+

配送至

+

河南省

+

驻马店市 驿城区

+

黄淮学院南校区学府花园26号楼3602

+

463000

+

已发货

+

您的订单已经发出。

+

尊享免费配送,您的物流单号:

+

4263882788397

+
+
+
+
+ +
+
+

商品名商品名商品名商品名商品

+

款式:衬衫

+

尺码:XXL

+

主辅料:主料1,辅料2,辅料3,辅料4,辅料5,辅料6

+
+
+ 124782478 +
+
+
+
+ +
+
+

商品名商品名商品名商品名商品

+

款式:衬衫

+

尺码:XXL

+

主辅料:主料1,辅料2,辅料3,辅料4,辅料5,辅料6

+
+
+ 124782478 +
+
+
+
+
+

+ 购买人 + 小记 + 4,956 +

+

+ 王贰 + 运费总计 + 0 +

+

+ + 总计 + 4,956 +

+
+
+
+
@@ -40,10 +146,152 @@ @import '../assets/common.css'; .orderMain{ background: #F6F6F6; - .breadcrumb{ - padding-top: 50px; - padding-bottom: 50px; + padding-bottom: 100px; + .jz{ + .breadcrumb{ + padding-top: 50px; + padding-bottom: 50px; + } + .d-flex{ + justify-content: space-between; + .l{ + width: 300px; + .card{ + width: 300px; + height: 157px; + background: #FFFFFF; + margin-bottom: 20px; + text-align: center; + padding-top: 40px; + .f_24{ + color: #C8A985; + margin-bottom: 20px; + } + .f_12{ + padding: 5px 14px; + border: 1px solid #333333; + } + } + .steps{ + width: 300px; + height: 736px; + background: #FFFFFF; + padding: 32px 55px; + } + } + .r{ + width: 1110px; + height: 913px; + background: #FFFFFF; + padding: 54px 48px; + .title{ + padding-bottom: 15px; + border-bottom: 1px solid #DADADA; + .line{ + margin-left: 10px; + margin-right: 10px; + } + .right{ + width: 25%; + span{ + color: #C8A985; + } + } + } + .orderDiv{ + padding-bottom: 20px; + border-bottom: 1px solid #DADADA; + .orderAddr{ + width: 25%; + color: #333; + font-size: 16px; + p{ + margin-bottom: 10px; + } + .headline{ + font-weight: 500; + color: #C8A985; + margin-top: 30px; + } + .text{ + font-weight: 400; + } + } + .orderList{ + width: 75%; + .item{ + padding-top: 30px; + border-bottom: 1px solid #DADADA; + &:last-of-type{ + border: none; + } + .img{ + width: 23.33%; + img{ + width: 180px; + height: 180px; + } + } + .info{ + width: 43.33%; + padding-right: 10px; + .headline{ + font-weight: 500; + } + p{ + span{ + margin-left: 10px; + display: inline-block; + width: 80%; + } + } + } + .right{ + width: 33.33%; + font-weight: 500; + } + } + + + }} + .heji{ + padding: 30px 20px; + p{ + span{ + width: 20%; + color: #333; + } + .leftSide{ + text-align: left; + + } + .midst{ + text-align: center; + + } + .rightSide{ + text-align: right; + + } + } + } + } + } } +.btn{ + a{ + display: inline-block; + width: 284px; + height: 56px; + background: #1B1B1B; + line-height: 56px; + } + &:hover{ + color: red; + } + text-align: center; + margin-top: 60px; +} } diff --git a/ant-design-vue-jeecg/src/views/shopping/shopHome.vue b/ant-design-vue-jeecg/src/views/shopping/shopHome.vue index 9bb5db88..e51da067 100644 --- a/ant-design-vue-jeecg/src/views/shopping/shopHome.vue +++ b/ant-design-vue-jeecg/src/views/shopping/shopHome.vue @@ -69,15 +69,33 @@

Recommending Commodities

- - -
- -

CLOTHING NAM

-

15分钟前定制

-
-
-
+ +
+ +
+
+ +
+
+ +

CLOTHING NAM

+

15分钟前定制

+
+
+ + + + + + + + +