From fbb2cfbdb42b5937a6aa1c47f7a412d26a79d090 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 14 Nov 2023 16:07:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B8=82=E7=BA=A7=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E9=93=BE=E5=85=A5=E9=A9=BB=E6=97=A0=E9=9C=80=E9=98=85?=
 =?UTF-8?q?=E8=AF=BB=E5=8D=8F=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/store/settled/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 87d6bfc..4a64586 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -630,7 +630,8 @@
 				let idx = e.target.value
 				this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id']
 				this.mer_storeType = this.storeTypeArr[idx]['type_name']
-				console.log(this.storeTypeArr[idx]['type_code'] == "TypeStore")
+				// console.log(this.storeTypeArr[idx]['type_code'] == "TypeStore")
+        // console.log(this.merchantData.mer_type)
 				if(this.storeTypeArr[idx]['type_code']== 'TypeStore'&&this.merchantData.mer_type){
 					this.shoplist('mer_services_agree')
 				}else{
@@ -910,8 +911,8 @@
 				}
 			},
 			formSubmit() {
-        console.log('sss');
 				if (this.validateForm() && this.validate) {
+          if (this.merchantData.mer_type == '12') return this.agree();
 					if (this.codenote.length == 0) {
 						this.isshow = true
 						this.countDown()