From 5bd21898fb4625847f5059a6b8688a62973c75c8 Mon Sep 17 00:00:00 2001 From: sszdot Date: Tue, 10 Dec 2024 16:39:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?= =?UTF-8?q?=EF=BC=9Afeat=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0=E3=80=91?= =?UTF-8?q?=EF=BC=9A=20=E3=80=90=E8=BF=87=20=20=E7=A8=8B=E3=80=91=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E2=80=9C=E7=A1=AE=E8=AE=A4=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E2=80=9C=20=E9=A1=B5=E9=9D=A2ui=20=E3=80=90=E5=BD=B1?= =?UTF-8?q?=20=20=E5=93=8D=E3=80=91=EF=BC=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # 类型 包含: # feat：新功能（feature） # fix：修补bug # docs：文档（documentation） # style： 格式（不影响代码运行的变动） # refactor：重构（即不是新增功能，也不是修改bug的代码变动） # test：增加测试 # chore：构建过程或辅助工具的变动 --- App.vue | 28 ++++++++++++++++++++-------- pages/shop/list.vue | 2 +- pages/shop/order.vue | 28 +++++++++++++++++++++++----- static/icons/pulldown-24.svg | 6 ------ static/icons/pulldown-40.svg | 6 ++++++ 5 files changed, 50 insertions(+), 20 deletions(-) delete mode 100644 static/icons/pulldown-24.svg create mode 100644 static/icons/pulldown-40.svg diff --git a/App.vue b/App.vue index 6015db8..fa75234 100644 --- a/App.vue +++ b/App.vue @@ -25,7 +25,7 @@ }, // 当应用程序被带到前台或对用户可见时调用 onShow: function() { - + }, // 当应用程序被隐藏或最小化时调用 onHide: function() {}, @@ -47,6 +47,14 @@ } /*public*/ + .l { + float: left; + } + + .r { + float: right; + } + .ls { background-color: #007aff; } @@ -155,17 +163,17 @@ .flex4 { flex: 4; } - + //阴影 .boxshadow { box-shadow: 0px 4rpx 4rpx rgba(0, 0, 0, 0.1); } - + //边框 .border { - border: solid 0.1rpx $uni-border-color; + border: 1rpx solid $uni-border-color; } - + //粗边框 .border4 { - border: solid 4rpx $uni-border-color; + border: 4rpx solid $uni-border-color; } .border-g { @@ -179,9 +187,13 @@ .borderno { border: none; } - + //下边框 实线 .borderB { - border-bottom: solid 0.1px $uni-border-color; + border-bottom: 1rpx solid $uni-border-color; + } + //下边框 虚线 + .borderBDas{ + border-bottom: 1rpx dashed $uni-border-color; } .rad-c { diff --git a/pages/shop/list.vue b/pages/shop/list.vue index d050930..6b27788 100644 --- a/pages/shop/list.vue +++ b/pages/shop/list.vue @@ -10,7 +10,7 @@ {{siteCon.sitename}} - + {{siteCon.describe}} 营业时间：{{shopCon.opening_time | formatTime}}——{{shopCon.closeing_time | formatTime}} diff --git a/pages/shop/order.vue b/pages/shop/order.vue index cd6ebc7..eebb888 100644 --- a/pages/shop/order.vue +++ b/pages/shop/order.vue @@ -7,11 +7,23 @@ - - - - {{siteCon.sitename}} - {{userInfo.tel}} + + + + + {{siteCon.sitename}} + + + + + + + 配置物流 + {{shopCon.name}} + + + 送达时间 + 预估30分钟之后送达 @@ -73,6 +85,10 @@ siteCon() { return this.$store.state.siteList.find(item => item.id === this.$store.state.site_id.toString()) }, + //商铺信息 + shopCon(){ + return this.$store.state.shopCon + }, //购物车列表 cartList() { return this.$store.state.cartList @@ -160,4 +176,6 @@ position: fixed; bottom: 0rpx; } + .siteBox{ + } \ No newline at end of file diff --git a/static/icons/pulldown-24.svg b/static/icons/pulldown-24.svg deleted file mode 100644 index 78471f5..0000000 --- a/static/icons/pulldown-24.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/static/icons/pulldown-40.svg b/static/icons/pulldown-40.svg new file mode 100644 index 0000000..c224917 --- /dev/null +++ b/static/icons/pulldown-40.svg @@ -0,0 +1,6 @@ + + + + + +