diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3b7434f..7c53626 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -361,7 +361,7 @@
 		merstreet,
 		getUserInfo
 	} from '@/api/user.js';
-	import {
+import {
 		business,
 		intention,
 		intentionbus
@@ -463,6 +463,14 @@
 					limit: 3,
 					status: 2
 				},
+				where1: {
+					product_type: 0
+				},
+				where2: {
+					type: 2,
+					page: 1,
+					limit: 10
+				},
 				loadend: false,
 				loading: false,
 				loadTitle: '加载更多',
@@ -473,9 +481,7 @@
 				userInfoData: {},
 
 				isshow: false,
-				where1: {
-					product_type: 0
-				},
+				
 				codenote: [],
 				validate: false,
 				merchantData: {
@@ -502,7 +508,7 @@
 		},
 
 		onLoad() {
-			this.getUserInfo()
+		
 			this.list1()
 			this.Fheight = uni.getSystemInfoSync().windowHeight + 'px';
 		},
@@ -519,14 +525,10 @@
 
 		},
 
-		mounted() {
-
-
-			this.list1()
-
-		},
+		
 		onShow() {
 			this.getUserInfo()
+			this.codelist()
 		},
 
 		beforeDestroy() {
@@ -541,7 +543,8 @@
 			},
 			//获取交易信息
 			codelist() {
-				intention(this.where).then(res => {
+				
+				intention(this.where2).then(res => {
 					this.codenote = res.data.list
 				})
 			},
@@ -781,40 +784,15 @@
 			//商家设置
 			byset() {
 				if (this.userid) {
-
-					if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
-						if (this.codenote.length == 0) {
-							this.isFshow = true
-							this.countDown()
-						} else {
-							if (this.codenote[0].status == 0) {
-								uni.showModal({
-									title: '申请正在审核中，请勿重复提交'
-								})
-							} else {
-								this.isFshow = true
-								this.countDown()
-							}
-						}
-					} else {
-
-						uni.navigateTo({
-							url: '/pages/product/basicSet?mer_id=' + this.userInfoData
-								.service
-								.mer_id
-						})
-					}
-
-
-
-
+					uni.navigateTo({
+						url: '/pages/product/basicSet?mer_id=' + this.userInfoData
+							.service
+							.mer_id
+					})
 				} else {
 					this.isAuto = true;
 					this.isShowAuth = true
 				}
-
-
-
 			},
 			//个人详情
 			logout() {
@@ -969,12 +947,10 @@
 			},
 			//路由跳转
 			navation(item) {
-				if (item.type == 8) {
-					uni.navigateTo({
-						url: '/pages/moreProject/moreProject'
-					})
-				}
+				
+				
 				if (this.userid) {
+		
 					if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
 						if (this.codenote.length == 0) {
 							this.isFshow = true
@@ -989,6 +965,11 @@
 								this.countDown()
 							}
 						}
+						if (item.type == 8) {
+							uni.navigateTo({
+								url: '/pages/moreProject/moreProject'
+							})
+						}
 					} else {
 
 						switch (item.type) {
@@ -1037,12 +1018,17 @@
 
 								})
 								break;
+								case 8:
+									uni.navigateTo({
+										url: '/pages/moreProject/moreProject'
+									})
+									break;
 
 						}
 
 					}
 
-
+                  
 
 
 
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 7e84c88..a60dfa9 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -57,7 +57,7 @@
 								<text class="text">入库管理</text>
 							</view>
 							<view class="examine"
-								@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}&product_type=98`, '商户设置')">
+								@click="buyserset">
 								<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
 									<text class="text">商户设置</text>
 							</view>
@@ -189,7 +189,7 @@
 									<text class="text">商品管理</text>
 								</view>
 								<view class="examine"
-									@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
+									@click="buyserset">
 									<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
 									</image>
 									<text class="text">商户设置</text>
@@ -307,7 +307,7 @@
 									</image>
 								</view>
 								<view class="examine"
-									@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
+									@click="buyserset">
 									<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
 									</image>
 									<text class="text">商户设置</text>
@@ -401,16 +401,13 @@
 					<view class="special_work com">
 						<view class="title">我的店铺</view>
 						<view class="content ">
-
 							<view class="examine"
-								@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
+								@click="buyserset">
 								<image class="icon_img" src="@/static/images/index11.png" mode="aspectFit">
 								</image>
 								<text class="text">商户设置</text>
 							</view>
 
-
-
 						</view>
 					</view>
 				</view>
@@ -875,6 +872,7 @@
 				}
 
 			},
+			
 			//商户设置
 			buyserset() {
 				uni.navigateTo({
@@ -882,10 +880,8 @@
 				})
 			},
 			navigator(url, t) {
-
+				console.log(this.codenote)
 				if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
-
-
 					if (this.codenote.length == 0) {
 						this.isFshow = true
 						this.countDown()