From bba2525e2f028d68770bda2eece8dcfa3e1dad85 Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Thu, 8 Jan 2026 09:19:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8Alog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/AiApply.vue                             |  2 +-
 components/list/job.vue                            | 11 +++---
 components/panel/detailItem.vue                    |  2 +-
 components/panel/formSlot.vue                      | 21 +++++-----
 components/panel/time.vue                          | 46 +++++++++++++++-------
 pages.json                                         |  5 ++-
 .../conversation-list/conversation-item.vue        |  2 +-
 pages/home/child/filter.vue                        | 46 +++++++++++-----------
 pages/home/index.vue                               | 15 ++++---
 pages/home/order.vue                               |  5 ++-
 pages/workBench/index.vue                          |  8 ++--
 root/home/editTownsman.vue                         |  6 +--
 root/home/quickApplication.vue                     | 11 ++++--
 root/person/loginIndex.vue                         |  2 +-
 utils/common.js                                    | 46 +++++++++++-----------
 utils/wyyx.js                                      |  2 +-
 16 files changed, 129 insertions(+), 101 deletions(-)

diff --git a/components/AiApply.vue b/components/AiApply.vue
index b7af922..d9c7cd6 100644
--- a/components/AiApply.vue
+++ b/components/AiApply.vue
@@ -7,7 +7,7 @@
 				<img :src="currentImg" class="g_w_48 g_h_48 g_radius_8" alt />
 			</div>
 			<textarea class data-type="desp" v-model="aitext" placeholder="粘贴工友信息, 用AI识别 " placeholder-style="color:#999" :maxlength="-1" :style="{ width: '100%', 'height': true ? '84px' : '84px' }"></textarea>
-			<div class>
+			<div class> 
 				<view class="g_flex_row_end flex_center">
 					<view class="iconfont icon-jia1 g_c_9 g_mr_8 g_fs_20 g_position_rela biggerSize" @click="chooseImgShow = true"></view>
 					<view class="g_mr_8 g_w_72 g_fw_600">
diff --git a/components/list/job.vue b/components/list/job.vue
index 6ac59dc..862f873 100644
--- a/components/list/job.vue
+++ b/components/list/job.vue
@@ -2,15 +2,16 @@
 	<view class="g-components-yi-list-job g_bg_f_5">
 		<g-loading paddingBottom="g_pb_120" v-if="loading && speed == -1" />
 		<!-- loading && speed == -1 -->
-		<view v-if="!loading && speed == 0" style="width: calc(100% - 20px); margin: 0 auto" class="g_h_all g_flex_row_center">
+		<view v-if="!loading && speed == 0 && isLogin" style="width: calc(100% - 20px); margin: 0 auto" class="g_h_all g_flex_row_center">
 			<!-- <view class="g_h_all" style="" v-if="!isLogin">
-                                <unloginInfo></unloginInfo>
-                        </view> -->
+        <unloginInfo></unloginInfo>
+      </view> -->
 			<rh-empty :text="emptyText" style="margin-top: 30px" />
-			<view class="g_mt_32" v-if="isShowLoginBtn">
+			<!-- <view class="g_mt_32" v-if="isShowLoginBtn">
 				<rh-button :btnText="'登录查看'" type="primary" @clickBtn="goLogin" />
-			</view>
+			</view> -->
 		</view>
+
 		<view v-if="speed > 0" class="link">
 			<block class="" v-for="(item, index) in jobArray" :key="index">
 				<view class="item g_position_rela g_mb_10 g_ml_12 g_mr_12 g_bg_f g_radius_8 g_border_e_b" :class="from == 'share' ? 'g_pl_32' : ''" hover-class="thover">
diff --git a/components/panel/detailItem.vue b/components/panel/detailItem.vue
index 4d0300f..60a635d 100644
--- a/components/panel/detailItem.vue
+++ b/components/panel/detailItem.vue
@@ -30,7 +30,7 @@
 							{{ value ? value : "-" }}
 						</view>
 						<view v-if="afterType == 'time'" class="g_flex_1 310">
-							<g-panel-time :timeval="value" @confirmChooseTime="getChooseTime" />
+							<g-panel-time :timeval="value" :from="from" @confirmChooseTime="getChooseTime" />
 						</view>
 						<view v-if="afterType == 'list'">
 							<view>
