From 106179eb6c6d9013ecb1e4929348028066fbbf00 Mon Sep 17 00:00:00 2001
From: Wik-T <812952667@qq.com>
Date: Fri, 21 Apr 2023 11:55:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |  80 +--
 Utils/Api.js                                  |  18 +-
 components/mcclist.vue                        | 297 +++++++++++
 pages.json                                    |  92 ++--
 pages/index/depositaryBank/depositaryBank.vue |  89 ++++
 pages/index/mcc-list/mcc-list.vue             |  89 ++--
 .../merchant-incoming-parts.vue               | 471 +++++++++++-------
 pages/welcome/welcome.vue                     |   7 +-
 unpackage/dist/build/h5/index.html            |   2 +-
 9 files changed, 840 insertions(+), 305 deletions(-)
 create mode 100644 components/mcclist.vue
 create mode 100644 pages/index/depositaryBank/depositaryBank.vue

diff --git a/App.vue b/App.vue
index 2725333..40ac437 100644
--- a/App.vue
+++ b/App.vue
@@ -4,46 +4,52 @@
 			// url: 'http://192.168.3.4:9301/crest',
 			// imgUrl: 'https://192.168.3.4:9301/filesystem/',
 			//正式
-			// url: 'https://pay.dctpay.com/crest',
-			// imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
+			url: 'https://pay.dctpay.com/crest',
+			imgUrl: 'https://gratia-pay.obs.cn-southwest-2.myhuaweicloud.com',
 			//测试
-			url: 'https://gratia-pay.dctpay.com/crest',
-			imgUrl: 'https://xuan-pay-private.obs.cn-southwest-2.myhuaweicloud.com',
+			// url: 'https://gratia-pay.dctpay.com/crest',
+			// imgUrl: 'https://xuan-pay-private.obs.cn-southwest-2.myhuaweicloud.com',
 			userInfo: "",
 			openId: '',
 			h5code: '',
-			token: '',
-			//行业id
-			businessid:'',
-			//行业名称
-			businessname:'',
-			//mccid
-			mccid:'',
-			//mcc名称
-			mccname:'',
-			//数据字典类型数据
-			Dictionaries:''
-		},
-		onLaunch: function() {
-			let that  = this;
-			uni.getStorage({
-				key: 'payuser',
-				success: (res) => {
-					that.globalData.userInfo = res.data;
-					uni.getStorage({
-						key: "paytoken",
-						success: (res) => {
-							that.globalData.token = res.data;
-						}
-					})
-			
-				}
-			});
-		},
-		onShow: function() {
-		},
-		onHide: function() {
-		}
+			token: '',
+			//行业id
+			businessid: '',
+			//行业名称
+			businessname: '',
+			//mccid
+			mccid: '',
+			//mcc名称
+			mccname: '',
+			//数据字典类型数据
+			Dictionaries: '',
+			//开户支行名称
+			depositaryBank: '',
+			//开户行号
+			branchBankNo:'',
+			//清算行号
+			clearNo:'',
+			//开户行地区
+			bankareaCode: ''
+		},
+		onLaunch: function() {
+			let that = this;
+			uni.getStorage({
+				key: 'payuser',
+				success: (res) => {
+					that.globalData.userInfo = res.data;
+					uni.getStorage({
+						key: "paytoken",
+						success: (res) => {
+							that.globalData.token = res.data;
+						}
+					})
+
+				}
+			});
+		},
+		onShow: function() {},
+		onHide: function() {}
 	}
 </script>
 
@@ -58,4 +64,4 @@
 		-webkit-appearance: none;
 		background: transparent;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/Utils/Api.js b/Utils/Api.js
