From 986c442a8ca5036e88e26e8d1d769fb2af943de3 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Thu, 17 Dec 2020 17:19:02 +0800
Subject: [PATCH] 订单当前客户
---
hive-app/pages/workbench/selectProduct.vue | 69 ++++++++++++++++++++++++++--------
1 files changed, 53 insertions(+), 16 deletions(-)
diff --git a/hive-app/pages/workbench/selectProduct.vue b/hive-app/pages/workbench/selectProduct.vue
index 51308ab..d81e0ae 100644
--- a/hive-app/pages/workbench/selectProduct.vue
+++ b/hive-app/pages/workbench/selectProduct.vue
@@ -20,9 +20,9 @@
<view class="flex justify-between align-center mt-15">
<text class="flex justify-start font-12 red mt-10">￥400.00</text>
<view class="flex align-center justify-end mt-10">
- <text class="blue-btn-circle mr-10">-</text>
- <text class="font-12">1</text>
- <text class="blue-btn-circle ml-10 mr-0">+</text>
+ <text class="iconfont iconjian blue-outline-btn-circle mr-10"></text>
+ <text>1</text>
+ <text class="iconfont iconjia blue-btn-circle ml-10"></text>
</view>
</view>
</view>
@@ -35,9 +35,9 @@
<view class="flex justify-between align-center mt-15">
<text class="flex justify-start font-12 red mt-10">￥400.00</text>
<view class="flex align-center justify-end mt-10">
- <text class="blue-btn-circle mr-10">-</text>
- <text class="font-12">1</text>
- <text class="blue-btn-circle ml-10 mr-0">+</text>
+ <text class="iconfont iconjian blue-outline-btn-circle mr-10"></text>
+ <text>1</text>
+ <text class="iconfont iconjia blue-btn-circle ml-10"></text>
</view>
</view>
</view>
@@ -46,7 +46,7 @@
</view>
<view class="shopping flex align-center justify-between">
<view class="flex align-center">
- <view class="shopping-icon iconfont icongouwuche gray" @click="openShoppingCart">
+ <view class="shopping-icon iconfont iconicongouwuche gray" @click="openShoppingCart">
<view class="shopping-icon-num flex align-center justify-center">
<text class="font-10">19</text>
</view>
@@ -60,13 +60,34 @@
<view class="popup-header flex justify-between">
<text class="font-16 blue">已选商品</text>
<view class="flex align-center">
- <text class="icon iconfont iconlajixiang_huaban1 gray"></text>
+ <view class="popup-header-icon iconfont iconlajixiang_huaban1 gray"></view>
<text class="font-16 gray">清空</text>
</view>
- <view>
- <image src="../../static/images/product.jpg"></image>
- <view></view>
+ </view>
+ <view class="popup-row flex align-center">
+ <image class="popup-row-img" mode="aspectFill" src="../../static/images/product.jpg"></image>
+ <view class="popup-row-right">
+ <text class="flex justify-start font-12">肽妍氨基酸平衡基础洁面乳</text>
+ <view class="flex justify-between align-center">
+ <text class="flex justify-start font-12 red">￥400.00</text>
+ <view class="flex align-center justify-end">
+ <text class="iconfont iconjian blue-outline-btn-circle mr-10 center"></text>
+ <text>1</text>
+ <text class="iconfont iconjia blue-btn-circle ml-10 center"></text>
+ </view>
+ </view>
</view>
+ </view>
+ <view class="popup-end flex align-center justify-between">
+ <view class="flex align-center">
+ <view class="shopping-icon iconfont iconicongouwuche gray" @click="openShoppingCart">
+ <view class="shopping-icon-num flex align-center justify-center">
+ <text class="font-10">19</text>
+ </view>
+ </view>
+ <text class="font-14 blue ml-10">¥110.00</text>
+ </view>
+ <button class="blue-btn btn mr-0" @click="linkTo('./confirmOrder')">提交订单</button>
</view>
</view>
</uni-popup>
@@ -152,7 +173,7 @@
height: 81px;
}
.shopping{
- padding: 20px 10px;
+ padding: 10px 10px;
box-shadow:0 6px 100px rgba(237,234,244,1);
}
.shopping-icon{
@@ -171,7 +192,8 @@
}
.btn{
border-radius: 20px;
- line-height: 30px;
+ line-height: 34px;
+ padding: 0 24px;
font-size: 14px;
}
.popup-content{
@@ -180,11 +202,26 @@
border-top-right-radius: 8px;
padding: 10px;
}
- .icon{
- font-size: 20px;
- }
.popup-header{
padding: 0 5px 10px;
border-bottom: 1px solid #EDEAF4;
}
+ .popup-header-icon{
+ width: 20px;
+ height: 20px;
+ }
+ .popup-row{
+ border-bottom: 1px solid #EDEAF4;
+ padding: 10px 5px;
+ }
+ .popup-row-img{
+ width: 40px;
+ height: 40px;
+ }
+ .popup-row-right{
+ width: 100%;
+ }
+ .popup-end{
+ padding: 10px 0;
+ }
</style>
--
Gitblit v1.9.1