diff --git a/components/panel/formSlot.vue b/components/panel/formSlot.vue
index 88effbf..21322b4 100644
--- a/components/panel/formSlot.vue
+++ b/components/panel/formSlot.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="g-components-item">
-		<div class="m-set g_bg_f g_radius_8" :style="{ overflow: 'hidden'}">
+		<div class="m-set g_bg_f g_radius_8" :style="{ overflow: 'hidden' }">
 			<block v-for="(item, index) in list" :key="index">
 				<div
 					class="item g_flex_row_start"
@@ -139,7 +139,7 @@
 
 									<div class="" v-if="item.tip == 'slot-choose&input-address'">
 										<view v-if="item.uneditable" class="g_br_6 g_text_r g_pt_8 g_pb_8">
-											{{ item.value || '-' }}
+											{{ item.value || "-" }}
 										</view>
 										<view class="form-new-choose g_flex_rowRight_columnCenter" v-else>
 											<u-input v-model="item.value" @input="(e) => handleAddress(e, item, index)" class="g_flex_1 g_ml_8" maxlength="1000" type="textarea" :placeholder="item.placeholder" placeholder-style="color:#999;line-height:24px" :clearable="false" :customStyle="{ fontSize: '16px', 'text-align': 'right', 'min-height': '24px', 'line-height': '24px' }" />
@@ -157,7 +157,8 @@
 									</div>
 									<!-- 时间 -->
 									<div class="form-new-time g_flex_rowRight_columnCenter g_w_all" v-if="item.tip == 'slot-time'">
-										<g-panel-detail-item :from="item.from" style="width: 100%" label=" " :isShowBottom="false" :value="item.value" afterType="time" @confirmChooseTime="handleMianshi" />
+										<g-panel-time :timeval="item.value" :from="item.from" @confirmChooseTime="handleMianshi" />
+										<!-- <g-panel-detail-item :from="item.from" style="width: 100%" label=" " :isShowBottom="false" :value="item.value" afterType="time" @confirmChooseTime="handleMianshi" /> -->
 									</div>
 									<!-- 附件上传 -->
 									<div class="g_flex_rowRight_columnCenter g_w_all" @click="chooseImgType('img')" v-if="item.tip == 'slot-update-file'">
@@ -240,7 +241,7 @@
 			<g-panel-fixed>
 				<slot>
 					<div class="g_flex_row_center">
-						<rh-button primaryColor='#00b666' btnText="确定" type="primary" @clickBtn="submitZhengce" />
+						<rh-button primaryColor="#00b666" btnText="确定" type="primary" @clickBtn="submitZhengce" />
 					</div>
 				</slot>
 			</g-panel-fixed>
@@ -385,7 +386,7 @@ export default {
 		},
 		// 身份证号
 		handleIDcard(e, $item, $index) {
-      console.log('123123132',e);
+			console.log("123123132", e);
 			this.$emit("changeIDcard", e);
 		},
 		// 家庭住址
@@ -441,11 +442,11 @@ export default {
 			// #endif
 			// #ifdef APP-PLUS
 			that.$emit("chooseAddress", {
-				district:'',
-				address:'',
-				addressName:'',
-				lat:'',
-				lng:'',
+				district: "",
+				address: "",
+				addressName: "",
+				lat: "",
+				lng: "",
 			});
 			// #endif
 		},
diff --git a/components/panel/time.vue b/components/panel/time.vue
index c51bba2..1c73224 100644
--- a/components/panel/time.vue
+++ b/components/panel/time.vue
@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="g_flex_row_end flex_center" @click="showPop">
+		<view class="g_flex_row_end flex_center" @click="showPop" v-if="from == 'reservation-time'">
 			<view class="g_fs_16">
 				{{ !!currentTime ? currentTime : "----" }}
 			</view>
@@ -8,8 +8,16 @@
 				<i class="iconfont icon-rili g_c_9 g_ml_6"></i>
 			</view>
 		</view>
-		<u-popup v-model="showPopFlag" mode="bottom" z-index="999999" border-radius="12" :closeable="true" :mask-close-able="true" @close="closePop">
-			<view class="g_p_12">
+		<picker v-else mode="multiSelector" class="g_flex_column_center" :range="dateTimeArray" :value="dateTime" :z-index="99999" @change="changeDateTime" @columnchange="changeDateTimeColumn($event)" style="color: #333" :disabled="disabled">
+			<view class="g_flex_row_end flex_center">
+				<view class="g_fs_16">{{ !!currentTime ? currentTime : "----" }}</view>
+				<view class>
+					<i class="iconfont icon-rili g_c_9 g_ml_6"></i>
+				</view>
+			</view>
+		</picker>
+		<u-popup v-model="showPopFlag" mode="center" z-index="999999" border-radius="12" :closeable="true" :mask-close-able="true" @close="closePop">
+			<view class="g_p_12" style="width: 85vw">
 				<view class="g_fs_16 g_fw_600 g_mb_16">选择时间</view>
 				<view class="g_p_9 g_border_d9 g_flex_row_center g_radius_6">
 					<picker mode="multiSelector" class="g_flex_column_center flex_center3 g_w_all" :range="dateTimeArray" :value="dateTime" @change="changeDateTime" @columnchange="changeDateTimeColumn($event)" style="color: #333">
