|
|
@@ -17,13 +17,12 @@
|
|
|
<view class="buy-flower-container">
|
|
|
<button class="buy-mall-btn" @click="buyHs()">
|
|
|
<view class="btn-content">
|
|
|
- <view class="arrow-icon"></view>
|
|
|
<text class="btn-text">买绿植花束</text>
|
|
|
</view>
|
|
|
</button>
|
|
|
- <button @click="scanCode()">
|
|
|
+ <button @click="scanCode()" style="background: linear-gradient(135deg, #ff6b6b 0%, #ee5a24 100%);border: none;">
|
|
|
<view class="btn-content">
|
|
|
- <text class="btn-text" style="color: #666;">扫一扫</text>
|
|
|
+ <text class="btn-text">扫一扫</text>
|
|
|
</view>
|
|
|
</button>
|
|
|
</view>
|
|
|
@@ -92,14 +91,14 @@
|
|
|
<sel-popup :show="popupShow" :info="infoData" @close="hidePopup" />
|
|
|
<app-activily-coupon :show.sync="isNewCustom" :info="newCustomGift" :ghsId="ghsId" />
|
|
|
|
|
|
- <view v-if="cartItemShow == true" style="position: fixed;z-index: 190;top: 0;left: 0;width: 100vw;height: 100vh;background: rgba(0, 0, 0, 0.6);color: #fff;" @click="hideCartItem()">
|
|
|
+ <view v-if="cartItemShow == true" style="position: fixed;z-index: 190;top: 0;left: 0;width: 100vw;height: 145vh;background: rgba(0, 0, 0, 0.6);color: #fff;" @click="hideCartItem()">
|
|
|
<view style="position: fixed;bottom: 108upx;width:100vw;background-color:white;" @click.stop="">
|
|
|
<view class="commodity-view">
|
|
|
<view class="summary-bar">
|
|
|
<button class="admin-button-com blue middle" style="border:none;" @click.stop="delMemory()">清空购物车</button>
|
|
|
- <button class="admin-button-com middle" @click.stop="scanCode()" style="padding:16upx 20upx; background:transparent; border: 1px solid #999; display:flex; align-items:center;">
|
|
|
+ <button class="admin-button-com blue middle" @click.stop="scanCode()" style="border:none;padding:18upx 20upx; display:flex; align-items:center;">
|
|
|
<view class="btn-content">
|
|
|
- <text class="btn-text" style="color: #666; font-size: 28upx;">扫一扫</text>
|
|
|
+ <text class="btn-text" style="font-size: 28upx;">扫一扫</text>
|
|
|
</view>
|
|
|
</button>
|
|
|
</view>
|
|
|
@@ -513,7 +512,6 @@ export default {
|
|
|
onlyFromCamera: false, // 可从相册识别
|
|
|
scanType: ['barCode'],
|
|
|
success: (res) => {
|
|
|
- console.log('扫码结果：', res.result)
|
|
|
const itemId = res.result
|
|
|
|
|
|
let foundItem = null;
|
|
|
@@ -883,7 +881,7 @@ export default {
|
|
|
flex-direction: column;
|
|
|
.commodity-list {
|
|
|
overflow:scroll;
|
|
|
- height:50vh;
|
|
|
+ height:60vh;
|
|
|
padding: 20upx;
|
|
|
.commodity-item {
|
|
|
display: flex;
|
