diff --git a/components/list/job.vue b/components/list/job.vue
index c74a303..97ea397 100644
--- a/components/list/job.vue
+++ b/components/list/job.vue
@@ -90,9 +90,7 @@
 									<view class>
 										<image class="g_mr_4" style="width: 20px; height: 20px; display: block" src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/fee.svg" mode="aspecFill" lazy-load="false"></image>
 									</view>
-									<view class="g_fs_13" v-if="!isLogin" @click.stop="goLogin">登录查看</view>
-									<view class="g_fs_13" v-else-if="userinfo.agencyStatus == 1">{{ item.fuWuFei || "详询客服" }}</view>
-									<view class="biggerSize2 g_fs_13" v-else @click.stop="tobeAgencyToast">{{ "仅代理可见" }}</view>
+									<view class="g_fs_13">{{ (recordStatus == 3 || recordStatus == 4 || recordStatus == 5) && !isSelf ? "关注查看" : item.policyClassify == 1 ? item.fuWuFei : "总价" }}</view>
 								</view>
 								<!-- <text class="g_fs_14">元/月</text> -->
 							</view>
@@ -218,6 +216,12 @@ export default {
 				return "default";
 			},
 		},
+		isSelf: {
+			type: Boolean,
+			default: () => {
+				return false;
+			},
+		},
 		isuse: {
 			type: String,
 			default: () => {
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 6402ec5..c2e1c92 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -156,6 +156,10 @@ export default {
 					wxCode: "",
 				};
 			}
+			uni.showLoading({
+				title: "登录中...",
+				mask: true,
+			});
 			// #ifdef MP-WEIXIN
 			uni.checkSession({
 				success() {
@@ -254,6 +258,7 @@ export default {
 		setToken($data) {
 			let that = this;
 			console.log("获取登录用户信息：", $data);
+			uni.hideLoading();
 			uni.setStorageSync("apply-userinfo", $data); // 获取用户信息, 参与实际逻辑
 			uni.setStorageSync("apply-userinfo-copy", JSON.stringify($data)); // 仅用于查看数据，不参与实际逻辑
 			uni.setStorageSync("apply-avatar", $data.imgSrc); // 单独存储 -- 头像，方便修改
@@ -277,16 +282,16 @@ export default {
 					url: that.path,
 				});
 			}
-			if ($data.agencyStatus == 1) {
-				that.G.Get(that.api.login_agencyInfo, {}, (aRes) => {
-					console.log("获取团队信息:", aRes);
-					uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员
-					uni.setStorageSync("IS_CREATOR", aRes.agency.userId == $data.user.id || $data.admin == true ? 1 : 2); // 1是创建者 2是普通成员
+			// if ($data.agencyStatus == 1) {
+			that.G.Get(that.api.login_agencyInfo, {}, (aRes) => {
+				console.log("获取团队信息:", aRes);
+				uni.setStorageSync("agencyInfo", aRes.agency); // 1是创建者 2是普通成员
+				uni.setStorageSync("IS_CREATOR", aRes.agency.userId == $data.user.id || $data.admin == true ? 1 : 2); // 1是创建者 2是普通成员
 
-					// 登录跳转到首页的判断
-					uni.setStorageSync("SHOW_INVITE", 1);
-				});
-			}
+				// 登录跳转到首页的判断
+				uni.setStorageSync("SHOW_INVITE", 1);
+			});
+			// }
 		},
 
 		// 发送验证码
diff --git a/pages/person/index.vue b/pages/person/index.vue
index 2d6acd9..4f7babb 100644
--- a/pages/person/index.vue
+++ b/pages/person/index.vue
@@ -4,9 +4,9 @@
 		<!-- 基本信息 -->
 		<g-panel-card-info
 			:info="{
-				avatar: userinfo.avatar,
-				title: userinfo.name,
-				num: userinfo.tel,
+				avatar: userInfo.avatar,
+				title: userInfo.name,
+				num: userInfo.tel,
 				isHaveOrder: isHaveOrder,
 			}"
 			@clickCard="goPage('/root/person/info')"
@@ -17,7 +17,7 @@
 				<view v-if="isHaveOrder" class="g_pt_12 g_pb_12 g_flex_row_between" style="border-bottom: 1px solid #f5f5f5">
 					<view class="g_fs_16 g_c_3 g_fw_600 g_flex_none g_pl_16">我的发单账号</view>
 					<view class="g_flex_row_end g_flex_1 g_pr_16" hover-class="thover" @click="goPage('/root/person/myOrder')">
-						<view class="g_fs_16 g_c_6">{{ userinfo.agencyName }}</view>
+						<view class="g_fs_16 g_c_6">{{ userInfo.agencyName }}</view>
 						<view class="g_ml_6 g_flex_column_center">
 							<i class="iconfont icon-gengduo11 g_c_c"></i>
 						</view>
@@ -25,7 +25,7 @@
 				</view>
 				<view class="g_flex_row_center">
 					<view
-						v-for="(item, index) in userinfo.num"
+						v-for="(item, index) in userInfo.num"
 						:key="index"
 						@click="handleClickNum(item, index)"
 						hover-class="g_bg_e"
@@ -97,20 +97,22 @@
 					</view> -->
 				</view>
 				<i class="iconfont icon-gengduo11 g_c_c"></i>
-				<!-- <view class="g_flex_row_end g_fs_16"> {{ userinfo.agencyName }} </view> -->
+				<!-- <view class="g_flex_row_end g_fs_16"> {{ userInfo.agencyName }} </view> -->
 			</view>
 		</view>
 		<!-- <g-panel-form-item :list="[{ icon: 'icon-my_setup', label: '创建发单号', result: '', path: '/root/person/order', tip: 'createOrder', pRow: 12 }]" @clickItem="handleClickItem" /> -->
 
-		<view class="g_mt_10">
+		<view class="g_mt_10" v-if="userInfo.admin">
 			<g-panel-form-item
-				:list="[{
-					icon: 'icon-wodetuandui',
-					label: '团队管理',
-					result: '',
-					path: '/root/person/teamManage',
-					pRow: 12,
-				}]"
+				:list="[
+					{
+						icon: 'icon-wodetuandui',
+						label: '团队管理',
+						result: '',
+						path: '/root/person/teamManage',
+						pRow: 12,
+					},
+				]"
 				@clickItem="handleClickItem"
 			/>
 		</view>
