diff --git a/pages.json b/pages.json
index acb3c3f..4d1083b 100644
--- a/pages.json
+++ b/pages.json
@@ -21,17 +21,31 @@
 				"app-plus": {
 					"scrollIndicator": false, //禁用原生导航栏
 					"subNVues": [{
-						"id": "concatIndex", // 唯一标识  
-						"path": "pages/index/subnvue/concat", // 页面路径  
-						"type": "popup",
-						"style": {
-							"position": "absolute",
-							"dock": "right",
-							"width": "750rpx",
-							"height": "1000px",
-							"background": "rgba(0,0,0,0.2)"
+							"id": "concatIndex", // 唯一标识  
+							"path": "pages/index/subnvue/concat", // 页面路径  
+							"type": "popup",
+							"style": {
+								"position": "absolute",
+								"dock": "right",
+								"width": "750rpx",
+								"height": "1000px",
+								"background": "rgba(0,0,0,0.2)"
+							}
+						},
+						{
+							"id": "newUser", // 唯一标识  
+							"path": "pages/index/subnvue/newUser", // 页面路径  
+							"type": "popup",
+							"style": {
+								"position": "absolute",
+								"dock": "right",
+								"width": "750rpx",
+								"height": "1000px",
+								"background": "rgba(0,0,0,0.2)"
+							}
 						}
-					}]
+
+					]
 				}
 			}
 		}, {
@@ -81,7 +95,22 @@
 			"style": {
 				"enablePullDownRefresh": true,
 				"navigationBarTitleText": "个人中心",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"app-plus": {
+					"scrollIndicator": false, //禁用原生导航栏
+					"subNVues": [{
+						"id": "userSubnvu", // 唯一标识  
+						"path": "pages/user/subnvue/index", // 页面路径  
+						"type": "popup",
+						"style": {
+							"position": "absolute",
+							"dock": "right",
+							"width": "750rpx",
+							"height": "1500rpx",
+							"background": "rgba(0,0,0,0.2)"
+						}
+					}]
+				}
 			}
 		},
 		{
@@ -832,7 +861,8 @@
 				{
 					"path": "settled/index",
 					"style": {
-						"navigationBarTitleText": "商家入驻"
+						"navigationBarTitleText": "商家入驻",
+						"navigationStyle": "custom"
 					}
 				},
 				{
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index c73835d..de98f17 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -172,11 +172,9 @@
 				</view>
 			</view>
 		</view>
-
 		<view class="title-img">
 			<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/807b8202403111125379295.webp" mode=""></image>
 		</view>
-		<button @click="test">jiaowoanjhsd</button>
 		<view class="business com special_work" v-if="jurisdiction == false">
 			<view class="content">
 				<block v-if="nowMenuList.length > 0">
@@ -247,6 +245,9 @@
 	} from "@/api/public";
 	// #ifdef APP-PLUS
 	import uniMP from '@/utils/uniMP.js';
+	import {
+		isNewMer
+	} from '@/api/user.js';
 	// #endif
 
 	export default {
@@ -301,6 +302,19 @@
 
 		},
 		onShow() {
+			// #ifdef APP-PLUS
+			if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) {
+				isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => {
+					console.log('resdata', res.data)
+					if (res.data == 'true' && this.elInfo) {
+
+						this.subNvue = uni.getSubNVueById('concat')
+						this.subNvue.show('slide-in-left', 300)
+						// this.openDiver()
+					}
+				})
+			}
+			// #endif
 			this.street = this.$store.state.storage.address.townName;
 			this.getNav();
 			if (this.isLogin) {
@@ -320,8 +334,10 @@
 		},
 		beforeDestroy() {},
 		onReady() {
-			if (uni.getStorageSync('is_new_user')) {
-				let that = this
+			// #ifdef APP-PLUS
+			let that = this
+			if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) {
+				this.initMenu(true)
 				setTimeout(() => {
 					const query = uni.createSelectorQuery().in(this);
 					query
@@ -329,13 +345,33 @@
 						.boundingClientRect((data) => {
 							let info = JSON.stringify(data)
 							that.elInfo = data
-							// #ifdef APP-PLUS
 							that.openDiver()
-							// #endif
 						})
 						.exec();
 				}, 1000)
+
 			}
+
+
+			// #endif
+
+
+			// if (uni.getStorageSync('is_new_user')) {
+			// 	let that = this
+			// 	setTimeout(() => {
+			// 		const query = uni.createSelectorQuery().in(this);
+			// 		query
+			// 			.select(".gatherDiver")
+			// 			.boundingClientRect((data) => {
+			// 				let info = JSON.stringify(data)
+			// 				that.elInfo = data
+			// 				// #ifdef APP-PLUS
+			// 				that.openDiver()
+			// 				// #endif
+			// 			})
+			// 			.exec();
+			// 	}, 1000)
+			// }
 		},
 		// #ifdef APP-PLUS
 		onPageScroll(e) {
@@ -356,17 +392,6 @@
 			uni.$emit('showLoading', false);
 		},
 		methods: {
-			test() {
-				let data = {
-					"name": "供销助农平台",
-					"app_id": "__UNI__1EE148C",
-					"pic": "https://lihai001.oss-cn-chengdu.aliyuncs.com/def/0fa43202312291702314919.png",
-					"url": "https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/457d9202404291733397921.wgt",
-					"version": "1.4.5"
-				}
-				uniMP.loadAppletMP(data)
-
-			},
 			openDiver() {
 				this.subNVue.show('zoom-out', 300)
 				uni.$emit('diverGatherEmit', this.elInfo);
@@ -465,7 +490,7 @@
 				}
 			},
 			// 初始化菜单
-			initMenu() {
+			initMenu(flag = false) {
 				let nowMenu = uni.getStorageSync('gatherMenuList');
 				try {
 					let list = JSON.parse(nowMenu || '[]');
@@ -476,7 +501,7 @@
 						else now.push(item)
 					})
 					// if()
-					if (uni.getStorageSync('is_new_user') && !now.length) now[0] = all[0];
+					if (flag && !now.length) now[0] = all[0];
 					// console.log(all, now)
 
 					this.AllMenuList = all;
diff --git a/pages/gather/subnvue/concat.nvue b/pages/gather/subnvue/concat.nvue
index 80d83c3..52a3ce5 100644
--- a/pages/gather/subnvue/concat.nvue
+++ b/pages/gather/subnvue/concat.nvue
@@ -41,7 +41,6 @@
 				this.subNVue.hide('zoom-in', 300, )
 				setTimeout(() => {
 					uni.$emit('diverGatherSubEmit');
-					uni.setStorageSync('is_new_user', false)
 				}, 500)
 
 			},
@@ -54,7 +53,6 @@
 			let that = this
 			this.subNVue = uni.getSubNVueById('concat')
 			uni.$on('diverGatherEmit', (data) => {
-				console.log('收到data', data)
 				that.left = data.left
 				that.top = data.top
 			})
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c206e70..51acce2 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -597,16 +597,28 @@
 			};
 		},
 		// #endif
