From edaf65a314a51211091bd5d621ecf1ec4fda842f Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Tue, 31 Oct 2023 19:54:39 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/plugins/scanpay/index/index.vue         |  2 +-
 .../uni-popup-dialog/uni-popup-dialog.vue     | 27 +++++++++----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/pages/plugins/scanpay/index/index.vue b/pages/plugins/scanpay/index/index.vue
index 7c8c1a71..bfc7530a 100644
--- a/pages/plugins/scanpay/index/index.vue
+++ b/pages/plugins/scanpay/index/index.vue
@@ -24,7 +24,7 @@
                 </view>
                 <view class="bg-white border-radius-main padding-main spacing-mb">
                     <view class="text-size fw-b spacing-mb">支付方式</view>
-                    <view class="flex-col jc-sa">
+                    <view class="flex-col jc-sa" :class="data.payment_list.length>2">
                         <view v-for="(item, index) in is_more ? data.payment_list : data.payment_list.slice(0, 2)" :key="index" class="flex-row jc-sb align-c padding-vertical-sm" @tap="change_event(index, item.id)">
                             <div class="flex-1 flex-width flex-row align-c">
                                 <image v-if="item.logo" :src="item.logo" mode="widthFix" class="circle img-pay margin-right-main" />
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
index 9bc87fc2..3936d5da 100644
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -56,10 +56,10 @@
 		name: "uniPopupDialog",
 		mixins: [popup],
 		emits:['confirm','close'],
-		props: {
-			inputType:{
-				type: String,
-				default: 'text'
+		props: {
+			inputType:{
+				type: String,
+				default: 'text'
 			},
 			value: {
 				type: [String, Number],
@@ -88,14 +88,14 @@
 			beforeClose: {
 				type: Boolean,
 				default: false
-			},
-			cancelText:{
-				type: String,
-				default: ''
-			},
-			confirmText:{
-				type: String,
-				default: ''
+			},
+			cancelText:{
+				type: String,
+				default: ''
+			},
+			confirmText:{
+				type: String,
+				default: ''
 			}
 		},
 		data() {
@@ -143,9 +143,6 @@
 				this.dialogType = this.type
 			}
 		},
-		mounted() {
-			this.focus = true
-		},
 		methods: {
 			/**
 			 * 点击确认按钮