@@ -197,7 +199,7 @@ export default {
 					path: "/root/bind/search?active=1",
 				},
 			],
-			userinfo: {
+			userInfo: {
 				all: {},
 				avatar: "",
 				name: "请登录",
@@ -252,11 +254,11 @@ export default {
 			that.waitNum_ups = 0;
 			that.pageSpeed = 1;
 			that.isLogin = false;
-			that.userinfo.avatar = that.G.store().localBaseImg + "fadanzhushou.png";
-			that.userinfo.name = "请登录";
-			that.userinfo.tel = "-";
-			that.userinfo.agencyName = "";
-			that.userinfo.teamType = 0;
+			that.userInfo.avatar = that.G.store().localBaseImg + "fadanzhushou.png";
+			that.userInfo.name = "请登录";
+			that.userInfo.tel = "-";
+			that.userInfo.agencyName = "";
+			that.userInfo.teamType = 0;
 			that.speed = 0;
 		}
 	},
@@ -302,7 +304,7 @@ export default {
 					pRow: 12,
 				},
 			];
-			if (uni.getStorageSync("apply-supplierAccount") == 1) {
+			// if (uni.getStorageSync("apply-supplierAccount") == 1) {
 				// 有
 				that.isHaveOrder = true;
 				if (that.isCreator) {
@@ -326,19 +328,17 @@ export default {
 						},
 					];
 				}
-			}
+			// }
 			let userInfo = uni.getStorageSync("apply-userinfo");
 			that.isLogin = true;
+			that.userInfo = { ...userInfo };
+        console.log(that.userInfo,'that.userInfo');
+			that.userInfo.avatar = uni.getStorageSync("apply-avatar");
+			that.userInfo.name = userInfo.userName || userInfo.aliasName;
+			that.userInfo.tel = uni.getStorageSync("apply-tel");
 
