【类 型】：feat
【原 因】： 【过 程】：修改 “确认订单“ 页面ui 【影 响】： # 类型 包含: # feat：新功能（feature） # fix：修补bug # docs：文档（documentation） # style： 格式（不影响代码运行的变动） # refactor：重构（即不是新增功能，也不是修改bug的代码变动） # test：增加测试 # chore：构建过程或辅助工具的变动
This commit is contained in:
parent
27102c451b
commit
5bd21898fb
28
App.vue
28
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 {
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
<view class="flex column p-24 borderB bg-w">
|
||||
<view class="flex md">
|
||||
<view class="fz36 siteBox l-h-18">{{siteCon.sitename}}</view>
|
||||
<u--image src="/static/icons/pulldown-24.svg" width="48rpx" height="48rpx"></u--image>
|
||||
<u--image src="/static/icons/pulldown-40.svg" width="40rpx" height="40rpx"></u--image>
|
||||
</view>
|
||||
<view class="fcb l-h-12">{{siteCon.describe}}</view>
|
||||
<view class="fcb l-h-12">营业时间：{{shopCon.opening_time | formatTime}}——{{shopCon.closeing_time | formatTime}}
|
||||
|
||||
@ -7,11 +7,23 @@
|
||||
</view>
|
||||
</u-navbar>
|
||||
<!-- 地址框 -->
|
||||
<view class="flex p-24 borderB bg-w">
|
||||
<u--image src="/static/icons/site-48.svg" width="96rpx" height="96rpx" />
|
||||
<view class="flex column m-l-24">
|
||||
<view class="fz36 siteBox l-h-18">{{siteCon.sitename}}</view>
|
||||
<view>{{userInfo.tel}}</view>
|
||||
<view class="m-24 p-24 bg-w siteBox rad8 boxshadow">
|
||||
<view class="flex md msb borderBDas p-b-24">
|
||||
<view class="flex md">
|
||||
<u--image src="/static/icons/site-48.svg" width="75rpx" height="75rpx" />
|
||||
<view class="m-l-24 fz36 fcm fb">{{siteCon.sitename}}</view>
|
||||
</view>
|
||||
<view>
|
||||
<u--image src="/static/icons/pulldown-40.svg" width="40rpx" height="40rpx" />
|
||||
</view>
|
||||
</view>
|
||||
<view class="flex m-t-24 fz28 msb">
|
||||
<view>配置物流</view>
|
||||
<view>{{shopCon.name}}</view>
|
||||
</view>
|
||||
<view class="flex m-t-12 fz28 msb">
|
||||
<view>送达时间</view>
|
||||
<view>预估30分钟之后送达</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- 订单详情 -->
|
||||
@ -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{
|
||||
}
|
||||
</style>
|
||||
@ -1,6 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="23.076904296875" height="24" viewBox="0 0 23.076904296875 24" fill="none">
|
||||
<path d="M12.2926 17.7212C13.4242 17.4961 14.4636 16.9406 15.2794 16.1247C16.0952 15.3089 16.6507 14.2695 16.8758 13.138C17.1009 12.0064 16.9854 10.8335 16.5439 9.76764C16.1024 8.70174 15.3547 7.79069 14.3954 7.14972C13.4361 6.50875 12.3083 6.16663 11.1546 6.16663C9.60748 6.16663 8.12375 6.78121 7.02979 7.87517C5.93582 8.96913 5.32124 10.4529 5.32124 12C5.32124 13.1537 5.66336 14.2815 6.30434 15.2408C6.94531 16.2001 7.85635 16.9477 8.92226 17.3893C9.98816 17.8308 11.161 17.9463 12.2926 17.7212Z" stroke="rgba(0, 0, 0, 1)" stroke-width="1.5" stroke-linejoin="round" stroke-linecap="round" >
|
||||
</path>
|
||||
<path stroke="rgba(0, 0, 0, 1)" stroke-width="1.5" stroke-linejoin="round" stroke-linecap="round" d="M12.8212 11.1666L11.1545 12.8333L9.48783 11.1666">
|
||||
</path>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 939 B |
6
static/icons/pulldown-40.svg
Normal file
6
static/icons/pulldown-40.svg
Normal file
@ -0,0 +1,6 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="40" height="40" viewBox="0 0 40 40" fill="none">
|
||||
<path stroke="rgba(166, 166, 166, 1)" stroke-width="3" stroke-linejoin="round" stroke-linecap="round" d="M20.0001 8.33337C22.3075 8.33337 24.5632 9.01761 26.4817 10.2996C28.4003 11.5815 29.8956 13.4036 30.7787 15.5354C31.6617 17.6672 31.8927 20.013 31.4426 22.2761C30.9924 24.5392 29.8813 26.618 28.2497 28.2496C26.618 29.8812 24.5392 30.9924 22.2761 31.4425C20.013 31.8927 17.6672 31.6616 15.5354 30.7786C13.4036 29.8956 11.5815 28.4003 10.2996 26.4817C9.01764 24.5631 8.3334 22.3075 8.3334 20C8.3334 16.9058 9.56256 13.9384 11.7505 11.7505C13.9384 9.56254 16.9059 8.33337 20.0001 8.33337">
|
||||
</path>
|
||||
<path stroke="rgba(166, 166, 166, 1)" stroke-width="3" stroke-linejoin="round" stroke-linecap="round" d="M23.3333 18.3334L19.9999 21.6667L16.6666 18.3334">
|
||||
</path>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 918 B |
Loading…
Reference in New Issue
Block a user