diff --git a/Utils/Api.js b/Utils/Api.js
index 12c1c3a..85731c1 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -103,6 +103,34 @@ export const getStoreDetailById = params => {
 export const configStore = params => {
 	return POST('POST', `${base}/store/configStore`, params).then(res => res.data);
 }
+//修改结算信息
+export const createApplyUpdateSettle = params => {
+	return POST('POST', `${base}/merSettleAcct/createApplyUpdateSettle`, params).then(res => res.data);
+}
+//查询商户最新申请修改
+export const getLastApplyByMer = params => {
+	return POST('GET', `${base}/merSettleAcct/getLastApplyByMer`, params).then(res => res.data);
+}
+//查询商户修改结算申请列表
+export const getAuditList = params => {
+	return POST('GET', `${base}/audit/getAuditList`, params).then(res => res.data);
+}
+//通过审核
+export const approve = params => {
+	return POST('POST', `${base}/audit/approve`, params).then(res => res.data);
+}
+//驳回审核
+export const reject = params => {
+	return POST('POST', `${base}/audit/reject`, params).then(res => res.data);
+}
+//审核详情
+export const getAuditDetail = params => {
+	return POST('GET', `${base}/audit/getAuditDetail`, params).then(res => res.data);
+}
+
+
+
+
 
 // ---------- 设备 ----------
 //查询设备列表
@@ -215,8 +243,8 @@ export const getLedgerReceiverList = params => {
 //分账解绑接收方申请
 export const merLedgerReceiverDelApply = params => {
 	return POST('POST', `${base}/merLedger/merLedgerReceiverDelApply`, params).then(res => res.data);
-}
-//查询接收方详情
+}
+//查询接收方详情
 export const getLedgerReceiverById = params => {
 	return POST('GET', `${base}/merLedger/getLedgerReceiverById`, params).then(res => res.data);
-}
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 6383271..706fd87 100644
--- a/pages.json
+++ b/pages.json
@@ -317,7 +317,7 @@
 		}, {
 			"path": "pages/index/bindMerchants/bindMerchants",
 			"style": {
-				"navigationBarTitleText": "绑定商户",
+				"navigationBarTitleText": "绑定接收方",
 				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": false,
 				"app-plus": {
@@ -329,7 +329,7 @@
 		}, {
 			"path": "pages/index/bindDividedMerchant/bindDividedMerchant",
 			"style": {
-				"navigationBarTitleText": "绑定分账商户",
+				"navigationBarTitleText": "绑定分账接收方",
 				"navigationBarTextStyle": "white",
 				"enablePullDownRefresh": false,
 				"app-plus": {
@@ -362,8 +362,58 @@
 				}
 			}
 
+		}, {
+			"path": "pages/index/updateSettlement/updateSettlement",
+			"style": {
+				"navigationBarTitleText": "修改结算信息",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
+			}
+
+		}, {
+			"path": "pages/index/review-Settlement/review-Settlement",
+			"style": {
+				"navigationBarTitleText": "结算信息",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
+			}
+
+		}, {
+			"path": "pages/index/settlement_details/settlement_details",
+			"style": {
+				"navigationBarTitleText": "结算详情",
+				"navigationBarTextStyle": "white",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"titleNView": false, //禁用原生导航栏
+					"softinputNavBar": "none"
+				}
+			}
+
 		}
-	],
+	    ,{
+            "path" : "pages/index/table_CodeList/table_CodeList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "分配桌码",
+                "navigationBarTextStyle": "white",
+                "enablePullDownRefresh": false,
+                "app-plus": {
+                	"titleNView": false, //禁用原生导航栏
+                	"softinputNavBar": "none"
+                }
+            }
+            
+        }
+    ],
 	"subpackages": [{
 		"root": "subPages",
 
diff --git a/pages/index/merchant-details/merchant-details.vue b/pages/index/merchant-details/merchant-details.vue
index 160f777..79374bc 100644
--- a/pages/index/merchant-details/merchant-details.vue
+++ b/pages/index/merchant-details/merchant-details.vue
@@ -28,7 +28,7 @@
 			</view>
 			<view class="notes">
 				<view class="fcor666 width25">联系人</view>
-				<view class="font14 fcor333 text2 width75 fotrt">-</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.account.userName}}</view>
 			</view>
 			<view class="notes">
 				<view class="fcor666 width25">身份证号</view>
@@ -36,12 +36,13 @@
 			</view>
 			<view class="notes">
 				<view class="fcor666 width25">银行卡号</view>
-				<view class="font14 fcor333 text2 width75 fotrt">-</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.merSettleAcct.bankCardNo}}</view>
 			</view>
 			<view class="notes">
 				<view class="fcor666 width25">所属银行</view>
-				<view class="font14 fcor333 text2 width75 fotrt">-</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{merDesInfo.merSettleAcct.bankName}}</view>
 			</view>
+
 		</view>
 		<!-- 门店信息 -->
 		<view class="mart15 width100" v-else>
@@ -60,16 +61,16 @@
 					</view>
 					<view class="otstatucs" v-if="item.status == 1">
 						编辑中
-					</view>
-					<view class="otstatucs" v-if="item.status == 3">
-						审核中
-					</view>
-					<view class="otstatucs" v-if="item.status == 4">
-						审核失败
-					</view>
-					<view class="otstatucs" v-if="item.status == 5">
-						停用
-					</view>
+					</view>
+					<view class="otstatucs" v-if="item.status == 3">
+						审核中
+					</view>
+					<view class="otstatucs" v-if="item.status == 4">
+						审核失败
+					</view>
+					<view class="otstatucs" v-if="item.status == 5">
+						停用
+					</view>
 				</view>
 				<view class="conts" style="border-bottom: 0px;">
 					<image src="../../../static/img/store/store8.png" mode="widthFix" class="iconw"></image>
@@ -83,8 +84,8 @@
 					<image src="../../../static/img/store/store10.png" mode="widthFix" class="iconw"></image>
 					<view class="margle10 font14 fcor999 width90p">{{item.storeRegion.address}}</view>
 				</view>
-				<view class="height45 width100">
-					<button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,1)">绑定二维码</button>
+				<view class="height45 width100">
+					<button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,1)">绑定二维码</button>
 					<button class="btns mart10 margle10" @click.stop="jumpBindScan(item.id,2)">二维码列表</button>
 					<!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,1)">绑定设备</button> -->
 					<!-- <button class="btns mart10 marRight10" @click.stop="jumpService(item.id,2)">设备列表</button> -->
@@ -92,6 +93,7 @@
 				<view class="lin10"></view>
 			</view>
 		</view>
+		<view class="subbtn" @tap="updateFigMerBasis()" v-if="current == 0">修改结算</view>
 	</view>
 </template>
 
@@ -183,12 +185,18 @@
 				uni.navigateTo({
 					url: '../serviceBuild/serviceBuild?storeid=' + item + '&type=' + items
 				})
