Merge branch 'master' of https://gitee.com/beiwu/jobslink-user-clent

pages/login/login.vue

@@ -8,7 +8,7 @@
 		<jl-input type="text" v-model="phone" placeholder="请输入手机号" @confirm="login"></jl-input>
 		<jl-input type="text" v-model="password" placeholder="请输入登录密码" @confirm="login" showPassword clearable></jl-input>
 		<!-- <code-input ref="code" v-model="code" :getCode="getCaptcha" @key-change="keyChange" @confirm="login"></code-input> -->
-		<view v-if="loading" class="btn nocheck" loading="true">登录中</view>
+		<view v-if="loading" class="btn nocheck" loading="true"></view>
 		<view v-else-if="validate" class="btn" @click="login">立即登录</view>
 		<view v-else class="btn nocheck">立即登录</view>
 		<!-- <view class="changeLogintype">

pages/my/my.vue

@@ -76,22 +76,23 @@
 				我的申请
 				<image src="../../static/img/right.svg" mode=""></image>
 			</view> -->
-			<view class="btnList" @click="go('/pageMy/help/help')">
+			<!-- <view class="btnList" @click="go('/pageMy/help/help')">
 				<image src="../../static/img/help.svg" mode=""></image>
 				帮助与反馈
 				<image src="../../static/img/right.svg" mode=""></image>
-			</view>
+			</view> -->
 			<!-- <view class="btnList" @click="go('/pageMy/my/set')">
 				<image src="../../static/img/set.svg" mode=""></image>
 				设置
 				<image src="../../static/img/right.svg" mode=""></image>
 			</view> -->
 		</view>
-		<view class="btn-out" @click="logout">
+		<!-- <view class="btn-out" @click="logout">
 			退出登录
-		</view>
+		</view> -->
 		<view class="bottom" @click="makePhoneCall">
-			客服电话 18500206848 工作时间 9:00-18:00
+			<view>德阳市人社局 电话：0838-2505580</view>
+			<view>地址：德阳市旌阳区天山南路1段-102号</view>
 		</view>
 		<cs-button></cs-button>
 	</view>
@@ -133,16 +134,16 @@
 					this.federationStatus = e.data.data.joined
 				})
 			},
-			logout() {
-				this.$store.dispatch('LogOut').then(() => {
-					// uni.reLaunch({
-					// 	url: '/pages/login/login'
+			// logout() {
+			// 	this.$store.dispatch('LogOut').then(() => {
+			// 		// uni.reLaunch({
+			// 		// 	url: '/pages/login/login'
+			// 		// })
+			// 		this.$store.dispatch('clearAuthState')
+			// 		this.$store.dispatch('endRefreshNewsTimer')
+			// 		location.href = "https://dy12333.org.cn/h5/"
 			// 	})
-					this.$store.dispatch('clearAuthState')
-					this.$store.dispatch('endRefreshNewsTimer')
-					location.href = "https://dy12333.org.cn/h5/"
-				})
-			},
+			// },
 			go(url) {
 				uni.navigateTo({
 					url
@@ -307,7 +308,7 @@
 		position: relative;
 		overflow: auto;
 	}
-	.btn-out {
+	/* .btn-out {
 		background-color: #fefefe;
 		margin-top: 20rpx;
 		padding: 20rpx 0;
@@ -315,5 +316,5 @@
 		font-family: PingFangSC-Regular;
 		font-size: 32rpx;
 		color: #F46161;
-	}
+	} */
 </style>

pages/recruit/subPage/recruit.vue

@@ -92,7 +92,7 @@
 				value2: '招工内容',
 				pageType: null, // null： 个人 enterprise： 企业
 				fileList1: [],
-				nonReactiveArray: ["发布任务", "发布岗位", "个体户招工"],
+				nonReactiveArray: ["发布任务", "发布岗位"],
 				activeTab: 0,
                 companyInfo: null,
 			}