-			that.userinfo.agencyName = userInfo.agencyName;
-			that.userinfo.user = userInfo.user;
-
-			that.userinfo.avatar = uni.getStorageSync("apply-avatar");
-			that.userinfo.name = userInfo.userName || userInfo.aliasName;
-			that.userinfo.tel = uni.getStorageSync("apply-tel");
-
-			if (that.userinfo.num[0].name == "-") {
-				that.userinfo.num = [
+			if (that.userInfo.num[0].name == "-") {
+				that.userInfo.num = [
 					{
 						name: "-",
 						num: "-",
@@ -346,11 +346,11 @@ export default {
 				];
 			}
 
-			that.userinfo.agencyName = userInfo.agencyName;
-			that.userinfo.teamType = userInfo.teamType;
-			that.getWaitNum();
-			that.checkInvite();
-			that.getTeamList();
+			that.userInfo.agencyName = userInfo.agencyName;
+			that.userInfo.teamType = userInfo.teamType;
+			// that.getWaitNum();
+			// that.checkInvite();
+			// that.getTeamList();
 
 			if (uni.getStorageSync("watch_invite")) {
 				if (uni.getStorageSync("watch_invite") == 1) {
@@ -390,16 +390,16 @@ export default {
 					type: 2,
 				},
 				(res) => {
-					if (res.total > 0) {
-						uni.setTabBarBadge({
-							index: 2,
-							text: String(res.total),
-						});
-					} else {
-						uni.removeTabBarBadge({
-							index: 2,
-						});
-					}
+					// if (res.total > 0) {
+					// 	uni.setTabBarBadge({
+					// 		index: 2,
+					// 		text: String(res.total),
+					// 	});
+					// } else {
+					// 	uni.removeTabBarBadge({
+					// 		index: 2,
+					// 	});
+					// }
 					that.waitNum_ups = res.total;
 					that.getDetail();
 				}
@@ -420,7 +420,7 @@ export default {
 						that.pageSpeed = 1;
 						if (uni.getStorageSync("apply-supplierAccount") == 1) {
 							// 有
-							that.userinfo.num = [
+							that.userInfo.num = [
 								{
 									name: "全部职位",
 									num: res.jobNum,
@@ -442,7 +442,7 @@ export default {
 							];
 						} else {
 							// 无
-							that.userinfo.num = [
+							that.userInfo.num = [
 								{
 									name: "关注",
 									num: res.upNum,
@@ -521,7 +521,7 @@ export default {
 			that.G.Get(that.api.user_getTeamList, {}, (res) => {
 				console.log("res", res);
 				res.forEach((item) => {
-					if (item.id == that.userinfo.user.agencyId) {
+					if (item.id == that.userInfo.user.agencyId) {
 						item.checked = true;
 					}
 				});
diff --git a/pages/workBench/index.vue b/pages/workBench/index.vue
index 614e5d9..5006b18 100644
--- a/pages/workBench/index.vue
+++ b/pages/workBench/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="g_bg_page">
-		<view class="g_h_all" style="" v-if="!isLogin || userInfo.agencyStatus != 1">
+		<view class="g_h_all" style="" v-if="!isLogin">
 			<!-- <unloginInfo></unloginInfo> -->
 		</view>
 		<view class="g_pb_48" v-else>
@@ -11,7 +11,7 @@
 				<view class="g_fw_600 g_mb_10 g_fs_20">{{ upNum }}</view>
 				<view class="g_c_6">关注发单号</view>
 			</view>
-      <!-- v-if="agencyInfo.supplierAccount == 1" -->
+			<!-- v-if="agencyInfo.supplierAccount == 1" -->
 			<view class="g_mt_10" v-if="false">
 				<!-- 发单号 -->
 				<g-panel-card-num :list="orderDataList" :subhead="agencyInfo.fullName || ''" titleNav="/root/merchantManagement/orderManagement" :border="true" :speed="1" :marginBottom="16" cusType="num" :height="26" :num="5" cusTitle="我的发单号" :bottomBox="true" bottomNav="/root/merchantManagement/jobForm" @clickItem="handleClickNum" />
@@ -23,8 +23,8 @@
 			</view>
 			<!-- wx:if="{{configInfo.record}}" -->
 			<!-- titleNav="/root/detail/applyTob" -->
-				<!-- 今日数据 -->
-				<!-- titleNav="/root/person/todayData" -->
+			<!-- 今日数据 -->
+			<!-- titleNav="/root/person/todayData" -->
 			<!-- <view class="g_mt_10">
 				<g-panel-card-num :list="todayDataList" :border="true" :speed="1" :marginBottom="16" cusType="num" :height="26" :num="5" cusTitle="今日数据" @clickItem="handleClickNum" />
 			</view> -->
@@ -135,7 +135,33 @@ export default {
 					path: "/root/person/todayData",
 				},
 			],
-			billDataList: [],
+			billDataList: [
+				{
+					name: "审核中",
+					num: 0,
+					path: "/pages/apply/index?status=1",
+				},
+				{
+					name: "待接待",
+					num: 0,
+					path: "/pages/apply/index?status=2",
+				},
+				{
+					name: "待面试",
+					num: 0,
+					path: "/pages/apply/index?status=3",
+				},
+				{
+					name: "待入职",
+					num: 0,
+					path: "/pages/apply/index?status=4",
+				},
+				{
+					name: "在职中",
+					num: 0,
+					path: "/pages/apply/index?status=5",
+				},
+			],
 			query: {
 				pageNum: 1,
 				size: 50,
@@ -152,11 +178,11 @@ export default {
 		that.agencyInfo = uni.getStorageSync("agencyInfo");
 		console.log("that.agencyInfo", that.agencyInfo);
 		that.isLogin = uni.getStorageSync("apply-token") ? true : false;
-		if (that.userInfo.agencyStatus == 1) {
-			this.getData();
-			this.getJobList();
-			this.getCompanyInfo();
-		}
+		// if (that.userInfo.agencyStatus == 1) {
+		this.getData();
+		this.getJobList();
+		this.getCompanyInfo();
+		// }
 		// if (typeof that.$scope.getTabBar === "function" && that.$scope.getTabBar()) {
 		// 	that.$scope.getTabBar().setData({
 		// 		selected: 4,
diff --git a/root/detail/apply.vue b/root/detail/apply.vue
index 419ad33..0b29bd0 100644
--- a/root/detail/apply.vue
+++ b/root/detail/apply.vue
@@ -11,12 +11,12 @@
 					<g-panel-detail-item label="状态" :value="orderDetail.status_text" valueColor="#ff4400" />
 					<!-- afterIcon="icon-gengduo11"  @clickItem="goBossDetail" -->
 					<g-panel-detail-item label="项目方" :value="orderDetail.upAgencyName" valueColor="#333" />
-					
+
 					<!-- @clickItem="handleOpenPeopleModal"  -->
-					<g-panel-detail-item label="报名人" from="resident-info" beforeIcon='icon-phone' @clickItem="goTel(orderDetail.agencyTel)" :remarkValue='orderDetail.agencyTel' v-if="!orderDetail.prevRecordId" :value="orderDetail.applyUserName"  />
-					<g-panel-detail-item label="报名人" from="resident-info" beforeIcon='icon-phone' @clickItem="goTel(orderDetail.agencyTel)" :remarkValue='orderDetail.agencyTel' v-else :value="orderDetail.applyUserName"  />
-					
-					<view >
+					<g-panel-detail-item label="报名人" from="resident-info" beforeIcon="icon-phone" @clickItem="goTel(orderDetail.agencyTel)" :remarkValue="orderDetail.agencyTel" v-if="!orderDetail.prevRecordId" :value="orderDetail.applyUserName" />
+					<g-panel-detail-item label="报名人" from="resident-info" beforeIcon="icon-phone" @clickItem="goTel(orderDetail.agencyTel)" :remarkValue="orderDetail.agencyTel" v-else :value="orderDetail.applyUserName" />
+
+					<view>
 						<view class="g_pt_10 g_border_d_t" v-if="orderDetail.canEdit || (!orderDetail.canEdit && (orderDetail.statusId == 10 || orderDetail.statusId == 20 || orderDetail.statusId == 25))">
 							<g-panel-detail-item from="times" label="面试时间" :value="orderDetail.interview_time" afterType="time" @confirmChooseTime="handleMianshi" />
 						</view>
@@ -89,15 +89,16 @@
 			<view class="m-price">
 				<view class="g_h_12"></view>
 				<view class="link g_bg_f g_pt_10">
-					<view v-if="(!orderDetail.nextRecordId && !orderDetail.prevRecordId && isCreator) || (isCreator && orderDetail.nextRecordId)">
+					<!-- v-if="(!orderDetail.nextRecordId && !orderDetail.prevRecordId && isCreator) || (isCreator && orderDetail.nextRecordId)" -->
+					<view>
 						<g-panel-detail-item label="服务费" :value="setReturnFee(orderDetail.returnFee, orderDetail.returnFeeType)" />
 						<g-panel-detail-item label="服务费详情" :value="orderDetail.returnFeeDesp" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.returnFeeDesp, '服务费详情', 'view')" />
 					</view>
-					<div v-if="(!orderDetail.nextRecordId && !orderDetail.prevRecordId) || orderDetail.prevRecordId || agencyId == orderDetail.agencyId">
+					<!-- <div v-if="(!orderDetail.nextRecordId && !orderDetail.prevRecordId) || orderDetail.prevRecordId || agencyId == orderDetail.agencyId">
 						<g-panel-detail-item :label="isCreator ? '代理费' : '代理费'" :value="setReturnFee(orderDetail.agencyReturnFee, orderDetail.agencyReturnFeeType)" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.agencyReturnFee / 100, '代理费', 'form', orderDetail.agencyReturnFeeType)" />
 						<g-panel-detail-item :label="isCreator ? '代理费详情' : '代理费详情'" :value="orderDetail.agencyReturnFeeDesp" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.agencyReturnFeeDesp, '代理费详情', 'edit')" />
-					</div>
-					<g-panel-detail-item label="政策模式" v-if="isCreator" :value="orderDetail.zhengceTextShow" afterIcon="icon-gengduo11" @clickItem="handleOpenZhengceModal" from="zhengce-info" />
+					</div> -->
+					<!-- <g-panel-detail-item label="政策模式" v-if="isCreator" :value="orderDetail.zhengceTextShow" afterIcon="icon-gengduo11" @clickItem="handleOpenZhengceModal" from="zhengce-info" /> -->
 					<g-panel-detail-item label="报名备注" :value="orderDetail.desp" />
 					<view class="g_h_15"></view>
 				</view>
@@ -106,19 +107,27 @@
 			<view class="m-job">
 				<view class="g_h_12"></view>
 				<view class="link g_bg_f g_pt_10">
-					<g-panel-detail-item label="报名企业" :value="orderDetail.storeName" />
+					<!-- <g-panel-detail-item label="报名企业" :value="orderDetail.storeName" /> -->
 					<g-panel-detail-item label="报名岗位" :value="orderDetail.storeJobName" fontWeight="bold" />
-					<g-panel-detail-item label="面试地址" :value="orderDetail.interviewAddress" afterIcon="icon-gengduo11" @clickItem="handleChooseAddressModal" />
 					<!-- 服务费 最上游或者不是管理人员不显示 orderDetail.nextRecordId为空 是最上游 -->
 					<!-- 代理费/服务费 最下游不显示 orderDetail.prevRecordId为空 是最下游 -->
-					<g-panel-detail-item label="驻场信息" v-if="orderDetail.prevRecordId || (!orderDetail.prevRecordId && !orderDetail.nextRecordId)" :value="orderDetail.totalZC || '-'" afterIcon="icon-gengduo11" @clickItem="handleOpenModal" from="resident-info" afterType="multi" @clickLabelBtn="handleClickLabelBtn(orderDetail.totalZC || '-')" labelSubStr="复制" />
-					<g-panel-detail-item label="驻场信息" v-else labelSubStr="复制" :value="orderDetail.totalZC || '-'" from="resident-info" afterType="multi" @clickLabelBtn="handleClickLabelBtn(orderDetail.totalZC || '-')" />
+
 					<!-- <g-panel-detail-item label="报名时间" :value="orderDetail.create_time" /> -->
-					<g-panel-detail-item label="其他信息" :value="orderDetail.interviewDesp" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.interviewDesp, '其他信息', 'edit')" />
 					<g-panel-detail-item label="职位说明" :value="orderDetail.employeeSalary" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.employeeSalary, '职位说明', 'edit')" />
 					<view class="g_h_15"></view>
 				</view>
 			</view>
+			<view class="m-price">
+				<view class="g_h_12"></view>
+				<view class="link g_bg_f g_pt_10">
+					<g-panel-detail-item label="面试地址" :value="orderDetail.interviewAddress" afterIcon="icon-gengduo11" @clickItem="handleChooseAddressModal" />
+					<g-panel-detail-item label="驻场信息" v-if="orderDetail.prevRecordId || (!orderDetail.prevRecordId && !orderDetail.nextRecordId)" :value="orderDetail.totalZC || '-'" afterIcon="icon-gengduo11" @clickItem="handleOpenModal" from="resident-info" afterType="multi" @clickLabelBtn="handleClickLabelBtn(orderDetail.totalZC || '-')" labelSubStr="复制" />
+					<g-panel-detail-item label="驻场信息" v-else labelSubStr="复制" :value="orderDetail.totalZC || '-'" from="resident-info" afterType="multi" @clickLabelBtn="handleClickLabelBtn(orderDetail.totalZC || '-')" />
+					<g-panel-detail-item label="其他说明" :value="orderDetail.interviewDesp" afterIcon="icon-gengduo11" @clickItem="goInfo(orderDetail.interviewDesp, '其他信息', 'edit')" />
+
+					<view class="g_h_15"></view>
+				</view>
+			</view>
 			<!-- 企业信息 -->
 			<!-- <view class="m-boss">
 				<view class="g_h_10"></view>
diff --git a/root/person/set.vue b/root/person/set.vue
index fd43737..51f8b8c 100644
--- a/root/person/set.vue
+++ b/root/person/set.vue
@@ -115,9 +115,8 @@ export default {
 	},
 	onLoad() {
 		let that = this;
-		let userInfo = uni.getStorageSync("apply-userinfo");
+		that.userinfo = uni.getStorageSync("apply-userinfo") || "";
 		this.showInvite = uni.getStorageSync("SHOW_INVITE_ALL") == 1 ? true : false;
-		that.userinfo = userInfo;
 		this.getTeamList();
 	},
 	onShow() {
@@ -133,7 +132,7 @@ export default {
 			that.G.Get(that.api.user_getTeamList, {}, (res) => {
 				console.log("res", res);
 				res.forEach((item) => {
-					if (item.id == that.userinfo.user.agencyId) {
+					if (item.id == uni.getStorageSync("apply-agencyId")) {
 						item.checked = true;
 					}
 				});
@@ -206,6 +205,7 @@ export default {
 				title: "切换中...",
 			});
 			that.G.Get(that.api.user_toggleTeam + `/${item.id}`, {}, (res) => {
+				uni.setStorageSync("apply-agencyId", item.id);
 				console.log("res", res);
 				that.G.checkTokenNew().then(() => {
 					uni.hideLoading();
diff --git a/utils/ajax.js b/utils/ajax.js
index e6a0398..fed98df 100644
--- a/utils/ajax.js
+++ b/utils/ajax.js
@@ -151,7 +151,7 @@ let data = {
           });
           setTimeout(() => {
             uni.reLaunch({
-              url: '/pages/login/index?path=' + that.getPathCopy().path + '&level=' + that.getPathCopy().level
+              url: '/pages/login/index?path=/' + that.getPathCopy().path + '&level=' + that.getPathCopy().level
             });
           }, 1500);
         } else {// 其他异常