-			},
-			//跳转绑定二维码
-			jumpBindScan(item, items) {
-				uni.navigateTo({
-					url: '../bindScan/bindScan?storeid=' + item + '&type=' + items
-				})
+			},
+			//更换结算信息
+			updateFigMerBasis() {
+				uni.navigateTo({
+					url: '/pages/index/updateSettlement/updateSettlement?id=' + this.merid
+				})
+			},
+			//跳转绑定二维码
+			jumpBindScan(item, items) {
+				uni.navigateTo({
+					url: '../bindScan/bindScan?storeid=' + item + '&type=' + items
+				})
 			}
 		}
 	}
@@ -240,7 +248,22 @@
 		padding: 0px;
 	}
 
+	.subbtn {
+		color: #FFFFFF;
+		background-color: #0083f5;
+		width: 90%;
+		margin-left: 5%;
+		margin-top: 80rpx;
+		margin-bottom: 50rpx;
+		height: 90rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 10rpx;
+		font-size: 30rpx;
+	}
+
 	.lin10 {
 		height: 10px;
 	}
-</style>
+</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 83977f0..1fbcf1d 100644
--- a/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
+++ b/pages/index/merchant-incoming-parts/merchant-incoming-parts.vue
@@ -485,7 +485,7 @@
 
 			<view class="username">
 				<view class="namecont">所属支行</view>
-				<input placeholder="请选择或者输入所属支行" v-model="belongbranch" style="width: 70%;"
+				<input placeholder="请选择或者输入所属支行" v-model="belongbranch" style="width: 70%;" disabled="true"
 					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
 				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw" @click="showdepositaryBank()">
 				</image>
diff --git a/pages/index/merchant-management/merchant-management.vue b/pages/index/merchant-management/merchant-management.vue
index 6e9a309..9aa0ac2 100644
--- a/pages/index/merchant-management/merchant-management.vue
+++ b/pages/index/merchant-management/merchant-management.vue
@@ -34,7 +34,7 @@
 				</view>
 				<view class="height45 width100 paddbotm10" v-if="item.merStatus == 1">
 					<button class="btns mart10 margle10" @click.stop="openAccounts(item.id)">开通分账</button>
-					<button class="btns mart10 margle10" @click.stop="bindMerchants(item.id)">绑定商户</button>
+					<button class="btns mart10 margle10" @click.stop="bindMerchants(item.id)">分账接收方</button>
 				</view>
 			</view>
 		</view>