index 26279a7..ed0c8e7 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -58,7 +58,19 @@ export const configMerBasis = params => {
 //第三步商户结算信息
 export const configMerSettlement = params => {
 	return POST('POST', `${base}/mer/configMerSettlement`, params).then(res => res.data);
-}
+}
+//获取银行卡bin信息
+export const getBankCardBin = params => {
+	return POST('GET', `${base}/common/getBankCardBin`, params).then(res => res.data);
+}
+//获取银行支行列表
+export const getBankList = params => {
+	return POST('GET', `${base}/common/getBankList`, params).then(res => res.data);
+}
+//银行开户许可证识别
+export const recognizeBankAccount = params => {
+	return POST('GET', `${base}/ocr/recognizeBankAccount`, params).then(res => res.data);
+}
 //第四步商户门店信心
 export const configMerStore = params => {
 	return POST('POST', `${base}/mer/configMerStore`, params).then(res => res.data);
@@ -68,8 +80,8 @@ export const getMerListBySalesman = params => {
 	return POST('GET', `${base}/mer/getMerListBySalesman`, params).then(res => res.data);
 }
 //业务员查询mcc
-export const getLklMcc = params => {
-	return POST('GET', `${base}/common/getLklMcc`, params).then(res => res.data);
+export const getMccList = params => {
+	return POST('GET', `${base}/common/getMccList`, params).then(res => res.data);
 }
 //查询所有数据字典
 export const getDictionaries = params => {
diff --git a/components/mcclist.vue b/components/mcclist.vue
new file mode 100644
index 0000000..b947020
--- /dev/null
+++ b/components/mcclist.vue
@@ -0,0 +1,297 @@
+<template>
+		<view class="u-wrap">
+			<view class="search-warp" v-if="showAction">
+				<scroll-view scroll-y :style="{'height': scrollHeight+'px'}" class="item-container">
+					<view class="thumb-box" v-for="(item, index) in searchList" :key="index" @click="selval(item)">
+						<view :class="[value==item[valueName]? 'item-active' : '']">
+							<text>{{item.pname}}-{{item[labelName]}}</text>
+						</view>
+						
+					</view>
+				</scroll-view>
+			</view>
+			<view class="u-menu-wrap">
+				<scroll-view scroll-y scroll-with-animation class="u-tab-view menu-scroll-view" :scroll-top="scrollTop">
+					<view v-for="(item,index) in list" :key="index" class="u-tab-item"
+						:class="[current==index ? 'u-tab-item-active' : '']" :data-current="index"
+						@tap.stop="swichMenu(index)">
+						<text class="u-line-2">{{item[labelName]}}</text>
+					</view>
+				</scroll-view>
+				<block v-for="(item,index) in list" :key="index">
+					<scroll-view scroll-y class="right-box" v-if="current==index">
+						<view class="page-view">
+							<view class="class-item">
+								<view class="item-container">
+									<view class="thumb-box" v-for="(item1, index1) in item.childLklMccList" :key="index1"
+										@click="selval(item1)">
+										<view :class="[value==item1[valueName] ? 'item-active' : '']">
+											<text>{{item1[labelName]}}</text>
+										</view>
+										<!-- <u-icon v-if="value==item1[valueName]" name="checkbox-mark" :color="iconColor"
+											size="28">
+										</u-icon> -->
+									</view>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</block>
+			</view>
+		</view>
+</template>
+
+<script>
+	export default {
+		name: 'macclist',
+		props: {
+			//label展示字段
+			labelName: {
+				type: String,
+				default: 'name'
+			},
+			//value选中字段
+			valueName: {
+				type: String,
+				default: 'id'
+			},
+			//初始选中值
+			selectValue: {
+				type: Number,
+				default: 0
+			},
+			//选择数据
+			listData: {
+				type: Array,
+				default: () => {
+					return [];
+				}
+			}
+		},
+		data() {
+			return {
+				list: JSON.parse(JSON.stringify(this.listData)),
+				scrollTop: 0, //tab标题的滚动条位置
+				current: 0, // 预设当前项的值
+				menuHeight: 0, // 左边菜单的高度
+				menuItemHeight: 0, // 左边菜单item的高度
+				value: this.selectValue,
+				keyword: '',
+				iconColor: 'primary',
+				showAction: false,
+				searchList: [],
+				scrollHeight: 500
+			}
+		},
+		watch: {
+			listData: {
+				handler(newName, oldName) {
+					this.list = JSON.parse(JSON.stringify(newName))
+				},
+				deep: true,
+			}
+		},
+		created() {
+			var that = this;
+			uni.getSystemInfo({
+				success: function(res) {
+					let windowHeight = res.windowHeight;
+					let windowWidth = res.windowWidth;
+					//#ifdef H5
+					let headHeight = 110 / 750 * windowWidth;
+					//#endif
+					//#ifndef H5
+					let headHeight = 200 / 750 * windowWidth;
+					//#endif
+					let scrollHeight = (windowHeight - headHeight);
+					that.scrollHeight = scrollHeight;
+
+				}
+			});
+		},
+		methods: {
+			selval(item) {
+				this.value = item[this.valueName];
+				this.keyword = '';
+				this.showAction = false;
+				this.$emit('confirem', item);
+			},
+			// 点击左边的栏目切换
+			async swichMenu(index) {
+				if (index == this.current) return;
+				this.current = index;
+				// 如果为0，意味着尚未初始化
+				if (this.menuHeight == 0 || this.menuItemHeight == 0) {
+					await this.getElRect('menu-scroll-view', 'menuHeight');
+					await this.getElRect('u-tab-item', 'menuItemHeight');
+				}
+				// 将菜单菜单活动item垂直居中
+				this.scrollTop = index * this.menuItemHeight + this.menuItemHeight / 2 - this.menuHeight / 2;
+			},
+			// 获取一个目标元素的高度
+			getElRect(elClass, dataVal) {
+				new Promise((resolve, reject) => {
+					const query = uni.createSelectorQuery().in(this);
+					query.select('.' + elClass).fields({
+						size: true
+					}, res => {
+						// 如果节点尚未生成，res值为null，循环调用执行
+						if (!res) {
+							setTimeout(() => {
+								this.getElRect(elClass);
+							}, 10);
+							return;
+						}
+						this[dataVal] = res.height;
+					}).exec();
+				})
+			},
+			focus() {
+				this.showAction = true;
+			},
+			cancle() {
+				this.showAction = false;
+				this.keyword = '';
+			},
+			toSearch() {
+				let arr = [];
+				this.list.map((item, index) => {
+					item.children.map((it, ix) => {
+						if (it[this.labelName].indexOf(this.keyword) >= 0) {
+							it['pname'] = item[this.labelName];
+							arr.push(it);
+						}
+					})
+				})
+				this.searchList = arr;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.u-wrap {
+		height: 100%;
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		position: relative;
+		overflow: hidden;
+		.head {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			height: 100rpx;
+			padding: 0 20rpx;
+			background-color: white;
+		}
+	}
+
+	.u-search-box {
+		padding: 0rpx 30rpx;
+		background-color: white;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		height: 100rpx;
+		width: 100%;
+	}
+
+	.search-warp {
+		display: flex;
+		overflow: hidden;
+		background-color: #FFFFFF;
+		position: absolute;
+		z-index: 10;
+		top: 200rpx;
+		left: 0;
+		width: 100%;
+	}
+
+	.u-menu-wrap {
+		flex: 1;
+		display: flex;
+		overflow: hidden;
+		background-color: #F8F8F8;
+	}
+
+	.u-tab-view {
+		width: 300rpx;
+		height: 100%;
+	}
+
+	.u-tab-item {
+		height: 100rpx;
+		background: #f6f6f6;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+		font-size: 26rpx;
+		padding: 0 20rpx;
+		color: #444;
+		font-weight: 400;
+	}
+
+	.u-tab-item-active {
+		position: relative;
+		color: #333333;
+		font-size: 28rpx;
+		font-weight: 600;
+		background: #fff;
+	}
+
+	.u-tab-item-active::before {
+		content: "";
+		position: absolute;
+		border-left: 4px solid #ed6853;
+		height: 32rpx;
+		left: 0;
+		top: 39rpx;
+	}
+
+	.u-tab-view {
+		height: 100%;
+	}
+
+	.right-box {
+		background-color: white;
+	}
+
+	.page-view {
+		background-color: white;
+	}
+
+	.class-item {
+		background-color: #fff;
+		border-radius: 8rpx;
+	}
+
+	.item-menu-name {
+		font-weight: normal;
+		font-size: 24rpx;
+		color: #007AFF;
+	}
+
+	.item-container {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+	}
+
+	.item-active {
+		color: #ed6853;
+	}
+
+	.thumb-box {
+		display: flex;
+		flex-direction: row;
+		justify-content: space-between;
+		height: 100rpx;
+		width: 100%;
+		padding: 0 20rpx;
+		align-items: center;
+		font-size: 30rpx;
+		color: #999999;
+	}
+</style>
diff --git a/pages.json b/pages.json
index c560622..7018589 100644
--- a/pages.json
+++ b/pages.json
@@ -1,30 +1,29 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		{
-		    "path" : "pages/welcome/welcome",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "",
-		        "enablePullDownRefresh": false,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
-		    }
-		    
-		},{
-			"path": "pages/login/login",
-			"style": {
-				"navigationBarTextStyle": "white",
-				"navigationBarTitleText": "登录",
-				"onReachBottomDistance": 50,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
-			}
-		
-		},  {
+		{
+			"path": "pages/welcome/welcome",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
+			}
+
+		}, {
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "登录",
+				"onReachBottomDistance": 50,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
+			}
+
+		}, {
 			"path": "pages/index/serviceApplicationList/serviceApplicationList",
 			"style": {
 				"navigationBarTextStyle": "white",
@@ -279,21 +278,32 @@
 					"softinputNavBar": "none"
 				}
 			}
-		},{
-            "path" : "pages/index/salesOrderList/salesOrderList",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "设备订单",
-				"navigationBarTextStyle": "white",
-                "enablePullDownRefresh": false,
-				"app-plus": {
-					"titleNView": false, //禁用原生导航栏
-					"softinputNavBar": "none"
-				}
-            }
-            
-        }
-    ],
+		}, {
+			"path": "pages/index/salesOrderList/salesOrderList",
+			"style": {
+				"navigationBarTitleText": "设备订单",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
+			}
+
+		}, {
+			"path": "pages/index/depositaryBank/depositaryBank",
+			"style": {
+				"navigationBarTitleText": "选择支行",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
+			}
+
+		}
+	],
 	"subpackages": [{
 		"root": "subPages",
 
@@ -305,4 +315,4 @@
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8"
 	}
-}
+}
\ No newline at end of file
diff --git a/pages/index/depositaryBank/depositaryBank.vue b/pages/index/depositaryBank/depositaryBank.vue
new file mode 100644
index 0000000..e8506e4
--- /dev/null
+++ b/pages/index/depositaryBank/depositaryBank.vue
@@ -0,0 +1,89 @@
+<template>
+	<view>
+		<!-- 搜索框 -->
+		<unisearchbar v-model="searchValue" class="mart20" @input="getBankList" placeholder="搜索内容" radius="100">
+		</unisearchbar>
+		<!-- 商户名字 -->
+		<view v-if="taryBankList == ''" class="mart60 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
+		</view>
+		<view class="width100">
+			<view class=" mcclist font15 fcor666" v-for="(item,index) in taryBankList" :key="index"
+				@click="changebank(item)">
+				{{item.branchBankName}}
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		getBankList
+	} from '../../../Utils/Api.js';
+	import unisearchbar from '../../../components/uni-search-bar/components/uni-search-bar/uni-search-bar.vue';
+	let app = getApp();
+	export default {
+		components: {
+			unisearchbar
+		},
+		data() {
+			return {
+				//列表数据
+				taryBankList: [],
+				searchValue: ''
+			}
+		},
+		onLoad() {
+			if (app.globalData.depositaryBank) {
+				this.searchValue = app.globalData.depositaryBank;
+			}
+			this.getBankList();
+		},
+
+		methods: {
+			//查询mcc商户
+			getBankList() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let datas = {
+					regionId: app.globalData.bankareaCode,
+					bankName: this.searchValue
+				}
+				getBankList(datas).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000' && res.return_data) {
+						this.taryBankList = res.return_data;
+					} else {
+						uni.showToast({
+							title: res.return_msg,
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				});
+			},
+
+			//选择某个mcc 并返回
+			changebank(item) {
+				app.globalData.depositaryBank = item.branchBankName;
+				app.globalData.branchBankNo = item.branchBankNo;
+				app.globalData.clearNo = item.clearNo;
+				uni.navigateBack({})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.mcclist {
+		width: calc(100% - 50upx);
+		height: 100upx;
+		display: flex;
+		align-items: center;
+		background-color: rgba($color: #ffffff, $alpha: 0.1);
+		border-bottom: 1px solid #f6f6f6;
+		padding: 12upx 25upx;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/mcc-list/mcc-list.vue b/pages/index/mcc-list/mcc-list.vue
index 0709b46..95aeeb9 100644
--- a/pages/index/mcc-list/mcc-list.vue
+++ b/pages/index/mcc-list/mcc-list.vue
@@ -1,26 +1,30 @@
 <template>
 	<view>
 		<!-- 搜索框 -->
-		<unisearchbar v-model="searchValue" @input="focusInput" placeholder="搜索内容" radius="100">
-		</unisearchbar>
+		<!-- <unisearchbar v-model="searchValue" @input="focusInput" placeholder="搜索内容" radius="100">
+		</unisearchbar> -->
 		<!-- 商户名字 -->
-		<view class="mart20 width100">
+		<!-- <view class="mart20 width100">
 			<view class=" mcclist font15 fcor666" v-for="(item,index) in mccList" :key="index" @click="changemcc(item)">
 				{{item.maccCode}}
 			</view>
-		</view>
+		</view> -->
+		
+		<macclist :listData="mccList" @confirem="changemcc"></macclist>
 	</view>
 </template>
 
 <script>
-	import unisearchbar from '../../../components/uni-search-bar/components/uni-search-bar/uni-search-bar.vue';
+	import unisearchbar from '../../../components/uni-search-bar/components/uni-search-bar/uni-search-bar.vue';
+	import macclist from  '../../../components/mcclist.vue';
 	import {
-		getLklMcc
-	} from '../../../Utils/Api.js';
+		getMccList
+	} from '../../../Utils/Api.js';
 	let app = getApp();
 	export default {
 		components: {
-			unisearchbar
+			unisearchbar,
+			macclist
 		},
 		data() {
 			return {
@@ -28,67 +32,44 @@
 				searchValue: '',
 				//列表数据
 				mccList: [],
-				pageNum: 1,
-				pagesize: 15,
-				isLoadMore: false, //是否加载中
 			}
 		},
 		onLoad() {
-			this.getLklMcc();
-		},
-		onReachBottom() { //上拉触底函数
-			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
-				this.isLoadMore = true
-				this.pageNum += 1
-				this.getLklMcc()
-			}
+			this.getMccList();
 		},
+
 		methods: {
 			//查询mcc商户
-			getLklMcc() {
-				let params = {
-					pageNum: this.pageNum,
-					pageSize: this.pagesize,
-					name: this.searchValue
-				}
-				getLklMcc(params).then(res => {
-					if (res.return_code == '000000' && res.return_data.list) {
-						this.mccList = this.mccList.concat(res.return_data.list);
-						if (res.return_data.pages == this.pageNum) {
-							this.isLoadMore = true;
-						} else {
-							this.isLoadMore = false
-						}
-					} else {
-						this.isLoadMore = true
+			getMccList() {
+				getMccList().then(res => {
+					if (res.return_code == '000000' && res.return_data) {
+						this.mccList = res.return_data;
 					}
 				});
 			},
 			// 搜索商户
 			focusInput() {
-				this.pageNum = 1;
-				this.pagesize = 15;
 				this.mccList = [];
-				this.getLklMcc();
-			},
-			//选择某个mcc 并返回
-			changemcc(item){
-				app.globalData.mccid = item.name;
-				app.globalData.mccname = item.maccCode;
-				uni.navigateBack({})
+				this.getMccList();
+			},
+			//选择某个mcc 并返回
+			changemcc(item) {
+				app.globalData.mccid = item.maccCode;
+				app.globalData.mccname = item.name;
+				uni.navigateBack({})
 			}
 		}
 	}
 </script>
 
 <style lang="scss">
-	.mcclist {
-		width: calc(100% - 50upx);
-		height: 100upx;
-		display: flex;
-		align-items: center;
-		background-color: rgba($color: #ffffff, $alpha: 0.1);
-		border-bottom: 1px solid #f6f6f6;
-		padding: 12upx 25upx;
-	}
-</style>
+	// .mcclist {
+	// 	width: calc(100% - 50upx);
+	// 	height: 100upx;
+	// 	display: flex;
+	// 	align-items: center;
+	// 	background-color: rgba($color: #ffffff, $alpha: 0.1);
+	// 	border-bottom: 1px solid #f6f6f6;
+	// 	padding: 12upx 25upx;
+	// }
+</style>
\ No newline at end of file
diff --git a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
index e8f9168..d5be223 100644
--- a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
+++ b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
@@ -175,7 +175,7 @@
 			</view> -->
 			<view class="username">
 				<view class="namecont">mcc编号</view>
-				<input placeholder="请选择mcc编号" v-model="mccno" style="width: 70%;" disabled="true"
+				<input placeholder="请选择mcc编号" v-model="mccname" style="width: 70%;" disabled="true"
 					@click="jumpchangemcc()" placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
 				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
 			</view>
@@ -419,21 +419,21 @@
 				</picker>
 				<view class="width40 fotct fcor999" v-if="timetype == '2' ">长期有效</view>
 			</view>
-			<!-- <view class="notes font16" style="border-bottom: 0px;" v-if="lementId != 1">
+			<view class="notes font16" style="border-bottom: 0px;" v-if="lementId != 1">
 				<view class="width70 aliitem fcor666">
 					结算人银行卡照片
 				</view>
 			</view>
 			<view class="width94 displ mart5" v-if="lementId != 1">
-				<image :src="imgsUrl+settleimg" v-if="settleimg" @click="upload(4)" mode="widthFix" class="width100">
+				<image :src="settleimg" v-if="settleimg" @click="upload(4)" mode="widthFix" class="width100">
 				</image>
 				<image src="../../../static/img/businesslic9.png" v-else @click="upload(4)" mode="widthFix"
 					class="width100">
 				</image>
 
-			</view> -->
+			</view>
 			<!-- 对公结算 -->
-			<!-- <view class="notes font16" style="border-bottom: 0px;" v-if="lementId == 1">
+			<view class="notes font16" style="border-bottom: 0px;" v-if="lementId == 1">
 				<view class="width70 aliitem fcor666">
 					开户许可证照片
 				</view>
@@ -447,32 +447,31 @@
 				</image>
 				<image src="../../../static/img/businesslic11.png" mode="widthFix" class="width100" v-else
 					@click="upload(5)"></image>
-			</view> -->
-			<!-- <view class="username">
-				<view class="namecont">开户行号</view>
-				<input placeholder="请输入开户行号" v-model="openingbankNo" style="width: 70%;"
-					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
-			</view> -->
-			<!-- <view class="username">
-				<view class="namecont">所属支行</view>
-				<input placeholder="请输入所属支行" v-model="belongbranch" style="width: 70%;"
-					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
-			</view> -->
-			<view class="username">
-				<view class="namecont">银行卡号</view>
-				<input placeholder="请输入银行卡号" v-model="bankNo" style="width: 70%;"
+			</view>
+			<view class="username" v-if="lementId == 1">
+				<view class="namecont">开户持有人</view>
+				<input placeholder="请输入开户持有人" v-model="bankName" style="width: 70%;"
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
 			</view>
-			<view class="username">
+
+			<view class="username" v-else>
 				<view class="namecont">银行卡持有人</view>
 				<input placeholder="请输入银行卡持有人" v-model="bankName" style="width: 70%;"
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
 			</view>
-			<view class="username">
-				<view class="namecont">所属银行</view>
-				<input placeholder="请输入所属银行" v-model="belongbank" style="width: 70%;"
+
+			<view class="username" v-if="lementId == 1">
+				<view class="namecont">开户账号</view>
+				<input placeholder="请输入开户账号" v-model="bankNo" style="width: 70%;"
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
 			</view>
+
+			<view class="username" v-else>
+				<view class="namecont">银行卡号</view>
+				<input placeholder="请输入银行卡号" v-model="bankNo" style="width: 70%;"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+			</view>
+
 			<view class="username">
 				<view class="namecont">开户行地址</view>
 				<pickRegions :defaultRegion="defaultRegionCode" class="width70" @getRegion="handleBankCityCode">
@@ -483,6 +482,33 @@
 				</pickRegions>
 				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
 			</view>
+
+			<view class="username">
+				<view class="namecont">所属支行</view>
+				<input placeholder="请选择或者输入所属支行" v-model="belongbranch" style="width: 70%;"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw" @click="showdepositaryBank()">
+				</image>
+			</view>
+			<!-- <view class="username" v-else>
+				<view class="namecont">所属支行</view>
+				<input placeholder="请输入所属支行" v-model="belongbranch" style="width: 70%;"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+			</view> -->
+			<!-- <view class="username">
+				<view class="namecont">开户行号</view>
+				<input placeholder="请输入开户行号" v-model="openingbankNo" style="width: 70%;"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+			</view> -->
+
+
+
+			<view class="username">
+				<view class="namecont">所属银行</view>
+				<input placeholder="请输入所属银行" v-model="belongbank" style="width: 70%;"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+			</view>
+
 			<!-- <view class="notes font16" style="border-bottom: 0px;">
 				<view class="width70 aliitem fcor666">
 					电子协议
@@ -497,7 +523,7 @@
 				<image src="../../../static/img/businesslic12.png" mode="widthFix" class="width100" @click="upload(9)">
 				</image>
 			</view> -->
-			<!-- 	<view class="username">
+			<!-- <view class="username">
 				<view class="namecont">清算行号</view>
 				<input placeholder="请输入清算行号" v-model="clearbankNo" style="width: 70%;"
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
@@ -549,26 +575,26 @@
 				<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.merSettleAcct.settleIdCardPeriodStart}}
 					至 {{merDetailInfo.merSettleAcct.settleIdCardPeriodEnd}}</view>
 			</view>
-			<!-- <view class="titlename fcor666" v-if="merDetailInfo.merSettleAcct.bankCardImg">结算人银行卡照片</view>
+			<view class="titlename fcor666" v-if="merDetailInfo.merSettleAcct.bankCardImg">结算人银行卡照片</view>
 			<view class="width94 displ" v-if="merDetailInfo.merSettleAcct.bankCardImg">
 				<image :src="imgsUrl+merDetailInfo.merSettleAcct.bankCardImg" mode="widthFix" class="width30"
 					@click="perImage(imgsUrl+merDetailInfo.merSettleAcct.bankCardImg)" style="margin-left: 3%;"></image>
-			</view> -->
+			</view>
 			<!-- 对公结算 -->
-			<!-- <view class="titlename fcor666" v-if="merDetailInfo.merSettleAcct.openningBankLicenseUrl">开户许可证照片</view>
+			<view class="titlename fcor666" v-if="merDetailInfo.merSettleAcct.openningBankLicenseUrl">开户许可证照片</view>
 			<view class="width94 displ" v-if="merDetailInfo.merSettleAcct.openningBankLicenseUrl">
 				<image :src="imgsUrl+merDetailInfo.merSettleAcct.openningBankLicenseUrl" mode="widthFix" class="width30"
 					@click="perImage(imgsUrl+merDetailInfo.merSettleAcct.openningBankLicenseUrl)"
 					style="margin-left: 3%;"></image>
-			</view> -->
-			<!-- <view class="username">
+			</view>
+			<view class="username">
 				<view class="namecont">开户行号</view>
 				<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.merSettleAcct.openningBankCode}}</view>
-			</view> -->
-			<!-- <view class="username">
+			</view>
+			<view class="username">
 				<view class="namecont">所属支行</view>
 				<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.merSettleAcct.openningBankName}}</view>
-			</view> -->
+			</view>
 			<view class="username">
 				<view class="namecont">银行卡号</view>
 				<view class="font14 fcor333 text2 width75 fotrt">{{merDetailInfo.merSettleAcct.bankCardNo}}</view>
@@ -590,11 +616,11 @@
 
 		<!--第四步 未录入门店信息 -->
 		<view class="width100 mart10 backcorfff" v-if="merchart == 4">
-			<view class="username">
+			<!-- <view class="username">
 				<view class="namecont">门店账号</view>
 				<input placeholder="请输入6-20位门店账号" maxlength="20" v-model="storeaccount" style="width: 70%;"
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
-			</view>
+			</view> -->
 			<view class="username">
 				<view class="namecont">门店名称</view>
 				<input placeholder="请输入门店名称" v-model="storename" style="width: 70%;"
@@ -728,7 +754,9 @@
 		configMerBasis,
 		configMerSettlement,
 		configMerStore,
-		getDictionaryByCodeType
+		getDictionaryByCodeType,
+		getBankCardBin,
+		recognizeBankAccount
 	} from '../../../Utils/Api.js';
 	let app = getApp();
 	export default {
@@ -778,16 +806,18 @@
 				larIdCardAddress: '', //身份证地址
 				idcardtime: '1', // times:选择时间  longterm: 长期 
 				uncorporsettelimg: '', //非法人结算授权书
-				// settleimg: '', //结算人银行卡照片
+				settleimg: '', //结算人银行卡照片
+				uploadsettleimg: '', //上传结算人银行卡照片
 				accopenperimg: '', //开户许可证图片
+				uploadaccopenperimg: '', //上传开户许可图片
 				electronicProtocolimg: [], //商户电子协议
-				// openingbankNo: '', //开户行号
+				openingbankNo: '', //开户行号
 				OpenningBankCityCode: '', //开户行地区
 				bankNo: '', // 银行卡号
 				bankName: '', // 银行卡持有人
 				belongbank: '', //所属银行
-				// belongbranch: '', //所属支行
-				// clearbankNo: '', //清算行号
+				belongbranch: '', //所属支行
+				clearbankNo: '', //清算行号
 				storeaccount: '', //门店账号
 				storename: '', //门店名称
 				storephone: '', //门店电话
@@ -804,7 +834,8 @@
 				cardend_date: '结束时间', //身份证结束时间
 				region: [], //选择区域
 				areaCode: '', //区级
-				// mccno: '', //mcc编号
+				mccno: '', //mcc编号
+				mccname: '', //mcc名称
 				defaultRegion: ['北京市', '市辖区', '东城区'], //默认地区
 				defaultRegionCode: '110101', //区级编号
 				regionName: '',
@@ -839,22 +870,35 @@
 		onLoad(options) {
 			this.merId = options.id;
 			this.getMerDetail(1);
-			console.log('======' + this.cardstart_date);
 		},
 		onShow() {
 			if (app.globalData.businessid) {
 				this.industrycategory = app.globalData.businessname;
 				this.inducateid = app.globalData.businessid;
 			}
-			// if (app.globalData.mccid) {
-			// 	this.mccno = app.globalData.mccid;
-			// }
+			if (app.globalData.mccid) {
+				this.mccno = app.globalData.mccid;
+				this.mccname = app.globalData.mccname;
+			}
+			if (app.globalData.depositaryBank) {
+				this.belongbranch = app.globalData.depositaryBank;
+				var belongbank = this.belongbranch.split('银行');
+				this.belongbank = belongbank[0] + '银行';
+			}
+			if (app.globalData.branchBankNo) {
+				this.openingbankNo = app.globalData.branchBankNo;
+			}
+			if (app.globalData.clearNo) {
+				this.clearbankNo = app.globalData.clearNo;
+			}
 		},
 		onUnload() {
 			app.globalData.businessid = '';
 			app.globalData.businessname = '';
 			app.globalData.mccid = '';
 			app.globalData.mccname = '';
+			app.globalData.branchBankNo = '';
+			app.globalData.clearNo = '';
 		},
 		methods: {
 			//显示商户弹出
@@ -888,6 +932,7 @@
 				this.region = region;
 				this.bankareaCode = this.region.map(item => item.code)[2];
 				this.bankregionName = this.region.map(item => item.name).join('-');
+				app.globalData.bankareaCode = this.bankareaCode;
 			},
 			//选择行业
 			showjob() {
@@ -895,6 +940,13 @@
 					url: '../business-category/business-category'
 				})
 			},