@@ -30,7 +38,7 @@
 						</view>
 					</template>
 				</view>
-				<view class="g_h_32"></view>
+				<view class="g_h_12"></view> 
 				<!-- <view class="g_flex_row_center g_mt_12">
 					<view class="g_mr_12">
 						<rh-button primaryColor='#00b666' btnText="取消" type="default" size="small" @clickBtn="showPopFlag = false"></rh-button>
@@ -98,6 +106,12 @@ export default {
 				return "";
 			},
 		},
+		from: {
+			type: String,
+			default: () => {
+				return "";
+			},
+		},
 	},
 	created() {
 		console.log("create 是否触发", this.timeval);
@@ -107,17 +121,17 @@ export default {
 			console.log("watch 是否触发", oldVal, "--", newVal);
 			this.currentTime = oldVal ? oldVal : newVal;
 		},
-		showPopFlag(oldVal, newVal) {
-			if (oldVal) {
-				uni.hideTabBar({
-					animation: false,
-				});
-			} else {
-				uni.showTabBar({
-					animation: false,
-				});
-			}
-		},
+		// showPopFlag(oldVal, newVal) {
+		// 	if (oldVal) {
+		// 		uni.hideTabBar({
+		// 			animation: false,
+		// 		});
+		// 	} else {
+		// 		uni.showTabBar({
+		// 			animation: false,
+		// 		});
+		// 	}
+		// },
 	},
 	mounted() {
 		var obj = dateTimePicker.dateTimePicker(this.startYear, this.endYear, this.currentTime);
@@ -156,6 +170,8 @@ export default {
 		},
 		showPop() {
 			this.showPopFlag = true;
+			if (this.from) {
+			}
 
 			this.quickSelectTime.forEach((item) => {
 				if (item.value == this.currentTime) {
diff --git a/pages.json b/pages.json
index f1c15d2..a5441b9 100644
--- a/pages.json
+++ b/pages.json
@@ -4,8 +4,9 @@
       "path": "pages/home/index",
       "style": {
         "navigationBarTitleText": "报名助手",
-        "backgroundColor": "#fff",
-        "backgroundColorTop": "#fff"
+        "backgroundColor": "#ededed",
+        "backgroundColorTop": "#ededed",
+        "backgroundColorBottom": "#ededed"
       }
     },
     {
diff --git a/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue b/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
index 26652f9..903a7c3 100644
--- a/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
+++ b/pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
@@ -399,7 +399,7 @@ $cellHeight: 72px;
 		font-size: 12px;
 		color: #cccccc;
 		text-align: right;
-		width: 90px;
+		width: 100px;
 		flex-shrink: 0;
 	}
 }
diff --git a/pages/home/child/filter.vue b/pages/home/child/filter.vue
index c1c5acc..706eca7 100644
--- a/pages/home/child/filter.vue
+++ b/pages/home/child/filter.vue
@@ -114,10 +114,10 @@ export default {
 		getFilterDataNew: {
 			handler(newValue, oldValue) {
 				var that = this;
-				console.log("筛选组件 newValue", JSON.parse(JSON.stringify(newValue)));
-				console.log("筛选组件 oldValue", JSON.parse(JSON.stringify(oldValue)));
+				// console.log("筛选组件 newValue", JSON.parse(JSON.stringify(newValue)));
+				// console.log("筛选组件 oldValue", JSON.parse(JSON.stringify(oldValue)));
 				// if (newValue != oldValue) {
-				console.log("筛选组件：有变化");
+				// console.log("筛选组件：有变化");
 				if (newValue.ageRangeStr != "" && newValue.ageRangeStr != "16-60") {
 					this.rangeValue = newValue.ageRangeStr.split("-").map((item) => Number(item));
 				} else {
@@ -130,7 +130,7 @@ export default {
 						item.active = 0;
 						this.filterData.sex[0].active = -1;
 					});
-					console.log("this.filterData.sex", this.filterData.sex);
+					// console.log("this.filterData.sex", this.filterData.sex);
 				} else {
 					this.filterData.sex.forEach((item) => {
 						item.active = 0;
@@ -181,13 +181,13 @@ export default {
 						item.active = 0;
 						this.filterData.sex[0].active = -1;
 					});
-					console.log("this.filterData.sex", this.filterData.sex);
+					// console.log("this.filterData.sex", this.filterData.sex);
 				} else {
 					this.filterData.sex.forEach((item) => {
 						item.active = 0;
 						this.filterData.sex[Number(newValue.sex)].active = newValue.sex;
 					});
-					console.log("newValue.sex +++++++++++++++++++++ newValue.sex", newValue.sex);
+					// console.log("newValue.sex +++++++++++++++++++++ newValue.sex", newValue.sex);
 					this.sex = newValue.sex;
 				}
 				if (newValue.labelNames) {
@@ -204,7 +204,7 @@ export default {
 											});
 										});
 									}
-									console.log("this.filterData.jobFilter", that.filterData.jobFilter);
+									// console.log("this.filterData.jobFilter", that.filterData.jobFilter);
 								}
 								that.toList();
 							} else {
@@ -215,7 +215,7 @@ export default {
 					digui();
 				}
 				// } else {
-				// 	console.log("筛选组件：无变化");
+				// 	// console.log("筛选组件：无变化");
 				// }
 			},
 			deep: true,
@@ -316,21 +316,21 @@ export default {
 	},
 	methods: {
 		hideDrawer() {
-      console.log('123123');
+      // console.log('123123');
 			this.$emit("hideDrawer", "");
 		},
 		format(val) {
 			return val;
 		},
 		handleRangeChange(e) {
-			console.log(e);
+			// console.log(e);
 			this.rangeValue = e;
 			this.ageRangeStr = e[0] + "-" + e[1];
 		},
 		doNothing() {},
 		toList() {
 			var that = this;
-			console.log("this.sex", this.sex);
+			// console.log("this.sex", this.sex);
 			this.filterObj["sex"] = this.sex;
 			this.filterObj["ageRangeStr"] = this.ageRangeStr;
 			this.jobSpecialLabelIds = [];
@@ -351,12 +351,12 @@ export default {
 			// 根据id获取对象
 			const jobCategoryLabelObjects = that.filterData.classifyList.filter((item) => this.jobCategoryLabelIds.includes(item.id));
 
-			console.log(jobCategoryLabelObjects);
+			// console.log(jobCategoryLabelObjects);
 
 			// 根据id获取对象(职位标签)
 			const jobSpecialLabelObjects = that.totalList.filter((item) => this.jobSpecialLabelIds.includes(item.id));
 
-			console.log(jobSpecialLabelObjects);
+			// console.log(jobSpecialLabelObjects);
 
 			this.filterObj.jobCategoryLabelObjects = jobCategoryLabelObjects;
 			this.filterObj.jobSpecialLabelObjects = jobSpecialLabelObjects;
@@ -365,7 +365,7 @@ export default {
 		},
 		clearFilter() {
 			var that = this;
-			console.log("cleclecleclecleclecle");
+			// console.log("cleclecleclecleclecle");
 			this.filterObj["sex"] = -1;
 			this.filterObj["ageRangeStr"] = "";
 			this.rangeValue = [16, 60];
@@ -387,7 +387,7 @@ export default {
 				item.active = 0;
 			});
 			this.clearArray();
-			console.log(that.filterData);
+			// console.log(that.filterData);
 
 			setTimeout(() => {
 				this.rangeValue = [16, 60];
@@ -395,7 +395,7 @@ export default {
 			}, 100);
 		},
 		clearArray(type) {
-			console.log(type);
+			// console.log(type);
 			if (type || type == 0) {
 				this["clearArray" + type]();
 			} else {
@@ -440,7 +440,7 @@ export default {
 				that.api.yi_job_class_new,
 				{ type: 90, industry: 2, hasJob: 1 },
 				(res) => {
-					console.log(res);
+					// console.log(res);
 					that.allSpecial = res;
 					that.allSpecial.forEach((item) => {
 						item.active = 0;
@@ -458,7 +458,7 @@ export default {
 					});
 					that.totalList = [...this.filterData.jobFilter.tagArray0, ...this.filterData.jobFilter.tagArray1, ...this.filterData.jobFilter.tagArray2, ...this.filterData.jobFilter.tagArray3, ...this.filterData.jobFilter.tagArray4];
 
-					console.log(that.totalList);
+					// console.log(that.totalList);
 
 					// that.filterData.classifyList = res.labels.map(label => ({
 					//   ...label,
@@ -466,7 +466,7 @@ export default {
 					// }));
 				},
 				(res) => {
-					console.log(res);
+					// console.log(res);
 				}
 			);
 		},
@@ -485,7 +485,7 @@ export default {
 		// 			}));
 		// 		},
 		// 		(res) => {
-		// 			console.log(res);
+		// 			// console.log(res);
 		// 		}
 		// 	);
 		// },
@@ -517,9 +517,9 @@ export default {
 					this.jobCategoryLabelIds.push(id);
 				}
 
-				console.log(this.jobCategoryLabelIds);
+				// console.log(this.jobCategoryLabelIds);
 			} else {
-				console.log("id", id);
+				// console.log("id", id);
 				if (this.filterData.jobFilter[str][index].active == id) {
 					//已选中状态 取消选中
 					this.filterData.jobFilter[str][index].active = 0;
@@ -528,7 +528,7 @@ export default {
 					this.filterData.jobFilter[str][index].active = id;
 					// this.jobSpecialLabelIds.push(id);
 				}
-				console.log("this.filterData.jobFilter[str]", this.filterData.jobFilter[str]);
+				// console.log("this.filterData.jobFilter[str]", this.filterData.jobFilter[str]);
 			}
 		},
 		goAnchor(item) {
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 88a0c86..5b96910 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -3,8 +3,10 @@
 		<div v-show="computeCode == -1" class="g_flex_column_center">
 			<g-loading marginBottom="g_mb_130" />
 		</div>
-
-		<div v-show="computeCode > -1">
+		<view class="g_h_all" v-show="!isLogin">
+			<rh-login-false-list />
+		</view>
+		<div v-show="computeCode > -1 && isLogin">
 			<!-- 列表区 -->
 			<!-- <div @click="showPop = true"> 1123 </div> -->
 			<!-- `calc(${navInfo.windowHeight}px - ${navInfo.navigationBarHeight + navInfo.statusBarHeight}px)` -->
@@ -98,7 +100,7 @@
 						</div>
 
 						<div class="g_h_8"></div>
-						<g-list-job from="home" @uploadList="getList" bg="#ededed" class="" :list="query.list" :active="tabInfo.active" @shareJob="shareJob" :loading="loading" :speed="speed" :query="query" :isShowLoginBtn="isLogin ? false : true" :emptyText="isLogin ? (tabInfo.active == 0 || tabInfo.active == 2 ? '嘿，这里还没有数据呢' : '您还未收藏职位，快去试试收藏职位吧') : '你好，此服务仅限人力资源行业受邀商家登录，请确认'" />
+						<g-list-job from="home" @uploadList="getList" bg="#ededed" class="" :list="query.list" :active="tabInfo.active" @shareJob="shareJob" :loading="loading" :speed="speed" :query="query" :isShowLoginBtn="isLogin ? false : true" :emptyText="isLogin ? (tabInfo.active == 0 || tabInfo.active == 2 ? '嘿，这里还没有数据呢' : '您还未收藏职位，快去试试收藏职位吧') : '您还有没有登录，请登录后查看'" />
 					</div>
 				</div>
 			</scroll-view>
@@ -158,7 +160,7 @@ export default {
 		let that = this;
 		that.navInfo = that.G.getNavInfo();
 		console.log('uni.getStorageSync("apply-token")', uni.getStorageSync("apply-token"));
-		that.isLogin = uni.getStorageSync("apply-token");
+		that.isLogin = uni.getStorageSync("apply-token") ? true : false;
 		that.tabInfo.active = 0;
 
 		if (!that.isLogin) {
@@ -328,6 +330,7 @@ export default {
 	computed: {},
 	onShow() {
 		let that = this;
+		this.isLogin = uni.getStorageSync("apply-token") ? true : false;
 		if (that.isLogin) {
 			this.agencyInfo = uni.getStorageSync("agencyInfo");
 			this.userInfo = uni.getStorageSync("apply-userinfo");
@@ -882,9 +885,9 @@ export default {
 			}
 		},
 		searchJob() {
-      console.log(123123);
+			console.log(123123);
 			this.query.list = [];
-			this.query.page = 1; 
+			this.query.page = 1;
 			this.speed = -1;
 			this.loading = true;
 			this.getList();
diff --git a/pages/home/order.vue b/pages/home/order.vue
index d802c55..93f7afa 100644
--- a/pages/home/order.vue
+++ b/pages/home/order.vue
@@ -92,7 +92,7 @@
 				</view>
 				<view class="g_h_12"></view>
 				<view class="g_flex_row_center g_pl_16 g_pr_16" style="z-index: 99">
-					<rh-button primaryColor='#00b666' btnText="立即报名" type="primary" :loading="btnLoading" @clickBtn="submitForm" />
+					<rh-button primaryColor="#00b666" btnText="立即报名" type="primary" :loading="btnLoading" @clickBtn="submitForm" />
 				</view>
 				<view class="g_h_32"></view>
 				<!-- <g-panel-fixed v-if="false">
@@ -210,7 +210,7 @@ export default {
 	},
 	data() {
 		return {
-			isLogin: uni.getStorageSync("apply-token") ? true : false,
+			isLogin: false,
 			detailRes: {},
 			IS_CREATOR: false,
 			jobType: 2,
@@ -246,6 +246,7 @@ export default {
 	onShow() {
 		let that = this;
 		that.pageSpeed = -1;
+		this.isLogin = uni.getStorageSync("apply-token") ? true : false;
 	},
 	methods: {
 		getTownsManInfo(info) {
diff --git a/pages/workBench/index.vue b/pages/workBench/index.vue
index 4e9abac..1795745 100644
--- a/pages/workBench/index.vue
+++ b/pages/workBench/index.vue
@@ -1,5 +1,5 @@
 <template>
-	<gListApply  :status="menuActive" :hasRequested.sync="hasRequested"></gListApply>
+	<gListApply :status="menuActive" :hasRequested.sync="hasRequested"></gListApply>
 </template>
 
 <script>
@@ -119,7 +119,7 @@ export default {
 			isLogin: false,
 			loginInfo: {},
 			navInfo: {},
-      hasRequested:false
+			hasRequested: false,
 		};
 	},
 	onHide() {
@@ -162,7 +162,6 @@ export default {
 		// 	that.isHaveOrder = 0;
 		// 	that.tabActive = 0;
 		// }
-		that.isLogin = uni.getStorageSync("apply-token") ? true : false;
 		// // console.log("that.isLogin", that.isLogin);
 		// that.loginInfo = uni.getStorageSync("apply-userinfo");
 
@@ -180,12 +179,13 @@ export default {
 	},
 	onShow() {
 		let that = this;
+		this.isLogin = uni.getStorageSync("apply-token") ? true : false;
 		if (that.isLogin) {
 			if (uni.getStorageSync("applyType") || uni.getStorageSync("applyType") === 0) {
 				that.menuActive = uni.getStorageSync("applyType");
 				uni.removeStorageSync("applyType");
 			}
-      this.hasRequested = false
+			this.hasRequested = false;
 			// this.getList();
 		}
 		this.getGZHInfo();
diff --git a/root/home/editTownsman.vue b/root/home/editTownsman.vue
index 0c7a2c9..3887bb4 100644
--- a/root/home/editTownsman.vue
+++ b/root/home/editTownsman.vue
@@ -29,9 +29,9 @@
 						result: '',
 						value: info.name,
 						path: '',
-						tip: 'slot-upID',
+						tip: 'slot-name',
 						img: info.idCardImageUrl,
-						placeholder: '手动输入或拍照自动识别 → ',
+						placeholder: '请输入姓名',
 						type: 'slot',
 						pColumn: 8,
 						require: true,
@@ -143,7 +143,7 @@
 </template>
 
 <script>
-import AiApply from "./components/AiApply.vue";
+import AiApply from "../../components/AiApply.vue";
 import { nationlist } from "../../utils/nation.js";
 export default {
 	components: {
diff --git a/root/home/quickApplication.vue b/root/home/quickApplication.vue
index 00fd0d0..ab7e9ff 100644
--- a/root/home/quickApplication.vue
+++ b/root/home/quickApplication.vue
@@ -89,8 +89,13 @@
 				<g-panel-fixed>
 					<slot>
 						<view class="g_flex_row_between g_pl_16 g_pr_16" style="z-index: 99">
-							<view class="g_fs_16 g_c_6 g_flex_c g_pl_8 g_pr_8 g_radius_6 g_ml_16" hover-class="thover" @click="goReturn">取消</view>
-							<rh-button primaryColor='#00b666' btnText="立即报名" type="primary" :loading="btnLoading" @clickBtn="submitForm" />
+							<div class="" style="width:82px">
+								<!-- <view class="g_fs_16 g_c_main g_flex_c g_pl_8 g_pr_8 g_radius_6 g_ml_16 g_border_main" hover-class="thover" @click="goReturn">取消</view> -->
+								<rh-button primaryColor="#00b666" btnText="取消" size="small_auto" type="default" @clickBtn="goReturn" />
+							</div>
+							<div class="g_flex_1 g_flex_row_end">
+								<rh-button primaryColor="#00b666" btnText="立即报名" type="primary" :loading="btnLoading" @clickBtn="submitForm" />
+							</div>
 						</view>
 					</slot>
 				</g-panel-fixed>
@@ -294,7 +299,7 @@ export default {
 						pColumn: 12,
 						from: "reservation-time",
 					},
-			that.updateInfo["interviewAddress"]
+					that.updateInfo["interviewAddress"]
 						? {
 								icon: "",
 								label: "面试地址",
diff --git a/root/person/loginIndex.vue b/root/person/loginIndex.vue
index 54d6dd5..d15bc25 100644
--- a/root/person/loginIndex.vue
+++ b/root/person/loginIndex.vue
@@ -41,7 +41,7 @@
 				</view>
 			</view>
 			<view class="g_mt_24 g_flex_row_center">
-				<rh-button primaryColor='#00b666' width="260" height="48" btnText="一键免密登录" type="default" openType="getPhoneNumber" @clickTel="getphonenumber" />
+				<rh-button primaryColor='#00b666' width="260" height="48" icon="icon-shouji" btnText="手机号快捷登录" type="default" openType="getPhoneNumber" @clickTel="getphonenumber" />
 			</view>
 			<!-- #endif -->
 		</view>
diff --git a/utils/common.js b/utils/common.js
index 013ffb4..0cc0c98 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -53,7 +53,7 @@ let data = {
       imageUrl: image,
       title: title
     };
-    console.log('分享数据:', params)
+    // console.log('分享数据:', params)
     return params;
   },
 
@@ -62,7 +62,7 @@ let data = {
   handleConfirm (
     options
   ) {
-    console.log(options);
+    // console.log(options);
     uni.showModal({
       title: options.title || '',
       content: options.content || '',
@@ -131,7 +131,7 @@ let data = {
       sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
       sourceType: $sourceType, //album 从相册选图，camera 使用相机
       success: function (res) {
-        console.log('选取文件数据：', res)
+        // console.log('选取文件数据：', res)
         callback(JSON.stringify(res.tempFilePaths));
       }
     });
@@ -144,7 +144,7 @@ let data = {
       sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
       sourceType: ['album', 'camera'], //从相册选择
       success: function (res) {
-        console.log('选取文件数据：', res)
+        // console.log('选取文件数据：', res)
         callback(JSON.stringify(res.tempFilePaths));
       }
     });
@@ -159,7 +159,7 @@ let data = {
         encoding: 'base64',
         success: res => {
           let base64 = 'data:image/jpeg;base64,' + res.data; //不加上这串字符，在页面无法显示
-          console.log('base64：', base64)
+          // console.log('base64：', base64)
           return base64;
         }
       })
@@ -168,7 +168,7 @@ let data = {
   /* 设置导航条
    */
   setNavStyle ($form = 'default') {
-    console.log('into setNavStyle');
+    // console.log('into setNavStyle');
 
     if ($form == 'home') {
       uni.setNavigationBarColor({
@@ -415,7 +415,7 @@ let data = {
         if (item.storeDistrict) {
           var districtArr = item.storeDistrict.split(",");
           var districtArr1 = [];
-          // console.log(districtArr);
+          // // console.log(districtArr);
           districtArr.forEach((item1, index) => {
             if (item1.length != 0) {
               item1 = item1 + "丨";
@@ -541,7 +541,7 @@ let data = {
         } else {
           let newArr = [item.minAgeMan, item.maxAgeMan, item.minAgeWoman, item.maxAgeWoman]
           newArr.sort()
-          // console.log('newArr', newArr)
+          // // console.log('newArr', newArr)
           let minAge = (newArr[0] == 0) ? newArr[2] : newArr[0]
           let maxAge = newArr[3]
           item["age"] = minAge + '-' + maxAge + '岁';
@@ -632,7 +632,7 @@ let data = {
             item["jobDesp"] = item["jobDesp"].replaceAll("*****", "");
           }
           //年龄
-          // console.log(jobList);
+          // // console.log(jobList);
           var ageStr = "";
           if (that.isNotEmptyCheck(item.minAge) && that.isNotEmptyCheck(item.maxAge)) {
             ageStr = item.minAge + "-" + item.maxAge + "岁";
@@ -689,7 +689,7 @@ let data = {
             var districtArr = item.district.split(",");
             var districtArr1 = [];
             districtArr.forEach((item1, index) => {
-              // console.log('item1',item1)
+              // // console.log('item1',item1)
               if (item1.length != 0 && index < 2) {
                 item1 = item1 + "丨";
                 districtArr1.push(item1);
@@ -784,28 +784,28 @@ let data = {
           var districtArr
 
           districtArr = that.isNotEmptyCheck(jobList.district) ? jobList.district.split(",") : jobList.storeDistrict.split(",")
-          // console.log(districtArr);
+          // // console.log(districtArr);
           var districtArr1 = [];
-          // console.log(districtArr);
+          // // console.log(districtArr);
           districtArr.forEach((item1, index) => {
             if (item1.length != 0 && index < 2) {
               item1 = item1 + "丨";
               districtArr1.push(item1);
             }
           });
-          // console.log(districtArr1);
+          // // console.log(districtArr1);
           if (districtArr.length > 3) {
             districtStr = districtArr1[districtArr1.length - 1];
           } else {
             districtStr = districtArr1.join("");
           }
-          // console.log(districtStr);
-          // console.log(jobList.district);
+          // // console.log(districtStr);
+          // // console.log(jobList.district);
           if (jobList.district == undefined && jobList.storeDistrict == undefined) {
             districtStr = "-丨";
           }
         }
-        // console.log(districtStr);
+        // // console.log(districtStr);
         jobList["district"] = districtStr;
         //职位特色
         jobList["jobRequestLabelNames"] = that.getjobRequestLabelNamesArray(jobList.jobRequestLabelNames);
@@ -1222,7 +1222,7 @@ let data = {
     } else {
       info.age = calculationAge - 1
     }
-    console.log('info', info);
+    // console.log('info', info);
     return info
   },
   /**
@@ -1250,7 +1250,7 @@ let data = {
 
     uni.scanCode({
       success: function (res) {
-        console.log('获取扫码结果：', res.result)
+        // console.log('获取扫码结果：', res.result)
         if (res.result) {
           if (res.result.indexOf('=') > -1) {
             // 前往详情页
@@ -1299,7 +1299,7 @@ let data = {
   calculateTotalWidth (ctx, segments) {
     let totalWidth = 0;
     segments.forEach((segment) => {
-      console.log('segment', segment);
+      // console.log('segment', segment);
       if (segment) {
         ctx.font = `${segment.fontWeight} ${segment.fontSize}px Arial`;
         totalWidth += ((ctx.measureText(segment.content).width) + (segment.space || 0));
@@ -1313,7 +1313,7 @@ let data = {
 
     // 计算总宽度
     const totalWidth = this.calculateTotalWidth(ctx, textSegments);
-    console.log('totalWidth', totalWidth, textSegments);
+    // console.log('totalWidth', totalWidth, textSegments);
     // 计算起始X坐标（居中位置）
     const centerX = x;
     const startX = (centerX - totalWidth) / 2;
@@ -1505,7 +1505,7 @@ let data = {
 * @params $type 1：共享 0 普通
 */
   setReturnFee (returnFee, returnFeeType, $type) {
-    // console.log('here');
+    // // console.log('here');
     let servetype = '-', $num = 1;
     if ($type == 1) {
       $num = 1;
@@ -1533,7 +1533,7 @@ let data = {
   },
   yijobCopy (recordList) {
     var that = this;
-    console.log(recordList);
+    // console.log(recordList);
     if (recordList && recordList.length > 0) {
       recordList.forEach((item, index) => {
         //月薪
@@ -1608,7 +1608,7 @@ let data = {
 */
 
   getGenderByMinAge (res) {
-    // console.log("==================", res);
+    // // console.log("==================", res);
     let str = "";
     if (res.minAgeMan && res.minAgeWoman) {
       str = "男女不限";
diff --git a/utils/wyyx.js b/utils/wyyx.js
index 543dd09..aae1092 100644
--- a/utils/wyyx.js
+++ b/utils/wyyx.js
@@ -1,5 +1,5 @@
 import common from './common.js'
-console.log('common',common);
+// console.log('common',common);
 // let ajaxUrl = "http://192.168.3.83:8001";
 // let ajaxUrl = "https://daotian.matripe.com.cn";
 let ajaxUrl = common.store().baseUrl;