+
+
+
+
+		created(options) {
+			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+			let curRoute = routes[routes.length - 1].route //获取当前页面路由
+			this.activeRouter = '/' + curRoute
+		},
 		onLoad(options) {
 			// #ifdef APP
-			this.subNVue = uni.getSubNVueById('concatIndex')
-			uni.$on('diverIndexSubEmit', function(data) {
-				that.subNVue.hide('slide-out-right', 300)
-				setTimeout(() => {
-					uni.switchTab({
-						url: '/pages/gather/gather'
-					})
-				}, 400)
+			uni.$on('offSubnvue', () => {
+				this.subNvue.hide('slide-out-left')
+				uni.switchTab({
+					url: '/pages/user/index'
+				})
+			})
+			uni.$on('diverIndexSubEmit', () => {
+				this.subNvue.hide('slide-out-left')
+				uni.switchTab({
+					url: '/pages/gather/gather'
+				})
 			})
 			// #endif
 
@@ -627,21 +639,35 @@
 			that.pageLoad(options);
 			this.$store.dispatch('INIT_CONFIG');
 		},
-		created(options) {
-			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
-			let curRoute = routes[routes.length - 1].route //获取当前页面路由
-			this.activeRouter = '/' + curRoute
-		},
+
 		onShow() {
+			console.log(Boolean(this.$store.state.app.userInfo.service?.mer_id))
 			let that = this;
-			// console.log()
-			if (this.$store.state.app.userInfo.service?.mer_id) {
+			// #ifdef APP-PLUS
+			if (Boolean(uni.getStorageSync('is_new_user'))) {
+				this.subNvue = uni.getSubNVueById('newUser')
+				this.subNvue.show('slide-in-left', 300)
+			}
+			if (Boolean(this.$store.state.app.userInfo.service?.mer_id)) {
 				isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => {
+					console.log('resdata', res.data)
 					if (res.data == 'true') {
-						this.openDiver()
+						this.subNvue = uni.getSubNVueById('concatIndex')
+						this.subNvue.show('slide-in-left', 300)
+						// this.openDiver()
 					}
 				})
 			}
+
+			// #endif
+			// console.log()
+			// if (this.$store.state.app.userInfo.service?.mer_id) {
+			// 	isNewMer(this.$store.state.app.userInfo.uid, this.$store.state.app.userInfo.service?.mer_id).then(res => {
+			// 		if (res.data == 'true') {
+			// 			this.openDiver()
+			// 		}
+			// 	})
+			// }
 			// if (this.$store.state.app.userInfo) {
 			// console.log(this.$store.state.app.userInfo.service?.mer_id, 'sdsd')
 
@@ -702,7 +728,7 @@
 		methods: {
 			openDiver() {
 				this.subNVue.show('slide-in-left', 300)
-				uni.$emit('diverIndexEmit', this.userInfo);
+				// uni.$emit('diverIndexEmit', this.userInfo);
 			},
 			loadCoupon() {
 				if (!this.showCoupon && !uni.getStorageSync('show_coupon') && uni.getStorageSync('is_new_user')) {
diff --git a/pages/index/subnvue/newUser.nvue b/pages/index/subnvue/newUser.nvue
new file mode 100644
index 0000000..bc05f2f
--- /dev/null
+++ b/pages/index/subnvue/newUser.nvue
@@ -0,0 +1,165 @@
+<template>
+	<view class="">
+		<view class="jump" @click="jump">
+			<text class="font">跳过</text>
+		</view>
+		<view class="next-btn center" :style="{ left:screenWidth/2,top:(screenHeight-96)}">
+			<text class="next-btn-text font" style="line-height: 76rpx;" @click="next">下一步(1/2)</text>
+		</view>
+		<view class="target" :style="{left:screenWidth/4*3,top:screenHeight-68}">
+			<image src="/static/images/fabu.png" class="target-icon"></image>
+			<text class="target-text">我的</text>
+		</view>
+		<view :style="{left:screenWidth/4*3,top:screenHeight-130}">
+			<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;"></image>
+		</view>
+		<view class="tips-box" :style="{right:20,top:screenHeight-220}">
+			<view class="tips" style="position: absolute;padding-left: 20px;">
+				<view class="tras" :class="{act:isAct}">
+					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
+				</view>
+			</view>
+			<image src="/static/images/starpng.png" class="start" mode="">
+			</image>
+		</view>
+		<image src="/static/images/greenLine.png" class="greenLine"
+			:style="{left:screenWidth/4*3+15,top:screenHeight-120}" mode=""></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				screenHeight: 800,
+				screenWidth: 375,
+				isAct: false
+			}
+		},
+		methods: {
+			jump() {
+				uni.$emit('offSubnvue');
+				uni.setStorageSync("is_new_user", 0)
+			},
+			next() {
+				uni.$emit('offSubnvue');
+			}
+		},
+		onLoad() {
+			let that = this
+			const res = uni.getSystemInfo({
+				success: (res => {
+					this.screenHeight = res.screenHeight
+					this.screenWidth = res.screenWidth
+				})
+			});
+			setTimeout(() => {
+				that.isAct = true
+			})
+
+
+		}
+
+
+	}
+</script>
+
+<style>
+	.jump {
+		position: absolute;
+		right: 30rpx;
+		top: 80rpx;
+		border: 1px solid white;
+		padding: 10rpx 20rpx;
+		border-radius: 30rpx;
+	}
+
+	.font {
+		font-size: 28rpx;
+		color: white;
+		lines: 1;
+		text-align: center;
+	}
+
+	.center {
+		transform: translateX(-50%);
+	}
+
+	.next-btn {
+		position: absolute;
+		width: 240rpx;
+		height: 76rpx;
+		border: 1px solid white;
+		border-radius: 38rpx;
+	}
+
+	.target {
+		width: 136rpx;
+		height: 136rpx;
+		background-color: white;
+		border-radius: 136rpx;
+	}
+
+	.target-icon {
+		width: 50rpx;
+		height: 50rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, -50%);
+		top: 68rpx;
+	}
+
+	.target-text {
+		font-size: 20rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, 0);
+		top: 100rpx;
+	}
+
+	.pointer {
+		position: absolute;
+	}
+
+	.tips-box {
+		width: 462rpx;
+		height: 178rpx;
+		position: absolute;
+		padding-top: 72rpx;
+		position: absolute;
+	}
+
+	.start {
+		width: 72rpx;
+		height: 72rpx;
+		position: absolute;
+		right: 0;
+		top: 20px;
+	}
+
+	.tips {
+		width: 462rpx;
+		height: 106rpx;
+		background-color: #5BE157;
+		border-radius: 20rpx;
+
+	}
+
+	.tras {
+		width: 0px;
+		transition-property: width;
+		transition-duration: 3s;
+		transition-delay: 0.1s;
+		transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
+	}
+
+	.act {
+		width: 462rpx;
+	}
+
+	.greenLine {
+		width: 35px;
+		height: 60px;
+		position: absolute;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/store/applicationRecord/index.vue b/pages/store/applicationRecord/index.vue
index f3f47ea..c583286 100644
--- a/pages/store/applicationRecord/index.vue
+++ b/pages/store/applicationRecord/index.vue
@@ -1,7 +1,43 @@
 <template>
-	<view>
+	<view style="padding: 42rpx 50rpx;">
+
+		<view class="card" v-for="item in listData" :key="item.mer_intention_id">
+			<view class="" style="display: flex;align-items: center;">
+				<view class="ciecle"
+					style="width: 24rpx;height: 24rpx;border-radius: 24rpx;border: 1px solid #DDDDDD;margin-right: 30rpx;">
+				</view>
+				<view class="" style="color: #777777;font-size: 24rpx;">
+					{{item.create_time}}
+				</view>
+			</view>
+			<view class=""
+				style="padding:40rpx;margin: 30rpx 0; width: 606rpx;margin-left: 30rpx;border-radius: 16rpx;box-shadow: 0rpx 6rpx 12rpx 2rpx rgba(0,0,0,0.16);">
+
+				<view class="" v-if="item.status==1" style="color: #20B128;font-size: 32rpx;">
+					审核通过
+				</view>
+				<view class="" v-if="item.status==2" style="color: #FC452F;font-size: 32rpx;">
+					审核失败
+				</view>
+				<u-line style="margin: 28rpx 0;"></u-line>
+				<view class="" style="margin-bottom: 20rpx;">
+					{{item.mer_name}}
+				</view>
+				<view class="" v-if="item.status==1" style="font-size: 24rpx; color: #777777;">
+					可以登录我们的工作台，把您的商品推向市场了
+				</view>
+				<view class="" v-if='item.status==2' style="font-size: 24rpx; color: #777777;">
+					备注:{{item.fail_msg}}
+				</view>
+			</view>
+
+
+		</view>
+
+
+
 		<view class="application-record" v-if="listData.length">
-			<view class="card-list" v-for="item in listData" :key="item.mer_intention_id">
+			<!-- <view class="card-list" v-for="item in listData" :key="item.mer_intention_id">
 				<view class="card-top">
 					<view class="title">{{item.mer_name}}</view>
 					<view class="time">提交时间：{{item.create_time}}</view>
@@ -17,7 +53,7 @@
 					</view>
 					<view class="status-btn" @click="jump(item)">{{statusBtn(item.status)}}</view>
 				</view>
-			</view>
+			</view> -->
 		</view>
 		<view class='no-shop' v-if="!listData.length && !loading">
 			<view class='pictrue' style="margin: 0 auto;">
@@ -41,11 +77,13 @@
 	import {
 		getApplicationRecordList
 	} from '@/api/store.js'
-	import {HTTP_REQUEST_URL} from '@/config/app';
+	import {
+		HTTP_REQUEST_URL
+	} from '@/config/app';
 	export default {
 		data() {
 			return {
-				domain:HTTP_REQUEST_URL,
+				domain: HTTP_REQUEST_URL,
 				loading: false,
 				listData: [],
 				pageData: {
@@ -127,76 +165,24 @@
 		align-items: center;
 		background-color: #F5F5F5;
 		padding: 20rpx 30rpx;
-		.card-list {
-			width: 100%;
-			background-color: #fff;
-			padding: 20rpx 24rpx;
-			margin: 10rpx 20rpx;
-			border-radius: 12rpx;
-			.card-top {
-				height: 140rpx;
-				.title {
-					font-size: 28rpx;
-					font-weight: bold;
-					color: #333333;
-				}
-				.time {
-					color: #999999;
-					font-size: 24rpx;
-					padding: 5rpx 0;
-				}
-				.reason {
-					color: #E93323;
-					font-weight: bold;
-					font-size: 24rpx;
-				}
-			}
-			.line {
-				height: 2rpx;
-				margin: 20rpx 0 20rpx 0;
-				background-color: #EEEEEE;
-			}
-			.card-bottom {
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				color: #333;
-				.card-status {
-					display: flex;
-					align-items: center;
-					.status-icon {
-						width: 30rpx;
-						height: 30rpx;
-						margin: 10rpx;
-					}
-					.status-text {
-						font-size: 28rpx;
-						font-weight: 500;
-					}
-				}
-				.status-btn {
-					font-size: 26rpx;
-					color: #555;
-					border: 1px solid #999999;
-					padding: 8rpx 32rpx;
-					border-radius: 40rpx;
-				}
-			}
-		}
+
 	}
+
 	.no-shop {
 		width: 100%;
 		background-color: #fff;
 		height: 100vh;
+
 		.pictrue {
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			color: $uni-nothing-text;
+
 			image {
 				width: 414rpx;
 				height: 380rpx;
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index 4862f3e..9b91fda 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -1,5 +1,16 @@
-<!-- <template>
-	<view class="content">
+<template>
+	<view class="content" style="padding-top: var(--status-bar-height);">
+		<view style="height: 88rpx;">
+		</view>
+		<view class="bar" style="padding-top: var(--status-bar-height);">
+			<i class="iconfont icon-xiangzuo" style="color: black;"></i>
+			<view class="">
+				商户入住
+			</view>
+			<view class="" @click="jumpToList">
+				申请记录
+			</view>
+		</view>
 		<view class="heder-tips">
 			简单3步 享开店好礼 {{step}}
 		</view>
@@ -44,9 +55,9 @@
 					</view>
 					<u--input placeholder="店铺名称" :maxlength='20' style="height: 100rpx;" border="surround"
 						v-model="formData.mer_name">
-						<template slot="suffix">
-							{{formData.mer_name.length}}/20
-						</template>
+						<!-- <template slot="suffix">
+							{{12}}/20
+						</template> -->
 					</u--input>
 				</view>
 				<view class="card">
@@ -102,24 +113,34 @@
 					</view>
 					<view class="card-cont">
 						<view class="card-cont-li">
-							<view class="ellipsis">
-								详细地址 {{formData.address}}
+							<view class="ellipsis" style="display: flex;align-items: center;">
+								详细地址 <u--input style="margin-left: 40rpx;width: 500rpx;" border="none"
+									v-model="formData.address">
+								</u--input>
 							</view>
 						</view>
 						<u-line style="margin: 28rpx 0;"></u-line>
 						<view class="card-cont-li">
-							<view class="ellipsis">
-								公司名称 {{formData.company_name}}
+							<view class="ellipsis" style="display: flex;align-items: center;">
+								公司名称 <u--input style="margin-left: 40rpx;width: 500rpx;" border="none"
+									v-model="formData.company_name">
+								</u--input>
 							</view>
 						</view>
 						<u-line style="margin: 28rpx 0;"></u-line>
 						<view class="card-cont-li">
-							法人名称 {{formData.name}}
+							<view class="ellipsis" style="display: flex;align-items: center;">
+								法人名称 <u--input style="margin-left: 40rpx;width: 500rpx;" border="none"
+									v-model="formData.name">
+								</u--input>
+							</view>
 						</view>
 						<u-line style="margin: 28rpx 0;"></u-line>
 						<view class="card-cont-li">
-							<view class="ellipsis">
-								社会信用代码 {{formData.social_credit_code}}
+							<view class="ellipsis" style="display: flex;align-items: center;">
+								社会信用代码 <u--input style="margin-left: 40rpx;width: 500rpx;" border="none"
+									v-model="formData.social_credit_code">
+								</u--input>
 							</view>
 						</view>
 					</view>
@@ -151,7 +172,7 @@
 						<u-line style="margin: 28rpx 0;"></u-line>
 						<view class="card-cont-li">
 							<view class="" style="flex: 4;display: flex;align-items: center;">
-								验证码 <u--input style="padding-left: 40rpx;" border="none" v-model="formData.code">
+								验证码 <u--input style="margin-left: 40rpx;" border="none" v-model="formData.code">
 								</u--input>
 							</view>
 							<view class="" style="flex: 1;">
@@ -176,15 +197,25 @@
 					<view class="" style="display: flex;justify-content: space-between;font-size: 32rpx;">
 						<text>{{formData.mer_name}}</text>
 						<text style="font-family: PFR;" v-if='formData.status==0'>等待审核</text>
-						<text style="font-family: PFR;" v-if='formData.status==1'>审核通过</text>
-						<text style="font-family: PFR;" v-if='formData.status==2'>审核失败</text>
-					</view>
-					<view v-if='formData.status==2' style="color: #777;font-size: 24rpx;margin-top: 28rpx;">
-						原因：{{formData.create_time}}
+						<text style="font-family: PFR;color: #20B128;" v-if='formData.status==1'>审核通过</text>
+						<text style="font-family: PFR;color: #FC452F;" v-if='formData.status==2'>审核失败</text>
 					</view>
 					<view class="" style="color: #777;font-size: 24rpx;margin-top: 28rpx;">
 						提交时间：{{formData.create_time}}
 					</view>
+					<u-line color="#ECECEC" style="margin: 36rpx 0;"></u-line>
+					<view v-if='formData.status==2' class=""
+						style="color: #777;font-size: 24rpx;margin-top: 28rpx;margin-bottom: 36rpx;">
+						备注：阿斯顿撒
+					</view>
+					<u-button v-if='formData.status==2' @click="step=1" style="color: #FC452F;" color="#F8E9E7"
+						shape="circle" type='error' text="重新申请"></u-button>
+					<view v-if='formData.status==1' class=""
+						style="color: #777;font-size: 24rpx;margin-top: 28rpx;margin-bottom: 36rpx;">
+						可以登录我们的工作台，把您的商品推向市场了
+					</view>
+					<u-button v-if='formData.status==1' @click="openApplet" color="#3ABD40" shape="circle"
+						text="立即发布产品"></u-button>
 				</view>
 			</view>
 		</u-transition>
@@ -195,7 +226,7 @@
 			</u-checkbox-group>
 			<text style="color: #35BD3E;" @click="getConfig">《入驻协议》</text>
 		</view>
-		<view class="submit-btn">
+		<view class="submit-btn" v-if='step!=3'>
 			<u-button text="添加店铺" @click="submit" shape='circle'
 				color=" linear-gradient( 132deg, #38BE41 0%, #20B128 100%)"></u-button>
 		</view>
@@ -228,6 +259,7 @@
 </template>
 
 <script>
+	import uniMP from '@/utils/uniMP.js';
 	import {
 		configMap
 	} from "@/utils";
@@ -251,11 +283,17 @@
 		components: {
 			Verify
 		},
+		// computed: {
+		// 	stroeLength() {
+		// 		return 12
+		// 	}
+		// },
 		data() {
 			return {
 				tagStyle: {
 					img: 'width:100%;display:block;'
 				},
+				stroeLength: 0,
 				disabled: false,
 				checkboxValue1: ['1'],
 				protocol: this.sys_intention_agree,
@@ -305,10 +343,16 @@
 				}
 			}
 		},
+
 		computed: configMap({
-			sys_intention_agree: ''
-		}, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
+				sys_intention_agree: ''
+			},
+			mapGetters(['isLogin', 'viewColor', 'keyColor'])),
 		methods: {
+			openApplet() {
+				// uniMP.loadAppletMP(data)
+
+			},
 			splitAddress(str) {
 				var reg = /.+?(省|市|自治区|自治州|县|区|镇|社区|街道|街|村)/g; // 省市区的正则
 				let list = str.match(reg)
@@ -339,7 +383,14 @@
 				// 获取配置
 				this.protocol = this.sys_intention_agree;
 			},
-
+			generateRandomNumbers(count, min, max) {
+				const randomNumbers = [];
+				for (let i = 0; i < count; i++) {
+					const number = Math.floor(Math.random() * (max - min + 1) + min);
+					randomNumbers.push(number);
+				}
+				return randomNumbers;
+			},
 			// 选择图片
 			handleChooseImage(type = 0) {
 				let that = this;
@@ -366,7 +417,7 @@
 						that.formData.address = res.data.address;
 						that.formData.name = res.data.legal_person;
 						// that.formData.social_credit_code = res.data.register_number;
-						that.formData.social_credit_code = '454as5455457sdfdf';
+						that.formData.social_credit_code = this.generateRandomNumbers(1, 10000, 99999)[0];
 						that.formData.company_name = res.data.name;
 						console.log(that.splitAddress(res.data.address))
 					} else {
@@ -436,7 +487,12 @@
 					console.log(err, 'err')
 					Toast(err)
 				})
-			}
+			},
+			jumpToList() {
+				uni.navigateTo({
+					url: "/pages/store/applicationRecord/index"
+				})
+			},
 		},
 		onLoad() {
 			this.formData.phone = this.$store.state.app.userInfo.account
@@ -452,9 +508,9 @@
 				this.formData = res.data
 				this.step = this.formData.step
 				this.formData.phone = this.$store.state.app.userInfo.account
-				if (this.formData.step == 3) {
-					getGoodsDetails(this.$store.state.app.userInfo.uid)
-				}
+				// if (this.formData.step == 3) {
+				// 	getGoodsDetails(this.$store.state.app.userInfo.uid)
+				// }
 
 			})
 		}
@@ -667,1835 +723,21 @@
 		color: #fff;
 		border-color: #bbb;
 	}