+			//选择支行
+			showdepositaryBank() {
+				app.globalData.bankareaCode = this.bankareaCode;
+				uni.navigateTo({
+					url: '/pages/index/depositaryBank/depositaryBank'
+				})
+			},
 			//选择mcc编号
 			jumpchangemcc() {
 				uni.navigateTo({
@@ -943,7 +995,7 @@
 				if (type === 'start') {
 					year = year - 60;
 				} else if (type === 'end') {
-					year = year + 2;
+					year = year + 50;
 				}
 				month = month > 9 ? month : '0' + month;
 				day = day > 9 ? day : '0' + day;
@@ -1029,7 +1081,7 @@
 					sourceType: ['camera', 'album'],
 					success: function(res) {
 						const tempFilePaths = res.tempFilePaths;
-						that.uploadFile(tempFilePaths[0], item);
+						that.uploadFile(tempFilePaths[0], item, 1);
 					},
 					error: function(e) {
 						console.log(e);
@@ -1067,7 +1119,7 @@
 				}
 			},
 			//上传
-			uploadFile(item, item1) {
+			uploadFile(item, item1, item2) {
 				const that = this
 				that.translate(item, 0.2, imgURL => {
 					const uploadTask = uni.uploadFile({
@@ -1083,7 +1135,7 @@
 						},
 						success: function(uploadFileRes) {
 							that.getImgSignedUrl(item1, JSON.parse(uploadFileRes.data)
-								.return_data);
+								.return_data, item2);
 						}
 					});
 				})
@@ -1093,30 +1145,52 @@
 				this.electronicProtocolimg.splice(e, 1);
 			},
 			//查看临时图片路径
-			getImgSignedUrl(item, item1) {
+			getImgSignedUrl(item, item1, item2) {
 				let datas = {
 					"fileUrl": item1
 				}
 				getImgSignedUrl(datas).then(res => {
 					if (res.return_code == '000000') {
 						if (item == 1) {
-							this.recognizeBusinessLicense(res.return_data);
+							if (item2 == 1) {
+								this.recognizeBusinessLicense(res.return_data);
+							} else {
+								this.businimg = res.return_data;
+							}
 							this.uploadbusinimg = item1;
 						}
 						if (item == 2) {
-							this.recognizeIdCard(1, res.return_data);
+							if (item2 == 1) {
+								this.recognizeIdCard(1, res.return_data);
+							} else {
+								this.idcardposimg = res.return_data;
+							}
 							this.uploadidcardposimg = item1;
 						}
 						if (item == 3) {
-							this.recognizeIdCard(2, res.return_data);
+							if (item2 == 1) {
+								this.recognizeIdCard(2, res.return_data);
+							} else {
+								this.idcardsideimg = res.return_data;
+							}
 							this.uploadidcardsideimg = item1;
 						}
-						// if (item == 4) {
-						// 	that.recognizeBankCard(res.return_data);
-						// }
-						// if (item == 5) {
-						// 	that.accopenperimg = res.return_data;
-						// }
+						if (item == 4) {
+							this.uploadsettleimg = item1;
+							if (item2 == 1) {
+								this.recognizeBankCard(res.return_data);
+							} else {
+								this.settleimg = res.return_data;
+							}
+						}
+						if (item == 5) {
+							this.uploadaccopenperimg = item1;
+							if (item2 == 1) {
+								this.recognizeBankAccount(res.return_data);
+							} else {
+								this.accopenperimg = res.return_data;
+							}
+						}
 						if (item == 6) {
 							this.storeimg1 = res.return_data;
 							this.uploadstoreimg1 = item1;
@@ -1138,6 +1212,46 @@
 					}
 				})
 			},
+			//查询银行卡信息
+			getBankCardBin(item) {
+				let datas = {
+					cardNo: item
+				}
+				getBankCardBin(datas).then(res => {
+					if (res.return_code == '000000' && res.return_data) {
+						this.belongbank = res.return_data.bankName;
+						this.bankNo = res.return_data.cardNo;
+						this.openingbankNo = res.return_data.bankCode;
+						this.belongbranch = res.return_data.bankName;
+						this.clearbankNo = res.return_data.clearingBankCode;
+					}
+				})
+			},
+			//开户行识别
+			recognizeBankAccount(item) {
+				uni.showLoading({
+					title: '识别中...'
+				})
+				let datas = {
+					url: item
+				}
+				recognizeBankAccount(datas).then(res => {
+					uni.hideLoading();
+					this.accopenperimg = item;
+					if (res.return_code == '000000' && res.return_data) {
+						var bankAccount = JSON.parse(res.return_data.data).data;
+						this.bankName = bankAccount.legalRepresentative;
+						this.bankNo = bankAccount.bankAccount;
+						app.globalData.depositaryBank = bankAccount.depositaryBank;
+					} else {
+						uni.showToast({
+							title: '图片识别失败、请重新上传或自动填写内容。',
+							duration: 3000,
+							icon: 'none'
+						})
+					}
+				})
+			},
 			//营业执照识别
 			recognizeBusinessLicense(item) {
 				uni.showLoading({
@@ -1205,7 +1319,6 @@
 								this.cardstart_date = times[0];
 								this.idcardsideimg = items;
 								this.cardend_date = times[1];
-								console.log('======' + this.idcardtime);
 							} else {
 								uni.showToast({
 									title: '请上传身份证国徽信息',
@@ -1234,10 +1347,11 @@
 				recognizeBankCard(params).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000' && res.return_data) {
+						this.settleimg = item;
 						if (JSON.parse(res.return_data.data).data != undefined) {
 							this.bankCardlist = JSON.parse(res.return_data.data).data;
 							this.bankNo = this.bankCardlist.cardNumber;
-							// this.settleimg = item;
+							this.getBankCardBin(this.bankNo);
 							this.belongbank = this.bankCardlist.bankName;
 						} else {
 							uni.showToast({
@@ -1334,18 +1448,27 @@
 							//第二步
 							if (res.return_data.merType) {
 								this.merchantId = res.return_data.merType;
+								if (res.return_data.merType == 1) {
+									this.merchantType = '个体商户';
+								}
+								if (res.return_data.merType == 2) {
+									this.merchantType = '企业商户';
+								}
+								if (res.return_data.merType == 3) {
+									this.merchantType = '小微商户';
+								}
 							} else {
 								this.merchantId = 1;
 							}
 							this.companyname = res.return_data.merName
 							this.merabbreviation = res.return_data.merAbbreviate;
-							// this.mccno = res.return_data.merMccCode;
+							this.mccno = res.return_data.merMccCode;
+							this.mccname = res.return_data.merMccName;
 							// this.businimg = res.return_data.blisUrl;
 							// this.uploadbusinimg = res.return_data.blisUrl;
 							this.companyname = res.return_data.blisName;
 							this.businnum = res.return_data.blisNo
 							this.regaddress = res.return_data.blisRegAddress;
-
 							if (res.return_data.blisPeriodStart) {
 								this.start_date = res.return_data.blisPeriodStart;
 							}
@@ -1365,16 +1488,17 @@
 									.merRegion.cityName + '-' + res.return_data.merRegion.areaName;
 								this.detailsaddress = res.return_data.merRegion.address;
 							}
-							if (this.merchart == 2) {
+							if (res.return_data && this.merchart == 2) {
 								this.idcardname = res.return_data.larName;
 								this.idcard = res.return_data.larIdCard;
-								// this.idcardposimg = res.return_data.larIdCardPortraitImg;
-								// this.uploadidcardposimg = res.return_data.larIdCardPortraitImg;
-								this.getImgSignedUrl(1, res.return_data.blisUrl);
-								this.getImgSignedUrl(2, res.return_data.larIdCardPortraitImg);
-								// this.idcardsideimg = res.return_data.larIdCardNationalEmblemImg;
-								// this.uploadidcardsideimg = res.return_data.larIdCardNationalEmblemImg;
-								this.getImgSignedUrl(3, res.return_data.larIdCardNationalEmblemImg);
+								this.larIdCardAddress = res.return_data.larIdCardAddress
+								this.idcardposimg = res.return_data.larIdCardPortraitImg;
+								this.uploadidcardposimg = res.return_data.larIdCardPortraitImg;
+								this.getImgSignedUrl(1, res.return_data.blisUrl, 2);
+								this.getImgSignedUrl(2, res.return_data.larIdCardPortraitImg, 2);
+								this.idcardsideimg = res.return_data.larIdCardNationalEmblemImg;
+								this.uploadidcardsideimg = res.return_data.larIdCardNationalEmblemImg;
+								this.getImgSignedUrl(3, res.return_data.larIdCardNationalEmblemImg, 2);
 								if (res.return_data.larIdCardPeriodStart) {
 									this.cardstart_date = res.return_data.larIdCardPeriodStart;
 								}
@@ -1406,43 +1530,64 @@
 								this.getDictionaryByCodeType();
 							}
 
-							// this.settleimg = res.return_data.merSettleAcct.bankCardImg;
-							// this.belongbranch = res.return_data.merSettleAcct.openningBankName;
 
-							// this.openingbankNo = res.return_data.merSettleAcct.openningBankCode;
-							// this.accopenperimg = res.return_data.merSettleAcct.openningBankLicenseUrl;
-							// if (res.return_data.merSettleAcct.electronicPact) {
-							// 	this.electronicProtocolimg = res.return_data.merSettleAcct.electronicPact.split(
-							// 		';');
-							// }
-							// this.clearbankNo = res.return_data.merSettleAcct.clearingBankCode;
-							if (this.merchart == 3 && res.return_data.merSettleAcct) {
+							if (res.return_data.merSettleAcct && this.merchart == 3) {
+
+								this.settleimg = res.return_data.merSettleAcct.bankCardImg;
+								this.getImgSignedUrl(4, res.return_data.merSettleAcct.bankCardImg, 2);
+								this.belongbranch = res.return_data.merSettleAcct.openningBankName;
+
+								this.openingbankNo = res.return_data.merSettleAcct.openningBankCode;
+								this.accopenperimg = res.return_data.merSettleAcct.openningBankLicenseUrl;
+								this.getImgSignedUrl(5, res.return_data.merSettleAcct.openningBankLicenseUrl, 2);
+								if (res.return_data.merSettleAcct.electronicPact) {
+									this.electronicProtocolimg = res.return_data.merSettleAcct.electronicPact
+										.split(
+											';');
+								}
+								this.clearbankNo = res.return_data.merSettleAcct.clearingBankCode;
+
 								this.lementId = res.return_data.merSettleAcct.settleType;
+								if (this.lementId == 1) {
+									this.lementType = '对公结算';
+								}
+								if (this.lementId == 2) {
+									this.lementType = '对私法人结算';
+								}
+								if (this.lementId == 3) {
+									this.lementType = '对私非法人结算';
+								}
+								this.bankregionName = res.return_data.merSettleAcct.openningBankProvinceName +
+									'-' +
+									res.return_data
+									.merSettleAcct.openningBankCityName + '-' + res.return_data.merSettleAcct
+									.openningBankAreaName;
 								this.bankNo = res.return_data.merSettleAcct.bankCardNo;
 								this.bankName = res.return_data.merSettleAcct.bankCardHolder;
 								this.belongbank = res.return_data.merSettleAcct.bankName;
 								this.idcardname = res.return_data.merSettleAcct.settleIdCardName;
 								this.idcard = res.return_data.merSettleAcct.settleIdCardNo;
 								this.idcardtime = res.return_data.merSettleAcct.settleIdPeriodType;
-								this.openningBankAreaCode = res.return_data.merSettleAcct.openningBankAreaCode;
-								// this.idcardposimg = res.return_data.merSettleAcct.settleIdCardPortraitImg;
-								// this.uploadidcardposimg = res.return_data.merSettleAcct.settleIdCardPortraitImg;
-								// this.idcardsideimg = res.return_data.merSettleAcct.settleIdCardNationalEmblemImg;
-								// this.uploadidcardsideimg = res.return_data.merSettleAcct.settleIdCardNationalEmblemImg;
-								this.getImgSignedUrl(2, res.return_data.merSettleAcct.settleIdCardPortraitImg);
+								this.bankareaCode = res.return_data.merSettleAcct.openningBankAreaCode;
+								this.idcardposimg = res.return_data.merSettleAcct.settleIdCardPortraitImg;
+								this.uploadidcardposimg = res.return_data.merSettleAcct.settleIdCardPortraitImg;
+								this.idcardsideimg = res.return_data.merSettleAcct.settleIdCardNationalEmblemImg;
+								this.uploadidcardsideimg = res.return_data.merSettleAcct
+									.settleIdCardNationalEmblemImg;
+								this.getImgSignedUrl(2, res.return_data.merSettleAcct.settleIdCardPortraitImg, 2);
 								this.getImgSignedUrl(3, res.return_data.merSettleAcct
-									.settleIdCardNationalEmblemImg);
+									.settleIdCardNationalEmblemImg, 2);
 								this.cardstart_date = res.return_data.merSettleAcct.settleIdCardPeriodStart;
 								this.cardend_date = res.return_data.merSettleAcct.settleIdCardPeriodEnd;
 							}
 							//第四步
 							if (res.return_data.storeModel) {
-								this.storeaccount = res.return_data.storeModel.account.loginName;
+								// this.storeaccount = res.return_data.storeModel.account.loginName;
 								this.storename = res.return_data.storeModel.name;
 								this.storephone = res.return_data.storeModel.telephone;
-								this.getImgSignedUrl(6, res.return_data.storeModel.doorHeadImg);
-								this.getImgSignedUrl(7, res.return_data.storeModel.cashRegisterImg);
-								this.getImgSignedUrl(8, res.return_data.storeModel.internalImg);
+								this.getImgSignedUrl(6, res.return_data.storeModel.doorHeadImg, 2);
+								this.getImgSignedUrl(7, res.return_data.storeModel.cashRegisterImg, 2);
+								this.getImgSignedUrl(8, res.return_data.storeModel.internalImg, 2);
 							}
 
 						} else {
@@ -1600,14 +1745,14 @@
 					});
 					return;
 				}
-				// if (!that.mccno) {
-				// 	uni.showToast({
-				// 		title: '请填写mcc编号',
-				// 		icon: "none",
-				// 		duration: 2000
-				// 	});
-				// 	return;
-				// }
+				if (!that.mccno) {
+					uni.showToast({
+						title: '请选择mcc编号',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
 				// if (that.mccno.length != 4) {
 				// 	uni.showToast({
 				// 		title: '请填写正确的mcc编号',
@@ -1703,7 +1848,7 @@
 					"merType": that.merchantId,
 					"merName": that.companyname,
 					"merAbbreviate": that.merabbreviation,
-					// "merMccCode": that.mccno,
+					"merMccCode": that.mccno,
 					"blisUrl": that.uploadbusinimg,
 					"blisName": that.companyname,
 					"blisNo": that.businnum,
@@ -1730,7 +1875,6 @@
 				configMerBasis(datas).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
-						that.getMerDetail(0);
 						that.idcardposimg = '';
 						that.idcardsideimg = '';
 						that.uploadidcardposimg = '';
@@ -1739,17 +1883,14 @@
 						that.idcard = '';
 						that.idcardtime = 1;
 						that.cardstart_date = '开始时间';
-						that.cardend_date = '结束时间'
+						that.cardend_date = '结束时间';
+						that.merchart = 3;
 						uni.showToast({
 							title: '提交成功',
 							icon: 'none',
-							duration: 2000,
-							success() {
-								setTimeout(() => {
-									that.merchart = 3;
-								}, 1000);
-							}
+							duration: 2000
 						})
+						that.getMerDetail(0);
 					} else {
 						uni.showToast({
 							title: res.return_msg,
@@ -1764,26 +1905,26 @@
 			//结算信息提交
 			submitsettlement() {
 				let that = this;
-				// if (that.lementId == 1) {
-				// 	if (!that.accopenperimg) {
-				// 		uni.showToast({
-				// 			title: '请上传开户许可证照片',
-				// 			icon: "none",
-				// 			duration: 2000
-				// 		});
-				// 		return;
-				// 	}
-				// }
-				// if (that.lementId == 2 || that.lementId == 3) {
-				// 	if (!that.settleimg) {
-				// 		uni.showToast({
-				// 			title: '请上传银行卡照片',
-				// 			icon: "none",
-				// 			duration: 2000
-				// 		});
-				// 		return;
-				// 	}
-				// }
+				if (that.lementId == 1) {
+					if (!that.accopenperimg) {
+						uni.showToast({
+							title: '请上传开户许可证照片',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+				}
+				if (that.lementId == 2 || that.lementId == 3) {
+					if (!that.settleimg) {
+						uni.showToast({
+							title: '请上传银行卡照片',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+				}
 				// if (that.lementId == 3) {
 				// 	if (!that.uncorporsettelimg) {
 				// 		uni.showToast({
@@ -1855,14 +1996,14 @@
 					}
 				}
 
-				// if (!that.openingbankNo) {
-				// 	uni.showToast({
-				// 		title: '请填写开户行号',
-				// 		icon: "none",
-				// 		duration: 2000
-				// 	});
-				// 	return;
-				// }
+				if (!that.openingbankNo) {
+					uni.showToast({
+						title: '请填写开户行号',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
 
 				if (!that.bankareaCode) {
 					uni.showToast({
@@ -1904,14 +2045,14 @@
 				// 	});
 				// 	return;
 				// }
-				// if (!that.clearbankNo) {
-				// 	uni.showToast({
-				// 		title: '请填写清算行号',
-				// 		icon: "none",
-				// 		duration: 2000
-				// 	});
-				// 	return;
-				// }
+				if (!that.clearbankNo) {
+					uni.showToast({
+						title: '请填写清算行号',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
 				if (that.merRateList.length != that.rateCodeList.length) {
 					uni.showToast({
 						title: '请完善商户费率',
@@ -1935,16 +2076,16 @@
 				let datas = {
 					"merId": that.merId,
 					"settleType": that.lementId, //结算类型 1：对公结算  2：对私法人结算  3：对私非法人结算,
-					// "bankCardImg": that.settleimg, //"银行卡照片",
-					// "openningBankName": that.belongbranch, //"银行名称",
+					"bankCardImg": that.uploadsettleimg, //"银行卡照片",
+					"openningBankName": that.belongbranch, //"银行名称",
 					"bankCardNo": that.bankNo, //"银行卡号",
 					"openningBankAreaCode": that.bankareaCode, // 开户地址
 					"bankCardHolder": that.bankName, //"银行卡持有人",
-					// "openningBankCode": that.openingbankNo, //"开户行号",
+					"openningBankCode": that.openingbankNo, //"开户行号",
 					"bankName": that.belongbank, //"开户行名称",
-					// "openningBankLicenseUrl": that.accopenperimg, //"开户许可证照片",
+					"openningBankLicenseUrl": that.uploadaccopenperimg, //"开户许可证照片",
 					// "electronicPact": imgsqes, //电子协议
-					// "clearingBankCode": that.clearbankNo, //"账户清算行号",
+					"clearingBankCode": that.clearbankNo, //"账户清算行号",
 					"settleIdCardName": that.idcardname, //身份证名字
 					"settleIdCardNo": that.idcard, //身份证号
 					"settleIdCardAddress": that.larIdCardAddress, // 身份证地址
@@ -1959,17 +2100,13 @@
 				configMerSettlement(datas).then(res => {
 					uni.hideLoading();
 					if (res.return_code == '000000') {
-						that.getMerDetail(0);
+						that.merchart = 4;
 						uni.showToast({
 							title: '提交成功',
 							icon: 'none',
-							duration: 2000,
-							success() {
-								setTimeout(() => {
-									that.merchart = 4;
-								}, 1000);
-							}
+							duration: 2000
 						})
+						that.getMerDetail(0);
 					} else {
 						uni.showToast({
 							title: res.return_msg,
@@ -1982,14 +2119,14 @@
 			//提交门店进行审核
 			submitsotre() {
 				let that = this;
-				if (!that.storeaccount) {
-					uni.showToast({
-						title: '请填写门店账号',
-						icon: "none",
-						duration: 2000
-					});
-					return;
-				}
+				// if (!that.storeaccount) {
+				// 	uni.showToast({
+				// 		title: '请填写门店账号',
+				// 		icon: "none",
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
 				if (!that.storename) {
 					uni.showToast({
 						title: '请填写门店名称',
@@ -2040,9 +2177,9 @@
 							})
 							let datas = {
 								"merId": that.merId,
-								"account": {
-									"loginName": that.storeaccount
-								},
+								// "account": {
+								// 	"loginName": that.storeaccount
+								// },
 								"name": that.storename,
 								"telephone": that.storephone,
 								"doorHeadImg": that.uploadstoreimg1,
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index 040080b..b563bd5 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -17,6 +17,9 @@
 		},
 		onLoad(options) {
 			let that = this;
+			// uni.reLaunch({
+			// 	url: '../tabBar/home/home'
+			// })
 			// #ifdef H5
 			let arr1 = window.location.href;
 			let arr2 = arr1.split('=');
@@ -30,7 +33,7 @@
 					})
 				}
 			} else {
-				// 获取openid
+			// 获取openid
 				that.jumpcdx();
 			}
 			if (app.globalData.h5code) {
@@ -76,4 +79,4 @@
 
 <style>
 
-</style>
+</style>
\ No newline at end of file
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index 5593c78..c8e76f0 100644
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>惠支付</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.65d11cca.js></script><script src=/cweb/static/js/index.65ccf64d.js></script></body></html>
\ No newline at end of file
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/cweb/static/index.63b34199.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/cweb/static/js/chunk-vendors.65d11cca.js></script><script src=/cweb/static/js/index.a731bc12.js></script></body></html>
\ No newline at end of file