diff --git a/pages/addjigou/all.vue b/pages/addjigou/all.vue
index 61031bc..d527d29 100644
--- a/pages/addjigou/all.vue
+++ b/pages/addjigou/all.vue
@@ -9,9 +9,18 @@
 				<view style="font-size: 30rpx;">机构加盟</view>
 			</view>
 		</view>
-		<view :style="{height:`${uni.getStorageSync('moveHeight') + 30}px`}"></view>
-		<view class="contentred" v-if="statesTarget==3||alldata.status==`5`||alldata.status==`3`">
-			<view class="contentred-bgc">
+		<view :style="{height:`${uni.getStorageSync('moveHeight') + (code>0? 50:40)}px`}"></view>
+		<view class="contentred">
+			<view class="content-img" style="display: flex;align-items: center;justify-content: flex-end;color: red;" >
+					<text v-if="alldata.status==1" >待审核</text>
+					<text v-if="alldata.status==3&&code==0">审核驳回</text>
+					<text v-if="alldata.status==2&&code==0" style="color: #0089FE;">审核通过</text>
+					<view class="small-blue" @click="changeMessage"  v-if="code>0">
+						编辑
+					</view>
+			</view>
+			
+			<view class="contentred-bgc" v-if="alldata.status==`3`">
 				驳回原因：{{contentred}}
 			</view>
 		</view>
@@ -190,13 +199,20 @@
 			show.value = true
 		}
 	}
+	const changeMessage = ()=>{
+		uni.navigateTo({
+			url: `/pages/addjigou/name?element=${JSON.stringify(alldata.value)}`
+		});
+	}
 	const goBack = () => {
 		uni.navigateBack()
 	}
 	const alldata = ref("");
 	const contentred = ref("")
 	const special = ref(false);
