From b4d25be9b33c861f5a6e561919aad733d7497918 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Tue, 2 Apr 2024 18:34:35 +0800
Subject: [PATCH 1/2] 1

---
 pages/store/settled/index.vue | 53 -----------------------------------
 utils/uniMPevent.js           |  7 ++++-
 2 files changed, 6 insertions(+), 54 deletions(-)

diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index c8fe219..24772e2 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -192,59 +192,6 @@
 							</view>
 						</view>
 
-						<!-- <view class="item" v-if="nature_business==1">
-							<view class="acea-row row-middle">
-								<text class="item-name">对公账号</text>
-								<input type="number" placeholder="请输入对公账号" v-model="merchantData.bank_code"
-									@input="validateBtn" placeholder-class='placeholder' />
-							</view>
-						</view>
-						<view class="item" v-else>
-							<view class="acea-row row-middle">
-								<text class="item-name">银行卡号</text>
-								<input type="number" placeholder="请输入银行卡号" v-model="merchantData.bank_code"
-									@input="validateBtn" placeholder-class='placeholder' />
-							</view>
-						</view>
-						<view class="item">
-							<view class="acea-row row-middle">
-								<text class="item-name">开户银行</text>
-								<input type="text" maxlength="30" placeholder="请输入开户银行名称"
-									v-model="merchantData.bank_username" @input="validateBtn"
-									placeholder-class='placeholder' />
-							</view>
-						</view>
-						<view class="item">
-							<view class="acea-row row-middle">
-								<text class="item-name">开户网点</text>
-								<input type="text" placeholder="请输入开户网点" v-model="merchantData.bank_opening"
-									@input="validateBtn" placeholder-class='placeholder' />
-							</view>
-						</view>
-						<view class="item" v-if="nature_business==2">
-							<view class="acea-row row-middle">
-								<text class="item-name">持卡人</text>
-								<input type="text" placeholder="请输入持卡人姓名" v-model="merchantData.bank_card_username"
-									@input="validateBtn" placeholder-class='placeholder' />
-							</view>
-						</view>
-						<view class="item no-border" v-if="nature_business==2">
-							<view class='acea-row row-middle'>
-								<text class="item-title" style="margin-right: 20rpx;">请上传银行卡正面照片</text>
-								<text class="item-desc">(支持JPG、PNG、JPEG)</text>
-								<view class="upload">
-									<view v-if="bank_front" class='pictrue' @click='uploadpicBack'>
-										<image :src='bank_front'></image>
-									</view>
-									<view v-else class='pictrue acea-row row-center-wrapper row-column'
-										@click='uploadpicBack'>
-										<text class='iconfont icon-icon25201'></text>
-										<view>上传图片</view>
-									</view>
-								</view>
-							</view>
-						</view> -->
-
 						<view class="item">
 							<view class="acea-row row-middle">
 								<text class="item-name">联系电话</text>
diff --git a/utils/uniMPevent.js b/utils/uniMPevent.js
index b5b5a53..3b414bd 100644
--- a/utils/uniMPevent.js
+++ b/utils/uniMPevent.js
@@ -3,7 +3,7 @@ import {
 	uniMPgetLocation,
 	test
 } from "@/utils/uniMPfunction.js"
-
+console.log(123)
 export const initEvent = () => {
 	mp.onUniMPEventReceive(async (ret) => {
 		console.log('小程序事件: ', ret);
@@ -17,6 +17,11 @@ export const initEvent = () => {
 			});
 		}
 
+		// 关闭app
+		if (ret.event == 'backApp') {
+			mp.closeUniMP(ret.fromAppid, (ret) => {});
+		}
+
 		if (ret.event == 'closeApp') {
 			mp.closeUniMP(ret.fromAppid, (ret) => {
 				console.log('closeUniMP: ' + JSON.stringify(ret));

From 88ec36b28e06298ce13e7aa57940f582fec80d21 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Tue, 2 Apr 2024 18:41:12 +0800
Subject: [PATCH 2/2] 1

---
 utils/uniMPevent.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/utils/uniMPevent.js b/utils/uniMPevent.js
index 3b414bd..12bd385 100644
--- a/utils/uniMPevent.js
+++ b/utils/uniMPevent.js
@@ -11,9 +11,11 @@ export const initEvent = () => {
 		// 用户如果没有注册商户 从小程序返回 入驻页面
 		if (ret.event == 'closeAppToOpenShop') {
 			mp.closeUniMP(ret.fromAppid, (ret) => {
-				uni.navigateTo({
-					url: "/pages/store/settled/index"
-				})
+				setTimeout(() => {
+					uni.navigateTo({
+						url: "/pages/store/settled/index"
+					})
+				}, 200)
 			});
 		}