From 285395cde3a4c95779d1bc4bb303330475bf60dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Mon, 11 Oct 2021 16:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/index-banner/index-banner.vue     |  4 ++--
 components/lf-payPassword/lf-payPassword.vue |  9 ++++++++-
 pages/order/cashier/cashier.vue              |  7 ++++++-
 pages/order/confirm/confirm.vue              |  4 +++-
 pages/shop/goodsdetail.vue                   | 14 ++++++++------
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/components/index-banner/index-banner.vue b/components/index-banner/index-banner.vue
index 4b1e8fa..af59b2f 100644
--- a/components/index-banner/index-banner.vue
+++ b/components/index-banner/index-banner.vue
@@ -14,7 +14,7 @@
 					:style="
 						'height: ' +
 							imgHeight +
-							'px; padding-left: ' +
+							'rpx; padding-left: ' +
 							meta.padding_left +
 							'px; padding-right: ' +
 							meta.padding_right +
@@ -41,7 +41,7 @@ export default {
 	// 对应data
 	data() {
 		return {
-			imgHeight: '450'
+			imgHeight: 900
 		};
 	},
 	options: {
diff --git a/components/lf-payPassword/lf-payPassword.vue b/components/lf-payPassword/lf-payPassword.vue
index bb98b97..0029404 100644
--- a/components/lf-payPassword/lf-payPassword.vue
+++ b/components/lf-payPassword/lf-payPassword.vue
@@ -50,7 +50,8 @@
 		data(){
 			return {
 				code: '', // 密码
-				time: new Date('2021/09/8 14:15:00').getTime() - new Date('2021/09/8 14:10:00').getTime()
+				time: new Date('2021/09/8 14:15:00').getTime() - new Date('2021/09/8 14:10:00').getTime(),
+				is_auto: false
 			}
 		},
 		created(){
@@ -64,12 +65,18 @@
 				this.code = event;
 				if(this.code.length >= 6){
 					this.comfirm();
+					this.is_auto = true;
+				}else{
+					this.is_auto = false;
 				}
 			},
 			comfirm(){
 				if(this.code.length < 6){
 					return this.$msg('请输入完整支付密码');
 				}
+				if(this.is_auto){
+					return;
+				}
 				this.$emit('comfirm', this.code);
 			}
 		}
diff --git a/pages/order/cashier/cashier.vue b/pages/order/cashier/cashier.vue
index 5663edd..b4ba6f9 100644
--- a/pages/order/cashier/cashier.vue
+++ b/pages/order/cashier/cashier.vue
@@ -129,7 +129,7 @@
 				this.confirm();
 			},
 			// 支付
-			confirm() {
+			confirm(event) {
 				if (this.clickContinue == true) {
 					this.clickContinue = false;
 					if (this.is_date_finish) return this.$msg('订单超时未支付');
@@ -143,6 +143,9 @@
 						this.show_pw = true;
 						return;
 					}
+					uni.showLoading({
+						title: '正在支付，请稍后'
+					})
 
 					this.getOpenid().then(res => {
 						var data = {
@@ -164,6 +167,7 @@
 								Authorization: this.token
 							}
 						}).then(res => {
+							uni.hideLoading()
 							res = res.data;
 							if (res.status) {
 								// this.formId =  e.detail.formId || '';
@@ -184,6 +188,7 @@
 						this.setData({
 							loading: false
 						});
+						uni.hideLoading()
 						wx.showModal({
 							content: '支付失败',
 							showCancel: false
diff --git a/pages/order/confirm/confirm.vue b/pages/order/confirm/confirm.vue
index ddfa766..a8dce23 100644
--- a/pages/order/confirm/confirm.vue
+++ b/pages/order/confirm/confirm.vue
@@ -144,6 +144,7 @@
 						</radio-group>
 						<view>不使用优惠券</view>
 					</label>
+					<view style="height: 40rpx;"></view>
 				</view>
 			</u-popup>	
 		</block>
@@ -489,9 +490,10 @@
 		width: 750rpx;
 		height: max-content;
 		max-height: 70vh;
-		overflow-y: scroll;
+		// overflow-y: scroll;
 		padding: 40rpx 32rpx;
 		background: #FFFFFF;
+		padding-bottom: 0rpx;
 	}
 	.coupon-circle1 {
 		width: 40rpx;
diff --git a/pages/shop/goodsdetail.vue b/pages/shop/goodsdetail.vue
index b702d3f..b997a48 100644
--- a/pages/shop/goodsdetail.vue
+++ b/pages/shop/goodsdetail.vue
@@ -63,15 +63,15 @@
 						<view class="cu-bar padding-lr">
 							<view class="lf-flex">
 								<text class="lf-color-777 lf-font-28">优惠</text>
-								<view style="width: 580rpx;">
-									<view class="lf-color-222 lf-font-26 lf-m-l-30" 
-										v-for="(item, index) in coupons" :key="index">{{ item.title }}
-									</view>
+								<view style="width: 580rpx; padding-left: 20rpx;">
+									<text class="lf-color-222 lf-font-26"
+										v-for="(item, index) in coupons" :key="index">{{ item.title }};
+									</text>
 								</view>
 							</view>
-							<view>
+							<!-- <view>
 								<text class="lf-font-24 lf-color-777 lf-iconfont icon-xiangyou"></text>
-							</view>
+							</view> -->
 						</view>
 					</view>
 				</block>
@@ -1001,6 +1001,7 @@
 			padding: 0;
 			width: 88rpx;
 			position: relative;
+			color: #555555;
 			&:first-child{
 				padding-left: 0;
 			}
@@ -1009,6 +1010,7 @@
 				width: 50rpx;
 				font-size: 40rpx;
 				line-height: 1;
+				color: #555555;
 			}
 		}
 		.btn1{