+	const code = ref(0);
 	onLoad((options) => {
+		code.value = options.code?options.code:0;
 		if(options.special){
 			special.value = true
 		}
@@ -234,6 +250,19 @@
 </script>
 
 <style lang="scss" scoped>
+	.small-blue {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 35%;
+		height: 70rpx;
+		background: linear-gradient(to bottom, #e7f4ff, #c5e5ff);
+		border: 2rpx solid #9AD1FF;
+		color: #007CFF;
+		border-radius: 30rpx;
+		font-size: 30rpx;
+		z-index: 2;
+	}
 	.container {
 		display: flex;
 		flex-direction: column;
@@ -401,7 +430,6 @@
 	}
 	.contentred{
 		width: 90%;
-		border: dashed 3rpx #FF4B2F;
 		border-radius: 15rpx;
 		margin: 15rpx 0;
 		margin-left: 5%;
diff --git a/pages/addjigou/api/addjigou.js b/pages/addjigou/api/addjigou.js
index 38b58d2..6e5135d 100644
--- a/pages/addjigou/api/addjigou.js
+++ b/pages/addjigou/api/addjigou.js
@@ -18,6 +18,16 @@ export function getMessageList(id){
 		method: 'get',
     })
 }
+export function queryOrgInfoById(id){
+    return request({
+        url: `/api/orgApplyInfo/queryOrgInfoById?id=${id}`,
+		method: 'get',
+    })
+}
+
+
+
+
 export function queryOrgHis(id){
     return request({
         url: `/api/orgApplyInfo/queryOrgHis?openId=${id}&optType=rz,bg`,
diff --git a/pages/addjigou/name.vue b/pages/addjigou/name.vue
index 6c6f83d..f9149de 100644
--- a/pages/addjigou/name.vue
+++ b/pages/addjigou/name.vue
@@ -387,13 +387,13 @@
 		if (!fontphoto.value) {
 			uni.showToast({
 				title: '请上传身份证正面',
-				icon: 'error'
+				icon: 'none'
 			})
 			return
 		} else if (!endphoto.value) {
 			uni.showToast({
 				title: '请上传身份证背面',
-				icon: 'error'
+				icon: 'none'
 			})
 			return
 		}
@@ -428,17 +428,24 @@
 		} else {
 			uni.showToast({
 				title: '请上传清晰的身份证',
-				icon: 'error'
+				icon: 'none'
 			})
 		}
 	}
 	const goBack = () => {
 		uni.navigateBack()
 	}
-
-	onLoad(() => {
-		if (uni.getStorageSync('baddata')) {
-			let data = uni.getStorageSync('baddata');
+	const alldata = ref({})
+	onLoad((e) => {
+		if (uni.getStorageSync('baddata')||e.element) {
+			let data = uni.getStorageSync('baddata')||JSON.parse(e.element);
+			if(e.element){
+				alldata.value = JSON.parse(e.element);
+				uni.setStorageSync('baddata',alldata.value)
+				uni.setStorageSync('backhuancun',alldata.value)
+				uni.setStorageSync('tel',alldata.value.tel)
+			}
+			console.log(uni.getStorageSync('baddata'))
 			textArray[0] = data.name;
 			textArray[1] = data.sex;
 			textArray[2] = data.idCard;
diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue
index 7f45a1d..7df0924 100644
--- a/pages/addjigou/where.vue
+++ b/pages/addjigou/where.vue
@@ -13,7 +13,7 @@
 						<!-- <image class="title-imge-title" src="https://www.focusnu.com/media/directive/index/mark.png" /> -->
 					</view>
 					<view style="display: flex;margin-left: 15rpx;">
-						<view class="button-father" v-for="(item,index) in address"
+						<view class="button-father" v-for="(item,index) in address" :key="index"
 							:style="index==address.length-1?{backgroundColor:`#e4e4e4;`,color:`#595959`}:{}"
 							@click="deleteUP(index)">
 							<view>
@@ -249,37 +249,37 @@
 		if (!form.address) {
 			uni.showToast({
 				title: '请选择机构位置',
-				icon: 'error'
+				icon: 'none'
 			})
 			return
 		} else if (!form.orgAddress) {
 			uni.showToast({
 				title: '请输入详细地址',
-				icon: 'error'
+				icon: 'none'
 			})
 			return
 		} else if (!form.orgLeader) {
 			uni.showToast({
 				title: '请输入机构负责人',
-				icon: 'error'
+				icon: 'none'
 			})
 			return
 		} else if (!form.orgLeaderPhone) {
 			uni.showToast({
 				title: '请输入手机号',
-				icon: 'error'
+				icon: 'none'
 			})
 			return
 		} else if (!isValid11DigitNumber(form.orgLeaderPhone)) {
 			uni.showToast({
 				title: '手机号格式错误',
-				icon: 'error'
+				icon: 'none'
 			})
 			return
 		} else if (!form.orgPropertyType) {
 			uni.showToast({
 				title: '请输入房屋性质',
-				icon: 'error'
+				icon: 'none'
 			})
 			return
 		} else if (!form.orgBuildingArea) {
@@ -316,8 +316,12 @@
 			if (data.endTime == '长期') {
 				data.endTime = swapLongTerm(data.endTime);
 			}
+			if((data.orgStatus != '3' && data.orgStatus != '4') && (data.optType == 'rz'  || (data.optType == 'bg' && (data.status == '2' || data.status ==  '3' )))){
+				data.status = `4`
+				data.optType = "bg"
+			}
+			 
 			uni.setStorageSync("backhuancun", data)
-			// return
 			changemessage(uni.getStorageSync('backhuancun'), ukey.value).then(res => {
 				if (res.success && res.result != '重复提交' && res.result != '未做变更') {
 
@@ -482,7 +486,6 @@
 			form.orgLeaderPhone = data.orgLeaderPhone;
 			form.orgPropertyType = data.orgPropertyType;
 			form.orgBuildingArea = data.orgBuildingArea;
-			console.log("111", form)
 		} else if (uni.getStorageSync('baddata')) {
 			let data = uni.getStorageSync('baddata');
 			if (data.orgProvince_dictText) {
@@ -497,7 +500,6 @@
 			form.orgLeaderPhone = data.orgLeaderPhone;
 			form.orgPropertyType = data.orgPropertyType;
 			form.orgBuildingArea = data.orgBuildingArea;
-			console.log("222", form)
 		} else {
 
 			form.orgLeaderPhone = uni.getStorageSync('tel');
diff --git a/pages/addsupplier/all.vue b/pages/addsupplier/all.vue
index a899899..03e4177 100644
--- a/pages/addsupplier/all.vue
+++ b/pages/addsupplier/all.vue
@@ -21,7 +21,7 @@
 				<view class="content-img" style="display: flex;align-items: center;justify-content: flex-end;color: red;">
 						<text v-if="datas.suppliersStatus==1" >待审核</text>
 						<text v-if="datas.suppliersStatus==3">审核驳回</text>
-						<text v-if="datas.suppliersStatus==4">待审核</text>
+						<text v-if="datas.suppliersStatus==2" style="color: #0089FE;">审核通过</text>
 				</view>
 				<view class="small-blue" @click="changeMessage"  v-if="code>0">
 					编辑
diff --git a/pages/addsupplier/information.vue b/pages/addsupplier/information.vue
index ac7f3df..65cc36e 100644
--- a/pages/addsupplier/information.vue
+++ b/pages/addsupplier/information.vue
@@ -439,8 +439,8 @@
 
 
 	}
-	const gotopush = () => {
-		if (form.id && form.suppliersStatus != 3) {
+	const gotopush = () => { 
+		if (form.id && form.suppliersStatus != 3 && form.suppliersStatus) {
 			if (!form.orgCode) {
 				uni.showToast({
 					title: '请选择机构',
@@ -466,7 +466,7 @@
 				}
 			})
 		} else {
-			if (!uni.getStorageSync('nostaffmessage')) {
+			if (!uni.getStorageSync('nostaffmessage')&&!form.orgCode) {
 				uni.showToast({
 					title: '请选择机构',
 					icon: 'none'
@@ -483,7 +483,7 @@
 					return
 				}
 				let data = {
-					orgCode: uni.getStorageSync('nostaffmessage'),
+					orgCode: uni.getStorageSync('nostaffmessage')||form.orgCode,
 					openId: uni.getStorageSync('openid')
 				}
 				applySupOrg(data).then((data) => {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b325120..6859c23 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -13,11 +13,8 @@
 		<model :show="show" @close="show=false" :content="content" />
 		<swiper style="width: 100%;position: fixed;bottom: 0;left: 0;" :duration="150" :style="{minHeight: `100vh`}"
 			:current="which" @change="swiperchange">
-
 			<view v-for="(item,index) in menuArray" :key="index">
 				<swiper-item>
-
-
 					<view class="white-content-father">
 						<view class="chuo-ball" @click="loadingData" v-if="item.status==`1`">
 							<image class="ball-img"
@@ -29,7 +26,6 @@
 								lazy-load="false" />
 							<view class="white-font">
 								您提交的
-
 							</view>
 							<view class="second-font">
 								<text>
@@ -165,12 +161,12 @@
 
 							</view>
 							<view class="middle-view">
-								<view class="middle-small">
+								<view class="middle-small" @click="jgxx(item,0)">
 									<image class="middle-small-img"
 										:src="`https://www.focusnu.com/media/directive/index/jigouindex/houqin.png`" />
 									机构信息
 								</view>
-								<view class="middle-small">
+								<view class="middle-small" @click="jgxx(item,1)">
 									<image class="middle-small-img"
 										:src="`https://www.focusnu.com/media/directive/index/jigouindex/gongqu.png`" />
 									信息变更
@@ -276,7 +272,8 @@
 
 	import {
 		getMessageList,
-		isRead
+		isRead,
+		queryOrgInfoById
 	} from '@/pages/addjigou/api/addjigou.js'
 
 	// import tu from 'https://www.focusnu.com/media/directive/index/tu.png'
@@ -482,6 +479,13 @@
 			}
 		});
 	}
+	const jgxx = (e,k)=>{
+		queryOrgInfoById(e.pkId ).then(res=>{
+			uni.navigateTo({
+				url: `/pages/addjigou/all?element=${JSON.stringify(res.result)}&code=${k}`
+			});
+		})
+	}
 	onShow(() => {
 		loadingData();
 		isRead().then(res => {
diff --git a/request/index.js b/request/index.js
index 7597bd5..0768da9 100644
--- a/request/index.js
+++ b/request/index.js
@@ -1,9 +1,9 @@
 // 全局请求封装
 // export const base_url = 'http://192.168.2.37:8081/opeapi'
-export const base_url = 'https://www.focusnu.com/opeapi'
+// export const base_url = 'https://www.focusnu.com/opeapi'
 
 export const media_base_url = 'https://www.focusnu.com/media/'
-// export const base_url = 'http://192.168.2.24:8081/opeapi'
+export const base_url = 'http://192.168.2.24:8081/opeapi'
 // export const base_url = 'http://192.168.2.27:8081/opeapi'
 // 请求超出时间
 const timeout = 5000