|
|
@@ -2,18 +2,18 @@
|
|
|
<view class="app-content">
|
|
|
<view class="billing_box_bg">
|
|
|
<view class="input-wrap" >
|
|
|
- <view style="padding:0upx 0upx 0upx 0upx;margin-right:15upx;" >
|
|
|
- <button class="admin-button-com middle blue" @click="selectFlowerNumFn()">图片分类</button>
|
|
|
+ <view class="header-action-wrap header-action-wrap--left">
|
|
|
+ <button class="admin-button-com blue header-action-btn" @click="selectFlowerNumFn()">图片分类</button>
|
|
|
</view>
|
|
|
<view class="search-bar">
|
|
|
<app-search-module ref="globalSearchRef" v-model="globalPy" placeholder="这里搜索" @input="globalSearch" />
|
|
|
</view>
|
|
|
- <view style="float:right;margin-left:15upx;">
|
|
|
- <button class="admin-button-com middle blue" style="background-color: red;color:white;border-color: red;" @click="removeFromSave(option.customId)">清空购物车</button>
|
|
|
+ <view class="header-action-wrap header-action-wrap--right">
|
|
|
+ <button class="admin-button-com blue header-action-btn header-action-btn--clear" @click="removeFromSave(option.customId)">清空已选</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
|
|
|
- <button class="admin-button-com middle blue" @click="confirmToSave" style="position: absolute;top:120upx;right:24upx;z-index:99;">选好了</button>
|
|
|
+ <button class="admin-button-com middle blue" @click="confirmToSave" style="position: absolute;top:140upx;right:24upx;z-index:99;">选好了</button>
|
|
|
|
|
|
<view class="scroll-middle_bx">
|
|
|
<scroll-view scroll-y scroll-with-animation class="tab-view">
|
|
|
@@ -122,6 +122,10 @@
|
|
|
<view class="commodity-view">
|
|
|
<view class="summary-bar">
|
|
|
<button class="admin-button-com blue middle" @click.stop="clearCartInPopup()" style="background-color: red;border:1upx solid red;">清空购物车</button>
|
|
|
+ <!-- 右上角关闭购物车弹框 -->
|
|
|
+ <view class="cart-popup-close" @click.stop="hideCartItem()">
|
|
|
+ <text class="iconfont iconclose cart-popup-close-icon"></text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="commodity-list">
|
|
|
<view class="commodity-item" v-for="(item, index) in selectList" :key="index">
|
|
|
@@ -472,9 +476,35 @@ export default {
|
|
|
flex-direction: column;
|
|
|
.input-wrap {
|
|
|
display: flex;
|
|
|
+ align-items: center;
|
|
|
padding: 22upx 20upx 22upx 13upx;
|
|
|
.search-bar {
|
|
|
flex: 1;
|
|
|
+ min-width: 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ .header-action-wrap {
|
|
|
+ flex-shrink: 0;
|
|
|
+ &--left {
|
|
|
+ margin-right: 15upx;
|
|
|
+ }
|
|
|
+ &--right {
|
|
|
+ margin-left: 15upx;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ /* 与搜索框 map-search 同高 90upx，去掉 middle 上下 padding，文字水平垂直居中 */
|
|
|
+ .header-action-btn {
|
|
|
+ height: 90upx;
|
|
|
+ line-height: 90upx;
|
|
|
+ padding: 0 16upx;
|
|
|
+ margin: 0;
|
|
|
+ box-sizing: border-box;
|
|
|
+ text-align: center;
|
|
|
+ font-size: 26upx;
|
|
|
+ &--clear {
|
|
|
+ background-color: red;
|
|
|
+ color: #fff;
|
|
|
+ border-color: red;
|
|
|
}
|
|
|
}
|
|
|
.scroll-middle_bx {
|
|
|
@@ -711,5 +741,19 @@ export default {
|
|
|
justify-content: space-between;
|
|
|
border-top: 1upx solid #eeeeee;
|
|
|
}
|
|
|
+ .cart-popup-close {
|
|
|
+ width: 80upx;
|
|
|
+ height: 80upx;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: center;
|
|
|
+ border-radius: 50%;
|
|
|
+ background-color: #f5f5f5;
|
|
|
+ }
|
|
|
+ .cart-popup-close-icon {
|
|
|
+ color: #666;
|
|
|
+ font-size: 44upx;
|
|
|
+ line-height: 1;
|
|
|
+ }
|
|
|
}
|
|
|
</style>
|