-</style> -->
-<template>
-	<view class="page" :style="{'height':successful?'100vh':''}">
-		<!-- #ifdef MP || APP-PLUS -->
-		<view class="conten-top" :style="'height:'+statusBarHeight+'px'" :class="{'bar-top-bg':barBg}"
-			v-if="!successful">
-			<view class="" style="position: absolute;left: 30rpx;bottom: 15rpx;" @click="logout"><i
-					class="iconfont icon-xiangzuo" style="font-size: 40rpx;text-align: left;color:#fff;"></i></view>
-			<view class=""
-				style="position: absolute;bottom: 15rpx;width: 500rpx; left:50%;transform: translate(-50%);text-align: center;color:#fff;font-size: 32rpx;font-weight: bold;">
-				商家入驻
-			</view>
-		</view>
-		<!-- #endif -->
 
-		<!-- #ifdef H5 -->
-		<view class="header" v-if="!successful">
-			<view class="title-bar" :class="{'bar-top-bg':barBg}">
-				<view class="title-bar-icon" @click="logout">
-					<i class="iconfont icon-xiangzuo"></i>
-				</view>
-				<view class="title-bar-txt">
-					商家入驻
-				</view>
-			</view>
-		</view>
-		<!-- #endif -->
-
-		<view v-if="!successful" :style="viewColor">
-			<form report-submit='true'>
-				<view class='merchantsSettled'>
-					<view class="merchantBgCount">
-						<image mode="widthFix" class="merchantBg"
-							src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/7d0f8202403160938542943.webp" alt="">
-					</view>
-					<view class="application-record" @click="jumpToList" v-if="!mer_i_id">
-						申请记录
-						<text class="iconfont icon-xiangyou"></text>
-					</view>
-					<view class='list'>
-						<view class="list-title">商家入驻</view>
-						<view class="item">
-							<view class="acea-row row-middle">
-								<text class="item-name">商户名称</text>
-								<input type="text" maxlength="30" placeholder="请输入商户名称"
-									v-model="merchantData.enterprise_name" @input="validateBtn"
-									placeholder-class='placeholder' />
-							</view>
-						</view>
-
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name">商户分类</text>
-										<picker @change="bindPickerChange" @columnchange="columnchange" mode="selector"
-											:value="index" :range="array" range-key="category_name">
-											<input placeholder="请选择商户分类" type="text" readonly disabled
-												v-model="mer_classification">
-											<view class='iconfont icon-jiantou'></view>
-										</picker>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name">店铺类型</text>
-										<text class="iconfont wenhao" @click="getAgreement">?</text>
-										<picker @change="bindPickerChange1" :value="index1" :range="storeTypeArr"
-											range-key="type_name">
-											<input placeholder="请选择店铺类型" type="text" disabled readonly
-												v-model="mer_storeType">
-											<view v-if="mer_storeType" @tap.stop="mer_storeType=''"
-												class="iconfont icon-guanbi2"></view>
-											<view class='iconfont icon-jiantou'></view>
-										</picker>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name businessBox">店铺所在地</text>
-										<picker mode=multiSelector @change="bindPickerChange2" :value="index2"
-											:range="business" range-key="name" @columnchange="pickerColumnchange">
-											<view class="businessBox"
-												:style="{'color':(business_name == '' || business_name.length == 5)?'#B2B2B2':''}"
-												style="width: 400rpx;word-break: keep-all;line-height: 40rpx;font-size: 30rpx;">
-												{{(business_name == '' || business_name.length == 5)?'请选择商圈':business_name}}
-											</view>
-											<view class='iconfont icon-jiantou'></view>
-										</picker>
-									</view>
-								</view>
-							</view>
-						</view>
-
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name">公司性质</text>
-										<picker @change="natureBusinessChange" mode="selector" :value="index"
-											:range="companyTypeList">
-											<input placeholder="请选择公司性质" type="text" readonly disabled
-												:value="nature_business==''?'':nature_business==1?'对公户':'个体户'">
-											<view class='iconfont icon-jiantou'></view>
-										</picker>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item no-border">
-							<view class='acea-row row-middle'>
-								<text class="item-title" style="margin-right: 20rpx;">请上传营业执照</text>
-								<text class="item-desc">(图片格式支持JPG、PNG、JPEG)</text>
-								<view class="upload">
-									<view v-if="business_license" class='pictrue' @click='uploadpicText'>
-										<image :src='business_license'></image>
-									</view>
-									<view v-else class='pictrue acea-row row-center-wrapper row-column'
-										@click='uploadpicText'>
-										<text class='iconfont icon-icon25201'></text>
-										<view>上传图片</view>
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name businessBox">详细地址</text>
-										<input type="text" maxlength="30" placeholder="自动识别"
-											v-model="merchantData.address" @input="validateBtn"
-											placeholder-class='placeholder' />
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name businessBox">公司名称</text>
-										<input type="text" maxlength="30" placeholder="自动识别"
-											v-model="merchantData.company_name" @input="validateBtn"
-											placeholder-class='placeholder' />
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item">
-							<view class="acea-row row-middle">
-								<text class="item-name">法人名称</text>
-								<input type="text" placeholder="自动识别" v-model="merchantData.user_name"
-									@input="validateBtn" placeholder-class='placeholder' />
-							</view>
-						</view>
-						<view class="item">
-							<view class="uni-list">
-								<view class="uni-list-cell">
-									<view class="uni-list-cell-db acea-row row-middle">
-										<text class="item-name businessBox">社会信用代码</text>
-										<input type="text" maxlength="30" placeholder="自动识别"
-											v-model="merchantData.social_credit_code" @input="validateBtn"
-											placeholder-class='placeholder' />
-									</view>
-								</view>
-							</view>
-						</view>
-						<view class="item no-border">
-							<view class='acea-row row-middle'>
-								<text class="item-title">请上传行业相关其他资质证明图片</text>
-								<text class="item-desc">(图片最多可上传10张,图片格式支持JPG、PNG、JPEG)</text>
-								<view class="upload">
-									<view class='pictrue' v-for="(item,index) in pics" :key="index" :data-index="index"
-										@click="getPhotoClickIdx">
-										<image :src='item'></image>
-										<text class='iconfont icon-guanbi1' @click.stop='DelPic(index)'></text>
-									</view>
-									<view class='pictrue acea-row row-center-wrapper row-column' @click='uploadpic'
-										v-if="pics.length < 10">
-										<text class='iconfont icon-icon25201'></text>
-										<view>上传图片</view>
-									</view>
-								</view>
-							</view>
-						</view>
-
-						<view class="item">
-							<view class="acea-row row-middle">
-								<text class="item-name">联系电话</text>
-								<input type="text" placeholder="请输入手机号" v-model="merchantData.phone"
-									@input="validateBtn" placeholder-class='placeholder' />
-							</view>
-						</view>
-						<view class="item rel">
-							<view class="acea-row row-middle">
-								<text class="item-name">验证码</text>
-								<input type="number" maxlength="4" placeholder="填写验证码" v-model="merchantData.yanzhengma"
-									@input="validateBtn" class="codeIput" placeholder-class='placeholder' />
-								<button class="code" :disabled="disabled" :class="disabled === true ? 'on' : ''"
-									@click="handleVerify">
-									{{ text }}
-								</button>
-							</view>
-						</view>
-						<view class="item" v-if="isShowCode">
-							<view class="acea-row row-middle">
-								<text class="item-name">验证码</text>
-								<input type="number" maxlength="4" placeholder="请输入验证码" class="codeIput"
-									v-model="codeVal" @input="validateBtn" placeholder-class='placeholder' />
-								<view class="imageCode" @click="again">
-									<image :src="codeUrl" />
-								</view>
-							</view>
-						</view>
-
-						<view class="item no-border">
-							<checkbox-group @change='ChangeIsAgree'>
-								<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意
-							</checkbox-group>
-							<button class="settleAgree" @click="getConfig">《入驻协议》</button>
-						</view>
-
-						<button class='submitBtn' :class="validate === true? 'on':''" @click="formSubmit">
-							提交申请
-						</button>
-					</view>
-				</view>
-			</form>
-			<view class="settlementAgreement" v-if="showProtocol">
-				<view class="setAgCount" style="width: 656rpx;height: 458px;">
-					<view class="close" @click="showProtocol = false">
-						<u-icon name="close-circle-fill" color="#B4B1B4" size="24"></u-icon>
-					</view>
-					<div class="title">{{isType ? '店铺类型说明' : '商户入驻协议'}}</div>
-					<view class="content">
-						<jyf-parser :html="protocol" ref="article" :tag-style="tagStyle"></jyf-parser>
-					</view>
-				</view>
-			</view>
-			<view class="settlementAgreement" v-if="isshow">
-				<view class="setAgCount" style="width: 100%;height: 100%;padding-top: 180rpx;">
-					<view class="" style="width: 60rpx;height: 60rpx; position: absolute;left: 30rpx; top:90rpx"
-						@click="recuo">
-						<i class="iconfont icon-xiangzuo" style="width: 60rpx;height: 60rpx;font-size: 40rpx;"></i>
-					</view>
-
-					<div class="title">{{detail.title}}</div>
-					<!-- <view style="margin: 20rpx 0;">甲方公司:{{company?company:"暂无公司信息"}}</view>
-					<view style="margin: 20rpx 0;">机构代码:{{organization_code?organization_code:"暂无公司信息"}}</view> -->
-
-					<view class="contenta" v-if="detail.mer_services_agree">
-						<jyf-parser :html="detail.mer_services_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
-
-					</view>
-					<view class="contenta" v-else>
-						<jyf-parser :html="detail.mer_supply_agree" ref="article" :tag-style="tagStyle"></jyf-parser>
-					</view>
-
-					<view class="setAgCountbtn">
-						<view class="border"></view>
-						<button :class="num>0?'setAgCountbtnb':'setAgCountbtnc'" class="btn" :disabled="num!=0"
-							@click="agree">
-							<text v-if="num>0">请仔细阅读协议 {{num}}秒后可提交</text>
-							<text v-else>同意本协议</text>
-						</button>
-					</view>
-				</view>
-			</view>
-			<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
-				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>
-			</view>
-			<authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse">
-			</authorize>
-			<Verify @success="success" :captchaType="'blockPuzzle'" :imgSize="{ width: '330px', height: '155px' }"
-				ref="verify">
-			</Verify>
-		</view>
-		<view class="settledSuccessMain " v-else :style="viewColor">
-			<view class="settledSuccessful">
-				<image class="image" src="../static/images/settledSuccessful.svg" alt="">
-					<view class="title">恭喜，您的资料提交成功！</view>
-					<view class="info">预计15个工作日内审核完毕，平台客服会及时与您联系！</view>
-					<view class="goHome" hover-class="none" @click="goHome">
-						返回首页
-					</view>
-			</view>
-		</view>
-	</view>
-</template>
-<script>
-	// +----------------------------------------------------------------------
-	// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
-	// +----------------------------------------------------------------------
-	// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
-	// +----------------------------------------------------------------------
-	// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
-	// +----------------------------------------------------------------------
-	// | Author: CRMEB Team <admin@crmeb.com>
-	// +----------------------------------------------------------------------
-	import {
-		create,
-		verify,
-		merClassifly,
-		getCategoryList,
-		getGoodsDetails,
-		updateGoodsRecord,
-		getStoreTypeApi,
-		agreeiness,
-		merchantLicenseIdentify
-	} from '@/api/store.js';
-	import {
-		getCaptcha,
-		getAgreementApi,
-	} from "@/api/user";
-	import {
-		getStreet,
-		getArea,
-		getVillage,
-		getCitys
-	} from "@/api/article.js"
-	import {
-		mapGetters
-	} from "vuex";
-	import {
-		configMap
-	} from "@/utils";
-	import {
-		intention,
-	} from "@/api/product"
-	import parser from "@/components/jyf-parser/jyf-parser";
-	import authorize from '@/components/Authorize';
-	import Verify from '@/components/verify/verify.vue';
-	import {
-		HTTP_REQUEST_URL
-	} from '@/config/app';
-	import {
-		Toast
-	} from '../../../libs/uniApi';
-	const app = getApp();
-	export default {
-		components: {
-			"jyf-parser": parser,
-			authorize,
-			Verify
-		},
-		data() {
-			return {
-				company: '',
-				organization_code: '',
-				domain: HTTP_REQUEST_URL,
-				cartId: '', //购物车id
-				pinkId: 0, //拼团id
-				couponId: 0, //优惠券id
-				isAuto: false, //没有授权的不会自动授权
-				isShowAuth: false, //是否隐藏授权
-				text: "获取验证码",
-				codeUrl: "",
-				disabled: false,
-				isAgree: false,
-				showProtocol: false,
-				isShowCode: false,
-				loading: false,
-				isshow: false,
-				merchantData: {
-					enterprise_name: "",
-					user_name: "",
-					phone: "",
-					classification: '',
-					social_credit_code: '',
-					company_name: '',
-					address: '',
-					invitation_code: '',
-				},
-				business_license: '', //营业执照
-				bank_front: '', //银行卡照片
-				validate: false,
-				successful: false,
-				keyCode: "",
-				codeVal: "",
-				protocol: this.sys_intention_agree,
-				timer: "",
-				index: 0,
-				index1: 0,
-				index2: [0, 0, 0],
-				mer_classification: "",
-				nature_business: 0,
-				array: [{
-					category_name: '',
-					merchant_category_id: ''
-				}],
-				companyTypeList: ['对公户', '个体户'],
-				bindPickerChangeidx: [],
-				storeTypeArr: [{
-					type_name: '',
-					mer_type_id: ''
-				}],
-				StreetTyoeArr: [{
-					city_id: '',
-					area_id: '',
-					street_id: '',
-					village_id: ''
-				}],
-				mer_storeType: '',
-				city_id: '',
-				area_id: '',
-				street_id: '',
-				village_id: '',
-				isnm: false,
-				isnum: 0,
-				code1: '',
-				code2: '',
-				business_name: '',
-				business: [],
-				pics: [],
-				tagStyle: {
-					img: 'width:100%;display:block;'
-				},
-				mer_i_id: null, // 商户申请id
-				isType: false,
-				num: 10,
-				detail: {},
-				statusBarHeight: 0,
-				where: {
-					type: 1,
-					page: 1,
-					limit: 10
-				},
-				codenote: [],
-				barBg: false, //导航栏背景
-			};
-		},
-		beforeDestroy() {
-			clearTimeout(this.timer)
-		},
-		computed: configMap({
-			sys_intention_agree: ''
-		}, mapGetters(['isLogin', 'viewColor', 'keyColor'])),
-
-		onPageScroll(e) {
-			if (e.scrollTop > 50) {
-				this.barBg = true;
-			} else {
-				this.barBg = false;
-			}
-		},
-		onLoad(options) {
-			if (this.isLogin) {
-				this.getClassfication();
-				this.getStoreType();
-			} else {
-				this.isAuto = true;
-				this.isShowAuth = true
-			}
-			if (options.mer_i_id) {
-				this.mer_i_id = options.mer_i_id
-				uni.showLoading({
-					title: '获取数据中',
-				});
-				this.$nextTick(function() {
-					this.getGoodsDetails(options.mer_i_id)
-				})
-			} else this.getCity();
-			this.shoplist('mer_services_agree');
-			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 45;
-		},
-
-		methods: {
-			//获取交易信息
-			codelist() {
-				intention(this.where).then(res => {
-					this.codenote = res.data.list
-				})
-			},
-
-			//退出
-			logout() {
-				uni.switchTab({
-					url: '/pages/user/index'
-				})
-			},
-
-			//关闭弹窗
-			recuo() {
-				if (this.num > 0) {
-					this.num = 10
-					this.isshow = false
-				} else {
-					this.num = 10
-					this.isshow = false
-				}
-			},
-
-			countDown() {
-				let {
-					num
-				} = this;
-				num = num > 0 ? num - 1 : "0";
-				setTimeout(() => {
-					this.num = num;
-					if (num == '0') {
-						return
-					}
-					if (this.isshow == false && this.num > 0) {
-						this.num = 10
-						return
-					}
-					this.countDown();
-				}, 1000);
-			},
-
-			//获取商户入驻申请协议
-			shoplist(val) {
-				agreeiness({
-					type: val
-				}).then(res => {
-					this.detail = res.data
-				})
-			},
-
-			// 获取村
-			getVillage(street = null) {
-				const self = this;
-				getVillage({
-					street_code: street
-				}).then(res => {
-					self.$set(self.business, 3, res.data);
-					if (self.mer_i_id && !this.business_name) {
-						let city = self.business[0].find(item => item.code == self.city_id)?.name;
-						const zero = self.business[0].findIndex(item => item.code == self.city_id);
-						this.index2[0] = zero;
-
-						let area = self.business[1].find(item => item.code == self.area_id)?.name;
-						const one = self.business[0].findIndex(item => item.code == self.area_id);
-						this.index2[1] = one;
-
-
-						let street = self.business[2].find(item => item.code == self.street_id)?.name;
-						const two = self.business[0].findIndex(item => item.code == self.street_id);
-						this.index2[2] = two;
-
-						let village = self.business[3].find(item => item.id == self.village_id)?.name;
-						const three = self.business[0].findIndex(item => item.code == self.village_id);
-						this.index2[3] = three;
-
-						this.business_name = `${city} ${area} ${street} ${village}`;
-					}
-				})
-			},
-
-			//获取镇
-			getStreet(area = null, street = null) {
-				const self = this;
-				getStreet({
-					area_code: area
-				}).then(res => {
-					this.business[2] = res.data;
-					street = street == null ? self.business[2][0].code : street;
-					self.getVillage(street)
-				})
-			},
-
-			//获取区
-			getArea(city = null, area = null, street = null) {
-				getArea({
-					city_code: city
-				}).then(res => {
-					this.business[1] = res.data;
-					area = area == null ? this.business[1][0].code : area;
-					this.getStreet(area, street)
-				})
-			},
-
-			// 获取市
-			getCity(city = null, area = null, street = null) {
-				getCitys().then(res => {
-					this.business[0] = res.data;
-					const code = this.business[0][0].code; //市 初始化
-					city = city == null ? code : city;
-
-					this.getArea(city, area, street);
-				})
-			},
-
-			//商圈数据变化
-			pickerColumnchange(e) {
-				if (e.detail.column === 0) { //第0列
-					this.getArea(this.business[0][e.detail.value].code);
-					this.index2[0] = e.detail.value
-					this.index2[1] = 0
-					this.index2[2] = 0
-					this.index2[3] = 0
-				} else if (e.detail.column === 1) {
-					this.getStreet(this.business[1][e.detail.value].code)
-					this.index2[1] = e.detail.value
-					this.index2[2] = 0
-					this.index2[3] = 0
-				} else if (e.detail.column === 2) {
-					this.getVillage(this.business[2][e.detail.value].code)
-					this.index2[2] = e.detail.value
-					this.index2[3] = 0
-				} else if (e.detail.column == 3) {
-					this.index2[3] = e.detail.value
-				}
-			},
-
-			getConfig() {
-				this.isType = false;
-				this.showProtocol = true;
-				// 获取配置
-				this.protocol = this.sys_intention_agree;
-			},
-
-			/*获取发票说明*/
-			getAgreement() {
-				let that = this
-				that.showProtocol = true;
-				that.isType = true
-				getAgreementApi('sys_merchant_type').then(res => {
-					that.protocol = res.data.sys_merchant_type
-				})
-			},
-
-			// 获取历史提交数据详情
-			getGoodsDetails(id) {
-				getGoodsDetails(id).then(res => {
-					let resData = res.data
-					this.merchantData.enterprise_name = resData.mer_name
-					this.merchantData.user_name = resData.name
-					this.merchantData.phone = resData.phone
-					this.merchantData.social_credit_code = resData.social_credit_code
-					this.merchantData.company_name = resData.company_name
-					this.merchantData.address = resData.address
-					this.merchantData.invitation_code = resData.invitation_code
-					this.merchantData.classification = resData.merchant_category_id
-					this.merchantData.mer_type = resData.mer_type_id
-					this.city_id = resData.city_id;
-					this.area_id = resData.area_id
-					this.street_id = resData.street_id
-					this.village_id = resData.village_id;
-
-					// const bankInfo = resData.financial_bank ? JSON.parse(resData.financial_bank) : '';
-					// this.$set(this.merchantData, 'bank_code', bankInfo.bank_code);
-					// this.$set(this.merchantData, 'bank_username', bankInfo.bank);
-					// this.$set(this.merchantData, 'bank_opening', bankInfo.bank_branch);
-					// this.$set(this.merchantData, 'bank_card_username', bankInfo.name);
-					// this.bank_front = bankInfo.bank_front[0] ? bankInfo.bank_front[0] : '';
-
-					this.nature_business = resData.is_company == 1 ? 1 : 2;
-
-					this.business_license = resData.images[0];
-					resData.images.shift();
-					this.pics = resData.images;
-					this.mer_classification = this.getCategoryName(resData.merchant_category_id, this.array)
-					this.mer_storeType = this.getStoreTypeName(resData.mer_type_id, this.storeTypeArr)
-					this.business_name = '';
-
-					this.getCity(this.city_id, this.area_id, this.street_id);
-					if (resData.mer_type_id != 12) {
-						this.shoplist('mer_services_agree')
-					} else {
-						this.shoplist('mer_supply_agree')
-					}
-					uni.hideLoading();
-				})
-			},
-
-			//获取商户分类名称
-			getCategoryName(id, arr) {
-				for (let i = 0; i < arr.length; i++) {
-					if (arr[i].merchant_category_id === id) {
-						return arr[i]['category_name']
-					}
-				}
-			},
-
-			//获取店铺类型名称
-			getStoreTypeName(id, arr) {
-				for (let i = 0; i < arr.length; i++) {
-					if (arr[i].mer_type_id === id) {
-						return arr[i]['type_name']
-					}
-				}
-			},
-
-			// 选择公司性质
-			natureBusinessChange(e) {
-				this.nature_business = this.companyTypeList[e.detail.value] == '个体户' ? 2 : 1;
-			},
-
-			bindPickerChange: function(e) {
-				let idx = e.target.value;
-				this.merchantData.classification = this.array[idx]['merchant_category_id']
-				this.mer_classification = this.array[idx]['category_name']
-				this.validateBtn()
-			},
-
-			columnchange(e) {
-				if (e.detail.column == 0) {
-					this.bindPickerChangeidx = this.array[e.detail.value].children;
-				}
-			},
-
-			bindPickerChange1: function(e) {
-				this.index1 = e.target.value
-				let idx = e.target.value
-				this.merchantData.mer_type = this.storeTypeArr[idx]['mer_type_id']
-				this.mer_storeType = this.storeTypeArr[idx]['type_name']
-				this.shoplist('mer_services_agree')
-				// if (this.storeTypeArr[idx]['type_code'] == 'TypeStore' && this.merchantData.mer_type) {
-				// 	this.shoplist('mer_services_agree')
-				// } else {
-				// 	this.shoplist('mer_supply_agree')
-				// }
-				this.validateBtn()
-			},
-
-			bindPickerChange2: function(e) {
-				this.index2 = e.detail.value
-				this.business_name =
-					`${this.business[0][this.index2[0]].name} ${this.business[1][this.index2[1]].name} ${this.business[2][this.index2[2]].name} ${this.business[3][this.index2[3]].name}`
-				this.city_id = this.business[0][this.index2[0]].code;
-				this.area_id = this.business[1][this.index2[1]].code;
-				this.street_id = this.business[2][this.index2[2]].code
-				this.village_id = this.business[3][this.index2[3]].id
-			},
-
-			// 获取商户分类
-			getClassfication: function() {
-				merClassifly().then(res => {
-					this.array = res.data
-				}).catch(res => {
-					this.$util.Tips({
-						title: res
-					});
-				});
-			},
-
-			// 获取店铺类型
-			getStoreType: function() {
-				getStoreTypeApi().then(res => {
-					this.storeTypeArr = res.data
-					// 初始化默认
-					this.merchantData.mer_type = this.storeTypeArr[0].mer_type_id;
-					this.mer_storeType = this.storeTypeArr[0].type_name;
-				}).catch(res => {
-					this.$util.Tips({
-						title: res
-					});
-				});
-			},
-			// 图片预览
-			// 获得相册 idx
-			getPhotoClickIdx(e) {
-				let _this = this;
-				let idx = e.currentTarget.dataset.index;
-				_this.imgPreview(_this.pics, idx);
-			},
-			// 图片预览
-			imgPreview: function(list, idx) {
-				// list：图片 url 数组
-				if (list && list.length > 0) {
-					uni.previewImage({
-						current: list[idx], //  传 Number H5端出现不兼容
-						urls: list
-					});
-				}
-			},
-			// 授权回调
-			onLoadFun: function() {
-				this.isShowAuth = false;
-			},
-			// 授权关闭
-			authColse: function(e) {
-				this.isShowAuth = e
-			},
-			toggleTab(str) {
-				this.$refs[str].show();
-			},
-			// 首页
-			goHome() {
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-			},
-			again() {
-				this.getcaptcha()
-			},
-
-			// 上传文件
-			uploadpic: function() {
-				let that = this;
-				that.$util.uploadImageOne('upload/image', function(res) {
-					that.pics.push(res.data.path);
-					that.$set(that, 'pics', that.pics);
-				});
-			},
-
-			uploadpicBack: function() {
-				let that = this;
-				that.$util.uploadImageOne('upload/image', function(res) {
-					that.bank_front = res.data.path;
-				});
-			},
-
-			// 上传图片识别文字
-			uploadpicText: function() {
-				let that = this;
-				that.$util.uploadImageOne('upload/image', function(res) {
-					that.business_license = res.data.path;
-					uni.showLoading({
-						title: '识别中'
-					})
-					merchantLicenseIdentify({
-						image: res.data.path
-					}).then(res => {
-						uni.hideLoading();
-						if (res.status == 200) {
-							that.merchantData.address = res.data.address;
-							that.merchantData.user_name = res.data.legal_person;
-							that.merchantData.social_credit_code = res.data.register_number;
-							that.merchantData.company_name = res.data.name;
-							// that.$set('merchantData', that.merchantData);
-						} else {
-							that.$util.Tips({
-								title: "识别失败!"
-							})
-						}
-					}).catch((e) => {
-						uni.hideLoading();
-						that.$util.Tips({
-							title: "识别失败"
-						})
-					})
-				});
-			},
-
-			// 删除图片
-			DelPic: function(index) {
-				let that = this,
-					pic = this.pics[index];
-				that.pics.splice(index, 1);
-				that.$set(that, 'pics', that.pics);
-			},
-
-			getCode() {
-				let that = this
-				getCodeApi().then(res => {
-					that.keyCode = res.data.key;
-				}).catch(res => {
-					that.$util.Tips({
-						title: res
-					});
-				});
-			},
-
-			async code(data) {
-				let that = this;
-				if (!that.merchantData.phone) return that.$util.Tips({
-					title: '请填写手机号码'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(that.merchantData.phone)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				await verify({
-					phone: that.merchantData.phone,
-					// key: that.codeKey,
-					// code: that.codeVal,
-					type: 'intention',
-					captchaType: 'blockPuzzle',
-					captchaVerification: data.captchaVerification
-				}).then(res => {
-					that.$util.Tips({
-						title: res.msg
-					});
-					that.sendCode();
-				}).catch(res => {
-					that.$util.Tips({
-						title: res
-					});
-				});
-			},
-
-			getcaptcha() {
-				let that = this
-				getCaptcha().then(data => {
-					that.codeUrl = data.data.captcha; //图片路径
-					that.codeVal = data.data.code; //图片验证码
-					that.codeKey = data.data.key //图片验证码key
-				})
-				that.isShowCode = true;
-			},
-
-			sendCode() {
-				if (this.disabled) return;
-				this.disabled = true;
-				let n = 60;
-				this.text = "剩余 " + n + "s";
-				const run = setInterval(() => {
-					n = n - 1;
-					if (n < 0) {
-						clearInterval(run);
-					}
-					this.text = "剩余 " + n + "s";
-					if (this.text < "剩余 " + 0 + "s") {
-						this.disabled = false;
-						this.text = "重新获取";
-					}
-				}, 1000);
-			},
-
-			onConfirm(val) {
-				this.region = val.checkArr[0] + '-' + val.checkArr[1] + '-' + val.checkArr[2];
-			},
-
-			ChangeIsAgree: function(e) {
-				this.isAgree = !this.isAgree;
-				this.validateBtn();
-			},
-
-			//提交
-			agree() {
-				let that = this;
-				let requestData = {
-					phone: that.merchantData.phone,
-					mer_name: that.merchantData.enterprise_name,
-					name: that.merchantData.user_name,
-					code: that.merchantData.yanzhengma,
-					company_name: that.merchantData.company_name,
-					address: that.merchantData.address,
-					invitation_code: that.merchantData.invitation_code,
-					social_credit_code: that.merchantData.social_credit_code,
-					merchant_category_id: that.merchantData.classification,
-					merchant_category_name: that.mer_classification,
-					is_company: that.nature_business == 1 ? 1 : 0, // 是否是公司, 1是公司, 0是个体
-					mer_type_id: that.merchantData.mer_type,
-					mer_storeType: this.mer_storeType,
-					city_id: this.city_id,
-					area_id: this.area_id,
-					street_id: this.street_id,
-					village_id: this.village_id,
-					is_nmsc: this.isnum,
-					images: [this.business_license, ...that.pics],
-					// financial_bank: {
-					// 	// 开户信息
-					// 	bank_code: this.merchantData.bank_code,
-					// 	bank: this.merchantData.bank_username,
-					// 	bank_branch: this.merchantData.bank_opening,
-					// 	name: this.nature_business == 1 ? that.merchantData.company_name : this.merchantData
-					// 		.bank_card_username,
-					// 	bank_front: [this.bank_front]
-					// }
-				}
-
-				that.validate = false;
-				if (that.mer_i_id) {
-					updateGoodsRecord(that.mer_i_id, requestData).then(res => {
-						if (res.status == 200) {
-							title: '提交成功',
-							that.loading = true;
-							that.timer = setTimeout(() => {
-								that.successful = true;
-								that.validate = true;
-							}, 1000)
-						}
-					}).catch(res => {
-						this.isshow = false
-						that.validate = true;
-						that.$util.Tips({
-							title: res
-						});
-					})
-				} else {
-					create(requestData).then(data => {
-						if (data.status == 200) {
-							title: '提交成功',
-							that.loading = true;
-							this.timer = setTimeout(() => {
-								that.successful = true;
-								that.validate = true;
-							}, 1000)
-						}
-					}).catch(res => {
-						this.isshow = false
-						that.validate = true;
-						that.$util.Tips({
-							title: res
-						});
-					})
-				}
-			},
-			formSubmit() {
-				if (this.validateForm() && this.validate) {
-					if (this.merchantData.mer_type == '12') return this.agree();
-					if (this.codenote.length == 0) {
-						this.isshow = true
-						this.countDown()
-					} else {
-						if (this.codenote[0].status == 0) {
-							uni.showModal({
-								title: '申请正在审核中，请勿重复提交'
-							})
-						} else {
-							this.isshow = true
-							this.countDown()
-						}
-					}
-				}
-			},
-			validateBtn: function() {
-				let that = this,
-					value = that.merchantData;
-				if (value.enterprise_name && value.user_name && value.phone && /^1(3|4|5|7|8|9|6)\d{9}$/i.test(
-						value
-						.phone) &&
-					value.yanzhengma && that.isAgree && this.mer_classification) {
-					if (!that.isShowCode) {
-						that.validate = true;
-					} else {
-						if (that.codeVal) {
-							that.validate = true;
-						} else {
-							that.validate = false;
-						}
-					}
-				} else {
-					that.validate = false;
-				}
-			},
-			validateForm: function() {
-				let that = this,
-					value = that.merchantData;
-				if (!value.enterprise_name) return that.$util.Tips({
-					title: '请输入企业名称'
-				});
-				if (!value.social_credit_code) return that.$util.Tips({
-					title: '请输入统一社会信用代码'
-				});
-				if (!value.company_name) return that.$util.Tips({
-					title: '请输入公司名称'
-				});
-				if (!value.address) return that.$util.Tips({
-					title: '请输入详细地址'
-				});
-				if (!value.user_name) return that.$util.Tips({
-					title: '请输入姓名'
-				});
-				if (!value.phone) return that.$util.Tips({
-					title: '请输入手机号'
-				});
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (!value.yanzhengma) return that.$util.Tips({
-					title: '请填写验证码'
-				});
-				if (!this.mer_classification) return that.$util.Tips({
-					title: '请选择商户分类'
-				});
-				if (!this.nature_business) return that.$util.Tips({
-					title: '请选择公司性质'
-				})
-				if (!this.mer_storeType) return that.$util.Tips({
-					title: '请选择店铺类型'
-				})
-				if (!this.business_name) return that.$util.Tips({
-					title: '请选择店铺所在地'
-				})
-				if (!that.isAgree) return that.$util.Tips({
-					title: '请勾选并同意入驻协议'
-				});
-
-				if (that.isShowCode && !that.codeVal) return that.$util.Tips({
-					title: '请填写图片验证码'
-				});
-				if (!that.business_license) return that.$util.Tips({
-					title: '请上传营业执照'
-				});
-
-
-				// if (this.nature_business == 1 && !this.merchantData.bank_code) {
-				// 	return that.$util.Tips({
-				// 		title: '请输入对公账号'
-				// 	});
-				// }
-
-				// if (this.nature_business != 1 && !this.merchantData.bank_code) {
-				// 	return that.$util.Tips({
-				// 		title: '请输入银行卡号'
-				// 	});
-				// }
-
-				// if (!this.merchantData.bank_username) {
-				// 	return that.$util.Tips({
-				// 		title: '请输入开户银行'
-				// 	});
-				// }
-
-				// if (!this.merchantData.bank_opening) {
-				// 	return that.$util.Tips({
-				// 		title: '请输入开户网点'
-				// 	});
-				// }
-
-				// if (this.nature_business == 0 && !this.merchantData.bank_card_username) {
-				// 	return that.$util.Tips({
-				// 		title: '请输入持卡人姓名'
-				// 	});
-				// }
-
-				that.validate = true;
-				return true;
-			},
-			jumpToList() {
-				uni.navigateTo({
-					url: "/pages/store/applicationRecord/index"
-				})
-			},
-			success(data) {
-				this.$refs.verify.hide();
-				this.code(data);
-			},
-			handleVerify() {
-				if (!this.merchantData.phone) return this.$util.Tips({
-					title: '请输入手机号'
-				});
-
-				if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(this.merchantData.phone)) return this.$util.Tips({
-					title: '请输入正确的手机号码'
-				});
-				if (!this.isAgree) return this.$util.Tips({
-					title: '请勾选并同意入驻协议'
-				});
-				this.$refs.verify.show();
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.page {
-		width: 750rpx;
-		height: 2400rpx;
-		background: linear-gradient(180deg, #44AF38 0%, #72BE53 100%);
-	}
-
-	.header {
-		// height: 440rpx;
-		width: 100%;
-		text-align: center;
-		background-color: transparent;
-		// background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/96ec1202403151608564555.webp);
-		background-position: center;
-
-		.title-bar {
-			position: fixed;
-			top: 0;
-			height: 88rpx;
-			line-height: 88rpx;
-			width: 100%;
-			z-index: 11;
-
-			.title-bar-icon {
-				position: absolute;
-				left: 30rpx;
-
-				.icon-xiangzuo {
-					font-size: 40rpx;
-					text-align: left;
-					color: #fff;
-				}
-			}
-
-			.title-bar-txt {
-				text-align: center;
-				color: #fff;
-			}
-		}
-	}
-
-	/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
-	/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
-		border: 1px solid var(--view-theme) !important;
-		background-color: var(--view-theme) !important;
-		color: #fff !important;
-	}
-
-
-	.conten-top {
-		width: 100%;
-		text-align: center;
-		background-color: transparent;
-		position: absolute;
-		top: 0;
+	.bar {
 		position: fixed;
-		z-index: 10;
-	}
-
-	.uni-input-placeholder {
-		color: #B2B2B2;
-	}
-
-	.bar-top-bg {
-		background-color: #46CC4B;
-	}
-
-	.item-name {
-		width: 190rpx;
-	}
-
-	.uni-list-cell {
-		position: relative;
-
-		.iconfont {
-			font-size: 14px;
-			color: #7a7a7a;
-			position: absolute;
-			right: 15px;
-			top: 7rpx;
-		}
-
-		.icon-guanbi2 {
-			right: 35px;
-		}
-	}
-
-	.merchantBgCount {
-		line-height: 0;
-	}
-
-	.merchantsSettled {
-		background-image: linear-gradient(var(--view-bntColor21) 0%, var(--view-bntColor22) 100%);
-		min-height: 3200rpx;
-		position: relative;
-	}
-
-	.merchantsSettled .merchantBg {
+		// height: 88rpx;
+		background-color: #fff;
+		display: flex;
+		z-index: 99;
+		justify-content: space-between;
 		width: 750rpx;
-		width: 100%;
-	}
-
-	.merchantsSettled .list {
-		background-color: #fff;
-		border-radius: 12px;
-		padding: 22px 0;
-		margin: 0 15px;
-		position: absolute;
-		top: 400rpx;
-		width: calc(100% - 30px);
-	}
-
-	.list-title {
-		position: relative;
-		font-weight: 600;
-		font-size: 30rpx;
-		color: #40AE36;
-		text-align: center;
-		margin-bottom: 40rpx;
-
-		&::after {
-			content: "";
-			display: inline-block;
-			position: absolute;
-			bottom: 0;
-			left: 50%;
-			transform: translateX(-50%);
-			width: 233rpx;
-			height: 14rpx;
-			background: #40AE36;
-			opacity: 0.36;
-			filter: blur(6px);
-		}
-	}
-
-	.application-record {
-		position: absolute;
-		display: flex;
-		align-items: center;
-		top: 320rpx;
-		right: 0;
-		color: #fff;
-		font-size: 22rpx;
-		background-color: rgba(0, 0, 0, 0.3);
-		padding: 8rpx 18rpx;
-		border-radius: 20px 0px 0px 20px;
-	}
-
-	.merchantsSettled .list .item {
-		padding: 50rpx 0 20rpx;
-		border-bottom: 1px solid #eee;
-		position: relative;
-		margin: 0 20px;
-
-		&.no-border {
-			border-bottom: none;
-			padding-left: 0;
-			padding-right: 0;
-		}
-
-		.item-title {
-			color: #666666;
-			font-size: 28rpx;
-			display: block;
-		}
-
-		.item-desc {
-			color: #B2B2B2;
-			font-size: 22rpx;
-			display: block;
-			margin-top: 9rpx;
-			line-height: 36rpx;
-		}
-	}
-
-	.acea-row,
-	.upload {
-		display: -webkit-box;
-		display: -moz-box;
-		display: -webkit-flex;
-		display: -ms-flexbox;
-		display: flex;
-		-webkit-box-lines: multiple;
-		-moz-box-lines: multiple;
-		-o-box-lines: multiple;
-		-webkit-flex-wrap: wrap;
-		-ms-flex-wrap: wrap;
-		flex-wrap: wrap;
-	}
-
-	.upload {
-		margin-top: 20rpx;
-	}
-
-	.acea-row.row-middle {
-		-webkit-box-align: center;
-		-moz-box-align: center;
-		-o-box-align: center;
-		-ms-flex-align: center;
-		-webkit-align-items: center;
-		align-items: center;
-		padding-left: 2px;
-	}
-
-	.acea-row.row-column {
-		-webkit-box-orient: vertical;
-		-moz-box-orient: vertical;
-		-o-box-orient: vertical;
-		-webkit-flex-direction: column;
-		-ms-flex-direction: column;
-		flex-direction: column;
-	}
-
-	.acea-row.row-center-wrapper {
-		-webkit-box-align: center;
-		-moz-box-align: center;
-		-o-box-align: center;
-		-ms-flex-align: center;
-		-webkit-align-items: center;
-		align-items: center;
-		-webkit-box-pack: center;
-		-moz-box-pack: center;
-		-o-box-pack: center;
-		-ms-flex-pack: center;
-		-webkit-justify-content: center;
-		justify-content: center;
-	}
-
-	.merchantsSettled .list .item .pictrue {
-		width: 130rpx;
-		height: 130rpx;
-		margin: 24rpx 22rpx 0 0;
-		position: relative;
-		font-size: 11px;
-		color: #bbb;
-
-		&:nth-child(4n) {
-			margin-right: 0;
-		}
-
-		&:nth-last-child(1) {
-			border: 0.5px solid #ddd;
-			box-sizing: border-box;
-		}
-
-		uni-image,
-		image {
-			width: 100%;
-			height: 100%;
-			border-radius: 1px;
-
-			img {
-				-webkit-touch-callout: none;
-				-webkit-user-select: none;
-				-moz-user-select: none;
-				display: block;
-				position: absolute;
-				top: 0;
-				left: 0;
-				opacity: 0;
-				width: 100%;
-				height: 100%;
-			}
-		}
-
-		.icon-guanbi1 {
-			font-size: 33rpx;
-			position: absolute;
-			top: -10px;
-			right: -10px;
-		}
-	}
-
-	.uni-list-cell-db {
-		position: relative;
-	}
-
-	.wenhao {
-		width: 34rpx;
-		height: 34rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		font-size: 28rpx;
-		border-radius: 50%;
-		background: #E3E3E3;
-		color: #ffffff !important;
-		margin-left: 4rpx;
-		position: absolute;
-		left: 122rpx;
-	}
-
-	.merchantsSettled .list .item .imageCode {
-		position: absolute;
-		top: 7px;
-		right: 0;
-	}
-
-	.merchantsSettled .list .item .icon {
-		font-size: 40rpx;
-		color: #b4b1b4;
-	}
-
-	.merchantsSettled .list .item input {
-		width: 400rpx;
-		font-size: 30rpx;
-	}
-
-	.merchantsSettled .list .item .placeholder {
-		color: #b2b2b2;
-	}
-
-	.merchantsSettled .default {
-		padding: 0 30rpx;
-		height: 90rpx;
-		background-color: #fff;
-		margin-top: 23rpx;
-	}
-
-	.merchantsSettled .default checkbox {
-		margin-right: 15rpx;
-	}
-
-	.merchantsSettled .acea-row uni-image {
-		width: 20px;
-		height: 20px;
-		display: block;
-	}
-
-	.merchantsSettled .list .item .codeIput {
-		width: 125px;
-	}
-
-	.uni-input-input {
-		display: block;
-		height: 100%;
-		background: none;
-		color: inherit;
-		opacity: 1;
-		-webkit-text-fill-color: currentcolor;
-		font: inherit;
-		line-height: inherit;
-		letter-spacing: inherit;
-		text-align: inherit;
-		text-indent: inherit;
-		text-transform: inherit;
-		text-shadow: inherit;
-	}
-
-	.merchantsSettled .list .item .code {
-		position: absolute;
-		width: 93px;
-		line-height: 27px;
-		border: 1px solid var(--view-theme);
-		border-radius: 15px;
-		color: var(--view-theme);
-		text-align: center;
-		bottom: 8px;
-		right: 0;
-		font-size: 12px;
-	}
-
-	.merchantsSettled .list .item .code.on {
-		background-color: #bbb;
-		color: #fff;
-		border-color: #bbb;
-	}
-
-	.merchantsSettled .submitBtn {
-		width: 588rpx;
-		margin: 0 auto;
-		height: 86rpx;
-		border-radius: 25px;
-		text-align: center;
-		line-height: 86rpx;
-		font-size: 15px;
-		color: #fff;
-		background: #E3E3E3;
-		margin-top: 25px;
-		pointer-events: none;
-	}
-
-	.merchantsSettled .submitBtn.on {
-		background: var(--view-theme);
-		pointer-events: all;
-	}
-
-	uni-checkbox-group,
-	.settleAgree {
-		display: inline-block;
-		font-size: 24rpx;
-	}
-
-	uni-checkbox-group {
-		color: #b2b2b2;
-	}
-
-	.settleAgree {
-		color: var(--view-theme);
-		position: relative;
-		top: 2px;
-		left: 8px;
-	}
-
-	.merchantsSettled uni-checkbox .uni-checkbox-wrapper {
-		width: 30rpx;
-		height: 30rpx;
-		border: 2rpx solid #C3C3C3;
-		border-radius: 15px;
-	}
-
-	.settlementAgreement {
-		width: 100%;
-		height: 100%;
-		position: fixed;
+		box-sizing: border-box;
 		top: 0;
-		left: 0;
-		z-index: 12;
-		background: rgba(0, 0, 0, .5);
-	}
-
-	.settlementAgreement .setAgCount {
-		background: #fff;
-		width: 694rpx;
-		// height: 458px;
-		position: absolute;
-		top: 50%;
-		left: 50%;
-
-		padding: 28rpx;
-		-webkit-transform: translate(-50%, -50%);
-		-moz-transform: translate(-50%, -50%);
-		transform: translate(-50%, -50%);
-		overflow: hidden;
-
-		.content {
-			height: 900rpx;
-			overflow-y: scroll;
-
-			/deep/ p {
-				font-size: 13px;
-				line-height: 22px;
-			}
-
-			/deep/ img {
-				max-width: 100%;
-			}
-		}
-	}
-
-	.settlementAgreement .setAgCount .close {
-		position: absolute;
-		top: 15rpx;
-		right: 15rpx;
-	}
-
-	.settlementAgreement .setAgCount .icon {
-		font-size: 42rpx;
-		color: #b4b1b4;
-		position: absolute;
-		top: 15rpx;
-		right: 15rpx;
-	}
-
-	.settlementAgreement .setAgCount .title {
-		color: #333;
-		font-size: 32rpx;
-		text-align: center;
-		font-weight: bold;
-	}
-
-	.settlementAgreement .setAgCount .content {
-		color: #333;
-		font-size: 26rpx;
-		line-height: 22px;
-		text-align: justify;
-		text-justify: distribute-all-lines;
-		overflow-y: scroll;
-		padding-bottom: 20rpx;
-	}
-
-	.settlementAgreement .setAgCount .contenta {
-		color: #333;
-		font-size: 26rpx;
-		line-height: 22px;
-		text-align: justify;
-		text-justify: distribute-all-lines;
-		height: 85%;
-		overflow-y: scroll;
-	}
-
-	.setAgCountbtn {
-		display: flex;
-		justify-content: space-around;
-		position: relative;
-
-		.setAgCountbtna {
-			margin-top: 40rpx;
-			// width: 200rpx;
-			height: 74rpx;
-			text-align: center;
-			line-height: 74rpx;
-			border-radius: 46rpx 46rpx;
-			opacity: 1;
-			border: 2rpx solid #B3B3B3;
-			font-size: 25rpx;
-			font-family: PingFang SC-Medium, PingFang SC;
-			font-weight: 500;
-			color: #737373;
-
-		}
-
-		.setAgCountbtnb {
-			margin-top: 40rpx;
-			padding-left: 20rpx;
-			padding-right: 20rpx;
-			height: 74rpx;
-			text-align: center;
-			line-height: 74rpx;
-			background: #cecece;
-			border-radius: 46rpx 46rpx;
-			opacity: 1;
-
-			font-size: 25rpx;
-			font-family: PingFang SC-Medium, PingFang SC;
-			font-weight: 500;
-			color: #fff;
-
-		}
-
-		.setAgCountbtnc {
-			margin-top: 40rpx;
-			height: 74rpx;
-			text-align: center;
-			line-height: 74rpx;
-			background: linear-gradient(270deg, #3da834 0%, #72BE53 100%);
-			border-radius: 46rpx 46rpx;
-			opacity: 1;
-			font-size: 25rpx;
-			font-family: PingFang SC-Medium, PingFang SC;
-			font-weight: 500;
-			color: #fff;
-
-		}
-
-		.border {
-			position: absolute;
-			top: 0;
-			left: -28rpx;
-			width: 100vw;
-			height: 100%;
-			border-radius: 40rpx 40rpx 0 0;
-			box-shadow: 0px -5px 5px -2px rgba(0, 0, 0, 0.2);
-			/* 在上边框添加阴影 */
-		}
-
-		.btn {
-			width: 694rpx;
-			font-weight: bold;
-			font-size: 34rpx;
-		}
-	}
-
-	.settledSuccessMain {
-		height: 100vh;
-		display: flex;
-		flex-direction: column;
-		background: #fff;
-	}
-
-	.settledSuccessful {
-		flex: 1;
-		width: 100%;
-		padding: 0 56px;
-		height: auto;
-		background: #fff;
-		text-align: center;
-	}
-
-	.settledSuccessful .image {
-		width: 189px;
-		height: 157px;
-		margin-top: 66px;
-	}
-
-	.settledSuccessful .title {
-		color: #333333;
-		font-size: 16px;
-		font-weight: bold;
-		margin-top: 35px;
-	}
-
-	.settledSuccessful .info {
-		color: #A0A0A0;
-		font-size: 13px;
-		margin-top: 12px;
-	}
-
-	.settledSuccessful .goHome {
-		margin: 60px auto 0;
-		line-height: 43px;
-		color: #282828;
-		font-size: 15px;
-		border: 1px solid #B4B4B4;
-		border-radius: 60px;
-	}
-
-	/deep/ uni-checkbox .uni-checkbox-input {
-		width: 15px;
-		height: 15px;
-		position: relative;
-	}
-
-	/deep/ uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked:before {
-		font-size: 14px;
-	}
-
-	.loadingicon {
-		height: 100vh;
-		overflow: hidden;
-		position: absolute;
-		top: 0;
-		left: 0;
-	}
-
-	.icon-xiangyou {
-		font-size: 22rpx;
-	}
-
-	// #ifdef MP
-	checkbox-group {
-		display: inline-block;
-	}
-
-	// #endif
-	.setAgCount {
-		/deep/ table {
-			border: 1px solid #DDD;
-			border-bottom: none;
-			border-right: none;
-		}
-
-		/deep/ td,
-		th {
-			padding: 5rpx 10rpx;
-			border-bottom: 1px solid #DDD;
-			border-right: 1px solid #DDD;
-		}
-	}
-
-	.merchantsSettled .list .items {
-		padding: 50rpx 0 20rpx;
-		border-bottom: 1px solid #eee;
-		position: relative;
-		margin: 0 20px;
-
-		.uni-list-area {
-			height: 50px;
-			display: flex;
-			justify-content: flex-start;
-			align-items: center;
-
-			.uni-list-stree {
-				width: 30%;
-				margin-left: 10px;
-
-				.mer-area {
-					width: 100%;
-					border: 1px solid #C3C3C3;
-
-					picker {
-						display: flex;
-					}
-
-					input {
-						width: 100%;
-						font-size: 30rpx;
-
-					}
-				}
-			}
-		}
+		padding-right: 50rpx;
+		padding-left: 10rpx;
+		padding-bottom: 30rpx;
+		// padding
 
 	}
 </style>
\ No newline at end of file
diff --git a/pages/user/index.vue b/pages/user/index.vue
index f88f3bf..2a3d8da 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -100,19 +100,19 @@
 							</view>
 							<view>补贴余额 (元)</view>
 						</view> -->
-            <view class="p_d_item" @click="authTo('/pages/users/user_money/index')">
-            	<view class="p_d_count">
-            		<image
-            			src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e41f4202401201745498894.png">
-            		</image>
-            		<view style="font-size: 30rpx;">我的余额 (元)</view>
-            	</view>
-            </view>
-            <view class="p_d_item" @click="authTo('/pages/users/user_money/index')">
-            	<view class="p_d_count">
-            		<view>￥{{userInfo.now_money||"0.00"}}</view>
-            	</view>
-            </view>
+						<view class="p_d_item" @click="authTo('/pages/users/user_money/index')">
+							<view class="p_d_count">
+								<image
+									src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e41f4202401201745498894.png">
+								</image>
+								<view style="font-size: 30rpx;">我的余额 (元)</view>
+							</view>
+						</view>
+						<view class="p_d_item" @click="authTo('/pages/users/user_money/index')">
+							<view class="p_d_count">
+								<view>￥{{userInfo.now_money||"0.00"}}</view>
+							</view>
+						</view>
 					</view>
 
 					<view @click="goSvip" class="cardVipA acea-row row-between-wrapper" v-if="svip_switch_status == 1">
@@ -174,13 +174,14 @@
 				</view>
 				<!-- 会员菜单 -->
 				<view class="user-menus" style="margin-top: 20rpx;">
-					<view class="title skeleton-rect">我的服务</view>
+					<view class="title skeleton-rect">我的2服务</view>
 					<view class="menu-box">
 						<block v-for="(item,index) in personalMenu" :key="index">
-							<view v-if="item.isShow" class="item">
+							<view v-if="item.isShow" class="item ">
 								<view @click="authTo(item.url)" class="item-count">
-									<image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image>
-									<image v-else :src="item.pic"></image>
+									<image v-if="showSkeleton" :id="'target'+index"
+										class="skeleton_image skeleton-radius"></image>
+									<image v-else :src="item.pic" :id="'target'+index" class="target"></image>
 									<text>{{item.name}}</text>
 								</view>
 							</view>
@@ -238,7 +239,7 @@
 				<view class="">备案号:蜀ICP备2022030133号-2A</view>
 				<view class="">增值电信营业许可证号:川B2-20221250</view>
 				<view class="">联系我们：08302669767</view>
-        <view style="padding-top: 50rpx;">{{appVersion}}</view>
+				<view style="padding-top: 50rpx;">{{appVersion}}</view>
 			</view>
 			<!-- <view v-else class="copy-right">
 				<view class="iconfont icon-crmeb"></view>
@@ -300,12 +301,14 @@
 	import Auth from '../../libs/wechat';
 	import {
 		HTTP_REQUEST_URL,
-    ENV 
+		ENV
 	} from '@/config/app';
 	import {
 		toLogin
 	} from '@/libs/login.js';
-  import {showTab} from "@/utils/showTab.js";
+	import {
+		showTab
+	} from "@/utils/showTab.js";
 	const app = getApp();
 	export default {
 		components: {
@@ -331,9 +334,11 @@
 		},
 		data() {
 			return {
+				elInfo: '',
 				//#ifdef H5
 				isWeixin: this.$wechat.isWeixin(),
 				//#endif
+				subNvue: '',
 				domain: HTTP_REQUEST_URL,
 				showSkeleton: true, //骨架屏显示隐藏
 				isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取
@@ -453,25 +458,60 @@
 				newData: {},
 				activeRouter: '',
 				sysHeight: sysHeight,
-        appVersion: ''
+				appVersion: ''
 			}
 		},
 		onLoad() {
-      // #ifdef APP-PLUS
-      this.appVersion = 'V ' + uni.getSystemInfoSync().appWgtVersion;
-      // #endif
-      // #ifdef H5
-      this.appVersion = 'V ' + uni.getSystemInfoSync().appVersion;
-      // #endif
-      if (ENV != 'prod') this.appVersion += " Beta"
+			// #ifdef APP-PLUS
+			uni.$on('offuserSubnvue', () => {
+				this.subNvue.hide('slide-out-right');
+			})
+			this.appVersion = 'V ' + uni.getSystemInfoSync().appWgtVersion;
+			// #endif
+			// #ifdef H5
+			this.appVersion = 'V ' + uni.getSystemInfoSync().appVersion;
+			// #endif
+			if (ENV != 'prod') this.appVersion += " Beta"
 		},
 		onReady() {
+			// #ifdef APP
 			this.isNodes++;
+			let that = this
+			setTimeout(() => {
+				const query = uni.createSelectorQuery().in(this);
+				query
+					.select("#target0")
+					.boundingClientRect((data) => {
+						that.elInfo = data
+						// #ifdef APP-PLUS
+						if (Boolean(uni.getStorageSync('is_new_user'))) {
+							that.subNvue = uni.getSubNVueById('userSubnvu')
+							that.subNvue.show('slide-in-left', 300)
+							uni.$emit('openUserSubnvue', JSON.stringify(data))
+						}
+
+						// #endif
+					})
+					.exec();
+			}, 500)
+
+			// #endif
+
+
 		},
 		mounted: function() {
 			this.getVersion()
 		},
 		onShow: function() {
+			// #ifdef APP-PLUS
+			if (Boolean(uni.getStorageSync('is_new_user')) && this.elInfo) {
+				this.subNvue = uni.getSubNVueById('userSubnvu')
+				this.subNvue.show('slide-in-left', 300)
+				uni.$emit('openUserSubnvue', JSON.stringify(data))
+			}
+
+			// #endif
+
 			let that = this;
 			let routes = getCurrentPages();
 			let curRoute = routes[routes.length - 1].route
@@ -636,7 +676,7 @@
 			getUserInfo: function() {
 				let that = this;
 				getUserInfo().then(res => {
-          showTab(res.data);
+					showTab(res.data);
 					that.userInfo = res.data;
 					that.is_promoter = res.data.is_promoter;
 					that.extension_status = res.data.extension_status;
diff --git a/pages/user/subnvue/index.nvue b/pages/user/subnvue/index.nvue
new file mode 100644
index 0000000..caad48c
--- /dev/null
+++ b/pages/user/subnvue/index.nvue
@@ -0,0 +1,172 @@
+<template>
+	<view class="">
+		<view class="jump" @click="jump">
+			<text class="font">跳过</text>
+		</view>
+		<view class="next-btn center" :style="{ left:screenWidth/2,top:(screenHeight-96)}">
+			<text class="next-btn-text font" style="line-height: 76rpx;" @click="next">我知道了</text>
+		</view>
+		<view class="target" :style="{left:left-13.5,top:top-13.5}">
+			<image src="/static/images/fabu.png" class="target-icon"></image>
+			<text class="target-text">商家入驻</text>
+		</view>
+		<view :style="{left:left-13.5,top:top-70}">
+			<image src="/static/images/pointer.png" style="width: 254rpx;height: 254rpx;"></image>
+		</view>
+		<view class="tips-box" :style="{left:left,top:top-170}">
+			<view class="tips" style="position: absolute;padding-left: 20px;">
+				<view class="tras" :class="{act:isAct}">
+					<text style="font-size: 28rpx;line-height: 100rpx;color: white;">点击我的页面，进行商户入驻</text>
+				</view>
+			</view>
+			<image src="/static/images/starpng.png" class="start" mode="">
+			</image>
+		</view>
+		<image src="/static/images/greenLine.png" class="greenLine" :style="{left:left,top:top-70}" mode="">
+		</image>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				screenHeight: 800,
+				screenWidth: 375,
+				isAct: false,
+				left: 36.272727966308594,
+				top: 401
+			}
+		},
+		methods: {
+			jump() {
+				uni.$emit('offuserSubnvue');
+				uni.setStorageSync("is_new_user", 0)
+			},
+			next() {
+				uni.$emit('offuserSubnvue');
+				uni.setStorageSync("is_new_user", 0)
+			}
+		},
+		onLoad() {
+			let that = this
+			uni.$on('openUserSubnvue', (data) => {
+				that.left = JSON.parse(data).left
+				that.top = JSON.parse(data).top
+			})
+			const res = uni.getSystemInfo({
+				success: (res => {
+					this.screenHeight = res.screenHeight
+					this.screenWidth = res.screenWidth
+				})
+			});
+			setTimeout(() => {
+				that.isAct = true
+			})
+
+
+		}
+
+
+	}
+</script>
+
+<style>
+	.jump {
+		position: absolute;
+		right: 30rpx;
+		top: 80rpx;
+		border: 1px solid white;
+		padding: 10rpx 20rpx;
+		border-radius: 30rpx;
+	}
+
+	.font {
+		font-size: 28rpx;
+		color: white;
+		lines: 1;
+		text-align: center;
+	}
+
+	.center {
+		transform: translateX(-50%);
+	}
+
+	.next-btn {
+		position: absolute;
+		width: 240rpx;
+		height: 76rpx;
+		border: 1px solid white;
+		border-radius: 38rpx;
+	}
+
+	.target {
+		width: 136rpx;
+		height: 136rpx;
+		background-color: white;
+		border-radius: 136rpx;
+	}
+
+	.target-icon {
+		width: 50rpx;
+		height: 50rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, -50%);
+		top: 68rpx;
+	}
+
+	.target-text {
+		font-size: 20rpx;
+		position: absolute;
+		left: 68rpx;
+		transform: translate(-50%, 0);
+		top: 100rpx;
+	}
+
+	.pointer {
+		position: absolute;
+	}
+
+	.tips-box {
+		width: 462rpx;
+		height: 178rpx;
+		position: absolute;
+		padding-top: 72rpx;
+		position: absolute;
+	}
+
+	.start {
+		width: 72rpx;
+		height: 72rpx;
+		position: absolute;
+		right: 0;
+		top: 20px;
+	}
+
+	.tips {
+		width: 462rpx;
+		height: 106rpx;
+		background-color: #5BE157;
+		border-radius: 20rpx;
+
+	}
+
+	.tras {
+		width: 0px;
+		transition-property: width;
+		transition-duration: 3s;
+		transition-delay: 0.1s;
+		transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1.0);
+	}
+
+	.act {
+		width: 462rpx;
+	}
+
+	.greenLine {
+		width: 35px;
+		height: 60px;
+		position: absolute;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 8190ec1..528b1c2 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -89,7 +89,7 @@
 						</view>
 					</view>
 
-					<view class="logon" @click="loginMobile" :hidden="current !== 0">登5445录</view>
+					<view class="logon" @click="loginMobile" :hidden="current !== 0">登录</view>
 					<view class="logon" @click="submit" :hidden="current === 0">账号登录</view>
 					<view class="protocol acea-row row-between-wrapper">
 						<checkbox-group class="checkgroup" @change='isAgree=!isAgree'>
@@ -229,7 +229,7 @@
 		<u-overlay :show="showTips">
 			<view class="tips">
 				<view class="" style="font-size: 32rpx;">
-					{{tispTile}}
+					温馨提示
 				</view>
 				<block v-if="tispTile=='密码错误'">
 					<view class="">
@@ -261,10 +261,18 @@
 					</view>
 				</block>
 				<block v-else>
+					<view class="">
+						{{tispTile}}
+					</view>
 					<view class="" style="display: flex;width: 236rpx;">
 						<u-button color="#46BF6F" text="确定" @tap="showTips=false"></u-button>
 					</view>
 				</block>
+
+
+
+
+
 			</view>
 		</u-overlay>
 		<!-- tips结束 -->
diff --git a/static/images/pointer.png b/static/images/pointer.png
index 9570f99..edd4fad 100644
Binary files a/static/images/pointer.png and b/static/images/pointer.png differ
diff --git a/static/images/starpng.png b/static/images/starpng.png
new file mode 100644
index 0000000..51c1e52
Binary files /dev/null and b/static/images/starpng.png differ