|
@@ -46,7 +46,7 @@
|
|
|
</view>
|
|
</view>
|
|
|
<view>
|
|
<view>
|
|
|
合计:
|
|
合计:
|
|
|
- <text style="color:red">¥123</text>
|
|
|
|
|
|
|
+ <text style="color:red">¥123</text>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
@@ -75,7 +75,7 @@
|
|
|
</view>
|
|
</view>
|
|
|
</view>
|
|
</view>
|
|
|
<view class="shop-show_box">
|
|
<view class="shop-show_box">
|
|
|
- <view
|
|
|
|
|
|
|
+ <view
|
|
|
@click="selectItem"
|
|
@click="selectItem"
|
|
|
class="show-shop_box">
|
|
class="show-shop_box">
|
|
|
<image
|
|
<image
|
|
@@ -95,7 +95,7 @@
|
|
|
<view class="btn-breakage">
|
|
<view class="btn-breakage">
|
|
|
报损
|
|
报损
|
|
|
</view>
|
|
</view>
|
|
|
- <view
|
|
|
|
|
|
|
+ <view
|
|
|
@click="settle"
|
|
@click="settle"
|
|
|
class="btn-account">
|
|
class="btn-account">
|
|
|
结算
|
|
结算
|
|
@@ -104,7 +104,7 @@
|
|
|
</view>
|
|
</view>
|
|
|
<uniPopup
|
|
<uniPopup
|
|
|
:show.sync="isShowFllowNum"
|
|
:show.sync="isShowFllowNum"
|
|
|
-
|
|
|
|
|
|
|
+ type="top"
|
|
|
>
|
|
>
|
|
|
<div>
|
|
<div>
|
|
|
<keyboardSetFlower></keyboardSetFlower>
|
|
<keyboardSetFlower></keyboardSetFlower>
|
|
@@ -119,6 +119,7 @@
|
|
|
<uniPopup
|
|
<uniPopup
|
|
|
:show.sync="isShowUser"
|
|
:show.sync="isShowUser"
|
|
|
type="top"
|
|
type="top"
|
|
|
|
|
+ maxHeight="auto"
|
|
|
>
|
|
>
|
|
|
<selectUser></selectUser>
|
|
<selectUser></selectUser>
|
|
|
</uniPopup>
|
|
</uniPopup>
|
|
@@ -190,30 +191,31 @@ export default {
|
|
|
display: flex;
|
|
display: flex;
|
|
|
height: 100vh;
|
|
height: 100vh;
|
|
|
& .shop-list {
|
|
& .shop-list {
|
|
|
- flex: 1;
|
|
|
|
|
|
|
+ flex: 63;
|
|
|
}
|
|
}
|
|
|
& .nav-left {
|
|
& .nav-left {
|
|
|
height: 100%;
|
|
height: 100%;
|
|
|
- width: 50upx;
|
|
|
|
|
|
|
+ // width: 50rpx;
|
|
|
|
|
+ flex: 4;
|
|
|
background-color: rgba(72, 91, 107, 1);
|
|
background-color: rgba(72, 91, 107, 1);
|
|
|
// #599981
|
|
// #599981
|
|
|
& .item-list {
|
|
& .item-list {
|
|
|
- margin-top: 50upx;
|
|
|
|
|
- font-size: 20upx;
|
|
|
|
|
|
|
+ margin-top: 50rpx;
|
|
|
|
|
+ font-size: 20rpx;
|
|
|
text-align: center;
|
|
text-align: center;
|
|
|
- padding: 15upx 0;
|
|
|
|
|
|
|
+ padding: 15rpx 0;
|
|
|
background-color: #599981;
|
|
background-color: #599981;
|
|
|
color: #FFFFFF;
|
|
color: #FFFFFF;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
& .shopList-box {
|
|
& .shopList-box {
|
|
|
- width: 250upx;
|
|
|
|
|
|
|
+ flex: 25;
|
|
|
height: 100%;
|
|
height: 100%;
|
|
|
display: flex;
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
flex-direction: column;
|
|
|
& .title {
|
|
& .title {
|
|
|
- padding: 3upx;
|
|
|
|
|
- font-size: 12upx;
|
|
|
|
|
|
|
+ padding: 3rpx;
|
|
|
|
|
+ font-size: 12rpx;
|
|
|
background-color: rgba(72, 91, 107, 1);
|
|
background-color: rgba(72, 91, 107, 1);
|
|
|
color: #FFFFFF;
|
|
color: #FFFFFF;
|
|
|
}
|
|
}
|
|
@@ -221,13 +223,13 @@ export default {
|
|
|
flex: 1;
|
|
flex: 1;
|
|
|
border: 1px solid #eee;
|
|
border: 1px solid #eee;
|
|
|
& .shop-item_box {
|
|
& .shop-item_box {
|
|
|
- padding: 5upx;
|
|
|
|
|
|
|
+ padding: 5rpx;
|
|
|
& .shop-body_box {
|
|
& .shop-body_box {
|
|
|
background-color: #f2f8f8;
|
|
background-color: #f2f8f8;
|
|
|
- padding: 5upx;
|
|
|
|
|
- font-size: 14upx;
|
|
|
|
|
|
|
+ padding: 5rpx;
|
|
|
|
|
+ font-size: 14rpx;
|
|
|
& .flower-name_box {
|
|
& .flower-name_box {
|
|
|
- padding: 0 5upx;
|
|
|
|
|
|
|
+ padding: 0 5rpx;
|
|
|
& .name {
|
|
& .name {
|
|
|
color: #333333;
|
|
color: #333333;
|
|
|
font-weight: bold;
|
|
font-weight: bold;
|
|
@@ -237,39 +239,39 @@ export default {
|
|
|
display: flex;
|
|
display: flex;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
|
- padding-top: 15upx;
|
|
|
|
|
|
|
+ padding-top: 15rpx;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
& .shopList-footer_box {
|
|
& .shopList-footer_box {
|
|
|
- height: 50upx;
|
|
|
|
|
|
|
+ height: 50rpx;
|
|
|
border: 1px solid #eee;
|
|
border: 1px solid #eee;
|
|
|
- font-size: 12upx;
|
|
|
|
|
|
|
+ font-size: 12rpx;
|
|
|
display: flex;
|
|
display: flex;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
justify-content: space-around;
|
|
justify-content: space-around;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
& .open-box {
|
|
& .open-box {
|
|
|
- width: 80upx;
|
|
|
|
|
|
|
+ flex: 8;
|
|
|
height: 100vh;
|
|
height: 100vh;
|
|
|
display: flex;
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
flex-direction: column;
|
|
|
- padding: 5upx;
|
|
|
|
|
- padding-top: 10upx;
|
|
|
|
|
|
|
+ padding: 5rpx;
|
|
|
|
|
+ padding-top: 10rpx;
|
|
|
& > view {
|
|
& > view {
|
|
|
border: 1px solid #eee;
|
|
border: 1px solid #eee;
|
|
|
text-align: center;
|
|
text-align: center;
|
|
|
- padding: 10upx 0;
|
|
|
|
|
|
|
+ padding: 10rpx 0;
|
|
|
color: #333333;
|
|
color: #333333;
|
|
|
- margin-bottom: 15upx;
|
|
|
|
|
- font-size: 14upx;
|
|
|
|
|
|
|
+ margin-bottom: 15rpx;
|
|
|
|
|
+ font-size: 14rpx;
|
|
|
text-align: center;
|
|
text-align: center;
|
|
|
&.active {
|
|
&.active {
|
|
|
color: #008000;
|
|
color: #008000;
|
|
|
border-color: #008000;
|
|
border-color: #008000;
|
|
|
- border-radius: 2upx;
|
|
|
|
|
|
|
+ border-radius: 2rpx;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -279,12 +281,12 @@ export default {
|
|
|
display: flex;
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
flex-direction: column;
|
|
|
& .shop-type_box {
|
|
& .shop-type_box {
|
|
|
- max-height: 300upx;
|
|
|
|
|
|
|
+ max-height: 300rpx;
|
|
|
display: flex;
|
|
display: flex;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
& > view {
|
|
& > view {
|
|
|
border:1px solid #e4e4e4;
|
|
border:1px solid #e4e4e4;
|
|
|
- padding: 8upx 5upx;
|
|
|
|
|
|
|
+ padding: 8rpx 5rpx;
|
|
|
font-size: 14px;
|
|
font-size: 14px;
|
|
|
&.active {
|
|
&.active {
|
|
|
background-color: #428369;
|
|
background-color: #428369;
|
|
@@ -294,49 +296,49 @@ export default {
|
|
|
}
|
|
}
|
|
|
& .shop-show_box {
|
|
& .shop-show_box {
|
|
|
flex: 1;
|
|
flex: 1;
|
|
|
- padding: 5upx;
|
|
|
|
|
|
|
+ padding: 5rpx;
|
|
|
display: flex;
|
|
display: flex;
|
|
|
flex-wrap: wrap;
|
|
flex-wrap: wrap;
|
|
|
& .show-shop_box {
|
|
& .show-shop_box {
|
|
|
position: relative;
|
|
position: relative;
|
|
|
- width: 120upx;
|
|
|
|
|
- height: 100upx;
|
|
|
|
|
-
|
|
|
|
|
|
|
+ width: 120rpx;
|
|
|
|
|
+ height: 100rpx;
|
|
|
|
|
+
|
|
|
& .img {
|
|
& .img {
|
|
|
height: 100%;
|
|
height: 100%;
|
|
|
}
|
|
}
|
|
|
.shop-info_price {
|
|
.shop-info_price {
|
|
|
position: absolute;
|
|
position: absolute;
|
|
|
- height: 42upx;
|
|
|
|
|
|
|
+ height: 42rpx;
|
|
|
background-color: rgba(0, 0, 0, 0.2);
|
|
background-color: rgba(0, 0, 0, 0.2);
|
|
|
bottom: 0;
|
|
bottom: 0;
|
|
|
width: 100%;
|
|
width: 100%;
|
|
|
- font-size: 14upx;
|
|
|
|
|
|
|
+ font-size: 14rpx;
|
|
|
color: #ffffff;
|
|
color: #ffffff;
|
|
|
& > view {
|
|
& > view {
|
|
|
display: flex;
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
flex-direction: column;
|
|
|
- padding: 3upx;
|
|
|
|
|
-
|
|
|
|
|
|
|
+ padding: 3rpx;
|
|
|
|
|
+
|
|
|
justify-content: center;
|
|
justify-content: center;
|
|
|
& > view:nth-child(1) {
|
|
& > view:nth-child(1) {
|
|
|
- margin-bottom: 2upx;
|
|
|
|
|
|
|
+ margin-bottom: 2rpx;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
& .shop-footer_box {
|
|
& .shop-footer_box {
|
|
|
- height: 40upx;
|
|
|
|
|
|
|
+ height: 40rpx;
|
|
|
display: flex;
|
|
display: flex;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
|
justify-content: flex-end;
|
|
justify-content: flex-end;
|
|
|
& > view {
|
|
& > view {
|
|
|
- height: 40upx;
|
|
|
|
|
- padding: 5upx 25upx;
|
|
|
|
|
- border-radius: 5upx;
|
|
|
|
|
- font-size: 14upx;
|
|
|
|
|
- margin: 0 10upx;
|
|
|
|
|
|
|
+ height: 40rpx;
|
|
|
|
|
+ padding: 5rpx 25rpx;
|
|
|
|
|
+ border-radius: 5rpx;
|
|
|
|
|
+ font-size: 14rpx;
|
|
|
|
|
+ margin: 0 10rpx;
|
|
|
vertical-align: middle;
|
|
vertical-align: middle;
|
|
|
display: flex;
|
|
display: flex;
|
|
|
align-items: center;
|
|
align-items: center;
|
|
@@ -352,4 +354,4 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-</style>
|
|
|
|
|
|
|
+</style>
|