diff --git a/pages/index/review-Settlement/review-Settlement.vue b/pages/index/review-Settlement/review-Settlement.vue
new file mode 100644
index 0000000..29b7700
--- /dev/null
+++ b/pages/index/review-Settlement/review-Settlement.vue
@@ -0,0 +1,153 @@
+<template>
+	<view>
+		<view class=" mart10 marb20 alijus">
+			<view class="font16 fcor333 paddtop5 paddbotm5  margle20  marRight40" v-for="(item,index) in reviewStatus"
+				@click="switchid(item)" :class="[rviewtyid == item.id ? 'fcor089 borbtom fontwig6' : '']" :key="index">
+				{{item.title}}
+			</view>
+		</view>
+		<view v-if="rviewList == ''" class="mart60 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
+		</view>
+
+		<view class="mart20 width100">
+			<view class="width94 backcorfff border-r mart15" v-for="(item,index) in rviewList" :key="index"
+				@click="jumpRviewSettdetails(item.auditNo)">
+				<view class="notes" style="padding-bottom: 0px;">
+					<!-- <image src="../../../static/img/merchantstu.png" mode="widthFix" class="iconw40"></image> -->
+					<view class="width80p">
+						<view class="font15 fcor333">{{item.auditObjectName}}</view>
+						<view class="font14 fcor999 paddtop5">
+							提交时间: {{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+						</view>
+					</view>
+					<!-- v-if="item.merStatus == 1" -->
+					<!-- <view class="statucs font14">正常</view>
+					<view class="otstatucs font14" v-if="item.merStatus == 2">编辑中</view>
+					<view class="otstatucs font14" v-if="item.merStatus == 3">审核中</view>
+					<view class="otstatucs font14" v-if="item.merStatus == 4">审核失败</view>
+					<view class="otstatucs font14" v-if="item.merStatus == 5">违规</view> -->
+				</view>
+				<view class="notes">
+					<view class="width30 fcor999 font14">提交人</view>
+					<view class="width30 fcor999 font14">{{item.opUserName}}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getAuditList
+	} from '../../../Utils/Api.js'
+	export default {
+		data() {
+			return {
+				reviewStatus: [{
+						id: 1,
+						title: '待审核'
+					},
+					{
+						id: 2,
+						title: '审核通过'
+					},
+					{
+						id: 3,
+						title: '审核驳回'
+					},
+				], //状态
+				rviewtyid: 1, //状态
+				rviewList: '', //审核列表
+				pageNum: 1,
+				pagesize: 15,
+				isLoadMore: false, //是否加载中
+			}
+		},
+		onShow() {
+			this.pageNum = 1;
+			this.rviewList = [];
+			this.getAuditList();
+		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.isLoadMore = true
+				this.pageNum += 1
+				this.rviewList = [];
+				this.getAuditList();
+			}
+		},
+		methods: {
+			//切换id
+			switchid(item) {
+				this.rviewtyid = item.id;
+				this.pageNum = 1;
+				this.rviewList = [];
+				this.getAuditList();
+			},
+			//查询列表
+			getAuditList() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let datas = {
+					pageNum: this.pageNum,
+					pageSize: this.pagesize,
+					status: this.rviewtyid
+				}
+				getAuditList(datas).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000' && res.return_data.list != '') {
+						this.rviewList = this.rviewList.concat(res.return_data.list);
+						if (res.return_data.pages == this.pageNum) {
+							this.isLoadMore = true;
+						} else {
+							this.isLoadMore = false
+						}
+					} else {
+						this.rviewList = [];
+					}
+				});
+			},
+			//跳转详情
+			jumpRviewSettdetails(item) {
+				uni.navigateTo({
+					url: '/pages/index/settlement_details/settlement_details?id=' + item
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.borbtom {
+		border-bottom: 3px solid #089bf5;
+	}
+
+	page {
+		background-color: #f6f6f6;
+	}
+
+	.notes {
+		width: calc(100% - 40upx);
+		display: flex;
+		align-items: center;
+		padding: 20upx 0 20upx 20upx;
+	}
+
+	//正常状态
+	.statucs {
+		background-color: #e9f9e5;
+		color: #84b878;
+		text-align: center;
+		padding: 2px 5px;
+	}
+
+	//其他状态
+	.otstatucs {
+		background-color: #fbeee4;
+		color: #db8c73;
+		text-align: center;
+		padding: 2px 5px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/salesOrderList/salesOrderList.vue b/pages/index/salesOrderList/salesOrderList.vue
index bfa2795..4a3d464 100644
--- a/pages/index/salesOrderList/salesOrderList.vue
+++ b/pages/index/salesOrderList/salesOrderList.vue
@@ -66,7 +66,8 @@
 				], //状态
 				pageNum: 1,
 				pagesize: 15,
-				goodtyid: 2, //当前状态
+				goodtyid: 2, //当前状态
+				isLoadMore: false, //是否加载中
 				serviceList: [] //设备列表˚
 			}
 		},
@@ -97,7 +98,8 @@
 		methods: {
 			//切换id
 			switchid(item) {
-				this.goodtyid = item.id;
+				this.goodtyid = item.id;
+				this.pageNum = 1;
 				this.serviceList = [];
 				this.getOrderList();
 			},
diff --git a/pages/index/settlement_details/settlement_details.vue b/pages/index/settlement_details/settlement_details.vue
new file mode 100644
index 0000000..24443a7
--- /dev/null
+++ b/pages/index/settlement_details/settlement_details.vue
@@ -0,0 +1,266 @@
+<template>
+	<view>
+		<!-- 商户信息 -->
+		<view class="titlename width100 font18 fontwig6 fcor333">结算信息</view>
+		<view class="width100 backcorfff">
+			<view class="notes">
+				<view class="fcor666 width25">公司名称</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.merName}}</view>
+			</view>
+			<view class="notes">
+				<view class="fcor666 width25">结算类型</view>
+				<view class="font14 fcor333 text2 width75 fotrt" v-if="auditDetail.settleType == 1">对公结算</view>
+				<view class="font14 fcor333 text2 width75 fotrt" v-if="auditDetail.settleType == 2">对私法人结算</view>
+				<view class="font14 fcor333 text2 width75 fotrt" v-if="auditDetail.settleType == 3">对私非法人结算</view>
+			</view>
+			<view class="notes">
+				<view class="fcor666 width25" v-if="auditDetail.settleType == 1">开户持有人</view>
+				<view class="fcor666 width25" v-if="auditDetail.settleType != 1">银行卡持有人</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.bankCardHolder}}</view>
+			</view>
+			<view class="notes" v-if="auditDetail.settleType == 1">
+				<view class="fcor666 width25" v-if="auditDetail.settleType == 1">开户账号</view>
+				<view class="fcor666 width25" v-if="auditDetail.settleType != 1">银行卡号</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.bankCardNo}}</view>
+			</view>
+			<view class="notes">
+				<view class="fcor666 width25">开户行地址</view>
+				<view class="font14 fcor333 text2 width75 fotrt">
+					{{auditDetail.openningBankProvinceName}}-{{auditDetail.openningBankAreaName}}-{{auditDetail.openningBankCityName}}
+				</view>
+			</view>
+			<view class="notes">
+				<view class="fcor666 width25">所属支行</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.openningBankName}}</view>
+			</view>
+			<view class="notes">
+				<view class="fcor666 width25">所属银行</view>
+				<view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.bankName}}</view>
+			</view>
+			<view v-if="auditDetail.settleType == 3">
+				<view class="notes">
+					<view class="fcor666 width25">非法人姓名</view>
+					<view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.settleIdCardName}}</view>
+				</view>
+				<view class="notes">
+					<view class="fcor666 width25">身份证号码</view>
+					<view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.settleIdCardNo}}</view>
+				</view>
+				<view class="notes">
+					<view class="fcor666 width25">身份证号码</view>
+					<view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.settleIdCardNo}}</view>
+				</view>
+				<view class="notes">
+					<view class="fcor666 width25">身份证地址</view>
+					<view class="font14 fcor333 text2 width75 fotrt">{{auditDetail.settleIdCardAddress}}</view>
+				</view>
+				<view class="notes">
+					<view class="fcor666 width25">身份证有效期</view>
+					<view class="font14 fcor333 text2 width75 fotrt">
+						{{auditDetail.settleIdCardPeriodStart}}至{{auditDetail.settleIdCardPeriodEnd}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="titlename width100 font18 fontwig6 fcor333" v-if="auditDetail.settleType == 3">非法人身份证图片</view>
+		<image class="width90 " mode="widthFix" :src="idcardposimg" v-if="auditDetail.settleType == 3"></image>
+		<image class="width90 " mode="widthFix" :src="idcardsideimg" v-if="auditDetail.settleType == 3"></image>
+		<view class="titlename width100 font18 fontwig6 fcor333" v-if="auditDetail.settleType == 1">开户许可证图片</view>
+		<image class="width90 " mode="widthFix" :src="accopenperimg" v-if="auditDetail.settleType == 1"></image>
+		<view class="titlename width100 font18 fontwig6 fcor333" v-if="auditDetail.settleType == 2">结算银行卡图片</view>
+		<image class="width90 " mode="widthFix" :src="settleimg" v-if="auditDetail.settleType != 1"></image>
+		<view class="titlename width100 font18 fontwig6 fcor333">驳回信息</view>
+		<textarea class="width100 backcorfff" v-model="rejectReason" style="padding: 15px;"
+			placeholder="请填写审核驳回内容"></textarea>
+		<view class="alijusstart">
+			<button class="btns mart40 backcor008" @click="approve()">通过</button>
+			<button class="btns mart40 backcorlr" @click="reject()">驳回</button>
+		</view>
+		<view class="height70"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		reject,
+		approve,
+		getAuditDetail,
+		getImgSignedUrl
+	} from '../../../Utils/Api.js';
+	export default {
+		data() {
+			return {
+				auditNo: '', //审批编号
+				auditDetail: '', //详情资料
+				rejectReason: '', //驳回内容
+				accopenperimg: '', //开户许可证图片
+				settleimg: '', //结算银行卡
+				idcardposimg: '', //身份证正面
+				idcardsideimg: '' //身份证反面
+			}
+		},
+		onLoad(options) {
+			this.auditNo = options.id;
+			this.getAuditDetail();
+		},
+		methods: {
+			//查询详情
+			getAuditDetail() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let datas = {
+					applyNo: this.auditNo
+				}
+				getAuditDetail(datas).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						this.auditDetail = res.return_data.auditObject;
+						this.getImgSignedUrl(5, res.return_data.auditObject.openningBankLicenseUrl);
+						if (res.return_data.auditObject.bankCardImg) {
+							this.getImgSignedUrl(4, res.return_data.auditObject.bankCardImg);
+						}
+						if (res.return_data.auditObject.settleType == 3) {
+							this.getImgSignedUrl(2, res.return_data.auditObject.settleIdCardPortraitImg);
+							this.getImgSignedUrl(3, res.return_data.auditObject
+								.settleIdCardNationalEmblemImg);
+						}
+
+					}
+				})
+			},
+			//查看临时图片路径
+			getImgSignedUrl(item, item1) {
+				let datas = {
+					"fileUrl": item1
+				}
+				getImgSignedUrl(datas).then(res => {
+					if (res.return_code == '000000') {
+						if (item == 5) {
+							this.accopenperimg = res.return_data;
+						}
+						if (item == 4) {
+							this.settleimg = res.return_data;
+						}
+						if (item == 2) {
+							this.idcardposimg = res.return_data;
+						}
+						if (item == 3) {
+							this.idcardsideimg = res.return_data;
+						}
+					}
+				})
+			},
+			//通过审核
+			approve() {
+				uni.showModal({
+					title: '通过审核',
+					content: '是否通过当前审核',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '提交中'
+							})
+							let datas = {
+								auditNo: this.auditNo
+							}
+							approve(datas).then(res => {
+								uni.hideLoading();
+								if (res.return_code == '000000') {
+									uni.showToast({
+										title: '提交成功',
+										icon: "none",
+										duration: 2000
+									});
+									uni.navigateBack();
+								} else {
+									uni.showToast({
+										title: res.return_msg,
+										icon: "none",
+										duration: 2000
+									});
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
+			//驳回审核
+			reject() {
+				if (!this.rejectReason) {
+					uni.showToast({
+						title: '请填写驳回资料',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				uni.showModal({
+					title: '驳回审核',
+					content: '是否驳回当前审核',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '提交中'
+							})
+							let datas = {
+								auditNo: this.auditNo,
+								"rejectReason": this.rejectReason
+							}
+							reject(datas).then(res => {
+								uni.hideLoading();
+								if (res.return_code == '000000') {
+									uni.showToast({
+										title: '提交成功',
+										icon: "none",
+										duration: 2000
+									});
+									uni.navigateBack();
+								} else {
+									uni.showToast({
+										title: res.return_msg,
+										icon: "none",
+										duration: 2000
+									});
+								}
+							})
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f6f6f6;
+	}
+
+	.titlename {
+		align-items: center;
+		padding: 30rpx 0 30rpx 20rpx;
+		background-color: #ffffff;
+		border-bottom: 1px solid #f6f6f6;
+	}
+
+	.notes {
+		width: calc(100% - 40rpx);
+		display: flex;
+		align-items: center;
+		padding: 30rpx 0 30rpx 20rpx;
+		border-bottom: 1px solid #f6f6f6;
+	}
+
+	.btns {
+		width: 40%;
+		height: 50px;
+		line-height: 50px;
+		color: #FFFFFF;
+		font-weight: bold;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/table_CodeList/table_CodeList.vue b/pages/index/table_CodeList/table_CodeList.vue
new file mode 100644
index 0000000..8caaff4
--- /dev/null
+++ b/pages/index/table_CodeList/table_CodeList.vue
@@ -0,0 +1,241 @@
+<template>
+	<view>
+		<view class="input-box">
+			<view class="icon search"></view>
+			<input placeholder="搜索设备编号" v-model="deviceNo" placeholder-style="color:#c0c0c0;" @input="toSearch()" />
+		</view>
+
+		<view v-if="!serviceList" class="mart60 fotct font14 fcor666">
+			<image mode="widthFix" style="width: 70vw;" src="../../../static/img/noorder.png"></image>
+		</view>
+		<view class="width94 mart5 font14 fcor666">当前需绑定桌码 <text class="fcorFD7 font18 paddleft5 paddtright5">10</text>
+			张 , 已绑定 <text class="fcorFD7 font18 paddleft5 paddtright5">9</text> 张
+		</view>
+		<view class="width94 serlist border-r mart15" v-for="(item,index) in serviceList" :key="index"
+			@click="assignOrder(item.deviceNo)">
+			<view class="notes">
+				<view class="width75 margle">
+					<view class="font18 fcor333 fontwig6">编号: {{item.deviceNo}}</view>
+				<!-- 	<view class="font13 fcor999 mart5" v-if="sourceId == 1">申请时间:
+						{{item.createTime | timeFormat('yyyy-mm-dd hh:mm:ss')}}
+					</view> -->
+				</view>
+				<!-- <view class="storestus" v-if="item.bindStatus">
+					已绑定
+				</view> -->
+				<view class="otstatucs" v-if="!item.bindStatus">
+					未绑定
+				</view>
+			</view>
+			<view class="conts">
+				<view class="margle10 font13 fcor999">设备类型: {{item.deviceType | toFilter()}}</view>
+			</view>
+		</view>
+		<view class="height40"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		getDeviceList,
+		assignOrder,
+		replace
+	} from '../../../Utils/Api.js';
+	let app = getApp();
+	export default {
+		data() {
+			return {
+				serviceList: [], //设备列表˚
+				orderNo: '', //订单号
+				buildStatus: false, //是否分配
+				deviceNo: '', // 设备编号
+				assderid: '', //分配id
+				storeid:'', //门店id
+				pageNum: 1,
+				pagesize: 10,
+				isLoadMore: false, //是否加载中
+			}
+		},
+		filters: {
+			// 过滤器
+			toFilter: function(id) {
+				let codeName;
+				for (let i = 0; i < app.globalData.Dictionaries.DEVICE_TYPE.length; i++) {
+					if (id == app.globalData.Dictionaries.DEVICE_TYPE[i].codeValue) {
+						codeName = app.globalData.Dictionaries.DEVICE_TYPE[i].codeName;
+					}
+				}
+				return codeName;
+			},
+		},
+		onReachBottom() { //上拉触底函数
+			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+				this.isLoadMore = true
+				this.pageNum += 1
+				this.getDeviceList()
+			}
+		},
+		onLoad(options) {
+			this.orderNo = options.orderNo;
+			this.storeid = options.storeid;
+			this.assderid = options.assderid;
+			if (this.sourceId == 1 || this.sourceId == 5) {
+				this.buildStatus = true;
+				this.getDeviceList();
+			}
+			if (this.sourceId == 2 || this.sourceId == 4) {
+				this.buildStatus = false;
+				this.getDeviceList();
+			}
+			if (this.sourceId == 3) {
+				this.buildStatus = '';
+				this.getDeviceList();
+			}
+		},
+		methods: {
+			//查询列表
+			getDeviceList() {
+				let datas = {
+					pageNum: this.pageNum,
+					pageSize: this.pagesize,
+					buildStatus: this.buildStatus,
+					deviceNo: this.deviceNo,
+					storeId: this.storeid
+				}
+				getDeviceList(datas).then(res => {
+					if (res.return_code == '000000' && res.return_data.list != '') {
+						this.serviceList = this.serviceList.concat(res.return_data.list);
+						if (res.return_data.pages == this.pageNum) {
+							this.isLoadMore = true;
+						} else {
+							this.isLoadMore = false
+						}
+					} else {
+						this.serviceList = '';
+					}
+				})
+			},
+			//搜索设备
+			toSearch() {
+				this.pageNum = 1;
+				this.pageSize = 10;
+				this.serviceList = [];
+				this.getDeviceList();
+			},
+			//分配设备
+			assignOrder(item) {
+				if (this.sourceId == 2) {
+					uni.showModal({
+						title: '温馨提示',
+						content: '是否分配当前桌码',
+						success: (res) => {
+							if (res.confirm) {
+								uni.showLoading({
+									title: '加载中'
+								})
+								let serviceList = [];
+								serviceList.push(item);
+								let datas = {
+									"orderNo": this.orderNo,
+									"deviceNoList": serviceList
+								}
+								assignOrder(datas).then(res => {
+									uni.hideLoading();
+									if (res.return_code == '000000') {
+										uni.showToast({
+											title: '分配成功',
+											duration: 2000,
+											icon: 'none'
+										})
+										uni.navigateBack({})
+									} else {
+										uni.showToast({
+											title: res.return_msg,
+											duration: 2000,
+											icon: 'none'
+										})
+									}
+								})
+							} else if (res.cancel) {}
+						}
+					});
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.input-box {
+		width: 90%;
+		margin-left: 5%;
+		margin-top: 15px;
+		margin-bottom: 15px;
+		height: 70rpx;
+		background-color: #f5f5f5;
+		border-radius: 10rpx;
+		position: relative;
+		display: flex;
+		align-items: center;
+
+		.icon {
+			display: flex;
+			align-items: center;
+			position: absolute;
+			top: 2px;
+			left: 5px;
+			width: 60upx;
+			height: 60upx;
+			font-size: 34upx;
+			color: #c0c0c0;
+		}
+
+		input {
+			padding-left: 50upx;
+			height: 28upx;
+			font-size: 28upx;
+			width: 100%;
+		}
+	}
+
+	.serlist {
+		border: 1px solid #f6f6f6;
+		box-shadow: 0upx 4upx 8upx rgba(0, 0, 0, 0.2);
+	}
+
+	.notes {
+		width: calc(100% - 40rpx);
+		display: flex;
+		align-items: center;
+		padding: 30rpx 0 10rpx 20rpx;
+	}
+
+	.storestus {
+		padding: 1px 5px;
+		color: #91bb88;
+		font-size: 14px;
+		background-color: #e8fbe6;
+	}
+
+	.otstatucs {
+		background-color: #fbeee4;
+		color: #db8c73;
+		font-size: 14px;
+		padding: 1px 5px;
+	}
+
+	.conts {
+		width: calc(100% - 60rpx);
+		display: flex;
+		align-items: center;
+		margin-bottom: 10px;
+		padding: 0 0rpx 30rpx 14rpx;
+	}
+
+	.xfimg {
+		width: 100rpx;
+		bottom: 60rpx;
+		position: fixed;
+		right: 40rpx;
+	}
+</style>
diff --git a/pages/index/updateSettlement/updateSettlement.vue b/pages/index/updateSettlement/updateSettlement.vue
new file mode 100644
index 0000000..2f99293
--- /dev/null
+++ b/pages/index/updateSettlement/updateSettlement.vue
@@ -0,0 +1,935 @@
+<template>
+	<view>
+		<!-- 审核状态回馈 -->
+		<view class="width100 height100p" style="background-color: #eb6a53;"
+			v-if="applyByMerList && (applyByMerList.status == 2 || applyByMerList.status == 4)">
+			<view class="font18 fcorfff paading10 aliitem" v-if="applyByMerList.status == 4">
+				<image src='../../../static/img/error.png' mode="widthFix" class="iconw25 marglerig"></image>审核驳回
+			</view>
+			<view class="font14 fcorfff paading10" v-if="applyByMerList.status == 4">{{applyByMerList.rejectReason}}
+			</view>
+			<view class="font18 fcorfff paddtop35 fotct" v-if="applyByMerList.status == 2">
+				审核中
+			</view>
+		</view>
+
+		<!--第三步 未录入结算信息 -->
+		<view class="width100 mart10 backcorfff">
+			<view class="titlename font18 fontwig6 fcor333">结算信息</view>
+			<view class="username">
+				<view class="namecont">结算类型</view>
+				<input placeholder="请选择结算类型" v-model="lementType" style="width: 70%;" disabled="true"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" @click="showPopup()" />
+				<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw"></image>
+			</view>
+			<view class="notes font16" style="border-bottom: 0px;" v-if="lementId == 3">
+				<view class="width70 aliitem fcor666">
+					非法人身份证照片
+				</view>
+				<view class="fcor666 alijusend width30 font14"
+					@click="perImage('../../../static/img/businesslic3.png')">查看示例
+					<image mode="widthFix" style="width: 12px;" src="../../../static/img/jtg.png"></image>
+				</view>
+			</view>
+			<view class="width94 displ mart5" v-if="lementId == 3">
+				<image :src="idcardposimg" v-if="idcardposimg" mode="widthFix" class="width45" style="margin-left: 3%;"
+					@click="upload(2)"></image>
+				<image src="../../../static/img/frontidcard.png" v-else mode="widthFix" class="width45"
+					style="margin-left: 3%;" @click="upload(2)"></image>
+				<image :src="idcardsideimg" v-if="idcardsideimg" mode="widthFix" class="width45"
+					style="margin-left: 3%;" @click="upload(3)"></image>
+				<image src="../../../static/img/reverseidcard.png" v-else mode="widthFix" class="width45"
+					style="margin-left: 3%;" @click="upload(3)"></image>
+			</view>
+			<view class="username" v-if="lementId == 3">
+				<view class="namecont">姓名</view>
+				<input placeholder="请输入姓名" v-model="idcardname" style="width: 70%;"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+			</view>
+			<view class="username" v-if="lementId == 3">
+				<view class="namecont">身份证号</view>
+				<input placeholder="请输入身份证号" v-model="idcard" style="width: 70%;"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+			</view>
+			<view class="username" v-if="lementId == 3">
+				<view class="namecont">身份证地址</view>
+				<input placeholder="请输入身份证地址" v-model="larIdCardAddress" style="width: 70%;"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+			</view>
+			<view class="username" style="border-bottom: 0px;" v-if="lementId == 3">
+				<view class="namecont">有效期</view>
+				<view class="width30 aliitem" @tap="timetype='1'">
+					<radio class="checbox" :checked="timetype=='1'" color="#0083f5" /> 选择时间
+				</view>
+				<view class="width30 aliitem" @tap="timetype='2'">
+					<radio class="checbox" :checked="timetype=='2'" color="#0083f5" /> 长期有效
+				</view>
+			</view>
+			<view class="username width80" v-if="lementId == 3">
+				<picker mode="date" class="width40 fotct" :value="cardstart_date" :start="startDate" :end="endDate"
+					@change="bindDateChange">
+					<view class="date">{{cardstart_date}}</view>
+				</picker>
+				<view class="width10 fotct">至</view>
+				<picker v-if="timetype == '1'" mode="date" class="width40 fotct" :value="cardend_date"
+					:start="startDate" :end="endDate" @change="bindDateChange2">
+					<view class="date">{{cardend_date}}</view>
+				</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="width70 aliitem fcor666">
+					结算人银行卡照片
+				</view>
+			</view>
+			<view class="width94 displ mart5" v-if="lementId != 1">
+				<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 class="notes font16" style="border-bottom: 0px;" v-if="lementId == 1">
+				<view class="width70 aliitem fcor666">
+					开户许可证照片
+				</view>
+				<view class="fcor666 alijusend width30 font14"
+					@click="perImage('../../../static/img/businesslic6.png')">查看示例
+					<image mode="widthFix" style="width: 12px;" src="../../../static/img/jtg.png"></image>
+				</view>
+			</view>
+			<view class="width94 displ mart5" v-if="lementId == 1">
+				<image mode="widthFix" class="width100" :src="accopenperimg" v-if="accopenperimg" @click="upload(5)">
+				</image>
+				<image src="../../../static/img/businesslic11.png" mode="widthFix" class="width100" v-else
+					@click="upload(5)"></image>
+			</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" 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" 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">
+					<view style="color: #333333;font-size:14px;padding-top:2px;" v-if="bankregionName">
+						{{bankregionName}}
+					</view>
+					<view style="color: #bfbfbf;font-size:14px;padding-top:2px;" v-else>请选择开户行地址</view>
+				</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%;" disabled="true"
+					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">
+				<view class="namecont">所属银行</view>
+				<input placeholder="请输入所属银行" v-model="belongbank" style="width: 70%;"
+					placeholder-style="color: #bfbfbf;font-size:14px;padding-top:2px;" />
+			</view>
+		</view>
+
+		<wybPopup ref="popup" type="bottom" width="500" bgColor="#f6f6f6" radius="6" :showCloseIcon="true">
+			<view class="width100">
+				<view class="fotct font18 fontwig6 fcor333 mart10 height30">选择商户类型</view>
+				<view class="width92 mart20" @click="changelementtype(1)">
+					<view class="wybtc" style="height: 40px;">
+						<image src="../../../static/img/wyb4.png" mode="widthFix" class="iconw40"></image>
+						<view class="width70 margle10">
+							<view class="fcor333 font16">对公结算</view>
+						</view>
+						<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
+					</view>
+				</view>
+				<view class="width92 mart20" @click="changelementtype(2)">
+					<view class="wybtc" style="height: 40px;">
+						<image src="../../../static/img/wyb4.png" mode="widthFix" class="iconw40"></image>
+						<view class="width70 margle10">
+							<view class="fcor333 font16">对私法人结算</view>
+						</view>
+						<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
+					</view>
+				</view>
+				<view class="width92 mart20" @click="changelementtype(3)">
+					<view class="wybtc" style="height: 40px;">
+						<image src="../../../static/img/wyb4.png" mode="widthFix" class="iconw40"></image>
+						<view class="width70 margle10">
+							<view class="fcor333 font16">对私非法人结算</view>
+						</view>
+						<image src="../../../static/img/jtg.png" mode="widthFix" class="iconw margle20"></image>
+					</view>
+				</view>
+			</view>
+		</wybPopup>
+		<view class="btn" @tap="submitsotre" v-if="!applyByMerList || applyByMerList.status == 4">提交审核</view>
+		<view class="height60"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		createApplyUpdateSettle,
+		getImgSignedUrl,
+		recognizeIdCard,
+		recognizeBankCard,
+		getBankCardBin,
+		recognizeBankAccount,
+		getLastApplyByMer
+	} from '../../../Utils/Api.js';
+	import wybPopup from '../../../components/wyb-popup/wyb-popup.vue';
+	import pickRegions from '../../../components/pick-regions/pick-regions.vue';
+	let app = getApp();
+	export default {
+		components: {
+			wybPopup,
+			pickRegions
+		},
+		data() {
+			const currentDate = this.getDate({
+				format: true
+			})
+			return {
+				reqUrl: app.globalData.url, //请求地址
+				imgsUrl: app.globalData.imgUrl, //图片访问地址
+				lementType: '对公结算', //结算账户类型
+				lementId: '1', //结算id
+				idcardposimg: '', //查看证件照正面
+				idcardsideimg: '', //查看证件照反面
+				idcardname: '', //证件姓名
+				idcard: '', //身份证号
+				larIdCardAddress: '', //身份证地址
+				settleimg: '', //结算人银行卡照片
+				uploadsettleimg: '', //上传结算人银行卡照片
+				accopenperimg: '', //开户许可证图片
+				uploadaccopenperimg: '', //上传开户许可图片
+				openingbankNo: '', //开户行号
+				region: [], //选择区域
+				defaultRegion: ['北京市', '市辖区', '东城区'], //默认地区
+				defaultRegionCode: '110101', //区级编号
+				bankregionName: '', //开户行名字
+				bankNo: '', // 银行卡号
+				bankName: '', // 银行卡持有人
+				belongbank: '', //所属银行
+				belongbranch: '', //所属支行
+				clearbankNo: '', //清算行号
+				timetype: '1', // times:选择时间  longterm: 长期
+				cardstart_date: '开始时间', // 身份证开始时间
+				cardend_date: '结束时间', //身份证结束时间
+				merId: '', //用户id 
+				applyByMerList: '' //修改的资料
+			}
+		},
+		onShow() {
+			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.branchBankNo = '';
+			app.globalData.clearNo = '';
+			app.globalData.depositaryBank = '';
+		},
+		onLoad(options) {
+			this.merId = options.id;
+			this.getLastApplyByMer();
+		},
+		computed: {
+			//开始时间转化
+			startDate() {
+				return this.getDate('start');
+			},
+			//结束时间转化
+			endDate() {
+				return this.getDate('end');
+			},
+		},
+		methods: {
+			// 获取当前时间
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 50;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}-${month}-${day}`;
+			},
+			//显示商户弹出
+			showPopup() {
+				if (this.applyByMerList.status == 4 || this.applyByMerList == '') {
+					this.$refs.popup.show();
+				}
+			},
+			//查询修改的结算信息
+			getLastApplyByMer() {
+				uni.showLoading({
+					title: '加载中...'
+				})
+				let datas = {
+					merId: this.merId
+				}
+				getLastApplyByMer(datas).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000') {
+						if (res.return_data.status != 3) {
+							this.applyByMerList = res.return_data;
+							this.settleimg = res.return_data.bankCardImg;
+							if (res.return_data.bankCardImg) {
+								this.getImgSignedUrl(4, res.return_data.bankCardImg, 2);
+							}
+							this.belongbranch = res.return_data.openningBankName;
+
+							this.openingbankNo = res.return_data.openningBankCode;
+							this.accopenperimg = res.return_data.openningBankLicenseUrl;
+							if (res.return_data.openningBankLicenseUrl) {
+								this.getImgSignedUrl(5, res.return_data.openningBankLicenseUrl, 2);
+							}
+							if (res.return_data.electronicPact) {
+								this.electronicProtocolimg = res.return_data.electronicPact
+									.split(
+										';');
+							}
+							this.clearbankNo = res.return_data.clearingBankCode;
+
+							this.lementId = res.return_data.settleType;
+							if (this.lementId == 1) {
+								this.lementType = '对公结算';
+							}
+							if (this.lementId == 2) {
+								this.lementType = '对私法人结算';
+							}
+							if (this.lementId == 3) {
+								this.lementType = '对私非法人结算';
+							}
+							this.bankregionName = res.return_data.openningBankProvinceName +
+								'-' +
+								res.return_data.openningBankCityName + '-' + res.return_data.openningBankAreaName;
+							this.bankNo = res.return_data.bankCardNo;
+							this.bankName = res.return_data.bankCardHolder;
+							this.belongbank = res.return_data.bankName;
+							this.idcardname = res.return_data.settleIdCardName;
+							this.idcard = res.return_data.settleIdCardNo;
+							this.timetype = res.return_data.settleIdPeriodType;
+							this.bankareaCode = res.return_data.openningBankAreaCode;
+							this.idcardposimg = res.return_data.settleIdCardPortraitImg;
+							this.uploadidcardposimg = res.return_data.settleIdCardPortraitImg;
+							this.idcardsideimg = res.return_data.settleIdCardNationalEmblemImg;
+							this.uploadidcardsideimg = res.return_data
+								.settleIdCardNationalEmblemImg;
+							if (res.return_data.settleIdCardPortraitImg) {
+								this.getImgSignedUrl(2, res.return_data.settleIdCardPortraitImg, 2);
+								this.getImgSignedUrl(3, res.return_data
+									.settleIdCardNationalEmblemImg, 2);
+							}
+							this.cardstart_date = res.return_data.settleIdCardPeriodStart;
+							this.cardend_date = res.return_data.settleIdCardPeriodEnd;
+						}
+					}
+				});
+			},
+			//重新提交
+			updatenewvalue() {
+				this.applyByMerList = '';
+			},
+			//选择结算类型
+			changelementtype(item) {
+				if (item == 1) {
+					this.lementId = 1;
+					this.lementType = '对公结算';
+				}
+				if (item == 2) {
+					this.lementId = 2;
+					this.lementType = '对私法人结算';
+				}
+				if (item == 3) {
+					this.lementId = 3;
+					this.lementType = '对私非法人结算';
+				}
+				this.$refs.popup.hide();
+			},
+			//上传图片
+			upload(item) {
+				let that = this;
+				if (that.applyByMerList) {
+					return;
+				}
+				if (that.applyByMerList.status == 2) {
+					return;
+				}
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['camera', 'album'],
+					success: function(res) {
+						const tempFilePaths = res.tempFilePaths;
+						that.uploadFile(tempFilePaths[0], item, 1);
+					},
+					error: function(e) {
+						console.log(e);
+					}
+				});
+			},
+			//上传
+			uploadFile(item, item1, item2) {
+				const that = this
+				that.translate(item, 0.2, imgURL => {
+					const uploadTask = uni.uploadFile({
+						url: that.reqUrl + '/mer/uploadBase64File',
+						filePath: imgURL,
+						header: {
+							"Authorization": app.globalData.token
+						},
+						name: 'file',
+						formData: {
+							'merId': that.merId,
+							'base64File': imgURL
+						},
+						success: function(uploadFileRes) {
+							that.getImgSignedUrl(item1, JSON.parse(uploadFileRes.data)
+								.return_data, item2);
+						}
+					});
+				})
+			},
+			/**
+			 * H5端图片压缩
+			 *  参数说明：
+			 *  imgSrc 图片url
+			 *  scale缩放比例 0-1
+			 *  返回base64
+			 *  callback 回调设置返回值 
+			 */
+			translate(imgSrc, scale, callback) {
+				var img = new Image();
+				img.src = imgSrc;
+				img.onload = function() {
+					var that = this;
+					var h = that.height; // 默认按比例压缩
+					var w = that.width;
+					var canvas = document.createElement('canvas');
+					var ctx = canvas.getContext('2d');
+					var width = document.createAttribute("width");
+					width.nodeValue = w;
+					var height = document.createAttribute("height");
+					height.nodeValue = h;
+					canvas.setAttributeNode(width);
+					canvas.setAttributeNode(height);
+					ctx.drawImage(that, 0, 0, w, h);
+					var base64 = canvas.toDataURL('image/jpeg', scale); //压缩比例
+					canvas = null;
+					callback(base64);
+				}
+			},
+			//item 放大图片
+			perImage(item) {
+				uni.previewImage({
+					current: 0, //预览图片的下标
+					urls: [item] //预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
+				})
+			},
+			//查看临时图片路径
+			getImgSignedUrl(item, item1, item2) {
+				let datas = {
+					"fileUrl": item1
+				}
+				getImgSignedUrl(datas).then(res => {
+					if (res.return_code == '000000') {
+						if (item == 2) {
+							if (item2 == 1) {
+								this.recognizeIdCard(1, res.return_data);
+							} else {
+								this.idcardposimg = res.return_data;
+							}
+							this.uploadidcardposimg = item1;
+						}
+						if (item == 3) {
+							if (item2 == 1) {
+								this.recognizeIdCard(2, res.return_data);
+							} else {
+								this.idcardsideimg = res.return_data;
+							}
+							this.uploadidcardsideimg = item1;
+						}
+						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;
+							}
+						}
+					}
+				})
+			},
+			//身份证识别
+			recognizeIdCard(item, items) {
+				uni.showLoading({
+					title: '识别中...'
+				})
+				let params = {
+					url: items
+				}
+				recognizeIdCard(params).then(res => {
+					uni.hideLoading();
+					if (res.return_code == '000000' && res.return_data) {
+						if (item == 1) {
+							if (JSON.parse(res.return_data.data).data.face != undefined) {
+								this.idCardzm = JSON.parse(res.return_data.data).data;
+								this.idcardname = this.idCardzm.face.data.name;
+								this.idcardposimg = items;
+								this.larIdCardAddress = this.idCardzm.face.data.address;
+								this.idcard = this.idCardzm.face.data.idNumber;
+							} else {
+								uni.showToast({
+									title: '请上传身份证人脸信息',
+									duration: 2000,
+									icon: 'none'
+								})
+							}
+						}
+						if (item == 2) {
+							if (JSON.parse(res.return_data.data).data.back != undefined) {
+								this.idCardfm = JSON.parse(res.return_data.data).data;
+								let times = this.idCardfm.back.data.validPeriod.split('-');
+								this.cardstart_date = times[0];
+								this.idcardsideimg = items;
+								this.cardend_date = times[1];
+							} else {
+								uni.showToast({
+									title: '请上传身份证国徽信息',
+									duration: 2000,
+									icon: 'none'
+								})
+							}
+						}
+					} else {
+						uni.showToast({
+							title: '请上传正确的身份证信息',
+							duration: 2000,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			//开户行识别
+			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'
+						})
+					}
+				})
+			},
+			//银行卡识别
+			recognizeBankCard(item) {
+				uni.showLoading({
+					title: '识别中...'
+				})
+				let params = {
+					url: item
+				}
+				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.getBankCardBin(this.bankNo);
+							this.belongbank = this.bankCardlist.bankName;
+						} else {
+							uni.showToast({
+								title: '请上传正确的银行卡',
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					} else {
+						uni.showToast({
+							title: '请上传正确的银行卡',
+							icon: 'none',
+							duration: 2000
+						})
+					}
+
+				})
+			},
+			//查询银行卡信息
+			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;
+					}
+				})
+			},
+			//选择支行
+			showdepositaryBank() {
+				app.globalData.bankareaCode = this.bankareaCode;
+				uni.navigateTo({
+					url: '/pages/index/depositaryBank/depositaryBank'
+				})
+			},
+			//选择开户行
+			handleBankCityCode(region) {
+				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;
+			},
+			//提交门店进行审核
+			submitsotre() {
+				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 == 3) {
+					if (!that.idcardposimg) {
+						uni.showToast({
+							title: '请上传身份证正面照',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+					if (!that.idcardsideimg) {
+						uni.showToast({
+							title: '请上传身份证反面照',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+
+					if (!that.idcardname) {
+						uni.showToast({
+							title: '请填写姓名',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+
+					if (!that.idcard) {
+						uni.showToast({
+							title: '请填写身份证号',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+					if (!that.larIdCardAddress) {
+						uni.showToast({
+							title: '请填写身份证地址',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+					if (!that.cardstart_date) {
+						uni.showToast({
+							title: '请选择身份证开始时间',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+					if (!that.cardend_date) {
+						uni.showToast({
+							title: '请选择身份证结束时间',
+							icon: "none",
+							duration: 2000
+						});
+						return;
+					}
+				}
+
+
+				if (!that.bankareaCode) {
+					uni.showToast({
+						title: '请选择开户行地址',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if (!that.bankNo) {
+					uni.showToast({
+						title: '请填写银行卡号',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if (!that.bankName) {
+					uni.showToast({
+						title: '请填写银行卡持有人',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if (!that.belongbank) {
+					uni.showToast({
+						title: '请填写所属银行',
+						icon: "none",
+						duration: 2000
+					});
+					return;
+				}
+				if (that.lementId != 3) {
+					that.cardstart_date = '';
+					that.cardend_date = '';
+				} else {
+					if (that.timetype == 2) {
+						that.cardend_date = '长期有效'
+					}
+				}
+
+				uni.showModal({
+					title: '提交审核',
+					content: '确认信息是否正确。',
+					success: (res) => {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '提交审核中...'
+							})
+							let datas = {
+								"applyType": 1,
+								"merId": that.merId,
+								"settleType": that.lementId, //结算类型 1：对公结算  2：对私法人结算  3：对私非法人结算,
+								"bankCardImg": that.uploadsettleimg, //"银行卡照片",
+								"openningBankName": that.belongbranch, //"银行名称",
+								"bankCardNo": that.bankNo, //"银行卡号",
+								"openningBankAreaCode": that.bankareaCode, // 开户地址
+								"bankCardHolder": that.bankName, //"银行卡持有人",
+								"openningBankCode": that.openingbankNo, //"开户行号",
+								"bankName": that.belongbank, //"开户行名称",
+								"openningBankLicenseUrl": that.uploadaccopenperimg, //"开户许可证照片",
+								"clearingBankCode": that.clearbankNo, //"账户清算行号",
+								"settleIdCardName": that.idcardname, //身份证名字
+								"settleIdCardNo": that.idcard, //身份证号
+								"settleIdCardAddress": that.larIdCardAddress, // 身份证地址
+								"settleIdPeriodType": that
+									.timetype, //【对私非法人结算】结算人身份证有效期类型  1：有效期   2：长期,
+								"settleIdCardPortraitImg": that
+									.uploadidcardposimg, //"【对私非法人结算】结算人身份证人像面图片",
+								"settleIdCardNationalEmblemImg": that
+									.uploadidcardsideimg, //"【对私非法人结算】结算人身份证国徽面图片",
+								"settleIdCardPeriodStart": that.cardstart_date, //"【对私非法人结算】结算人身份证有效期开始时间",
+								"settleIdCardPeriodEnd": that.cardend_date //"【对私非法人结算】结算人身份证有效期结束时间"
+							}
+							createApplyUpdateSettle(datas).then(res => {
+								uni.hideLoading();
+								if (res.return_code == '000000') {
+									that.merchart = 4;
+									uni.showToast({
+										title: '提交成功',
+										icon: 'none',
+										duration: 2000
+									})
+									uni.navigateBack();
+								} else {
+									uni.showToast({
+										title: res.return_msg,
+										icon: 'none',
+										duration: 2000
+									})
+								}
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f7f5f6;
+	}
+
+	.titlename {
+		width: calc(100% - 90upx);
+		height: 100upx;
+		display: flex;
+		align-items: center;
+		background-color: rgba($color: #ffffff, $alpha: 0.1);
+		padding: 0 45upx;
+	}
+
+	.username {
+		width: calc(100% - 90upx);
+		height: 100upx;
+		display: flex;
+		align-items: center;
+		background-color: rgba($color: #ffffff, $alpha: 0.1);
+		border-bottom: 1px solid #f6f6f6;
+		padding: 8upx 45upx;
+
+		input {
+			width: 50%;
+			height: 50upx;
+			font-size: 16px;
+			color: #333333;
+			font-weight: blod;
+		}
+
+		.get-code {
+			position: absolute;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			right: 7px;
+			z-index: 3;
+			border: 1px solid #bfbfbf;
+			width: 25%;
+			padding: 3px 5px;
+			border-radius: 22px;
+
+			&:after {
+				content: " ";
+				width: 1upx;
+				height: 50upx;
+				position: absolute;
+				z-index: 3;
+				margin-right: 100%;
+				left: 0;
+				top: 20upx;
+			}
+		}
+
+		.namecont {
+			color: #666666;
+			width: 28%;
+		}
+	}
+
+	.notes {
+		width: calc(100% - 90upx);
+		display: flex;
+		align-items: center;
+		background-color: rgba($color: #ffffff, $alpha: 0.1);
+		border-bottom: 1px solid #f6f6f6;
+		padding: 20rpx 45rpx;
+		color: #bfbfbf;
+
+	}
+
+	.btn {
+		color: #FFFFFF;
+		background-color: #0083f5;
+		width: 90%;
+		margin-left: 5%;
+		margin-top: 80rpx;
+		margin-bottom: 50rpx;
+		height: 90rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 10rpx;
+		font-size: 40rpx;
+	}
+
+	.wybtc {
+		width: calc(100% - 90upx);
+		display: flex;
+		height: 80px;
+		align-items: center;
+		background-color: #FFFFFF;
+		border-bottom: 1px solid #f6f6f6;
+		padding: 15rpx 45rpx;
+		border-radius: 8px;
+		color: #bfbfbf;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index 758cdd2..b94c698 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -9,6 +9,10 @@
 			<view class="width94 fcorfff font18 alijus" v-if="userInfo.secUser.objectType ==  4">
 				{{userInfo.mer.merAbbreviate}}
 				<image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image>
+			</view>
+			<view class="width94 fcorfff font18 alijus" v-if="userInfo.secUser.objectType ==  2">
+				{{userInfo.agent.name}}
+				<image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image>
 			</view>
 			<view class="width94 fcorfff font18 alijus" v-if="userInfo.secUser.objectType ==  5">{{userInfo.store.name}}
 				<image mode="widthFix" class="margle iconw" src="../../../static/img/jt.png"></image>
@@ -143,6 +147,16 @@
 					}
 				]
 				return;
+			}
+			//代理商
+			if (this.userInfo.secUser.objectType == 2) {
+				this.funcList = [{
+						title: '结算审核',
+						url: '../../index/review-Settlement/review-Settlement',
+						img: '../../../static/img/home1.png'
+					}
+				]
+				return;
 			}
 
 		},
diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index cf3893c..8565a0a 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -71,7 +71,7 @@
 			},
 			jumpcdx() {
 				location.href =
-					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://gratia-pay.dctpay.com/cweb&response_type=code&scope=snsapi_base#wechat_redirect';
+					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https://hsg.dctpay.com/wechat_authorize/?redirect_uri=https://pay.dctpay.com/cweb&response_type=code&scope=snsapi_base#wechat_redirect';
 			},
 		}
 	}
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index 5a88e71..a72f995 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.95963628.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.aaeb720f.js></script><script src=/cweb/static/js/index.c2efb2b2.js></script></body></html>
\ No newline at end of file