fix:样式调整

components/nav-bar/index.vue

@@ -47,6 +47,7 @@ export default {
   // justify-content: center;
   align-items: center;
   position: relative;
+  z-index: 9999;
   .go-back{
     width: 32.61px;
 	height: 26px;

my/publish/editor.vue

@@ -1,167 +1,259 @@
 <template>
-	<view class="padding-bottom-xl">
-		<!-- 顶部占位区域 -->
-		<view :style="{ height: statusBarHeight + 'px' }"></view>
-		
-		<!-- <view class="text-white padding margin bg" v-if="form.isRecommend==2">
+  <view class="page-box">
+    <!-- 顶部占位区域 -->
+    <navBar title="我的简历" color="#000" />
+	<view class="page-content">
+	
+    <!-- <view class="text-white padding margin bg" v-if="form.isRecommend==2">
 			<view class="flex align-center justify-between" style="color: red;">
 				<view class=" text-bold">已录入人才库</view>
 			</view>
 		</view> -->
-		<view class="text-white padding margin bg" v-if="form.status==3">
-			<view class="flex align-center justify-between" style="color: red;">
-				<view class=" text-bold">拒绝理由</view>
-				<view class="text-right ">
-					{{form.auditContent}}
-				</view>
-			</view>
-		</view>
-		<view class="text-white padding margin bg">
-			<u-form label-width="150" :label-style="labelStyle" :model="form" ref="uForm">
-				<u-form-item label="姓名">
-					<u-input height="200rpx" v-model="form.resumesName" placeholder="请输入姓名" />
-				</u-form-item>
-				<u-form-item label="年龄">
-					<u-input v-model="form.resumesAge" type="number" placeholder="请输入年龄" />
-				</u-form-item>
-				<u-form-item label="家庭住址" placeholder="请输入家庭住址">
-					<u-input v-model="form.address" />
-				</u-form-item>
-				<u-form-item label="性别" right-icon="arrow-right">
-					<u-input v-model="resumesSex" placeholder="请选择性别" :disabled="true" @click="SexChen()" />
-				</u-form-item>
-				<u-form-item label="手机号">
-					<u-input v-model="form.resumesPhone" type="number" maxlength="11" placeholder="请输入手机号" />
-				</u-form-item>
-				<u-form-item label="学历" right-icon="arrow-right">
-					<u-input v-model="form.resumesEducation" placeholder="请选择学历" :disabled="true"
-						@click="learnChen()" />
-				</u-form-item>
-				<u-form-item label="婚姻状况" right-icon="arrow-right">
-					<u-input v-model="form.resumesMarriage" placeholder="请选择婚姻状况" :disabled="true"
-						@click="MarriageChen()" />
-				</u-form-item>
-				<u-form-item label="期望薪资" right-icon="arrow-right">
-					<u-input v-model="form.resumesCompensation" placeholder="请选择期望薪资" :disabled="true"
-						@click="getMonyList()" />
-				</u-form-item>
-				<u-form-item label="电子邮箱">
-					<u-input v-model="form.resumesEmail" placeholder="请输入电子邮箱" />
-				</u-form-item>
-				<u-form-item label="工作经验" right-icon="arrow-right">
-					<u-input v-model="form.resumesWorkExperience" placeholder="请选择工作经验" :disabled="true"
-						@click="IntentionChen()" />
-				</u-form-item>
-				<u-form-item label="毕业院校">
-					<u-input v-model="form.school" placeholder="请输入毕业院校" />
-				</u-form-item>
-				<u-form-item label="所学专业">
-					<u-input v-model="form.major" placeholder="请输入所学专业" />
-				</u-form-item>
-				<u-form-item label="毕业时间" right-icon="arrow-right">
-					<u-input v-model="form.graduationTime" :disabled="true" @click="showGraduationTime = true"
-						placeholder="请选择毕业时间" />
-				</u-form-item>
-				<u-form-item label="行业" right-icon="arrow-right">
-					<u-input v-model="form.industryName" :disabled="true"
-						@click="gotoHy('/package/jobIntention/industry')" placeholder="请选择行业" />
-				</u-form-item>
-				<u-form-item label="意向城市" right-icon="arrow-right">
-					<u-input v-model="form.city" :disabled="true" @click="cityShow = true" placeholder="请选择意向城市" />
-				</u-form-item>
-			</u-form>
-		</view>
+    <view class="text-white padding margin bg" v-if="form.status == 3">
+      <view class="flex align-center justify-between" style="color: red">
+        <view class="text-bold">拒绝理由</view>
+        <view class="text-right">
+          {{ form.auditContent }}
+        </view>
+      </view>
+    </view>
+    <view class="text-white padding margin bg">
+      <u-form label-width="150" :label-style="labelStyle" :model="form" ref="uForm">
+        <u-form-item label="姓名">
+          <u-input height="200rpx" v-model="form.resumesName" placeholder="请输入姓名" />
+        </u-form-item>
+        <u-form-item label="年龄">
+          <u-input v-model="form.resumesAge" type="number" placeholder="请输入年龄" />
+        </u-form-item>
+        <u-form-item label="家庭住址" placeholder="请输入家庭住址">
+          <u-input v-model="form.address" />
+        </u-form-item>
+        <u-form-item label="性别" right-icon="arrow-right">
+          <u-input
+            v-model="resumesSex"
+            placeholder="请选择性别"
+            :disabled="true"
+            @click="SexChen()"
+          />
+        </u-form-item>
+        <u-form-item label="手机号">
+          <u-input
+            v-model="form.resumesPhone"
+            type="number"
+            maxlength="11"
+            placeholder="请输入手机号"
+          />
+        </u-form-item>
+        <u-form-item label="学历" right-icon="arrow-right">
+          <u-input
+            v-model="form.resumesEducation"
+            placeholder="请选择学历"
+            :disabled="true"
+            @click="learnChen()"
+          />
+        </u-form-item>
+        <u-form-item label="婚姻状况" right-icon="arrow-right">
+          <u-input
+            v-model="form.resumesMarriage"
+            placeholder="请选择婚姻状况"
+            :disabled="true"
+            @click="MarriageChen()"
+          />
+        </u-form-item>
+        <u-form-item label="期望薪资" right-icon="arrow-right">
+          <u-input
+            v-model="form.resumesCompensation"
+            placeholder="请选择期望薪资"
+            :disabled="true"
+            @click="getMonyList()"
+          />
+        </u-form-item>
+        <u-form-item label="电子邮箱">
+          <u-input v-model="form.resumesEmail" placeholder="请输入电子邮箱" />
+        </u-form-item>
+        <u-form-item label="工作经验" right-icon="arrow-right">
+          <u-input
+            v-model="form.resumesWorkExperience"
+            placeholder="请选择工作经验"
+            :disabled="true"
+            @click="IntentionChen()"
+          />
+        </u-form-item>
+        <u-form-item label="毕业院校">
+          <u-input v-model="form.school" placeholder="请输入毕业院校" />
+        </u-form-item>
+        <u-form-item label="所学专业">
+          <u-input v-model="form.major" placeholder="请输入所学专业" />
+        </u-form-item>
+        <u-form-item label="毕业时间" right-icon="arrow-right">
+          <u-input
+            v-model="form.graduationTime"
+            :disabled="true"
+            @click="showGraduationTime = true"
+            placeholder="请选择毕业时间"
+          />
+        </u-form-item>
+        <u-form-item label="行业" right-icon="arrow-right">
+          <u-input
+            v-model="form.industryName"
+            :disabled="true"
+            @click="gotoHy('/package/jobIntention/industry')"
+            placeholder="请选择行业"
+          />
+        </u-form-item>
+        <u-form-item label="意向城市" right-icon="arrow-right">
+          <u-input
+            v-model="form.city"
+            :disabled="true"
+            @click="cityShow = true"
+            placeholder="请选择意向城市"
+          />
+        </u-form-item>
+      </u-form>
+    </view>
 
-		<view class="text-white padding margin bg radius ">
-			<view>
-				<view class="flex align-center justify-between">
-					<view class=" text-bold">求职岗位</view>
-					<view @click="PostChen()">
-						<image src="../static/add.png" style="width: 54upx;height: 54upx;"></image>
-					</view>
-				</view>
-				<view class="flex align-center label" v-if="form.resumesPost">
-					<view v-if="form.resumesPost">{{form.resumesPost}}</view>
-					<!-- <view v-if="form.rulePostName">-</view>
+    <view class="text-white padding margin bg radius">
+      <view>
+        <view class="flex align-center justify-between">
+          <view class="text-bold">求职岗位</view>
+          <view @click="PostChen()">
+            <image src="../static/add.png" style="width: 54upx; height: 54upx"></image>
+          </view>
+        </view>
+        <view class="flex align-center label" v-if="form.resumesPost">
+          <view v-if="form.resumesPost">{{ form.resumesPost }}</view>
+          <!-- <view v-if="form.rulePostName">-</view>
 					<view v-if="form.rulePostName" class="">{{form.rulePostName}}</view> -->
-				</view>
-				<view class="margin-top-sm text-sm" style="color: #999999;" v-else>添加岗位会根据你的岗位需求为你推荐</view>
-			</view>
-
-			<view class="margin-tb-sm" style="width: 100%;height: 1rpx;background: #F2F2F2;"></view>
-			<view>
-				<view class="flex align-center justify-between">
-					<view class=" text-bold">工作经历</view>
-					<view @click="gowork(1)">
-						<image src="../static/add.png" style="width: 54upx;height: 54upx;"></image>
-					</view>
-				</view>
-				<view class="margin-top-sm text-sm" style="color: #999999;" v-if="form.resumesCompanyList.length==0">
-					添加工作经历向企业全面展示你的能力</view>
-				<view v-for="(item,index) in form.resumesCompanyList" class="gzjl" :key="index" v-else>
-					<view class="flex justify-between" style="color: #121212;">
-						<view class="text-bold">
-							{{item.resumesTitle}}
-						</view>
-						<view class="">
-							<u-icon name="trash" color="rgb(146,146,146)"
-								@click="deleteList(form.resumesCompanyList,index)" size="38"></u-icon>
-							<u-icon style="margin-left: 20rpx;" name="edit-pen" @click="updataLists(item,index,1)"
-								color="rgb(146,146,146)" size="38"></u-icon>
-						</view>
-					</view>
-					<view v-if="item.resumesProject">
-						{{item.resumesProject}}
-					</view>
-					<view class="flex align-center margin-tb-xs" style="color: #999999;">
-						<view>{{item.resumesTime}}</view>
-						<view class="margin-left">{{item.resumesPost}}</view>
-					</view>
-					<view>{{item.resumesContent}}</view>
-				</view>
-			</view>
-			<view class="margin-tb-sm" style="width: 100%;height: 1rpx;background: #F2F2F2;"></view>
-			<view>
-				<view class="flex align-center justify-between">
-					<view class=" text-bold">项目经验</view>
-					<view @click="gowork(2)">
-						<image src="../static/add.png" style="width: 54upx;height: 54upx;"></image>
-					</view>
-				</view>
-				<view class="margin-top-sm text-sm" style="color: #999999;" v-if="form.resumesWorkList.length==0">
-					添加工作经历向企业全面展示你的能力</view>
-				<view v-for="(item,index) in form.resumesWorkList" class="gzjl" :key="index" v-else>
-					<view class="flex justify-between" style="color: #121212;">
-						<view class="text-bold">
-							{{item.resumesTitle}}
-						</view>
-						<view class="">
-							<u-icon name="trash" color="rgb(146,146,146)"
-								@click="deleteList(form.resumesWorkList,index)" size="38"></u-icon>
-							<u-icon style="margin-left: 20rpx;" name="edit-pen" @click="updataLists(item,index,2)"
-								color="rgb(146,146,146)" size="38"></u-icon>
-						</view>
-					</view>
-					<view class="flex align-center margin-tb-xs" style="color: #999999;">
-						<view>{{item.resumesTime}}</view>
-						<view class="margin-left">{{item.resumesPost}}</view>
-					</view>
-					<view>{{item.resumesContent}}</view>
-				</view>
-			</view>
-			<view class="margin-tb-sm" style="width: 100%;height: 1rpx;background: #F2F2F2;"></view>
-			<view>
-				<view class="flex align-center justify-between">
-					<view class=" text-bold">个人优势</view>
-				</view>
-				<view class=" padding-xs radius margin-top-sm" style="background: #F5F5F5;">
-					<u-input v-model="form.resumesDetails" type="textarea" height="300"
-						placeholder="详细的个人信息与工作经历会让企业更加感兴趣" inputAlign="text-alight:left" />
-
-				</view>
+        </view>
+        <view class="margin-top-sm text-sm" style="color: #999999" v-else
+          >添加岗位会根据你的岗位需求为你推荐</view
+        >
+      </view>
 
-			</view>
-			<!-- <view style="margin-top: 20rpx;">
+      <view
+        class="margin-tb-sm"
+        style="width: 100%; height: 1rpx; background: #f2f2f2"
+      ></view>
+      <view>
+        <view class="flex align-center justify-between">
+          <view class="text-bold">工作经历</view>
+          <view @click="gowork(1)">
+            <image src="../static/add.png" style="width: 54upx; height: 54upx"></image>
+          </view>
+        </view>
+        <view
+          class="margin-top-sm text-sm"
+          style="color: #999999"
+          v-if="form.resumesCompanyList.length == 0"
+        >
+          添加工作经历向企业全面展示你的能力</view
+        >
+        <view
+          v-for="(item, index) in form.resumesCompanyList"
+          class="gzjl"
+          :key="index"
+          v-else
+        >
+          <view class="flex justify-between" style="color: #121212">
+            <view class="text-bold">
+              {{ item.resumesTitle }}
+            </view>
+            <view class="">
+              <u-icon
+                name="trash"
+                color="rgb(146,146,146)"
+                @click="deleteList(form.resumesCompanyList, index)"
+                size="38"
+              ></u-icon>
+              <u-icon
+                style="margin-left: 20rpx"
+                name="edit-pen"
+                @click="updataLists(item, index, 1)"
+                color="rgb(146,146,146)"
+                size="38"
+              ></u-icon>
+            </view>
+          </view>
+          <view v-if="item.resumesProject">
+            {{ item.resumesProject }}
+          </view>
+          <view class="flex align-center margin-tb-xs" style="color: #999999">
+            <view>{{ item.resumesTime }}</view>
+            <view class="margin-left">{{ item.resumesPost }}</view>
+          </view>
+          <view>{{ item.resumesContent }}</view>
+        </view>
+      </view>
+      <view
+        class="margin-tb-sm"
+        style="width: 100%; height: 1rpx; background: #f2f2f2"
+      ></view>
+      <view>
+        <view class="flex align-center justify-between">
+          <view class="text-bold">项目经验</view>
+          <view @click="gowork(2)">
+            <image src="../static/add.png" style="width: 54upx; height: 54upx"></image>
+          </view>
+        </view>
+        <view
+          class="margin-top-sm text-sm"
+          style="color: #999999"
+          v-if="form.resumesWorkList.length == 0"
+        >
+          添加工作经历向企业全面展示你的能力</view
+        >
+        <view
+          v-for="(item, index) in form.resumesWorkList"
+          class="gzjl"
+          :key="index"
+          v-else
+        >
+          <view class="flex justify-between" style="color: #121212">
+            <view class="text-bold">
+              {{ item.resumesTitle }}
+            </view>
+            <view class="">
+              <u-icon
+                name="trash"
+                color="rgb(146,146,146)"
+                @click="deleteList(form.resumesWorkList, index)"
+                size="38"
+              ></u-icon>
+              <u-icon
+                style="margin-left: 20rpx"
+                name="edit-pen"
+                @click="updataLists(item, index, 2)"
+                color="rgb(146,146,146)"
+                size="38"
+              ></u-icon>
+            </view>
+          </view>
+          <view class="flex align-center margin-tb-xs" style="color: #999999">
+            <view>{{ item.resumesTime }}</view>
+            <view class="margin-left">{{ item.resumesPost }}</view>
+          </view>
+          <view>{{ item.resumesContent }}</view>
+        </view>
+      </view>
+      <view
+        class="margin-tb-sm"
+        style="width: 100%; height: 1rpx; background: #f2f2f2"
+      ></view>
+      <view>
+        <view class="flex align-center justify-between">
+          <view class="text-bold">个人优势</view>
+        </view>
+        <view class="padding-xs radius margin-top-sm" style="background: #f5f5f5">
+          <u-input
+            v-model="form.resumesDetails"
+            type="textarea"
+            height="300"
+            placeholder="详细的个人信息与工作经历会让企业更加感兴趣"
+            inputAlign="text-alight:left"
+          />
+        </view>
+      </view>
+      <!-- <view style="margin-top: 20rpx;">
 				<view class="flex align-center justify-between">
 					<view class=" text-bold">资格证书</view>
 				</view>
@@ -171,7 +263,7 @@
 				</view>
 
 			</view> -->
-			<!-- <view class="margin-top">
+      <!-- <view class="margin-top">
 				<view class=" text-bold">资格证书上传
 				</view>
 				<view class="flex" style="overflow: hidden;flex-direction: initial;flex-wrap: wrap;">
@@ -199,662 +291,709 @@
 					</view>
 				</view>
 			</view> -->
-		</view>
-
+    </view>
 
-		<view class="margin-lr ">
-			<!-- <u-button v-if="id" @click="update" class="margin-top" :custom-style="customStyle" shape="square"
+    <view class="margin-lr">
+      <!-- <u-button v-if="id" @click="update" class="margin-top" :custom-style="customStyle" shape="square"
 			:hair-line="false">提交审核</u-button> -->
-			<u-button @click="submit" class="margin-top" :custom-style="customStyle" shape="square" :hair-line="false">
-				提交审核</u-button>
-		</view>
-		<!-- 选择学历 -->
-		<u-select v-model="learnShow" :list="learnList" @confirm="learnConfirm"></u-select>
-		<!-- 专业-->
-		<u-select v-model="sexShow" :list="Sexlist" @confirm="sexConfirm"></u-select>
-		<!-- 婚姻状况 -->
-		<u-select v-model="MarriageShow" :list="Marriagelist" @confirm="MarriageConfirm"></u-select>
-		<!-- 工作经验 -->
-		<u-select v-model="IntentionShow" :list="Intentionlist" @confirm="IntentionConfirm"></u-select>
-		<!-- 薪资 -->
-		<u-select v-model="monyShow" :list="monyList" @confirm="moneyConfirm"></u-select>
-		<u-picker v-model="showGraduationTime" mode="time" @confirm="setGraduationTime"></u-picker>
-		<!-- 意向城市 -->
-		<u-picker v-model="cityShow" mode="region" @confirm="cityConfirm"></u-picker>
+      <u-button
+        @click="submit"
+        class="margin-top"
+        :custom-style="customStyle"
+        shape="square"
+        :hair-line="false"
+      >
+        提交审核</u-button
+      >
+    </view>
+    <!-- 选择学历 -->
+    <u-select v-model="learnShow" :list="learnList" @confirm="learnConfirm"></u-select>
+    <!-- 专业-->
+    <u-select v-model="sexShow" :list="Sexlist" @confirm="sexConfirm"></u-select>
+    <!-- 婚姻状况 -->
+    <u-select
+      v-model="MarriageShow"
+      :list="Marriagelist"
+      @confirm="MarriageConfirm"
+    ></u-select>
+    <!-- 工作经验 -->
+    <u-select
+      v-model="IntentionShow"
+      :list="Intentionlist"
+      @confirm="IntentionConfirm"
+    ></u-select>
+    <!-- 薪资 -->
+    <u-select v-model="monyShow" :list="monyList" @confirm="moneyConfirm"></u-select>
 	</view>
+    <u-picker
+      v-model="showGraduationTime"
+      mode="time"
+      @confirm="setGraduationTime"
+    ></u-picker>
+    <!-- 意向城市 -->
+    <u-picker v-model="cityShow" mode="region" @confirm="cityConfirm"></u-picker>
+  </view>
 </template>
 
 <script>
-	import config from '../../common/config.js'
-	export default {
-		data() {
-			return {
-				statusBarHeight: 0,
-				showGraduationTime: false,
-				nameList: [],
-				labelStyle: {
-					fontWeight: 'bold'
-				},
-				resumesImage: [],
-				customStyle: {
-					backgroundColor: '#016BF6',
-					color: '#FFFFFF',
-					border: 0
-				},
-				cityShow: false,
-				form: {
-					address: '', //家庭住址
-					ruleClassifyId: '',
-					resumesName: '', //姓名
-					resumesAge: '', //年龄
-					resumesPhone: '', //电话
-					resumesEducation: '', //学历
-					resumesMarriage: '', //婚姻状态
-					resumesCompensation: '', //期望薪资
-					resumesEmail: '', //电子邮箱
-					resumesWorkExperience: '', //工作经验
-					// resumesMajor: '', //专业
-					resumesPost: '', //求职岗位
-					resumesDetails: '', //自我介绍
-					resumesCompanyList: [], //工作经历
-					resumesWorkList: [], //项目经验
-					// resumesImage: [], //证书
-					school: '',
-					major: '', //所学专业
-					// rulePostId: '',
-					// rulePostName: '',
-					resumesSex: '', //性别
-					// resumesImageName:'',//证书名称
-					graduationTime: '', //毕业时间
-					industryName: '', //行业
-					city: '', //意向城市
-				},
-				resumesImage: [],
-				learnShow: false,
-				learnList: [], //学历列表
-				MarriageShow: false, //婚姻状况
-				Marriagelist: [],
-				//求职岗位
-				IntentionShow: false,
-				Intentionlist: [],
-				//岗位
-				postlist: [],
-				resumesId: '',
-				resumes: {},
-				sexShow: false, //性别
-				resumesSex: '',
-				Sexlist: [{
-						value: '1',
-						label: '男'
-					},
-					{
-						value: '2',
-						label: '女'
-					}
-				],
-				type: 1, // 1:新增/2:修改
-				monyShow: false,
-				monyList: [],
-			}
-		},
-		onLoad(option) {
-			// 获取状态栏高度
-			const systemInfo = uni.getSystemInfoSync()
-			this.statusBarHeight = systemInfo.statusBarHeight || 0
-			
-			this.getbookName();
-			if (option.resumesId) {
-				this.type = 2
-				this.resumesId = option.resumesId
-				uni.setStorageSync("resumesId", option.resumesId)
-				this.getDetails()
-			}
-
-		},
-		// onHide() {
-		// 	uni.removeStorageSync('resumesCompanyList')
-		// 	uni.removeStorageSync('resumesWorkList')
-		// },
-		onUnload() {
-			uni.removeStorageSync('resumesCompanyList')
-			uni.removeStorageSync('resumesWorkList')
-		},
-		onShow() {
-			let that = this
-			uni.$on('jobs', (info) => {
-				that.form.resumesPost = info.ruleClassifyName
-				that.form.ruleClassifyId = info.ruleClassifyId
-			})
-			if (uni.getStorageSync("resumesCompanyList")) {
-				this.form.resumesCompanyList = uni.getStorageSync("resumesCompanyList")
-				uni.setStorageSync("resumesCompanyList", this.form.resumesCompanyList)
-			}
-			if (uni.getStorageSync("resumesWorkList")) {
-				this.form.resumesWorkList = uni.getStorageSync("resumesWorkList")
-				uni.setStorageSync("resumesWorkList", this.form.resumesWorkList)
-			}
-			if (uni.getStorageSync("resumesId")) {
-				this.resumesId = uni.getStorageSync("resumesId")
-			}
-			// if (uni.getStorageSync("resumes")) {
-			// 	this.resumes = uni.getStorageSync("resumes")
-			// 	this.form.rulePostId = this.resumes.rulePostId
-			// 	this.form.rulePostName = this.resumes.rulePostName
-			// 	this.form.resumesPost = this.resumes.resumesPost
-			// 	this.form.ruleClassifyId = this.resumes.ruleClassifyId
-			// }
-			//选择的行业
-			uni.$on('industry', (info) => {
-				that.form.industryName = info.industry
-			})
-		},
-		methods: {
-			/**
-			 * @param {Object} e
-			 * 地区选择回调
-			 */
-			cityConfirm(e) {
-				this.form.city = e.city.label
-			},
-			//去选择行业
-			gotoHy(url) {
-				uni.navigateTo({
-					url: url
-				})
-			},
-			//设置毕业时间
-			setGraduationTime(e) {
-				this.form.graduationTime = e.year + '-' + e.month + '-' + e.day
-			},
-			//证书名称
-			getbookName() {
-				this.$Request.get('/app/dict/list', {
-					type: '证书名称'
-				}).then(res => {
-					if (res.code == 0) {
-						let arr = []
-						res.data.map(item => {
-							let obj = {
-								name: item.code,
-								checked: false,
-								disabled: false
-							}
-							arr.push(obj)
-						})
-						this.nameList = arr
-					}
-				})
-			},
-			//修改
-			updataLists(list, index, state) {
-				uni.navigateTo({
-					url: '/my/publish/workhistory?index=' + index + '&state=' + state + '&list=' + JSON.stringify(
-						list)
-				})
-			},
-			//删除制定工作经验
-			deleteList(list, index) {
-				list.splice(index, 1)
-				uni.removeStorageSync('resumesCompanyList')
-				uni.removeStorageSync('resumesWorkList')
-				// uni.setStorageSync("resumesCompanyList", this.form.resumesCompanyList)
-				// uni.setStorageSync("resumesWorkList", this.form.resumesWorkList)
-			},
-			moneyConfirm(e) {
-				this.form.resumesCompensation = e[0].value
-			},
-			//薪资列表
-			getMonyList() {
-				this.$Request.get('/app/dict/list', {
-					type: '薪资'
-				}).then(res => {
-					if (res.code == 0) {
-						let arr = res.data
-						arr = JSON.parse(JSON.stringify(arr).replace(/code/g, 'label'))
-						this.monyList = arr
-						this.monyShow = true
-
-					}
-				})
-			},
-			removeImg(index) {
-				this.resumesImage.splice(index, 1)
-			},
-			sexConfirm(e) {
-				console.log(e)
-				this.form.resumesSex = e[0].value
-				this.resumesSex = e[0].label
-			},
-			SexChen() {
-				console.log('11111111111111')
-				this.sexShow = true
-			},
-			//获取 学历  婚姻状况  工作经验  专业
-			getType(index) {
-				let type = ''
-				if (index == '学历') {
-					type = index
-				} else if (index == '婚姻状况') {
-					type = index
-				} else if (index == '工作经验') {
-					type = index
-				} else if (index == '专业') {
-					type = index
-				}
-				let data = {
-					type: type
-				}
-				this.$Request.get('/app/dict/list', data).then(res => {
-					if (res.code == 0) {
-						if (res.data.length > 0) {
-							var arr = []
-							res.data.forEach((d, index) => {
-								var data = {}
-								data.label = d.value
-								data.value = index
-								arr.push(data)
-							})
-							if (index == '学历') {
-								this.learnList = arr
-								this.learnShow = true
-							} else if (index == '婚姻状况') {
-								this.Marriagelist = arr
-								this.MarriageShow = true
-							} else if (index == '工作经验') {
-								this.Intentionlist = arr
-								this.IntentionShow = true
-							} else if (index == '专业') {
-								this.Majorlist = arr
-								this.MajorShow = true
-							}
-							console.log(arr)
-						} else {
-							uni.showToast({
-								title: '暂无可选',
-								icon: 'none'
-							})
-						}
-
-					}
-				})
-			},
-			// 工作经验
-			IntentionChen() {
-				this.list = []
-				this.getType('工作经验')
-			},
-			IntentionConfirm(e) {
-				this.form.resumesWorkExperience = e[0].label
-			},
-			MarriageChen() {
-				this.list = []
-				this.getType('婚姻状况')
-			},
-			//婚姻状况
-			MarriageConfirm(e) {
-				this.form.resumesMarriage = e[0].label
-			},
-			learnChen() {
-				this.list = []
-				this.getType('学历')
-			},
-			//选择学历
-			learnConfirm(e) {
-				this.form.resumesEducation = e[0].label
-			},
-			PostChen() {
-				// uni.navigateTo({
-				// 	url: '/my/publish/resumesPost'
-				// })
-				uni.navigateTo({
-					url: '/package/jobIntention/jobList'
-				})
-			},
-			gowork(state) {
-				uni.navigateTo({
-					url: '/my/publish/workhistory?state=' + state
-				})
-			},
-
+import config from "../../common/config.js";
+import navBar from "@/components/nav-bar/index.vue";
 
-			// 发布
-			submit() {
-				this.form.resumesImage = this.resumesImage
-				this.form.resumesImage = this.form.resumesImage.toString();
-				let arr = this.nameList.filter(item => item.checked === true)
-				let arr2 = []
-				arr.map(item => {
-					arr2.push(item.name)
-				})
-				this.form.resumesImageName = arr2.join(',')
-				// if(){}
-				// this.form.resumesSex = this.resumesSex
-				if (!this.form.resumesName) {
-					uni.showToast({
-						title: '请输入真实姓名',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				if (!this.form.resumesAge) {
-					uni.showToast({
-						title: '请输入年龄',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				if (!this.form.address) {
-					uni.showToast({
-						title: '请输入家庭住址',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				if (!this.form.resumesSex) {
-					uni.showToast({
-						title: '请选择性别 ',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				if (!this.form.resumesPhone) {
-					uni.showToast({
-						title: '请输入手机号',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				if (!this.form.resumesEducation) {
-					uni.showToast({
-						title: '请选择学历',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				if (!this.form.resumesMarriage) {
-					uni.showToast({
-						title: '请输入婚姻状况',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				if (!this.form.resumesCompensation) {
-					uni.showToast({
-						title: '请选择期望薪资',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				// if (!this.form.resumesEmail) {
-				// 	uni.showToast({
-				// 		title: '请输入电子邮箱',
-				// 		icon: 'none',
-				// 		duration: 1000
-				// 	})
-				// 	return
-				// }
-				if (!this.form.resumesWorkExperience) {
-					uni.showToast({
-						title: '请选择工作经验',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				if (!this.form.school) {
-					uni.showToast({
-						title: '请填写毕业院校',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				if (!this.form.major) {
-					uni.showToast({
-						title: '请填写所学专业',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				if (!this.form.graduationTime) {
-					uni.showToast({
-						title: '请选择毕业时间',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				if (!this.form.industryName) {
-					uni.showToast({
-						title: '请选择行业',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				if (!this.form.city) {
-					uni.showToast({
-						title: '请选择意向城市',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				if (!this.form.resumesPost) {
-					uni.showToast({
-						title: '请添加求职岗位',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				// if (this.form.resumesWorkExperience != '无经验') {
-				// 	if (this.form.resumesCompanyList.length == 0) {
-				// 		uni.showToast({
-				// 			title: '请添加工作经历',
-				// 			icon: 'none',
-				// 			duration: 1000
-				// 		})
-				// 		return
-				// 	}
-				// 	if (this.form.resumesWorkList.length == 0) {
-				// 		uni.showToast({
-				// 			title: '请添加项目经验',
-				// 			icon: 'none',
-				// 			duration: 1000
-				// 		})
-				// 		return
-				// 	}
-				// }
-				if (!this.form.resumesDetails) {
-					uni.showToast({
-						title: '个人优势可以让你的简历眼前一亮，请填写个人优势',
-						icon: 'none',
-						duration: 1000
-					})
-					return
-				}
-				// else{
-				// 	this.form.resumesCompanyList = []
-				// 	this.form.resumesWorkList = []
-				// }
-				// if (!this.form.resumesDetails) {
-				// 	uni.showToast({
-				// 		title: '请添加个人优势',
-				// 		icon: 'none',
-				// 		duration: 1000
-				// 	})
-				// 	return
-				// }
-				if (this.type == 2) {
-					this.$Request.postJson("/app/resumes/updateResumes", this.form).then(res => {
-						if (res.code == 0) {
-							// uni.removeStorageSync('resumesWorkList')
-							uni.removeStorageSync('resumesCompanyList')
-							// uni.removeStorageSync('resumes')
-							uni.removeStorageSync('resumesId')
-							uni.showToast({
-								title: '修改成功',
-								icon: 'none'
-							})
-							setTimeout(function() {
-								uni.navigateBack()
-							}, 1000)
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none'
-							})
-						}
-					});
-				} else {
-					this.$Request.postJson("/app/resumes/insertResumes", this.form).then(res => {
-						if (res.code == 0) {
-							// uni.removeStorageSync('resumesWorkList')
-							uni.removeStorageSync('resumesCompanyList')
-							// uni.removeStorageSync('resumes')
-							uni.showToast({
-								title: '提交成功',
-								icon: 'none'
-							})
-							setTimeout(function() {
-								uni.navigateBack()
-							}, 1000)
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none'
-							})
-						}
-					});
-				}
+export default {
+  data() {
+    return {
+      statusBarHeight: 0,
+      showGraduationTime: false,
+      nameList: [],
+      labelStyle: {
+        fontWeight: "bold",
+      },
+      resumesImage: [],
+      customStyle: {
+        backgroundColor: "#016BF6",
+        color: "#FFFFFF",
+        border: 0,
+      },
+      cityShow: false,
+      form: {
+        address: "", //家庭住址
+        ruleClassifyId: "",
+        resumesName: "", //姓名
+        resumesAge: "", //年龄
+        resumesPhone: "", //电话
+        resumesEducation: "", //学历
+        resumesMarriage: "", //婚姻状态
+        resumesCompensation: "", //期望薪资
+        resumesEmail: "", //电子邮箱
+        resumesWorkExperience: "", //工作经验
+        // resumesMajor: '', //专业
+        resumesPost: "", //求职岗位
+        resumesDetails: "", //自我介绍
+        resumesCompanyList: [], //工作经历
+        resumesWorkList: [], //项目经验
+        // resumesImage: [], //证书
+        school: "",
+        major: "", //所学专业
+        // rulePostId: '',
+        // rulePostName: '',
+        resumesSex: "", //性别
+        // resumesImageName:'',//证书名称
+        graduationTime: "", //毕业时间
+        industryName: "", //行业
+        city: "", //意向城市
+      },
+      resumesImage: [],
+      learnShow: false,
+      learnList: [], //学历列表
+      MarriageShow: false, //婚姻状况
+      Marriagelist: [],
+      //求职岗位
+      IntentionShow: false,
+      Intentionlist: [],
+      //岗位
+      postlist: [],
+      resumesId: "",
+      resumes: {},
+      sexShow: false, //性别
+      resumesSex: "",
+      Sexlist: [
+        {
+          value: "1",
+          label: "男",
+        },
+        {
+          value: "2",
+          label: "女",
+        },
+      ],
+      type: 1, // 1:新增/2:修改
+      monyShow: false,
+      monyList: [],
+    };
+  },
+  components: {
+    navBar,
+  },
+  onLoad(option) {
+    // 获取状态栏高度
+    const systemInfo = uni.getSystemInfoSync();
+    this.statusBarHeight = systemInfo.statusBarHeight || 0;
 
-			},
-			getDetails() {
-				this.$Request.get('/app/resumes/selectResumesByUserId').then(res => {
-					if (res.code == 0) {
-						this.form = res.data
-						if (this.form.resumesSex == 1) {
-							this.form.resumesSex = 1
-							this.resumesSex = '男'
-						} else {
-							this.form.resumesSex = 2
-							this.resumesSex = '女'
-						}
-						if (res.data.resumesImage && res.data.resumesImage != '') {
-							this.resumesImage = res.data.resumesImage.split(',')
-						}
-						//初始化为对象否则会出现无法在字符串上创建属性的错误（原因是在onshow中有赋值）
-						// this.resumes = {}
-						// this.resumes.rulePostId = res.data.rulePostId
-						// this.resumes.resumesPost = res.data.resumesPost
-						// this.resumes.rulePostName = res.data.rulePostName
-						this.form.resumesPost = res.data.resumesPost
-						this.form.ruleClassifyId = res.data.ruleClassifyId
+    this.getbookName();
+    if (option.resumesId) {
+      this.type = 2;
+      this.resumesId = option.resumesId;
+      uni.setStorageSync("resumesId", option.resumesId);
+      this.getDetails();
+    }
+  },
+  // onHide() {
+  // 	uni.removeStorageSync('resumesCompanyList')
+  // 	uni.removeStorageSync('resumesWorkList')
+  // },
+  onUnload() {
+    uni.removeStorageSync("resumesCompanyList");
+    uni.removeStorageSync("resumesWorkList");
+  },
+  onShow() {
+    let that = this;
+    uni.$on("jobs", (info) => {
+      that.form.resumesPost = info.ruleClassifyName;
+      that.form.ruleClassifyId = info.ruleClassifyId;
+    });
+    if (uni.getStorageSync("resumesCompanyList")) {
+      this.form.resumesCompanyList = uni.getStorageSync("resumesCompanyList");
+      uni.setStorageSync("resumesCompanyList", this.form.resumesCompanyList);
+    }
+    if (uni.getStorageSync("resumesWorkList")) {
+      this.form.resumesWorkList = uni.getStorageSync("resumesWorkList");
+      uni.setStorageSync("resumesWorkList", this.form.resumesWorkList);
+    }
+    if (uni.getStorageSync("resumesId")) {
+      this.resumesId = uni.getStorageSync("resumesId");
+    }
+    // if (uni.getStorageSync("resumes")) {
+    // 	this.resumes = uni.getStorageSync("resumes")
+    // 	this.form.rulePostId = this.resumes.rulePostId
+    // 	this.form.rulePostName = this.resumes.rulePostName
+    // 	this.form.resumesPost = this.resumes.resumesPost
+    // 	this.form.ruleClassifyId = this.resumes.ruleClassifyId
+    // }
+    //选择的行业
+    uni.$on("industry", (info) => {
+      that.form.industryName = info.industry;
+    });
+  },
+  methods: {
+    /**
+     * @param {Object} e
+     * 地区选择回调
+     */
+    cityConfirm(e) {
+      this.form.city = e.city.label;
+    },
+    //去选择行业
+    gotoHy(url) {
+      uni.navigateTo({
+        url: url,
+      });
+    },
+    //设置毕业时间
+    setGraduationTime(e) {
+      this.form.graduationTime = e.year + "-" + e.month + "-" + e.day;
+    },
+    //证书名称
+    getbookName() {
+      this.$Request
+        .get("/app/dict/list", {
+          type: "证书名称",
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            let arr = [];
+            res.data.map((item) => {
+              let obj = {
+                name: item.code,
+                checked: false,
+                disabled: false,
+              };
+              arr.push(obj);
+            });
+            this.nameList = arr;
+          }
+        });
+    },
+    //修改
+    updataLists(list, index, state) {
+      uni.navigateTo({
+        url:
+          "/my/publish/workhistory?index=" +
+          index +
+          "&state=" +
+          state +
+          "&list=" +
+          JSON.stringify(list),
+      });
+    },
+    //删除制定工作经验
+    deleteList(list, index) {
+      list.splice(index, 1);
+      uni.removeStorageSync("resumesCompanyList");
+      uni.removeStorageSync("resumesWorkList");
+      // uni.setStorageSync("resumesCompanyList", this.form.resumesCompanyList)
+      // uni.setStorageSync("resumesWorkList", this.form.resumesWorkList)
+    },
+    moneyConfirm(e) {
+      this.form.resumesCompensation = e[0].value;
+    },
+    //薪资列表
+    getMonyList() {
+      this.$Request
+        .get("/app/dict/list", {
+          type: "薪资",
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            let arr = res.data;
+            arr = JSON.parse(JSON.stringify(arr).replace(/code/g, "label"));
+            this.monyList = arr;
+            this.monyShow = true;
+          }
+        });
+    },
+    removeImg(index) {
+      this.resumesImage.splice(index, 1);
+    },
+    sexConfirm(e) {
+      console.log(e);
+      this.form.resumesSex = e[0].value;
+      this.resumesSex = e[0].label;
+    },
+    SexChen() {
+      console.log("11111111111111");
+      this.sexShow = true;
+    },
+    //获取 学历  婚姻状况  工作经验  专业
+    getType(index) {
+      let type = "";
+      if (index == "学历") {
+        type = index;
+      } else if (index == "婚姻状况") {
+        type = index;
+      } else if (index == "工作经验") {
+        type = index;
+      } else if (index == "专业") {
+        type = index;
+      }
+      let data = {
+        type: type,
+      };
+      this.$Request.get("/app/dict/list", data).then((res) => {
+        if (res.code == 0) {
+          if (res.data.length > 0) {
+            var arr = [];
+            res.data.forEach((d, index) => {
+              var data = {};
+              data.label = d.value;
+              data.value = index;
+              arr.push(data);
+            });
+            if (index == "学历") {
+              this.learnList = arr;
+              this.learnShow = true;
+            } else if (index == "婚姻状况") {
+              this.Marriagelist = arr;
+              this.MarriageShow = true;
+            } else if (index == "工作经验") {
+              this.Intentionlist = arr;
+              this.IntentionShow = true;
+            } else if (index == "专业") {
+              this.Majorlist = arr;
+              this.MajorShow = true;
+            }
+            console.log(arr);
+          } else {
+            uni.showToast({
+              title: "暂无可选",
+              icon: "none",
+            });
+          }
+        }
+      });
+    },
+    // 工作经验
+    IntentionChen() {
+      this.list = [];
+      this.getType("工作经验");
+    },
+    IntentionConfirm(e) {
+      this.form.resumesWorkExperience = e[0].label;
+    },
+    MarriageChen() {
+      this.list = [];
+      this.getType("婚姻状况");
+    },
+    //婚姻状况
+    MarriageConfirm(e) {
+      this.form.resumesMarriage = e[0].label;
+    },
+    learnChen() {
+      this.list = [];
+      this.getType("学历");
+    },
+    //选择学历
+    learnConfirm(e) {
+      this.form.resumesEducation = e[0].label;
+    },
+    PostChen() {
+      // uni.navigateTo({
+      // 	url: '/my/publish/resumesPost'
+      // })
+      uni.navigateTo({
+        url: "/package/jobIntention/jobList",
+      });
+    },
+    gowork(state) {
+      uni.navigateTo({
+        url: "/my/publish/workhistory?state=" + state,
+      });
+    },
 
-						uni.setStorageSync("resumesWorkList", this.form.resumesWorkList)
-						uni.setStorageSync("resumesCompanyList", this.form.resumesCompanyList)
-						//证书名称回显
-						if (res.data.resumesImageName) {
-							res.data.resumesImageName.split(',').map(item => {
-								this.nameList.map(re => {
-									if (item === re.name) {
-										re.checked = true
-									}
-								})
+    // 发布
+    submit() {
+      this.form.resumesImage = this.resumesImage;
+      this.form.resumesImage = this.form.resumesImage.toString();
+      let arr = this.nameList.filter((item) => item.checked === true);
+      let arr2 = [];
+      arr.map((item) => {
+        arr2.push(item.name);
+      });
+      this.form.resumesImageName = arr2.join(",");
+      // if(){}
+      // this.form.resumesSex = this.resumesSex
+      if (!this.form.resumesName) {
+        uni.showToast({
+          title: "请输入真实姓名",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      if (!this.form.resumesAge) {
+        uni.showToast({
+          title: "请输入年龄",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      if (!this.form.address) {
+        uni.showToast({
+          title: "请输入家庭住址",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      if (!this.form.resumesSex) {
+        uni.showToast({
+          title: "请选择性别 ",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      if (!this.form.resumesPhone) {
+        uni.showToast({
+          title: "请输入手机号",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      if (!this.form.resumesEducation) {
+        uni.showToast({
+          title: "请选择学历",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      if (!this.form.resumesMarriage) {
+        uni.showToast({
+          title: "请输入婚姻状况",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      if (!this.form.resumesCompensation) {
+        uni.showToast({
+          title: "请选择期望薪资",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      // if (!this.form.resumesEmail) {
+      // 	uni.showToast({
+      // 		title: '请输入电子邮箱',
+      // 		icon: 'none',
+      // 		duration: 1000
+      // 	})
+      // 	return
+      // }
+      if (!this.form.resumesWorkExperience) {
+        uni.showToast({
+          title: "请选择工作经验",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      if (!this.form.school) {
+        uni.showToast({
+          title: "请填写毕业院校",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      if (!this.form.major) {
+        uni.showToast({
+          title: "请填写所学专业",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      if (!this.form.graduationTime) {
+        uni.showToast({
+          title: "请选择毕业时间",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      if (!this.form.industryName) {
+        uni.showToast({
+          title: "请选择行业",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      if (!this.form.city) {
+        uni.showToast({
+          title: "请选择意向城市",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      if (!this.form.resumesPost) {
+        uni.showToast({
+          title: "请添加求职岗位",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      // if (this.form.resumesWorkExperience != '无经验') {
+      // 	if (this.form.resumesCompanyList.length == 0) {
+      // 		uni.showToast({
+      // 			title: '请添加工作经历',
+      // 			icon: 'none',
+      // 			duration: 1000
+      // 		})
+      // 		return
+      // 	}
+      // 	if (this.form.resumesWorkList.length == 0) {
+      // 		uni.showToast({
+      // 			title: '请添加项目经验',
+      // 			icon: 'none',
+      // 			duration: 1000
+      // 		})
+      // 		return
+      // 	}
+      // }
+      if (!this.form.resumesDetails) {
+        uni.showToast({
+          title: "个人优势可以让你的简历眼前一亮，请填写个人优势",
+          icon: "none",
+          duration: 1000,
+        });
+        return;
+      }
+      // else{
+      // 	this.form.resumesCompanyList = []
+      // 	this.form.resumesWorkList = []
+      // }
+      // if (!this.form.resumesDetails) {
+      // 	uni.showToast({
+      // 		title: '请添加个人优势',
+      // 		icon: 'none',
+      // 		duration: 1000
+      // 	})
+      // 	return
+      // }
+      if (this.type == 2) {
+        this.$Request.postJson("/app/resumes/updateResumes", this.form).then((res) => {
+          if (res.code == 0) {
+            // uni.removeStorageSync('resumesWorkList')
+            uni.removeStorageSync("resumesCompanyList");
+            // uni.removeStorageSync('resumes')
+            uni.removeStorageSync("resumesId");
+            uni.showToast({
+              title: "修改成功",
+              icon: "none",
+            });
+            setTimeout(function () {
+              uni.navigateBack();
+            }, 1000);
+          } else {
+            uni.showToast({
+              title: res.msg,
+              icon: "none",
+            });
+          }
+        });
+      } else {
+        this.$Request.postJson("/app/resumes/insertResumes", this.form).then((res) => {
+          if (res.code == 0) {
+            // uni.removeStorageSync('resumesWorkList')
+            uni.removeStorageSync("resumesCompanyList");
+            // uni.removeStorageSync('resumes')
+            uni.showToast({
+              title: "提交成功",
+              icon: "none",
+            });
+            setTimeout(function () {
+              uni.navigateBack();
+            }, 1000);
+          } else {
+            uni.showToast({
+              title: res.msg,
+              icon: "none",
+            });
+          }
+        });
+      }
+    },
+    getDetails() {
+      this.$Request.get("/app/resumes/selectResumesByUserId").then((res) => {
+        if (res.code == 0) {
+          this.form = res.data;
+          if (this.form.resumesSex == 1) {
+            this.form.resumesSex = 1;
+            this.resumesSex = "男";
+          } else {
+            this.form.resumesSex = 2;
+            this.resumesSex = "女";
+          }
+          if (res.data.resumesImage && res.data.resumesImage != "") {
+            this.resumesImage = res.data.resumesImage.split(",");
+          }
+          //初始化为对象否则会出现无法在字符串上创建属性的错误（原因是在onshow中有赋值）
+          // this.resumes = {}
+          // this.resumes.rulePostId = res.data.rulePostId
+          // this.resumes.resumesPost = res.data.resumesPost
+          // this.resumes.rulePostName = res.data.rulePostName
+          this.form.resumesPost = res.data.resumesPost;
+          this.form.ruleClassifyId = res.data.ruleClassifyId;
 
-							})
-						}
-					}
-				})
-			},
-			// 图片上传
-			addImages(e) {
-				let that = this
-				uni.chooseImage({
-					count: 99,
-					sourceType: ['album', 'camera'],
-					success: res => {
-						for (let i = 0; i < res.tempFilePaths.length; i++) {
-							that.$queue.showLoading("上传中...");
-							uni.uploadFile({ // 上传接口
-								url: config.APIHOST + '/alioss/upload',
-								filePath: res.tempFilePaths[i],
-								name: 'file',
-								success: (uploadFileRes) => {
-									if (e == 2) {
-										that.resumesImage.push(JSON.parse(uploadFileRes.data).data)
-									}
-									uni.hideLoading();
-								}
-							});
-						}
-					}
-				})
-			},
+          uni.setStorageSync("resumesWorkList", this.form.resumesWorkList);
+          uni.setStorageSync("resumesCompanyList", this.form.resumesCompanyList);
+          //证书名称回显
+          if (res.data.resumesImageName) {
+            res.data.resumesImageName.split(",").map((item) => {
+              this.nameList.map((re) => {
+                if (item === re.name) {
+                  re.checked = true;
+                }
+              });
+            });
+          }
+        }
+      });
+    },
+    // 图片上传
+    addImages(e) {
+      let that = this;
+      uni.chooseImage({
+        count: 99,
+        sourceType: ["album", "camera"],
+        success: (res) => {
+          for (let i = 0; i < res.tempFilePaths.length; i++) {
+            that.$queue.showLoading("上传中...");
+            uni.uploadFile({
+              // 上传接口
+              url: config.APIHOST + "/alioss/upload",
+              filePath: res.tempFilePaths[i],
+              name: "file",
+              success: (uploadFileRes) => {
+                if (e == 2) {
+                  that.resumesImage.push(JSON.parse(uploadFileRes.data).data);
+                }
+                uni.hideLoading();
+              },
+            });
+          }
+        },
+      });
+    },
 
-			config: function(name) {
-				var info = null;
-				if (name) {
-					var name2 = name.split("."); //字符分割
-					if (name2.length > 1) {
-						info = configdata[name2[0]][name2[1]] || null;
-					} else {
-						info = configdata[name] || null;
-					}
-					if (info == null) {
-						let web_config = cache.get("web_config");
-						if (web_config) {
-							if (name2.length > 1) {
-								info = web_config[name2[0]][name2[1]] || null;
-							} else {
-								info = web_config[name] || null;
-							}
-						}
-					}
-				}
-				return info;
-			}
-		}
-	}
+    config: function (name) {
+      var info = null;
+      if (name) {
+        var name2 = name.split("."); //字符分割
+        if (name2.length > 1) {
+          info = configdata[name2[0]][name2[1]] || null;
+        } else {
+          info = configdata[name] || null;
+        }
+        if (info == null) {
+          let web_config = cache.get("web_config");
+          if (web_config) {
+            if (name2.length > 1) {
+              info = web_config[name2[0]][name2[1]] || null;
+            } else {
+              info = web_config[name] || null;
+            }
+          }
+        }
+      }
+      return info;
+    },
+  },
+};
 </script>
 
-<style>
-	page {
-		background-color: #F5F5F5;
-	}
+<style scoped lang="scss">
+.page-box {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  top: 0;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+  .page-content{
+	flex: 1;
+	width: 100%;
+	overflow: hidden;
+	overflow-y: auto;
+	padding-bottom: 40rpx;
+	box-sizing: border-box;
+  }
+}
+page {
+  background-color: #f5f5f5;
+}
 
-	.gzjl {
-		width: 100%;
-		background-color: rgb(247, 247, 247);
-		border-radius: 10rpx;
-		margin-top: 10rpx;
-		padding: 25rpx;
-	}
+.gzjl {
+  width: 100%;
+  background-color: rgb(247, 247, 247);
+  border-radius: 10rpx;
+  margin-top: 10rpx;
+  padding: 25rpx;
+}
 
-	.bg {
-		background-color: #FFFFFF;
-		border-radius: 24upx;
-	}
+.bg {
+  background-color: #ffffff;
+  border-radius: 24upx;
+}
 
-	/deep/ .u-form-item {
-		padding: 20rpx 0 20rpx 0;
-	}
+/deep/ .u-form-item {
+  padding: 20rpx 0 20rpx 0;
+}
 
-	.label {
-		background: #DDFFF7;
-		border-radius: 4upx;
-		color: #016BF6;
-		display: inline-flex;
-		padding: 14upx 23upx;
-	}
-</style>
+.label {
+  background: #ddfff7;
+  border-radius: 4upx;
+  color: #016bf6;
+  display: inline-flex;
+  padding: 14upx 23upx;
+}
+</style>

package/jobIntention/add.vue

@@ -1,317 +1,373 @@
 <template>
-	<view>
-		<!-- 顶部占位区域 -->
-		<view :style="{ height: statusBarHeight + 'px' }"></view>
-		
-		<!-- 表单 -->
-		<view class="list flex justify-center">
-			<view class="list-box">
-				<view class="list-box-job flex justify-between align-center">
-					<view class="list-box-job-l" @click="gotoJob('/package/jobIntention/jobList')">
-						<view class="list-box-job-l-label" @click="gotoJob('/package/jobIntention/jobList')">
-							期望岗位
-						</view>
-						<view class="" @click="gotoJob('/package/jobIntention/jobList')" style="width: 100%;">
-							<u-input @click="gotoJob('/package/jobIntention/jobList')" disabled
-								v-model="ruleClassifyName" :clearable="false" input-align="left" type="text"
-								placeholder="请选择" />
-						</view>
-					</view>
-					<view class="list-box-job-r" @click="gotoJob('/package/jobIntention/jobList')">
-						<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
-					</view>
-				</view>
-				<view class="list-box-line"></view>
-				<view class="list-box-job flex justify-between align-center"
-					@click="gotoJob('/package/jobIntention/city')">
-					<view class="list-box-job-l" @click="gotoJob('/package/jobIntention/city')">
-						<view class="list-box-job-l-label" @click="gotoJob('/package/jobIntention/city')">
-							期望地点
-						</view>
-						<view class="" style="width: 100%;">
-							<u-input disabled v-model="city" @click="gotoJob('/package/jobIntention/city')"
-								:clearable="false" input-align="left" type="text" placeholder="如:北京" />
-						</view>
-					</view>
-					<view class="list-box-job-r" @click="gotoJob('/package/jobIntention/city')">
-						<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
-					</view>
-				</view>
-				<view class="list-box-line"></view>
-				<view class="list-box-job flex justify-between align-center"
-					@click="gotoJob('/package/jobIntention/industry')">
-					<view class="list-box-job-l" @click="gotoJob('/package/jobIntention/industry')">
-						<view class="list-box-job-l-label" @click="gotoJob('/package/jobIntention/industry')">
-							期望行业
-						</view>
-						<view class="" @click="gotoJob('/package/jobIntention/industry')" style="width: 100%;">
-							<u-input @click="gotoJob('/package/jobIntention/industry')" disabled v-model="industry"
-								:clearable="false" input-align="left" type="text" placeholder="如:互联网/电子商务" />
-						</view>
-					</view>
-					<view class="list-box-job-r" @click="gotoJob('/package/jobIntention/industry')">
-						<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
-					</view>
-				</view>
-				<view class="list-box-line"></view>
-				<view class="list-box-job flex justify-between align-center" @click="getMonyList()">
-					<view class="list-box-job-l" @click="getMonyList()">
-						<view class="list-box-job-l-label" @click="getMonyList()">
-							期望薪资
-						</view>
-						<view class="" style="width: 100%;">
-							<u-input disabled v-model="resumesCompensation" @click="getMonyList()" :clearable="false"
-								input-align="left" type="text" placeholder="如:1W-2W" />
-						</view>
-					</view>
-					<view class="list-box-job-r" @click="getMonyList()">
-						<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
-					</view>
-				</view>
-				<view class="list-box-line"></view>
-				<view class="list-box-job flex justify-between align-center" @click="getPostType()">
-					<view class="list-box-job-l" @click="getPostType()">
-						<view class="list-box-job-l-label" @click="getPostType()">
-							工作性质
-						</view>
-						<view class="" style="width: 100%;">
-							<u-input disabled v-model="workType" @click="getPostType()" :clearable="false"
-								input-align="left" type="text" placeholder="如:全职" />
-						</view>
-					</view>
-					<view class="list-box-job-r" @click="getPostType()">
-						<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
-					</view>
-				</view>
-			</view>
-		</view>
+  <view>
+    <!-- 顶部占位区域 -->
+    <navBar title="求职意向" color="#000" />
+    <!-- 表单 -->
+    <view class="list flex justify-center">
+      <view class="list-box">
+        <view class="list-box-job flex justify-between align-center">
+          <view class="list-box-job-l" @click="gotoJob('/package/jobIntention/jobList')">
+            <view
+              class="list-box-job-l-label"
+              @click="gotoJob('/package/jobIntention/jobList')"
+            >
+              期望岗位
+            </view>
+            <view
+              class=""
+              @click="gotoJob('/package/jobIntention/jobList')"
+              style="width: 100%"
+            >
+              <u-input
+                @click="gotoJob('/package/jobIntention/jobList')"
+                disabled
+                v-model="ruleClassifyName"
+                :clearable="false"
+                input-align="left"
+                type="text"
+                placeholder="请选择"
+              />
+            </view>
+          </view>
+          <view class="list-box-job-r" @click="gotoJob('/package/jobIntention/jobList')">
+            <u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+          </view>
+        </view>
+        <view class="list-box-line"></view>
+        <view
+          class="list-box-job flex justify-between align-center"
+          @click="gotoJob('/package/jobIntention/city')"
+        >
+          <view class="list-box-job-l" @click="gotoJob('/package/jobIntention/city')">
+            <view
+              class="list-box-job-l-label"
+              @click="gotoJob('/package/jobIntention/city')"
+            >
+              期望地点
+            </view>
+            <view class="" style="width: 100%">
+              <u-input
+                disabled
+                v-model="city"
+                @click="gotoJob('/package/jobIntention/city')"
+                :clearable="false"
+                input-align="left"
+                type="text"
+                placeholder="如:北京"
+              />
+            </view>
+          </view>
+          <view class="list-box-job-r" @click="gotoJob('/package/jobIntention/city')">
+            <u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+          </view>
+        </view>
+        <view class="list-box-line"></view>
+        <view
+          class="list-box-job flex justify-between align-center"
+          @click="gotoJob('/package/jobIntention/industry')"
+        >
+          <view class="list-box-job-l" @click="gotoJob('/package/jobIntention/industry')">
+            <view
+              class="list-box-job-l-label"
+              @click="gotoJob('/package/jobIntention/industry')"
+            >
+              期望行业
+            </view>
+            <view
+              class=""
+              @click="gotoJob('/package/jobIntention/industry')"
+              style="width: 100%"
+            >
+              <u-input
+                @click="gotoJob('/package/jobIntention/industry')"
+                disabled
+                v-model="industry"
+                :clearable="false"
+                input-align="left"
+                type="text"
+                placeholder="如:互联网/电子商务"
+              />
+            </view>
+          </view>
+          <view class="list-box-job-r" @click="gotoJob('/package/jobIntention/industry')">
+            <u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+          </view>
+        </view>
+        <view class="list-box-line"></view>
+        <view
+          class="list-box-job flex justify-between align-center"
+          @click="getMonyList()"
+        >
+          <view class="list-box-job-l" @click="getMonyList()">
+            <view class="list-box-job-l-label" @click="getMonyList()"> 期望薪资 </view>
+            <view class="" style="width: 100%">
+              <u-input
+                disabled
+                v-model="resumesCompensation"
+                @click="getMonyList()"
+                :clearable="false"
+                input-align="left"
+                type="text"
+                placeholder="如:1W-2W"
+              />
+            </view>
+          </view>
+          <view class="list-box-job-r" @click="getMonyList()">
+            <u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+          </view>
+        </view>
+        <view class="list-box-line"></view>
+        <view
+          class="list-box-job flex justify-between align-center"
+          @click="getPostType()"
+        >
+          <view class="list-box-job-l" @click="getPostType()">
+            <view class="list-box-job-l-label" @click="getPostType()"> 工作性质 </view>
+            <view class="" style="width: 100%">
+              <u-input
+                disabled
+                v-model="workType"
+                @click="getPostType()"
+                :clearable="false"
+                input-align="left"
+                type="text"
+                placeholder="如:全职"
+              />
+            </view>
+          </view>
+          <view class="list-box-job-r" @click="getPostType()">
+            <u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+          </view>
+        </view>
+      </view>
+    </view>
 
+    <!-- 确认 -->
+    <view class="subbtn flex justify-center" @click="addjob()">
+      <view class="subbtn-box flex justify-center align-center"> 保存 </view>
+    </view>
 
-		<!-- 确认 -->
-		<view class="subbtn flex justify-center" @click="addjob()">
-			<view class="subbtn-box flex justify-center align-center">
-				保存
-			</view>
-		</view>
-
-
-		<!-- 薪资 -->
-		<u-select v-model="monyShow" :list="monyList" @confirm="moneyConfirm"></u-select>
-		<!-- 工作性质 -->
-		<u-select v-model="workShow" :list="workTypes" @confirm="workConfirm"></u-select>
-	</view>
+    <!-- 薪资 -->
+    <u-select v-model="monyShow" :list="monyList" @confirm="moneyConfirm"></u-select>
+    <!-- 工作性质 -->
+    <u-select v-model="workShow" :list="workTypes" @confirm="workConfirm"></u-select>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				statusBarHeight: 0,
-				monyShow: false,
-				monyList: [], //薪资列表
-				resumesCompensation: '', //薪资
-				workShow: false,
-				workType: '', //工作性质
-				workTypes: [],
-				city: '', //城市
-				ruleClassifyId: '', //岗位id
-				ruleClassifyName: '', //岗位名称
-				industry: '',
-				classifyOneId: '', //岗位一级
-				classifyTwoId: '', //岗位二级id
-				isDefault: 0,
-			};
-		},
-		onLoad() {
-			// 获取状态栏高度
-			const systemInfo = uni.getSystemInfoSync()
-			this.statusBarHeight = systemInfo.statusBarHeight || 0
-		},
-		onShow() {
-			let that = this
-			//选择的岗位
-			uni.$on('jobs', (info) => {
-				that.ruleClassifyId = info.ruleClassifyId
-				that.ruleClassifyName = info.ruleClassifyName
-				// that.classifyOneId = info.ruleClassifyId1
-				// that.classifyTwoId = info.ruleClassifyId2
-			})
-			//选择的城市
-			uni.$on('city', (info) => {
-				that.city = info.city
-			})
-			//选择的行业
-			uni.$on('industry', (info) => {
-				that.industry = info.industry
-			})
-
-		},
-		methods: {
-			/**
-			 * 提交求职期望
-			 */
-			addjob() {
-				if (!this.ruleClassifyId) {
-					uni.showToast({
-						title: '请选择期望岗位',
-						icon: 'none'
-					})
-					return
-				}
-				if (!this.city) {
-					uni.showToast({
-						title: '请选择期望城市',
-						icon: 'none'
-					})
-					return
-				}
-				if (!this.industry) {
-					uni.showToast({
-						title: '请选择期望行业',
-						icon: 'none'
-					})
-					return
-				}
-				if (!this.resumesCompensation) {
-					uni.showToast({
-						title: '请选择期望薪资',
-						icon: 'none'
-					})
-					return
-				}
-				if (!this.workType) {
-					uni.showToast({
-						title: '请选择工作性质',
-						icon: 'none'
-					})
-					return
-				}
-				let data = {
-					ruleClassifyId: this.ruleClassifyId, //岗位id
-					ruleClassifyName: this.ruleClassifyName, //岗位名称
-					citys: this.city, //工作城市
-					salaryRange: this.resumesCompensation, //薪资范围
-					industry: this.industry, //行业
-					postType: this.workType, //工作性质
-					isDefault: this.isDefault
-					// classifyOneId:this.classifyOneId,
-					// classifyTwoId:this.classifyTwoId
-				}
-				this.$Request.postT('/app/intention/saveUpdate', data).then(res => {
-					if (res.code == 0) {
-						uni.showToast({
-							title: '添加成功'
-						})
-						setTimeout(() => {
-							uni.navigateBack()
-						}, 1000)
-
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-					}
-				})
-			},
-			workConfirm(e) {
-				this.workType = e[0].value
-			},
-			moneyConfirm(e) {
-				this.resumesCompensation = e[0].value
-			},
-			/**
-			 * 工作性质
-			 */
-			getPostType() {
-				this.$Request.get('/app/dict/list', {
-					type: '工作性质'
-				}).then(res => {
-					if (res.code == 0) {
-						let arr = res.data
-						arr = JSON.parse(JSON.stringify(arr).replace(/code/g, 'label'))
-						this.workTypes = arr
-						this.workShow = true
-
-					}
-				})
-			},
-			/**
-			 * 薪资列表
-			 */
-			getMonyList() {
-				this.$Request.get('/app/dict/list', {
-					type: '薪资'
-				}).then(res => {
-					if (res.code == 0) {
-						let arr = res.data
-						arr = JSON.parse(JSON.stringify(arr).replace(/code/g, 'label'))
-						this.monyList = arr
-						this.monyShow = true
-
-					}
-				})
-			},
-			gotoJob(url) {
-				uni.navigateTo({
-					url: url
-				})
-			},
-		}
-	}
+import navBar from "@/components/nav-bar/index.vue";
+export default {
+  data() {
+    return {
+      statusBarHeight: 0,
+      monyShow: false,
+      monyList: [], //薪资列表
+      resumesCompensation: "", //薪资
+      workShow: false,
+      workType: "", //工作性质
+      workTypes: [],
+      city: "", //城市
+      ruleClassifyId: "", //岗位id
+      ruleClassifyName: "", //岗位名称
+      industry: "",
+      classifyOneId: "", //岗位一级
+      classifyTwoId: "", //岗位二级id
+      isDefault: 0,
+    };
+  },
+  components: {
+    navBar,
+  },
+  onLoad() {
+    // 获取状态栏高度
+    const systemInfo = uni.getSystemInfoSync();
+    this.statusBarHeight = systemInfo.statusBarHeight || 0;
+  },
+  onShow() {
+    let that = this;
+    //选择的岗位
+    uni.$on("jobs", (info) => {
+      that.ruleClassifyId = info.ruleClassifyId;
+      that.ruleClassifyName = info.ruleClassifyName;
+      // that.classifyOneId = info.ruleClassifyId1
+      // that.classifyTwoId = info.ruleClassifyId2
+    });
+    //选择的城市
+    uni.$on("city", (info) => {
+      that.city = info.city;
+    });
+    //选择的行业
+    uni.$on("industry", (info) => {
+      that.industry = info.industry;
+    });
+  },
+  methods: {
+    /**
+     * 提交求职期望
+     */
+    addjob() {
+      if (!this.ruleClassifyId) {
+        uni.showToast({
+          title: "请选择期望岗位",
+          icon: "none",
+        });
+        return;
+      }
+      if (!this.city) {
+        uni.showToast({
+          title: "请选择期望城市",
+          icon: "none",
+        });
+        return;
+      }
+      if (!this.industry) {
+        uni.showToast({
+          title: "请选择期望行业",
+          icon: "none",
+        });
+        return;
+      }
+      if (!this.resumesCompensation) {
+        uni.showToast({
+          title: "请选择期望薪资",
+          icon: "none",
+        });
+        return;
+      }
+      if (!this.workType) {
+        uni.showToast({
+          title: "请选择工作性质",
+          icon: "none",
+        });
+        return;
+      }
+      let data = {
+        ruleClassifyId: this.ruleClassifyId, //岗位id
+        ruleClassifyName: this.ruleClassifyName, //岗位名称
+        citys: this.city, //工作城市
+        salaryRange: this.resumesCompensation, //薪资范围
+        industry: this.industry, //行业
+        postType: this.workType, //工作性质
+        isDefault: this.isDefault,
+        // classifyOneId:this.classifyOneId,
+        // classifyTwoId:this.classifyTwoId
+      };
+      this.$Request.postT("/app/intention/saveUpdate", data).then((res) => {
+        if (res.code == 0) {
+          uni.showToast({
+            title: "添加成功",
+          });
+          setTimeout(() => {
+            uni.navigateBack();
+          }, 1000);
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: "none",
+          });
+        }
+      });
+    },
+    workConfirm(e) {
+      this.workType = e[0].value;
+    },
+    moneyConfirm(e) {
+      this.resumesCompensation = e[0].value;
+    },
+    /**
+     * 工作性质
+     */
+    getPostType() {
+      this.$Request
+        .get("/app/dict/list", {
+          type: "工作性质",
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            let arr = res.data;
+            arr = JSON.parse(JSON.stringify(arr).replace(/code/g, "label"));
+            this.workTypes = arr;
+            this.workShow = true;
+          }
+        });
+    },
+    /**
+     * 薪资列表
+     */
+    getMonyList() {
+      this.$Request
+        .get("/app/dict/list", {
+          type: "薪资",
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            let arr = res.data;
+            arr = JSON.parse(JSON.stringify(arr).replace(/code/g, "label"));
+            this.monyList = arr;
+            this.monyShow = true;
+          }
+        });
+    },
+    gotoJob(url) {
+      uni.navigateTo({
+        url: url,
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F2F2F7;
-	}
+page {
+  background-color: #f2f2f7;
+}
 
-	.list {
-		width: 100%;
-		// height: 795rpx;
-		margin-top: 30rpx;
+.list {
+  width: 100%;
+  // height: 795rpx;
+  margin-top: 30rpx;
 
-		.list-box {
-			width: 686rpx;
-			height: 100;
-			background-color: #ffffff;
-			border-radius: 24rpx;
+  .list-box {
+    width: 686rpx;
+    height: 100;
+    background-color: #ffffff;
+    border-radius: 24rpx;
 
-			.list-box-job {
-				width: 606rpx;
-				height: 164rpx;
-				margin: 0 auto;
+    .list-box-job {
+      width: 606rpx;
+      height: 164rpx;
+      margin: 0 auto;
 
-				.list-box-job-l {
-					width: 80%;
-				}
+      .list-box-job-l {
+        width: 80%;
+      }
 
-				.list-box-job-r {
-					width: 30rpx;
-				}
-			}
+      .list-box-job-r {
+        width: 30rpx;
+      }
+    }
 
-			.list-box-line {
-				width: 650rpx;
-				height: 1rpx;
-				border: 1rpx solid #F2F2F2;
-			}
-		}
-	}
+    .list-box-line {
+      width: 650rpx;
+      height: 1rpx;
+      border: 1rpx solid #f2f2f2;
+    }
+  }
+}
 
-	.subbtn {
-		width: 100%;
-		height: 88rpx;
-		margin-top: 90rpx;
+.subbtn {
+  width: 100%;
+  height: 88rpx;
+  margin-top: 90rpx;
 
-		.subbtn-box {
-			width: 686rpx;
-			height: 100%;
-			background-color: #016BF6;
-			border-radius: 44rpx;
-			color: #FFFFFF;
-			font-size: 32rpx;
-			font-weight: bold;
-		}
-	}
-</style>
+  .subbtn-box {
+    width: 686rpx;
+    height: 100%;
+    background-color: #016bf6;
+    border-radius: 44rpx;
+    color: #ffffff;
+    font-size: 32rpx;
+    font-weight: bold;
+  }
+}
+</style>

package/jobIntention/city.vue

@@ -1,249 +1,291 @@
 <template>
-	<view>
-
-		<!-- 左边内容 -->
-		<!-- <scroll-view class="scroller" :scroll-into-view="toView" scroll-y="true" scroll-with-animation="true">
+  <view class="address">
+    <navBar title="选择城市" color="#000" />
+    <!-- 左边内容 -->
+    <!-- <scroll-view class="scroller" :scroll-into-view="toView" scroll-y="true" scroll-with-animation="true">
 			<view :id="item" class="left" v-for="item in list">{{item.toUpperCase()}}</view>
 		</scroll-view> -->
 
-		<!-- 右边索引 -->
-		<!-- <view>
+    <!-- 右边索引 -->
+    <!-- <view>
 			<view :data-id="item" v-for="item in list" @tap="bindToView">{{item}}</view>
 		</view> -->
-		<!-- 中间主体内容 -->
-		<view class="content">
-			<scroll-view scroll-y="true" style="width: 100%;height: 100%;" :scroll-into-view="toView"
-				scroll-with-animation="true">
-				<view class="content-title">
-					选择城市
-				</view>
-				<view class="content-search">
-					<u-search placeholder="搜索城市名" v-model="keyword" @change="getCitysList"
-						:show-action="false"></u-search>
-				</view>
-				<view class="content-map">
-					<view class="flex align-center justify-between" @click="getLatOrLng">
-						定位城市
-						<view class="" style="font-size: 24rpx;font-weight: 500;color: #999999;">
-							<u-icon name="map" color="#999999" style="margin-right: 10rpx;" size="24"></u-icon>重新定位
-						</view>
-					</view>
-					<view class="content-map-address flex justify-center align-center" @click="selectCity(city)">
-						{{city}}
-					</view>
-				</view>
-				<view class="content-map flex justify-between flex-wrap" v-if="rmCity.length>0">
-					<view class="" style="width: 100%;">
-						热门城市
-					</view>
-					<view class="content-map-address flex justify-center align-center" @click="selectCity(item)"
-						v-for="(item,index) in rmCity" :key="index">
-						{{item}}
-					</view>
-					<view class="content-map-address flex justify-center align-center" style="height: 0;">
-
-					</view>
-				</view>
-				<view :id="item.letter" class="content-map flex justify-between flex-wrap"
-					v-for="(item,index) in cityList" v-if="item.city.length>0" :key="index">
-					<view class="" style="width: 100%;">
-						{{item.letter.toUpperCase()}}
-					</view>
-					<view class="content-map-address flex justify-center align-center" @click="selectCity(ite)"
-						v-for="(ite,ind) in item.city" :key="ind">
-						{{ite}}
-					</view>
-					<view class="content-map-address flex justify-center align-center" style="height: 0;">
-
-					</view>
-				</view>
-			</scroll-view>
-
-		</view>
-		<view class="left flex justify-center flex-wrap">
-			<view :data-id="item" class="left-item" v-for="(item,index) in list" @tap="bindToView">
-				{{item.toUpperCase()}}
-			</view>
-		</view>
-
-
-
-	</view>
+    <!-- 中间主体内容 -->
+    <view class="content">
+      <scroll-view
+        scroll-y="true"
+        style="width: 100%; height: 100%"
+        :scroll-into-view="toView"
+        scroll-with-animation="true"
+      >
+        <view class="content-title"> 选择城市 </view>
+        <view class="content-search">
+          <u-search
+            placeholder="搜索城市名"
+            v-model="keyword"
+            @change="getCitysList"
+            :show-action="false"
+          ></u-search>
+        </view>
+        <view class="content-map">
+          <view class="flex align-center justify-between" @click="getLatOrLng">
+            定位城市
+            <view class="" style="font-size: 24rpx; font-weight: 500; color: #999999">
+              <u-icon
+                name="map"
+                color="#999999"
+                style="margin-right: 10rpx"
+                size="24"
+              ></u-icon
+              >重新定位
+            </view>
+          </view>
+          <view
+            class="content-map-address flex justify-center align-center"
+            @click="selectCity(city)"
+          >
+            {{ city }}
+          </view>
+        </view>
+        <view class="content-map flex justify-between flex-wrap" v-if="rmCity.length > 0">
+          <view class="" style="width: 100%"> 热门城市 </view>
+          <view
+            class="content-map-address flex justify-center align-center"
+            @click="selectCity(item)"
+            v-for="(item, index) in rmCity"
+            :key="index"
+          >
+            {{ item }}
+          </view>
+          <view
+            class="content-map-address flex justify-center align-center"
+            style="height: 0"
+          >
+          </view>
+        </view>
+        <view
+          :id="item.letter"
+          class="content-map flex justify-between flex-wrap"
+          v-for="(item, index) in cityList"
+          v-if="item.city.length > 0"
+          :key="index"
+        >
+          <view class="" style="width: 100%">
+            {{ item.letter.toUpperCase() }}
+          </view>
+          <view
+            class="content-map-address flex justify-center align-center"
+            @click="selectCity(ite)"
+            v-for="(ite, ind) in item.city"
+            :key="ind"
+          >
+            {{ ite }}
+          </view>
+          <view
+            class="content-map-address flex justify-center align-center"
+            style="height: 0"
+          >
+          </view>
+        </view>
+      </scroll-view>
+    </view>
+    <view class="left flex justify-center flex-wrap">
+      <view
+        :data-id="item"
+        class="left-item"
+        v-for="(item, index) in list"
+        @tap="bindToView"
+      >
+        {{ item.toUpperCase() }}
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				searchList: [],
-				cityList: [],
-				rmCity: [],
-				keyword: '',
-				list: [],
-				toView: '',
-				city: '',
-				latitude: '',
-				longitude: '',
-			}
-		},
-		onLoad() {
-			this.getLatOrLng()
-			this.getRmCityList();
-			this.getCitysList()
-
-		},
-		methods: {
-			/**
-			 * 热门城市列表
-			 */
-			getRmCityList() {
-				let data = {
-					limitCount: 10,
-				}
-				this.$Request.get('/app/postPush/getHotCity', data).then(res => {
-					if (res.code == 0) {
-						this.rmCity = res.data
-					}
-				})
-			},
-			/**
-			 * 获取城市列表
-			 */
-			getCitysList() {
-				let data = {
-					city: this.keyword
-				}
-				this.$Request.get('/app/postPush/getCityList', data).then(res => {
-					if (res.code == 0) {
-						this.cityList = res.data
-						let arr = res.data
-						let rightList = []
-						arr.map(item => {
-							rightList.push(item.letter)
-						})
-						this.list = rightList
-					}
-				});
-
-			},
-			/**
-			 * 定位获取经纬度
-			 */
-			getLatOrLng() {
-				let that = this
-				uni.getLocation({
-					type: 'wgs84', //wgs84  gcj02
-					success: function(res) {
-						console.log(res, '地理位置')
-						that.latitude = res.latitude
-						that.longitude = res.longitude
-						// #ifdef APP-PLUS
-						if (res.address) {
-							that.city = res.address.city
-						} else {
-							that.getSelectCity(that.longitude, that.latitude);
-						}
-						// #endif
-						// #ifndef APP
-						that.getSelectCity(that.longitude, that.latitude);
-						// #endif
-					},
-					fail: function(err) {
-						console.log('获取地址失败', err)
-					}
-				})
-			},
-			/**
-			 * @param {Object} longitude
-			 * @param {Object} latitude
-			 * 使用经纬度获取城市
-			 */
-			getSelectCity(longitude, latitude) {
-				console.log(longitude + '' + latitude, 'app请求经纬度');
-				this.$Request.get('/app/Login/selectCity?lat=' + latitude + '&lng=' + longitude).then(res => {
-					if (res.code == 0) {
-						console.log(res, 'app定位请求')
-						this.city = res.data.city ? res.data.city : '未知'
-					}
-				});
-			},
-			/**
-			 * @param {Object} city
-			 * 选择城市
-			 */
-			selectCity(city) {
-				uni.$emit('city', {
-					city: city
-				})
-				uni.navigateBack()
-			},
+import navBar from "@/components/nav-bar/index.vue";
+export default {
+  data() {
+    return {
+      searchList: [],
+      cityList: [],
+      rmCity: [],
+      keyword: "",
+      list: [],
+      toView: "",
+      city: "",
+      latitude: "",
+      longitude: "",
+    };
+  },
+  components: {
+    navBar,
+  },
+  onLoad() {
+    this.getLatOrLng();
+    this.getRmCityList();
+    this.getCitysList();
+  },
+  methods: {
+    /**
+     * 热门城市列表
+     */
+    getRmCityList() {
+      let data = {
+        limitCount: 10,
+      };
+      this.$Request.get("/app/postPush/getHotCity", data).then((res) => {
+        if (res.code == 0) {
+          this.rmCity = res.data;
+        }
+      });
+    },
+    /**
+     * 获取城市列表
+     */
+    getCitysList() {
+      let data = {
+        city: this.keyword,
+      };
+      this.$Request.get("/app/postPush/getCityList", data).then((res) => {
+        if (res.code == 0) {
+          this.cityList = res.data;
+          let arr = res.data;
+          let rightList = [];
+          arr.map((item) => {
+            rightList.push(item.letter);
+          });
+          this.list = rightList;
+        }
+      });
+    },
+    /**
+     * 定位获取经纬度
+     */
+    getLatOrLng() {
+      let that = this;
+      uni.getLocation({
+        type: "wgs84", //wgs84  gcj02
+        success: function (res) {
+          console.log(res, "地理位置");
+          that.latitude = res.latitude;
+          that.longitude = res.longitude;
+          // #ifdef APP-PLUS
+          if (res.address) {
+            that.city = res.address.city;
+          } else {
+            that.getSelectCity(that.longitude, that.latitude);
+          }
+          // #endif
+          // #ifndef APP
+          that.getSelectCity(that.longitude, that.latitude);
+          // #endif
+        },
+        fail: function (err) {
+          console.log("获取地址失败", err);
+        },
+      });
+    },
+    /**
+     * @param {Object} longitude
+     * @param {Object} latitude
+     * 使用经纬度获取城市
+     */
+    getSelectCity(longitude, latitude) {
+      console.log(longitude + "" + latitude, "app请求经纬度");
+      this.$Request
+        .get("/app/Login/selectCity?lat=" + latitude + "&lng=" + longitude)
+        .then((res) => {
+          if (res.code == 0) {
+            console.log(res, "app定位请求");
+            this.city = res.data.city ? res.data.city : "未知";
+          }
+        });
+    },
+    /**
+     * @param {Object} city
+     * 选择城市
+     */
+    selectCity(city) {
+      uni.$emit("city", {
+        city: city,
+      });
+      uni.navigateBack();
+    },
 
-			bindToView(event) {
-				var id = event.currentTarget.dataset.id;
-				console.log(id)
-				this.toView = id;
-			}
-		}
-	}
+    bindToView(event) {
+      var id = event.currentTarget.dataset.id;
+      console.log(id);
+      this.toView = id;
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	.content {
-		width: 686rpx;
-		height: 100vh;
-		position: fixed;
-		right: 40rpx;
-		/* #ifdef MP-WEIXIN */
-		top: 0;
-		/* #endif */
-		/* #ifndef MP-WEIXIN */
-		top: 76;
-		/* #endif */
+.address{
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+}
+.content {
+  width: 686rpx;
+  height: 100vh;
+  position: fixed;
+  right: 40rpx;
+  /* #ifdef MP-WEIXIN */
+  top: 0;
+  /* #endif */
+  /* #ifndef MP-WEIXIN */
+  top: 76;
+  /* #endif */
 
-		.content-title {
-			width: 100%;
-			font-size: 38rpx;
-			font-weight: bold;
-			margin-top: 30rpx;
-		}
+  .content-title {
+    width: 100%;
+    font-size: 38rpx;
+    font-weight: bold;
+    margin-top: 30rpx;
+  }
 
-		.content-search {
-			width: 100%;
-			height: 60rpx;
-			border-radius: 24rpx;
-			background-color: #F2F2F7;
-			margin-top: 30rpx;
-		}
+  .content-search {
+    width: 100%;
+    height: 60rpx;
+    border-radius: 24rpx;
+    background-color: #f2f2f7;
+    margin-top: 30rpx;
+  }
 
-		.content-map {
-			width: 100%;
-			margin-top: 30rpx;
-			font-size: 30rpx;
-			font-weight: bold;
+  .content-map {
+    width: 100%;
+    margin-top: 30rpx;
+    font-size: 30rpx;
+    font-weight: bold;
 
-			.content-map-address {
-				margin-top: 20rpx;
-				width: 200rpx;
-				height: 70rpx;
-				background-color: #F2F2F7;
-				font-size: 26rpx;
-				font-weight: 500;
-			}
-		}
-	}
+    .content-map-address {
+      margin-top: 20rpx;
+      width: 200rpx;
+      height: 70rpx;
+      background-color: #f2f2f7;
+      font-size: 26rpx;
+      font-weight: 500;
+    }
+  }
+}
 
-	.left {
-		position: fixed;
-		right: 0;
-		top: 50%;
-		transform: translate(0, -50%);
-		width: 30rpx;
+.left {
+  position: fixed;
+  right: 0;
+  top: 50%;
+  transform: translate(0, -50%);
+  width: 30rpx;
 
-		.left-item {
-			margin-top: 10rpx;
-			padding-left: 10rpx;
-			padding-right: 10rpx;
-			color: #016BF6;
-		}
-	}
-</style>
+  .left-item {
+    margin-top: 10rpx;
+    padding-left: 10rpx;
+    padding-right: 10rpx;
+    color: #016bf6;
+  }
+}
+</style>

package/jobIntention/edit.vue

@@ -1,335 +1,393 @@
 <template>
-	<view>
-		<!-- 表单 -->
-		<view class="list flex justify-center">
-			<view class="list-box">
-				<view class="list-box-job flex justify-between align-center">
-					<view class="list-box-job-l" @click="gotoJob('/package/jobIntention/jobList')">
-						<view class="list-box-job-l-label" @click="gotoJob('/package/jobIntention/jobList')">
-							期望岗位
-						</view>
-						<view class="" @click="gotoJob('/package/jobIntention/jobList')" style="width: 100%;">
-							<u-input @click="gotoJob('/package/jobIntention/jobList')" disabled
-								v-model="ruleClassifyName" :clearable="false" input-align="left" type="text"
-								placeholder="请选择" />
-						</view>
-					</view>
-					<view class="list-box-job-r" @click="gotoJob('/package/jobIntention/jobList')">
-						<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
-					</view>
-				</view>
-				<view class="list-box-line"></view>
-				<view class="list-box-job flex justify-between align-center"
-					@click="gotoJob('/package/jobIntention/city')">
-					<view class="list-box-job-l" @click="gotoJob('/package/jobIntention/city')">
-						<view class="list-box-job-l-label" @click="gotoJob('/package/jobIntention/city')">
-							期望地点
-						</view>
-						<view class="" style="width: 100%;">
-							<u-input disabled v-model="city" @click="gotoJob('/package/jobIntention/city')"
-								:clearable="false" input-align="left" type="text" placeholder="如:北京" />
-						</view>
-					</view>
-					<view class="list-box-job-r" @click="gotoJob('/package/jobIntention/city')">
-						<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
-					</view>
-				</view>
-				<view class="list-box-line"></view>
-				<view class="list-box-job flex justify-between align-center"
-					@click="gotoJob('/package/jobIntention/industry')">
-					<view class="list-box-job-l" @click="gotoJob('/package/jobIntention/industry')">
-						<view class="list-box-job-l-label" @click="gotoJob('/package/jobIntention/industry')">
-							期望行业
-						</view>
-						<view class="" @click="gotoJob('/package/jobIntention/industry')" style="width: 100%;">
-							<u-input @click="gotoJob('/package/jobIntention/industry')" disabled v-model="industry"
-								:clearable="false" input-align="left" type="text" placeholder="如:互联网/电子商务" />
-						</view>
-					</view>
-					<view class="list-box-job-r" @click="gotoJob('/package/jobIntention/industry')">
-						<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
-					</view>
-				</view>
-				<view class="list-box-line"></view>
-				<view class="list-box-job flex justify-between align-center" @click="getMonyList()">
-					<view class="list-box-job-l" @click="getMonyList()">
-						<view class="list-box-job-l-label" @click="getMonyList()">
-							期望薪资
-						</view>
-						<view class="" style="width: 100%;">
-							<u-input disabled v-model="resumesCompensation" @click="getMonyList()" :clearable="false"
-								input-align="left" type="text" placeholder="如:1W-2W" />
-						</view>
-					</view>
-					<view class="list-box-job-r" @click="getMonyList()">
-						<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
-					</view>
-				</view>
-				<view class="list-box-line"></view>
-				<view class="list-box-job flex justify-between align-center" @click="getPostType()">
-					<view class="list-box-job-l" @click="getPostType()">
-						<view class="list-box-job-l-label" @click="getPostType()">
-							工作性质
-						</view>
-						<view class="" style="width: 100%;">
-							<u-input disabled v-model="workType" @click="getPostType()" :clearable="false"
-								input-align="left" type="text" placeholder="如:全职" />
-						</view>
-					</view>
-					<view class="list-box-job-r" @click="getPostType()">
-						<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
-					</view>
-				</view>
-			</view>
-		</view>
+  <view>
+    <navBar title="修改" color="#000" />
+    <!-- 表单 -->
+    <view class="list flex justify-center">
+      <view class="list-box">
+        <view class="list-box-job flex justify-between align-center">
+          <view class="list-box-job-l" @click="gotoJob('/package/jobIntention/jobList')">
+            <view
+              class="list-box-job-l-label"
+              @click="gotoJob('/package/jobIntention/jobList')"
+            >
+              期望岗位
+            </view>
+            <view
+              class=""
+              @click="gotoJob('/package/jobIntention/jobList')"
+              style="width: 100%"
+            >
+              <u-input
+                @click="gotoJob('/package/jobIntention/jobList')"
+                disabled
+                v-model="ruleClassifyName"
+                :clearable="false"
+                input-align="left"
+                type="text"
+                placeholder="请选择"
+              />
+            </view>
+          </view>
+          <view class="list-box-job-r" @click="gotoJob('/package/jobIntention/jobList')">
+            <u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+          </view>
+        </view>
+        <view class="list-box-line"></view>
+        <view
+          class="list-box-job flex justify-between align-center"
+          @click="gotoJob('/package/jobIntention/city')"
+        >
+          <view class="list-box-job-l" @click="gotoJob('/package/jobIntention/city')">
+            <view
+              class="list-box-job-l-label"
+              @click="gotoJob('/package/jobIntention/city')"
+            >
+              期望地点
+            </view>
+            <view class="" style="width: 100%">
+              <u-input
+                disabled
+                v-model="city"
+                @click="gotoJob('/package/jobIntention/city')"
+                :clearable="false"
+                input-align="left"
+                type="text"
+                placeholder="如:北京"
+              />
+            </view>
+          </view>
+          <view class="list-box-job-r" @click="gotoJob('/package/jobIntention/city')">
+            <u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+          </view>
+        </view>
+        <view class="list-box-line"></view>
+        <view
+          class="list-box-job flex justify-between align-center"
+          @click="gotoJob('/package/jobIntention/industry')"
+        >
+          <view class="list-box-job-l" @click="gotoJob('/package/jobIntention/industry')">
+            <view
+              class="list-box-job-l-label"
+              @click="gotoJob('/package/jobIntention/industry')"
+            >
+              期望行业
+            </view>
+            <view
+              class=""
+              @click="gotoJob('/package/jobIntention/industry')"
+              style="width: 100%"
+            >
+              <u-input
+                @click="gotoJob('/package/jobIntention/industry')"
+                disabled
+                v-model="industry"
+                :clearable="false"
+                input-align="left"
+                type="text"
+                placeholder="如:互联网/电子商务"
+              />
+            </view>
+          </view>
+          <view class="list-box-job-r" @click="gotoJob('/package/jobIntention/industry')">
+            <u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+          </view>
+        </view>
+        <view class="list-box-line"></view>
+        <view
+          class="list-box-job flex justify-between align-center"
+          @click="getMonyList()"
+        >
+          <view class="list-box-job-l" @click="getMonyList()">
+            <view class="list-box-job-l-label" @click="getMonyList()"> 期望薪资 </view>
+            <view class="" style="width: 100%">
+              <u-input
+                disabled
+                v-model="resumesCompensation"
+                @click="getMonyList()"
+                :clearable="false"
+                input-align="left"
+                type="text"
+                placeholder="如:1W-2W"
+              />
+            </view>
+          </view>
+          <view class="list-box-job-r" @click="getMonyList()">
+            <u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+          </view>
+        </view>
+        <view class="list-box-line"></view>
+        <view
+          class="list-box-job flex justify-between align-center"
+          @click="getPostType()"
+        >
+          <view class="list-box-job-l" @click="getPostType()">
+            <view class="list-box-job-l-label" @click="getPostType()"> 工作性质 </view>
+            <view class="" style="width: 100%">
+              <u-input
+                disabled
+                v-model="workType"
+                @click="getPostType()"
+                :clearable="false"
+                input-align="left"
+                type="text"
+                placeholder="如:全职"
+              />
+            </view>
+          </view>
+          <view class="list-box-job-r" @click="getPostType()">
+            <u-icon name="arrow-right" color="#999999" size="28"></u-icon>
+          </view>
+        </view>
+      </view>
+    </view>
 
+    <!-- 确认 -->
+    <view class="subbtn flex justify-center" @click="addjob()">
+      <view class="subbtn-box flex justify-center align-center"> 修改 </view>
+    </view>
 
-		<!-- 确认 -->
-		<view class="subbtn flex justify-center" @click="addjob()">
-			<view class="subbtn-box flex justify-center align-center">
-				修改
-			</view>
-		</view>
-
-
-		<!-- 薪资 -->
-		<u-select v-model="monyShow" :list="monyList" @confirm="moneyConfirm"></u-select>
-		<!-- 工作性质 -->
-		<u-select v-model="workShow" :list="workTypes" @confirm="workConfirm"></u-select>
-	</view>
+    <!-- 薪资 -->
+    <u-select v-model="monyShow" :list="monyList" @confirm="moneyConfirm"></u-select>
+    <!-- 工作性质 -->
+    <u-select v-model="workShow" :list="workTypes" @confirm="workConfirm"></u-select>
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				monyShow: false,
-				monyList: [], //薪资列表
-				resumesCompensation: '', //薪资
-				workShow: false,
-				workType: '', //工作性质
-				workTypes: [],
-				city: '', //城市
-				ruleClassifyId: '', //岗位id
-				ruleClassifyName: '', //岗位名称
-				industry: '',
-				intentionId: '', //求职意向id
-				isDefault: 0, //是否第一意向
-				// classifyOneId:'',//岗位一级
-				// classifyTwoId:'',//岗位二级id
-			};
-		},
-		onShow() {
-			let that = this
-			//选择的岗位
-			uni.$on('jobs', (info) => {
-				that.ruleClassifyId = info.ruleClassifyId
-				that.ruleClassifyName = info.ruleClassifyName
-				// that.classifyOneId = info.ruleClassifyId1
-				// that.classifyTwoId = info.ruleClassifyId2
-			})
-			//选择的城市
-			uni.$on('city', (info) => {
-				that.city = info.city
-			})
-			//选择的行业
-			uni.$on('industry', (info) => {
-				that.industry = info.industry
-			})
-
-		},
-		onLoad(option) {
-			this.intentionId = option.intentionId
-			this.getInfo()
-		},
-		methods: {
-			/**
-			 * 获取求职意向详情
-			 */
-			getInfo() {
-				let data = {
-					intentionId: this.intentionId
-				}
-				this.$Request.getT('/app/intention/getIntentionInfo', data).then(res => {
-					if (res.code == 0) {
-						this.ruleClassifyId = res.data.ruleClassifyId //岗位id
-						this.ruleClassifyName = res.data.ruleClassifyName //岗位名称
-						this.city = res.data.citys //工作城市
-						this.resumesCompensation = res.data.salaryRange //薪资范围
-						this.industry = res.data.industry //行业
-						this.workType = res.data.postType //工作性质
-						this.isDefault = res.data.isDefault //是第一意向
-						// this.classifyOneId = res.data.classifyOneId
-						// this.classifyTwoId = res.data.classifyTwoId
-					}
-				})
-			},
-			/**
-			 * 提交求职期望
-			 */
-			addjob() {
-				if (!this.ruleClassifyId) {
-					uni.showToast({
-						title: '请选择期望岗位',
-						icon: 'none'
-					})
-					return
-				}
-				if (!this.city) {
-					uni.showToast({
-						title: '请选择期望城市',
-						icon: 'none'
-					})
-					return
-				}
-				if (!this.industry) {
-					uni.showToast({
-						title: '请选择期望行业',
-						icon: 'none'
-					})
-					return
-				}
-				if (!this.resumesCompensation) {
-					uni.showToast({
-						title: '请选择期望薪资',
-						icon: 'none'
-					})
-					return
-				}
-				if (!this.workType) {
-					uni.showToast({
-						title: '请选择工作性质',
-						icon: 'none'
-					})
-					return
-				}
-				let data = {
-					intentionId: this.intentionId,
-					ruleClassifyId: this.ruleClassifyId, //岗位id
-					ruleClassifyName: this.ruleClassifyName, //岗位名称
-					citys: this.city, //工作城市
-					salaryRange: this.resumesCompensation, //薪资范围
-					industry: this.industry, //行业
-					postType: this.workType, //工作性质
-					isDefault: this.isDefault
-					// classifyOneId:this.classifyOneId,
-					// classifyTwoId:this.classifyTwoId
-				}
-				this.$Request.postT('/app/intention/saveUpdate', data).then(res => {
-					if (res.code == 0) {
-						uni.showToast({
-							title: '修改成功'
-						})
-						setTimeout(() => {
-							uni.navigateBack()
-						}, 1000)
-
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-					}
-				})
-			},
-			workConfirm(e) {
-				this.workType = e[0].value
-			},
-			moneyConfirm(e) {
-				this.resumesCompensation = e[0].value
-			},
-			/**
-			 * 工作性质
-			 */
-			getPostType() {
-				this.$Request.get('/app/dict/list', {
-					type: '工作性质'
-				}).then(res => {
-					if (res.code == 0) {
-						let arr = res.data
-						arr = JSON.parse(JSON.stringify(arr).replace(/code/g, 'label'))
-						this.workTypes = arr
-						this.workShow = true
-
-					}
-				})
-			},
-			/**
-			 * 薪资列表
-			 */
-			getMonyList() {
-				this.$Request.get('/app/dict/list', {
-					type: '薪资'
-				}).then(res => {
-					if (res.code == 0) {
-						let arr = res.data
-						arr = JSON.parse(JSON.stringify(arr).replace(/code/g, 'label'))
-						this.monyList = arr
-						this.monyShow = true
-
-					}
-				})
-			},
-			gotoJob(url) {
-				uni.navigateTo({
-					url: url
-				})
-			},
-		}
-	}
+import navBar from "@/components/nav-bar/index.vue";
+export default {
+  data() {
+    return {
+      monyShow: false,
+      monyList: [], //薪资列表
+      resumesCompensation: "", //薪资
+      workShow: false,
+      workType: "", //工作性质
+      workTypes: [],
+      city: "", //城市
+      ruleClassifyId: "", //岗位id
+      ruleClassifyName: "", //岗位名称
+      industry: "",
+      intentionId: "", //求职意向id
+      isDefault: 0, //是否第一意向
+      // classifyOneId:'',//岗位一级
+      // classifyTwoId:'',//岗位二级id
+    };
+  },
+  components: {
+    navBar,
+  },
+  onShow() {
+    let that = this;
+    //选择的岗位
+    uni.$on("jobs", (info) => {
+      that.ruleClassifyId = info.ruleClassifyId;
+      that.ruleClassifyName = info.ruleClassifyName;
+      // that.classifyOneId = info.ruleClassifyId1
+      // that.classifyTwoId = info.ruleClassifyId2
+    });
+    //选择的城市
+    uni.$on("city", (info) => {
+      that.city = info.city;
+    });
+    //选择的行业
+    uni.$on("industry", (info) => {
+      that.industry = info.industry;
+    });
+  },
+  onLoad(option) {
+    this.intentionId = option.intentionId;
+    this.getInfo();
+  },
+  methods: {
+    /**
+     * 获取求职意向详情
+     */
+    getInfo() {
+      let data = {
+        intentionId: this.intentionId,
+      };
+      this.$Request.getT("/app/intention/getIntentionInfo", data).then((res) => {
+        if (res.code == 0) {
+          this.ruleClassifyId = res.data.ruleClassifyId; //岗位id
+          this.ruleClassifyName = res.data.ruleClassifyName; //岗位名称
+          this.city = res.data.citys; //工作城市
+          this.resumesCompensation = res.data.salaryRange; //薪资范围
+          this.industry = res.data.industry; //行业
+          this.workType = res.data.postType; //工作性质
+          this.isDefault = res.data.isDefault; //是第一意向
+          // this.classifyOneId = res.data.classifyOneId
+          // this.classifyTwoId = res.data.classifyTwoId
+        }
+      });
+    },
+    /**
+     * 提交求职期望
+     */
+    addjob() {
+      if (!this.ruleClassifyId) {
+        uni.showToast({
+          title: "请选择期望岗位",
+          icon: "none",
+        });
+        return;
+      }
+      if (!this.city) {
+        uni.showToast({
+          title: "请选择期望城市",
+          icon: "none",
+        });
+        return;
+      }
+      if (!this.industry) {
+        uni.showToast({
+          title: "请选择期望行业",
+          icon: "none",
+        });
+        return;
+      }
+      if (!this.resumesCompensation) {
+        uni.showToast({
+          title: "请选择期望薪资",
+          icon: "none",
+        });
+        return;
+      }
+      if (!this.workType) {
+        uni.showToast({
+          title: "请选择工作性质",
+          icon: "none",
+        });
+        return;
+      }
+      let data = {
+        intentionId: this.intentionId,
+        ruleClassifyId: this.ruleClassifyId, //岗位id
+        ruleClassifyName: this.ruleClassifyName, //岗位名称
+        citys: this.city, //工作城市
+        salaryRange: this.resumesCompensation, //薪资范围
+        industry: this.industry, //行业
+        postType: this.workType, //工作性质
+        isDefault: this.isDefault,
+        // classifyOneId:this.classifyOneId,
+        // classifyTwoId:this.classifyTwoId
+      };
+      this.$Request.postT("/app/intention/saveUpdate", data).then((res) => {
+        if (res.code == 0) {
+          uni.showToast({
+            title: "修改成功",
+          });
+          setTimeout(() => {
+            uni.navigateBack();
+          }, 1000);
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: "none",
+          });
+        }
+      });
+    },
+    workConfirm(e) {
+      this.workType = e[0].value;
+    },
+    moneyConfirm(e) {
+      this.resumesCompensation = e[0].value;
+    },
+    /**
+     * 工作性质
+     */
+    getPostType() {
+      this.$Request
+        .get("/app/dict/list", {
+          type: "工作性质",
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            let arr = res.data;
+            arr = JSON.parse(JSON.stringify(arr).replace(/code/g, "label"));
+            this.workTypes = arr;
+            this.workShow = true;
+          }
+        });
+    },
+    /**
+     * 薪资列表
+     */
+    getMonyList() {
+      this.$Request
+        .get("/app/dict/list", {
+          type: "薪资",
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            let arr = res.data;
+            arr = JSON.parse(JSON.stringify(arr).replace(/code/g, "label"));
+            this.monyList = arr;
+            this.monyShow = true;
+          }
+        });
+    },
+    gotoJob(url) {
+      uni.navigateTo({
+        url: url,
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #F2F2F7;
-	}
+page {
+  background-color: #f2f2f7;
+}
 
-	.list {
-		width: 100%;
-		// height: 795rpx;
-		margin-top: 30rpx;
+.list {
+  width: 100%;
+  // height: 795rpx;
+  margin-top: 30rpx;
 
-		.list-box {
-			width: 686rpx;
-			height: 100;
-			background-color: #ffffff;
-			border-radius: 24rpx;
+  .list-box {
+    width: 686rpx;
+    height: 100;
+    background-color: #ffffff;
+    border-radius: 24rpx;
 
-			.list-box-job {
-				width: 606rpx;
-				height: 164rpx;
-				margin: 0 auto;
+    .list-box-job {
+      width: 606rpx;
+      height: 164rpx;
+      margin: 0 auto;
 
-				.list-box-job-l {
-					width: 80%;
-				}
+      .list-box-job-l {
+        width: 80%;
+      }
 
-				.list-box-job-r {
-					width: 30rpx;
-				}
-			}
+      .list-box-job-r {
+        width: 30rpx;
+      }
+    }
 
-			.list-box-line {
-				width: 650rpx;
-				height: 1rpx;
-				border: 1rpx solid #F2F2F2;
-			}
-		}
-	}
+    .list-box-line {
+      width: 650rpx;
+      height: 1rpx;
+      border: 1rpx solid #f2f2f2;
+    }
+  }
+}
 
-	.subbtn {
-		width: 100%;
-		height: 88rpx;
-		margin-top: 90rpx;
+.subbtn {
+  width: 100%;
+  height: 88rpx;
+  margin-top: 90rpx;
 
-		.subbtn-box {
-			width: 686rpx;
-			height: 100%;
-			background-color: #016BF6;
-			border-radius: 44rpx;
-			color: #FFFFFF;
-			font-size: 32rpx;
-			font-weight: bold;
-		}
-	}
-</style>
+  .subbtn-box {
+    width: 686rpx;
+    height: 100%;
+    background-color: #016bf6;
+    border-radius: 44rpx;
+    color: #ffffff;
+    font-size: 32rpx;
+    font-weight: bold;
+  }
+}
+</style>

package/jobIntention/jobIntention.vue

@@ -1,241 +1,279 @@
 <template>
-	<view>
-		<view class="list flex justify-center">
-			<view class="list-box">
-				<view class="list-box-item flex justify-center" v-for="(item,index) in list" :key="index">
-					<view class="list-box-item-con flex justify-between align-center">
-						<view class="flex flex-wrap list-box-item-con-l">
-							<view class="list-box-item-con-l-title">
-								{{item.ruleClassifyName}}
-							</view>
-							<view class="list-box-item-con-l-label flex align-center flex-wrap">
-								<view class=""
-									style="padding: 10rpx 15rpx 10rpx 15rpx;background-color: #F6F6F6;border-radius: 8rpx;margin-right: 20rpx;margin-bottom: 20rpx;">
-									{{item.postType}}
-								</view>
-								<view class=""
-									style="padding: 10rpx 15rpx 10rpx 15rpx;background-color: #F6F6F6;border-radius: 8rpx;margin-right: 20rpx;margin-bottom: 20rpx;">
-									{{item.citys}}
-								</view>
-								<view class=""
-									style="padding: 10rpx 15rpx 10rpx 15rpx;background-color: #F6F6F6;border-radius: 8rpx;margin-right: 20rpx;margin-bottom: 20rpx;">
-									{{item.salaryRange}}
-								</view>
-							</view>
-							<view class="list-box-item-con-l-type flex align-center">
-								<view class="" v-for="(ite,ind) in item.industry.split(',')" :key="ind">
-									{{ite}}
-									<text style="margin-left: 20rpx;margin-right: 20rpx;"
-										v-if="(ind + 1) != item.industry.split(',').length">|</text>
-								</view>
-							</view>
-						</view>
-						<view class="list-box-item-con-r flex align-center">
-							<u-icon name="trash" color="#999999" size="46"
-								@click="deleteJob(item.intentionId)"></u-icon>
-							<text style="margin: 0 10rpx;color:#f2f2f2;font-size: 46rpx;">|</text>
-							<u-icon name="edit-pen" color="#016BF6" size="46"
-								@click="upData(item.intentionId)"></u-icon>
-						</view>
-					</view>
-				</view>
-				<empty v-if="list.length==0" />
-			</view>
-		</view>
+  <view>
+    <navBar title="求职意向" color="#000" />
+    <view class="list flex justify-center">
+      <view class="list-box">
+        <view
+          class="list-box-item flex justify-center"
+          v-for="(item, index) in list"
+          :key="index"
+        >
+          <view class="list-box-item-con flex justify-between align-center">
+            <view class="flex flex-wrap list-box-item-con-l">
+              <view class="list-box-item-con-l-title">
+                {{ item.ruleClassifyName }}
+              </view>
+              <view class="list-box-item-con-l-label flex align-center flex-wrap">
+                <view
+                  class=""
+                  style="
+                    padding: 10rpx 15rpx 10rpx 15rpx;
+                    background-color: #f6f6f6;
+                    border-radius: 8rpx;
+                    margin-right: 20rpx;
+                    margin-bottom: 20rpx;
+                  "
+                >
+                  {{ item.postType }}
+                </view>
+                <view
+                  class=""
+                  style="
+                    padding: 10rpx 15rpx 10rpx 15rpx;
+                    background-color: #f6f6f6;
+                    border-radius: 8rpx;
+                    margin-right: 20rpx;
+                    margin-bottom: 20rpx;
+                  "
+                >
+                  {{ item.citys }}
+                </view>
+                <view
+                  class=""
+                  style="
+                    padding: 10rpx 15rpx 10rpx 15rpx;
+                    background-color: #f6f6f6;
+                    border-radius: 8rpx;
+                    margin-right: 20rpx;
+                    margin-bottom: 20rpx;
+                  "
+                >
+                  {{ item.salaryRange }}
+                </view>
+              </view>
+              <view class="list-box-item-con-l-type flex align-center">
+                <view class="" v-for="(ite, ind) in item.industry.split(',')" :key="ind">
+                  {{ ite }}
+                  <text
+                    style="margin-left: 20rpx; margin-right: 20rpx"
+                    v-if="ind + 1 != item.industry.split(',').length"
+                    >|</text
+                  >
+                </view>
+              </view>
+            </view>
+            <view class="list-box-item-con-r flex align-center">
+              <u-icon
+                name="trash"
+                color="#999999"
+                size="46"
+                @click="deleteJob(item.intentionId)"
+              ></u-icon>
+              <text style="margin: 0 10rpx; color: #f2f2f2; font-size: 46rpx">|</text>
+              <u-icon
+                name="edit-pen"
+                color="#016BF6"
+                size="46"
+                @click="upData(item.intentionId)"
+              ></u-icon>
+            </view>
+          </view>
+        </view>
+        <empty v-if="list.length == 0" />
+      </view>
+    </view>
 
-
-
-		<!-- add -->
-		<view class="addBtn flex justify-center" v-if="list.length<3">
-			<view class="addBtn-box flex justify-center align-center" @tap="gotoNav()">
-				添加求职意向
-			</view>
-		</view>
-	</view>
+    <!-- add -->
+    <view class="addBtn flex justify-center" v-if="list.length < 3">
+      <view class="addBtn-box flex justify-center align-center" @tap="gotoNav()">
+        添加求职意向
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import empty from '../../components/empty.vue'
-	export default {
-		components: {
-			empty
-		},
-		data() {
-			return {
-				list: [],
-			};
-		},
-		onLoad() {
-
-		},
-		onShow() {
-			this.getMyList();
-		},
-		methods: {
-			/**
-			 * @param {Object} intentionId
-			 * 删除求职意向
-			 */
-			deleteJob(intentionId) {
-				let that = this
-				uni.showModal({
-					title: '提示',
-					content: '确认删除此求职意向吗？',
-					complete(ret) {
-						if (ret.confirm) {
-							that.$Request.postT('/app/intention/deleteIntention', {
-								intentionId: intentionId
-							}).then(res => {
-								if (res.code == 0) {
-									uni.showToast({
-										title: '删除成功'
-									})
-									that.getMyList()
-								} else {
-									uni.showToast({
-										title: res.msg,
-										icon: 'none'
-									})
-								}
-							})
-						}
-					}
-				})
-			},
-			/**
-			 * 获取我的求职意向列表
-			 */
-			getMyList() {
-				this.$Request.get('/app/intention/getIntentionList').then(res => {
-					if (res.code == 0) {
-						this.list = res.data.records
-					}
-				})
-			},
-			upData(intentionId) {
-				uni.navigateTo({
-					url: './edit?intentionId=' + intentionId
-				})
-			},
-			//查询简历信息
-			getResumesByUserId() {
-				this.$Request.getT('/app/resumes/selectResumesByUserId').then(res => {
-					if (res.code == 0) {
-						if (res.data) {
-							uni.navigateTo({
-								url: './add'
-							})
-						} else {
-							uni.showModal({
-								title: '提示',
-								content: '你还为添加简历，请添加简历后再添加求职意向',
-								confirmColor: '#016BF6',
-								confirmText: '添加简历',
-								complete(ret) {
-									if (ret.confirm) {
-										uni.navigateTo({
-											url: '/package/my/resume'
-										})
-									}
-								}
-							})
-						}
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-					}
-				})
-			},
-			gotoNav() {
-				this.getResumesByUserId()
-
-			},
-		}
-	}
+import empty from "../../components/empty.vue";
+import navBar from "@/components/nav-bar/index.vue";
+export default {
+  components: {
+    empty,
+    navBar,
+  },
+  data() {
+    return {
+      list: [],
+    };
+  },
+  onLoad() {},
+  onShow() {
+    this.getMyList();
+  },
+  methods: {
+    /**
+     * @param {Object} intentionId
+     * 删除求职意向
+     */
+    deleteJob(intentionId) {
+      let that = this;
+      uni.showModal({
+        title: "提示",
+        content: "确认删除此求职意向吗？",
+        complete(ret) {
+          if (ret.confirm) {
+            that.$Request
+              .postT("/app/intention/deleteIntention", {
+                intentionId: intentionId,
+              })
+              .then((res) => {
+                if (res.code == 0) {
+                  uni.showToast({
+                    title: "删除成功",
+                  });
+                  that.getMyList();
+                } else {
+                  uni.showToast({
+                    title: res.msg,
+                    icon: "none",
+                  });
+                }
+              });
+          }
+        },
+      });
+    },
+    /**
+     * 获取我的求职意向列表
+     */
+    getMyList() {
+      this.$Request.get("/app/intention/getIntentionList").then((res) => {
+        if (res.code == 0) {
+          this.list = res.data.records;
+        }
+      });
+    },
+    upData(intentionId) {
+      uni.navigateTo({
+        url: "./edit?intentionId=" + intentionId,
+      });
+    },
+    //查询简历信息
+    getResumesByUserId() {
+      this.$Request.getT("/app/resumes/selectResumesByUserId").then((res) => {
+        if (res.code == 0) {
+          if (res.data) {
+            uni.navigateTo({
+              url: "./add",
+            });
+          } else {
+            uni.showModal({
+              title: "提示",
+              content: "你还为添加简历，请添加简历后再添加求职意向",
+              confirmColor: "#016BF6",
+              confirmText: "添加简历",
+              complete(ret) {
+                if (ret.confirm) {
+                  uni.navigateTo({
+                    url: "/package/my/resume",
+                  });
+                }
+              },
+            });
+          }
+        } else {
+          uni.showToast({
+            title: res.msg,
+            icon: "none",
+          });
+        }
+      });
+    },
+    gotoNav() {
+      this.getResumesByUserId();
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	page {
-		background: #F2F2F7;
-	}
-
-	.list {
-		width: 100%;
-		height: auto;
-		margin-top: 30rpx;
+page {
+  background: #f2f2f7;
+}
 
-		.list-box {
-			width: 686rpx;
-			height: auto;
+.list {
+  width: 100%;
+  height: auto;
+  margin-top: 30rpx;
 
-			.list-box-item {
-				width: 100%;
-				// height: 227rpx;
-				background: #FFFFFF;
-				border-radius: 24rpx;
-				margin-bottom: 20rpx;
-			}
+  .list-box {
+    width: 686rpx;
+    height: auto;
 
-			.list-box-item-con {
-				width: 626rpx;
-				height: 100%;
-				padding-top: 20rpx;
-				padding-bottom: 20rpx;
+    .list-box-item {
+      width: 100%;
+      // height: 227rpx;
+      background: #ffffff;
+      border-radius: 24rpx;
+      margin-bottom: 20rpx;
+    }
 
-				.list-box-item-con-l {
-					width: 80%;
-					height: 100%;
-					align-items: center;
-					align-content: center;
+    .list-box-item-con {
+      width: 626rpx;
+      height: 100%;
+      padding-top: 20rpx;
+      padding-bottom: 20rpx;
 
-					.list-box-item-con-l-title {
-						width: 100%;
-						color: #1F1F1F;
-						font-size: 38rpx;
-						font-weight: 800;
-					}
+      .list-box-item-con-l {
+        width: 80%;
+        height: 100%;
+        align-items: center;
+        align-content: center;
 
-					.list-box-item-con-l-label {
-						width: 100%;
-						margin-top: 20rpx;
-						color: #666666;
-						font-size: 28rpx;
-					}
+        .list-box-item-con-l-title {
+          width: 100%;
+          color: #1f1f1f;
+          font-size: 38rpx;
+          font-weight: 800;
+        }
 
-					.list-box-item-con-l-type {
-						width: 100%;
-						// margin-top: 20rpx;
-						color: #999999;
-						font-size: 28rpx;
-					}
-				}
+        .list-box-item-con-l-label {
+          width: 100%;
+          margin-top: 20rpx;
+          color: #666666;
+          font-size: 28rpx;
+        }
 
-				.list-box-item-con-r {
-					// width: 46rpx;
-					height: 46rpx;
-					z-index: 9999;
-				}
-			}
-		}
-	}
+        .list-box-item-con-l-type {
+          width: 100%;
+          // margin-top: 20rpx;
+          color: #999999;
+          font-size: 28rpx;
+        }
+      }
 
+      .list-box-item-con-r {
+        // width: 46rpx;
+        height: 46rpx;
+        z-index: 9999;
+      }
+    }
+  }
+}
 
-	.addBtn {
-		width: 100%;
-		height: 88rpx;
-		position: fixed;
-		bottom: 100rpx;
+.addBtn {
+  width: 100%;
+  height: 88rpx;
+  position: fixed;
+  bottom: 100rpx;
 
-		.addBtn-box {
-			width: 686rpx;
-			height: 100%;
-			border-radius: 44rpx;
-			background-color: #016BF6;
-			color: #FFFFFF;
-			font-size: 32rpx;
-			font-weight: bold;
-		}
-	}
-</style>
+  .addBtn-box {
+    width: 686rpx;
+    height: 100%;
+    border-radius: 44rpx;
+    background-color: #016bf6;
+    color: #ffffff;
+    font-size: 32rpx;
+    font-weight: bold;
+  }
+}
+</style>

package/my/pingbi.vue

@@ -1,235 +1,273 @@
 <template>
-	<view>
-		<view class="margin-lr-xl">
-			<view class=" margin-top">
-				<view class="text-bold" style="font-size: 44upx;color: #333333;">屏蔽公司</view>
-				<view class="text-sm margin-top-sm" style="color: #999999;">添加屏蔽公司后，你和这些公司Boss，都不会被相互推荐 你的查看行为也不会告知对方
-				</view>
-			</view>
+  <view class="page-box">
+    <navBar title="屏蔽公司" color="#000" />
+    <view class="margin-lr-xl">
+      <view class="margin-top">
+        <view class="text-bold" style="font-size: 44upx; color: #333333">屏蔽公司</view>
+        <view class="text-sm margin-top-sm" style="color: #999999"
+          >添加屏蔽公司后，你和这些公司Boss，都不会被相互推荐 你的查看行为也不会告知对方
+        </view>
+      </view>
 
-			<view class="box margin-top">
-				<view class="margin-left-xs">
-					<image src="../static/qiye.png" style="width: 36upx;height: 34upx;"></image>
-				</view>
-				<view class="text-left" style="width: 70%;">
-					<u-input v-model="value" @input="change()" type="text" placeholder="输入添加屏蔽公司名称" inputAlign="text-align:left"/>
-				</view>
-				<view class="add" @click="addpingbi()">添加</view>
-			</view>
-			<view class="searchList" v-if="show">
-				<view class="searchList-item" @click="selectcompany(item.companyId,item.companyName)" v-for="(item,index) in companyList" :key>
-					{{item.companyName}}
-				</view>
-			</view>
+      <view class="box margin-top">
+        <view class="margin-left-xs">
+          <image src="../static/qiye.png" style="width: 36upx; height: 34upx"></image>
+        </view>
+        <view class="text-left" style="width: 70%">
+          <u-input
+            v-model="value"
+            @input="change()"
+            type="text"
+            placeholder="输入添加屏蔽公司名称"
+            inputAlign="text-align:left"
+          />
+        </view>
+        <view class="add" @click="addpingbi()">添加</view>
+      </view>
+      <view class="searchList" v-if="show">
+        <view
+          class="searchList-item"
+          @click="selectcompany(item.companyId, item.companyName)"
+          v-for="(item, index) in companyList"
+          :key
+        >
+          {{ item.companyName }}
+        </view>
+      </view>
 
-			<view class="margin-top-xl">
-				<view class="flex align-center justify-between" style="margin-bottom: 20rpx;" v-for="(item,index) in pingbiList" :key="index">
-					<view style="color: #000000;">{{item.company?item.company.companyName:''}}</view>
-					<view class="btn" @click="jiebang(item.shieldCompanyId)">解除屏蔽</view>
-				</view>
-			</view>
-			<empty v-if="pingbiList.length==0" />
-
-		</view>
-	</view>
+      <view class="margin-top-xl">
+        <view
+          class="flex align-center justify-between"
+          style="margin-bottom: 20rpx"
+          v-for="(item, index) in pingbiList"
+          :key="index"
+        >
+          <view style="color: #000000">{{
+            item.company ? item.company.companyName : ""
+          }}</view>
+          <view class="btn" @click="jiebang(item.shieldCompanyId)">解除屏蔽</view>
+        </view>
+      </view>
+      <empty v-if="pingbiList.length == 0" />
+    </view>
+  </view>
 </template>
 
 <script>
-	import empty from '@/components/empty.vue'
-	export default {
-		components:{
-			empty
-		},
-		data() {
-			return {
-				show:false,
-				value: '',
-				page: 1,
-				limit: 10,
-				userId: '',
-				companyList:[],
-				companyId:'',
-				pingbiList:[],
-				cont:'',
-			}
-		},
-		onLoad() {
-			this.getDataList();
-		},
-		onPullDownRefresh() {
-			this.page = 1
-			this.getDataList();
-		},
-		onReachBottom() {
-			if(this.page == this.cont){
-				uni.showToast({
-					title:'已经到底了',
-					icon:"none"
-				})
-			}else{
-				this.page += 1
-				this.getDataList();
-			}
-		},
-		methods: {
-			//解除屏蔽
-			jiebang(shieldCompanyId){
-				let _this = this
-				uni.showModal({
-					title:'提示',
-					content:'确认解除该公司的屏蔽?',
-					complete(iet) {
-						if(iet.confirm){
-							_this.$Request.post('/app/shieldCompany/deleteShieldCompany', {
-								shieldCompanyId:shieldCompanyId
-							}).then(res => {
-								if (res.code == 0) {
-									uni.showToast({
-										title:'解除成功'
-									})
-									_this.getDataList();
-								}else{
-									uni.showToast({
-										title:res.msg,
-										icon:"none"
-									})
-								}
-							})
-						}
-					}
-					
-				})
-				
-			},
-			//屏蔽公司
-			addpingbi(){
-				if(this.companyId==''){
-					uni.showToast({
-						title:'请选择公司',
-						icon:"none"
-					})
-					return
-				}
-				let _this = this
-				uni.showModal({
-					title:'提示',
-					content:'确认屏蔽该公司吗？',
-					complete(iet) {
-						console.log(iet)
-						if(iet.confirm){
-							_this.$Request.postJson('/app/shieldCompany/insertShieldCompany', {
-								companyId:_this.companyId,
-								shieldType: 1,
-								userId: uni.getStorageSync('userId')
-							}).then(res => {
-								if (res.code == 0) {
-									uni.showToast({
-										title:'屏蔽成功'
-									})
-									_this.companyId = ''
-									_this.value = ''
-									_this.show = false
-									_this.getDataList();
-								}else{
-									uni.showToast({
-										title:res.msg,
-										icon:"none"
-									})
-									_this.companyId = ''
-									_this.value = ''
-									_this.show = false
-									_this.getDataList();
-								}
-							})
-						}
-					}
-				})
-				
-			},
-			//选择要屏蔽的公司
-			selectcompany(companyId,companyName){
-				this.value = companyName
-				this.companyId = companyId
-				this.show = false
-			},
-			//搜索公司
-			change(e){
-				if(this.value==''){
-					this.show = false
-					return
-				}
-				let data = {
-					page:1,
-					limit:999,
-					status:2,
-					companyName:this.value
-				}
-				this.$Request.get('/app/company/selectCompanyList', data).then(res => {
-					if (res.code == 0) {
-						this.companyList = res.data.records
-						if(this.companyList.length>0){
-							this.show = true
-						}
-					}
-				})
-			},
-			//查询屏蔽列表
-			getDataList() {
-				let data = {
-					page: this.page,
-					limit: this.limit,
-					userId:uni.getStorageSync('userId')
-				}
-				this.$Request.get('/app/shieldCompany/selectShieldList', data).then(res => {
-					uni.stopPullDownRefresh()
-					if (res.code == 0) {
-						this.cont = res.data.totalPage
-						if(this.page==1){
-							this.pingbiList = res.data.list
-						}else{
-							this.pingbiList = [...this.pingbiList,...res.data.list]
-						}
-					}
-				})
-			},
-		}
+import empty from "@/components/empty.vue";
+import navBar from "@/components/nav-bar/index.vue";
 
-	}
+export default {
+  components: {
+    empty,
+    navBar,
+  },
+  data() {
+    return {
+      show: false,
+      value: "",
+      page: 1,
+      limit: 10,
+      userId: "",
+      companyList: [],
+      companyId: "",
+      pingbiList: [],
+      cont: "",
+    };
+  },
+  onLoad() {
+    this.getDataList();
+  },
+  onPullDownRefresh() {
+    this.page = 1;
+    this.getDataList();
+  },
+  onReachBottom() {
+    if (this.page == this.cont) {
+      uni.showToast({
+        title: "已经到底了",
+        icon: "none",
+      });
+    } else {
+      this.page += 1;
+      this.getDataList();
+    }
+  },
+  methods: {
+    //解除屏蔽
+    jiebang(shieldCompanyId) {
+      let _this = this;
+      uni.showModal({
+        title: "提示",
+        content: "确认解除该公司的屏蔽?",
+        complete(iet) {
+          if (iet.confirm) {
+            _this.$Request
+              .post("/app/shieldCompany/deleteShieldCompany", {
+                shieldCompanyId: shieldCompanyId,
+              })
+              .then((res) => {
+                if (res.code == 0) {
+                  uni.showToast({
+                    title: "解除成功",
+                  });
+                  _this.getDataList();
+                } else {
+                  uni.showToast({
+                    title: res.msg,
+                    icon: "none",
+                  });
+                }
+              });
+          }
+        },
+      });
+    },
+    //屏蔽公司
+    addpingbi() {
+      if (this.companyId == "") {
+        uni.showToast({
+          title: "请选择公司",
+          icon: "none",
+        });
+        return;
+      }
+      let _this = this;
+      uni.showModal({
+        title: "提示",
+        content: "确认屏蔽该公司吗？",
+        complete(iet) {
+          console.log(iet);
+          if (iet.confirm) {
+            _this.$Request
+              .postJson("/app/shieldCompany/insertShieldCompany", {
+                companyId: _this.companyId,
+                shieldType: 1,
+                userId: uni.getStorageSync("userId"),
+              })
+              .then((res) => {
+                if (res.code == 0) {
+                  uni.showToast({
+                    title: "屏蔽成功",
+                  });
+                  _this.companyId = "";
+                  _this.value = "";
+                  _this.show = false;
+                  _this.getDataList();
+                } else {
+                  uni.showToast({
+                    title: res.msg,
+                    icon: "none",
+                  });
+                  _this.companyId = "";
+                  _this.value = "";
+                  _this.show = false;
+                  _this.getDataList();
+                }
+              });
+          }
+        },
+      });
+    },
+    //选择要屏蔽的公司
+    selectcompany(companyId, companyName) {
+      this.value = companyName;
+      this.companyId = companyId;
+      this.show = false;
+    },
+    //搜索公司
+    change(e) {
+      if (this.value == "") {
+        this.show = false;
+        return;
+      }
+      let data = {
+        page: 1,
+        limit: 999,
+        status: 2,
+        companyName: this.value,
+      };
+      this.$Request.get("/app/company/selectCompanyList", data).then((res) => {
+        if (res.code == 0) {
+          this.companyList = res.data.records;
+          if (this.companyList.length > 0) {
+            this.show = true;
+          }
+        }
+      });
+    },
+    //查询屏蔽列表
+    getDataList() {
+      let data = {
+        page: this.page,
+        limit: this.limit,
+        userId: uni.getStorageSync("userId"),
+      };
+      this.$Request.get("/app/shieldCompany/selectShieldList", data).then((res) => {
+        uni.stopPullDownRefresh();
+        if (res.code == 0) {
+          this.cont = res.data.totalPage;
+          if (this.page == 1) {
+            this.pingbiList = res.data.list;
+          } else {
+            this.pingbiList = [...this.pingbiList, ...res.data.list];
+          }
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="less">
-	page {
-		background: #FFFFFF;
-	}
-	.searchList{
-		width: 100%;
-		background-color: #F7F7F7;
-		padding-left: 10rpx;
-		padding-right: 10rpx;
-	}
-	.searchList-item{
-		padding: 20rpx;
-		
-	}
-	.box {
-		background: #F7F7F7;
-		padding: 10upx;
-		display: flex;
-		align-items: center;
-		justify-content: space-around;
-	}
+.page-box {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  top: 0;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+
+}
+.margin-lr-xl{
+	flex: 1;
+	overflow: hidden;
+	overflow-y: auto;
+	// width: 100%;
+}
+page {
+  background: #ffffff;
+}
+.searchList {
+  width: 100%;
+  background-color: #f7f7f7;
+  padding-left: 10rpx;
+  padding-right: 10rpx;
+}
+.searchList-item {
+  padding: 20rpx;
+}
+.box {
+  background: #f7f7f7;
+  padding: 10upx;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+}
 
-	.add {
-		background: #016BF6;
-		color: #FFFFFF;
-		padding: 15upx 30upx;
-		border-radius: 8upx;
-	}
+.add {
+  background: #016bf6;
+  color: #ffffff;
+  padding: 15upx 30upx;
+  border-radius: 8upx;
+}
 
-	.btn {
-		background: rgba(0, 184, 143, 0.1);
-		border-radius: 31upx;
-		color: #016BF6;
-		padding: 10rpx 27rpx;
-	}
+.btn {
+  background: rgba(0, 184, 143, 0.1);
+  border-radius: 31upx;
+  color: #016bf6;
+  padding: 10rpx 27rpx;
+}
 </style>

package/my/resume.vue

@@ -1,170 +1,215 @@
 <template>
-	<view>
-		<!-- 顶部占位区域 -->
-		<view :style="{ height: statusBarHeight + 'px' }"></view>
-		
-		<view v-if="JSON.stringify(list) != '{}'">
-			<view class="listbox" @click="goUpdete()">
-				<view class="flex align-center justify-between">
-					<view class="flex align-center">
-						<view style="color: #016BF6;" v-if="list.status==1">待审核</view>
-						<view style="color: #016BF6;" v-if="list.status==2">已通过</view>
-						<view style="color: red;" v-if="list.status==3">已拒绝</view>
-						<!-- <view style="color: #016BF6;" v-if="list.status==4">简历隐藏</view>
+  <view>
+    <navBar title="我的简历" color="#000" />
+    <view v-if="JSON.stringify(list) != '{}'">
+      <view class="listbox" @click="goUpdete()">
+        <view class="flex align-center justify-between">
+          <view class="flex align-center">
+            <view style="color: #016bf6" v-if="list.status == 1">待审核</view>
+            <view style="color: #016bf6" v-if="list.status == 2">已通过</view>
+            <view style="color: red" v-if="list.status == 3">已拒绝</view>
+            <!-- <view style="color: #016BF6;" v-if="list.status==4">简历隐藏</view>
 						<view class="" style="font-size: 24rpx;color: red;margin-left: 20rpx;"
 							v-if="list.isRecommend == 2">
 							已录入人才库
 						</view> -->
-					</view>
-					<view class="text-sm" style="color: #999999;">{{list.createTime}}</view>
-				</view>
-				<view class="margin-tb-sm" style="width: 100%;height: 1rpx;background: #EEEEEE;"></view>
-				<view class="flex align-center justify-between">
-					<view>
-						<view class="text-xl text-bold" style="color: #000;">{{list.resumesName}}</view>
-						<view class="flex align-center margin-top-xs flex-wrap" style="color: #999999;">
-							<view>{{list.resumesAge}}岁</view>
-							<view class="margin-lr-sm" style="width: 1rpx;height: 25rpx;background: #CCCCCC;"></view>
-							<view><span v-if="list.resumesWorkExperience!='无经验'">工作</span>{{list.resumesWorkExperience}}
-							</view>
-							<view class="margin-lr-sm" style="width: 1rpx;height: 25rpx;background: #CCCCCC;"></view>
-							<view>{{list.resumesEducation}}</view>
-							<view class="margin-lr-sm" style="width: 1rpx;height: 25rpx;background: #CCCCCC;"></view>
-							<view>{{list.resumesCompensation}}</view>
-						</view>
-					</view>
-					<view>
-						<image :src="avatar?avatar:'../../static/logo.png'"
-							style="width: 100upx;height: 100upx;border-radius: 55upx;">
-						</image>
-					</view>
-				</view>
-				<view class="margin-top">
-					<view class="flex align-center">
-						<view class="margin-right-xs">
-							<image src="../../static/images/qi.png" style="width: 30upx;height: 32upx;"></image>
-						</view>
-						<view style="color: #121212;">
-							{{list.resumesCompanyList.length!=0?list.resumesCompanyList[0].resumesTitle:'暂无工作经历'}}
-						</view>
-					</view>
-					<view class=" margin-left margin-top-xs padding-left-xs" style="color: #999999;font-size: 26upx;">
-						{{list.resumesCompanyList.length!=0?list.resumesCompanyList[0].resumesPost:'暂无'}}
-					</view>
-				</view>
-				<view class="margin-top-sm">
-					<view class="flex align-center">
-						<view class="margin-right-xs">
-							<image src="../../static/images/geren.png" style="width: 35upx;height:26upx;"></image>
-						</view>
-						<view style="color: #121212;">{{list.school}}</view>
-					</view>
-					<view class="margin-left margin-top-xs padding-left-xs" style="color: #999999;font-size: 26upx;">
-						{{list.major}}
-					</view>
-				</view>
-				<view class="text-right">
-					<view class="btn" v-if="list.status==2 || list.status==3" @click.stop="goUpdete()">修改简历</view>
-				</view>
-			</view>
+          </view>
+          <view class="text-sm" style="color: #999999">{{ list.createTime }}</view>
+        </view>
+        <view
+          class="margin-tb-sm"
+          style="width: 100%; height: 1rpx; background: #eeeeee"
+        ></view>
+        <view class="flex align-center justify-between">
+          <view>
+            <view class="text-xl text-bold" style="color: #000">{{
+              list.resumesName
+            }}</view>
+            <view
+              class="flex align-center margin-top-xs flex-wrap"
+              style="color: #999999"
+            >
+              <view>{{ list.resumesAge }}岁</view>
+              <view
+                class="margin-lr-sm"
+                style="width: 1rpx; height: 25rpx; background: #cccccc"
+              ></view>
+              <view
+                ><span v-if="list.resumesWorkExperience != '无经验'">工作</span
+                >{{ list.resumesWorkExperience }}
+              </view>
+              <view
+                class="margin-lr-sm"
+                style="width: 1rpx; height: 25rpx; background: #cccccc"
+              ></view>
+              <view>{{ list.resumesEducation }}</view>
+              <view
+                class="margin-lr-sm"
+                style="width: 1rpx; height: 25rpx; background: #cccccc"
+              ></view>
+              <view>{{ list.resumesCompensation }}</view>
+            </view>
+          </view>
+          <view>
+            <image
+              :src="avatar ? avatar : '../../static/logo.png'"
+              style="width: 100upx; height: 100upx; border-radius: 55upx"
+            >
+            </image>
+          </view>
+        </view>
+        <view class="margin-top">
+          <view class="flex align-center">
+            <view class="margin-right-xs">
+              <image
+                src="../../static/images/qi.png"
+                style="width: 30upx; height: 32upx"
+              ></image>
+            </view>
+            <view style="color: #121212">
+              {{
+                list.resumesCompanyList.length != 0
+                  ? list.resumesCompanyList[0].resumesTitle
+                  : "暂无工作经历"
+              }}
+            </view>
+          </view>
+          <view
+            class="margin-left margin-top-xs padding-left-xs"
+            style="color: #999999; font-size: 26upx"
+          >
+            {{
+              list.resumesCompanyList.length != 0
+                ? list.resumesCompanyList[0].resumesPost
+                : "暂无"
+            }}
+          </view>
+        </view>
+        <view class="margin-top-sm">
+          <view class="flex align-center">
+            <view class="margin-right-xs">
+              <image
+                src="../../static/images/geren.png"
+                style="width: 35upx; height: 26upx"
+              ></image>
+            </view>
+            <view style="color: #121212">{{ list.school }}</view>
+          </view>
+          <view
+            class="margin-left margin-top-xs padding-left-xs"
+            style="color: #999999; font-size: 26upx"
+          >
+            {{ list.major }}
+          </view>
+        </view>
+        <view class="text-right">
+          <view
+            class="btn"
+            v-if="list.status == 2 || list.status == 3"
+            @click.stop="goUpdete()"
+            >修改简历</view
+          >
+        </view>
+      </view>
+    </view>
 
-		</view>
-
-		<view class="submit" v-else @click="goUpdete()">添加简历</view>
-		<empty v-if="JSON.stringify(list) == '{}'" />
-	</view>
+    <view class="submit" v-else @click="goUpdete()">添加简历</view>
+    <empty v-if="JSON.stringify(list) == '{}'" />
+  </view>
 </template>
 
 <script>
-	import empty from '@/components/empty.vue'
-	export default {
-		components: {
-			empty
-		},
-		data() {
-			return {
-				avatar: '../../static/logo.png',
-				list: {},
-				statusBarHeight: 0
-			}
-		},
-		onLoad() {
-			// 获取状态栏高度
-			const systemInfo = uni.getSystemInfoSync()
-			this.statusBarHeight = systemInfo.statusBarHeight || 0
-		},
-		onPullDownRefresh() {
-			this.getDetails();
-		},
-		onShow() {
-			this.avatar = this.$queue.getData("avatar");
-			this.getDetails()
-		},
-		methods: {
-			goUpdetes() {
-				uni.navigateTo({
-					url: '/my/publish/editors?resumesId=' + this.list.resumesId
-				})
-			},
-			goUpdete() {
-				if (JSON.stringify(this.list) != '{}') {
-					uni.navigateTo({
-						url: '/my/publish/editor?resumesId=' + this.list.resumesId
-					})
-				} else {
-					uni.navigateTo({
-						url: '/my/publish/editor'
-					})
-				}
+import empty from "@/components/empty.vue";
+import navBar from "@/components/nav-bar/index.vue";
 
-			},
-			getDetails() {
-				this.$Request.get('/app/resumes/selectResumesByUserId').then(res => {
-					if (res.code == 0) {
-						uni.stopPullDownRefresh()
-						if (res.data) {
-							this.list = res.data
-						}
-					}
-				})
-			}
-		}
-	}
+export default {
+  components: {
+    empty,
+    navBar,
+  },
+  data() {
+    return {
+      avatar: "../../static/logo.png",
+      list: {},
+      statusBarHeight: 0,
+    };
+  },
+  onLoad() {
+    // 获取状态栏高度
+    const systemInfo = uni.getSystemInfoSync();
+    this.statusBarHeight = systemInfo.statusBarHeight || 0;
+  },
+  onPullDownRefresh() {
+    this.getDetails();
+  },
+  onShow() {
+    this.avatar = this.$queue.getData("avatar");
+    this.getDetails();
+  },
+  methods: {
+    goUpdetes() {
+      uni.navigateTo({
+        url: "/my/publish/editors?resumesId=" + this.list.resumesId,
+      });
+    },
+    goUpdete() {
+      if (JSON.stringify(this.list) != "{}") {
+        uni.navigateTo({
+          url: "/my/publish/editor?resumesId=" + this.list.resumesId,
+        });
+      } else {
+        uni.navigateTo({
+          url: "/my/publish/editor",
+        });
+      }
+    },
+    getDetails() {
+      this.$Request.get("/app/resumes/selectResumesByUserId").then((res) => {
+        if (res.code == 0) {
+          uni.stopPullDownRefresh();
+          if (res.data) {
+            this.list = res.data;
+          }
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="less">
-	page {
-		background: #F2F2F7;
-	}
+page {
+  background: #f2f2f7;
+}
 
-	.listbox {
-		background: #FFFFFF;
-		border-radius: 24upx;
-		margin: 20upx 30upx;
-		padding: 30upx;
-	}
+.listbox {
+  background: #ffffff;
+  border-radius: 24upx;
+  margin: 20upx 30upx;
+  padding: 30upx;
+}
 
-	.btn {
-		border: 1upx solid #016BF6;
-		border-radius: 30px;
-		color: #016BF6;
-		display: inline-block;
-		padding: 15upx 30upx;
-	}
+.btn {
+  border: 1upx solid #016bf6;
+  border-radius: 30px;
+  color: #016bf6;
+  display: inline-block;
+  padding: 15upx 30upx;
+}
 
-	.submit {
-		background: #016BF6;
-		border-radius: 50px;
-		margin: 0upx 30upx;
-		text-align: center;
-		padding: 34upx 0upx;
-		color: #FFFFFF;
-		// font-size: 32upx;
-		// font-weight: bold;
-		position: fixed;
-		bottom: 100upx;
-		left: 0;
-		right: 0;
-		z-index: 9;
-	}
-</style>
+.submit {
+  background: #016bf6;
+  border-radius: 50px;
+  margin: 0upx 30upx;
+  text-align: center;
+  padding: 34upx 0upx;
+  color: #ffffff;
+  // font-size: 32upx;
+  // font-weight: bold;
+  position: fixed;
+  bottom: 100upx;
+  left: 0;
+  right: 0;
+  z-index: 9;
+}
+</style>

package/screen/screen.vue

@@ -1,9 +1,10 @@
 <template>
-	<view>
-		<!-- 列表 -->
-		<view class="list flex justify-between">
-			<!-- 左侧分类 -->
-			<!-- <view class="list-l">
+  <view>
+    <navBar title="筛选" color="#000" />
+    <!-- 列表 -->
+    <view class="list flex justify-between">
+      <!-- 左侧分类 -->
+      <!-- <view class="list-l">
 				<scroll-view scroll-y="true" style="width: 100%;height: 100%;padding-bottom: 20rpx;">
 					<block v-if="type">
 						<view class="list-l-item flex align-center " v-if="index!=3" @click="change_click_index(index)"
@@ -21,535 +22,597 @@
 				</scroll-view>
 
 			</view> -->
-			<!-- 右侧列表 -->
-			<view class="list-r">
-				<scroll-view scroll-y="true" @scroll="e=>{scrolls(e)}" scroll-with-animation="true"
-					:scroll-into-view="'bottomView'+current" style="width: 100%;height: 100%;padding-bottom: 20rpx;">
-					<block v-if="type">
-						<view class="list-r-item" :id="'bottomView'+index" v-if="list.length>0 && index!=3"
-							v-for="(item,index) in list" :key="index">
-							<view class="list-r-item-title">
-								{{item.name}}
-							</view>
-							<view class="list-r-item-childs flex justify-around align-center flex-wrap">
-								<view class="list-r-item-childs-i flex justify-center align-center"
-									v-for="(ite,ind) in item.list" :class="ite.select==true?'activeRight':''"
-									@click="selectHyList(index,item.name,ite,ind)" :key="ind">
-									{{ite.value}}
-								</view>
-								<view class="list-r-item-childs-i flex justify-center align-center"
-									style="height: 0;padding: 0;">
-								</view>
-							</view>
-						</view>
-					</block>
-					<block v-else>
-						<view class="list-r-item" :id="'bottomView'+index" v-if="list.length>0"
-							v-for="(item,index) in list" :key="index">
-							<view class="list-r-item-title">
-								{{item.name}}
-							</view>
-							<view class="list-r-item-childs flex justify-around align-center flex-wrap">
-								<view class="list-r-item-childs-i flex justify-center align-center"
-									v-for="(ite,ind) in item.list" :class="ite.select==true?'activeRight':''"
-									@click="selectHyList(index,item.name,ite,ind)" :key="ind">
-									{{ite.value}}
-								</view>
-								<view class="list-r-item-childs-i flex justify-center align-center"
-									style="height: 0;padding: 0;">
-								</view>
-							</view>
-						</view>
-					</block>
-					<empty v-if="list.length==0" />
-				</scroll-view>
-			</view>
-		</view>
-		<!-- 底部按钮 -->
-		<view class="bottom flex justify-center">
-			<view class="bottom-box flex justify-between">
-				<view @click="cleanSe()" class="bottom-box-left flex justify-center align-center">
-					清除
-				</view>
-				<view @click="submitSe()" class="bottom-box-right flex justify-center align-center">
-					确定
-				</view>
-			</view>
-		</view>
-
-	</view>
+      <!-- 右侧列表 -->
+      <view class="list-r">
+        <scroll-view
+          scroll-y="true"
+          @scroll="
+            (e) => {
+              scrolls(e);
+            }
+          "
+          scroll-with-animation="true"
+          :scroll-into-view="'bottomView' + current"
+          style="width: 100%; height: 100%; padding-bottom: 20rpx"
+        >
+          <block v-if="type">
+            <view
+              class="list-r-item"
+              :id="'bottomView' + index"
+              v-if="list.length > 0 && index != 3"
+              v-for="(item, index) in list"
+              :key="index"
+            >
+              <view class="list-r-item-title">
+                {{ item.name }}
+              </view>
+              <view class="list-r-item-childs flex justify-around align-center flex-wrap">
+                <view
+                  class="list-r-item-childs-i flex justify-center align-center"
+                  v-for="(ite, ind) in item.list"
+                  :class="ite.select == true ? 'activeRight' : ''"
+                  @click="selectHyList(index, item.name, ite, ind)"
+                  :key="ind"
+                >
+                  {{ ite.value }}
+                </view>
+                <view
+                  class="list-r-item-childs-i flex justify-center align-center"
+                  style="height: 0; padding: 0"
+                >
+                </view>
+              </view>
+            </view>
+          </block>
+          <block v-else>
+            <view
+              class="list-r-item"
+              :id="'bottomView' + index"
+              v-if="list.length > 0"
+              v-for="(item, index) in list"
+              :key="index"
+            >
+              <view class="list-r-item-title">
+                {{ item.name }}
+              </view>
+              <view class="list-r-item-childs flex justify-around align-center flex-wrap">
+                <view
+                  class="list-r-item-childs-i flex justify-center align-center"
+                  v-for="(ite, ind) in item.list"
+                  :class="ite.select == true ? 'activeRight' : ''"
+                  @click="selectHyList(index, item.name, ite, ind)"
+                  :key="ind"
+                >
+                  {{ ite.value }}
+                </view>
+                <view
+                  class="list-r-item-childs-i flex justify-center align-center"
+                  style="height: 0; padding: 0"
+                >
+                </view>
+              </view>
+            </view>
+          </block>
+          <empty v-if="list.length == 0" />
+        </scroll-view>
+      </view>
+    </view>
+    <!-- 底部按钮 -->
+    <view class="bottom flex justify-center">
+      <view class="bottom-box flex justify-between">
+        <view @click="cleanSe()" class="bottom-box-left flex justify-center align-center">
+          清除
+        </view>
+        <view
+          @click="submitSe()"
+          class="bottom-box-right flex justify-center align-center"
+        >
+          确定
+        </view>
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
-	import empty from '../../components/empty.vue'
-	export default {
-		components: {
-			empty
-		},
-		data() {
-			return {
-				current: 0,
-				currents: 0,
-				list: [],
-				top_list: [],
-				selectArr: [],
-				type: '',
-				isBrowse: false, //是否是从用户浏览记录里过来的
-				isCompyBrowse: false, //是否是从企业浏览记录过来的
-				isCompyHistory: false, //是否是从企业的投递记录过来的
-			};
-		},
-		onLoad(option) {
-			if (option.type) {
-				this.type = option.type
-			}
-			if (option.isBrowse) {
-				this.isBrowse = true
-			} else {
-				this.isBrowse = false
-			}
-			if (option.isCompyBrowse) {
-				this.isCompyBrowse = true
-			} else {
-				this.isCompyBrowse = false
-			}
-			if (option.isCompyHistory) {
-				this.isCompyHistory = true
-			} else {
-				this.isCompyHistory = false
-			}
-			this.getSchools()
-		},
-		methods: {
-			/**
-			 * 清空筛选条件并清空缓存
-			 */
-			cleanSe() {
-				this.list.map(item => {
-					item.list.map(ite => {
-						ite.select = false
-					})
-				})
-				if (this.isBrowse) {
-					uni.removeStorageSync('browse')
-				} else if (this.isCompyBrowse) {
-					uni.removeStorageSync('isCompyBrowse')
-				} else if (this.isCompyHistory) {
-					uni.removeStorageSync('isCompyHistory')
-				} else {
-					uni.removeStorageSync('filter')
-				}
-			},
-			/**
-			 * 处理选中的条件
-			 */
-			submitSe() {
-				let arr = JSON.parse(JSON.stringify(this.list))
-				arr = arr && arr.map(item => {
-					item.list = item.list && item.list.filter(val => {
-						if (val.select) return val
-					})
-					if (item.list.length > 0) {
-						return item
-					}
-				})
-				arr = arr.filter(val => {
-					if (val) return val
-				})
-
-				if (this.isBrowse) {
-					//把选中的条件存到本地然后返回首页进行筛选
-					uni.setStorageSync('browse', arr)
-				} else if (this.isCompyBrowse) {
-					uni.setStorageSync('isCompyBrowse', arr)
-				} else if (this.isCompyHistory) {
-					uni.setStorageSync('isCompyHistory', arr)
-				} else {
-					uni.setStorageSync('filter', arr) //把选中的条件存到本地然后返回首页进行筛选
-				}
-				uni.navigateBack()
-			},
-			/**
-			 * @param {Object} index 外层下标
-			 * @param {Object} name 外层名称
-			 * @param {Object} info 内层对象
-			 * @param {Object} ind 内层下标
-			 * 选择右侧的筛选
-			 * 薪资单选，其余可以多选
-			 */
-			selectHyList(index, name, info, ind) {
-				//选中
-				if (name == '薪资范围（单选）') { // 薪资单选
-					this.list[1].list.map((item, index) => {
-						item.select = false
-						info.select = true
-					})
-				} else { //其余多选
-					if (info.value == '不限') {
-						this.list[index].list.map((item, index) => {
-							item.select = false
-							info.select = true
-						})
-					} else {
-						this.list[index].list.map((item, ind) => {
-							if (item.value == '不限') {
-								item.select = false
-							}
-						})
-						info.select = !info.select;
-					}
-				}
-				this.$forceUpdate()
-			},
-			/**
-			 * @param {Object} index
-			 * 点击切换分类
-			 */
-			change_click_index(index) {
-				this.current = index;
-				//解决最后一个 ***来回*** 问题 (由于点击左侧导航，右侧锚点位置信息变化，此时滚动事件也随之滚动。)
-				uni.setStorageSync("resolve", "last");
-				setTimeout(() => {
-					uni.removeStorageSync("resolve")
-				}, 400);
-			},
-			scrolls(e) {
-				if (!uni.getStorageSync("resolve")) {
-					// this.get_node_details(e);
-				};
-			},
-			/**
-			 * @param {Object} options
-			 * 获取节点信息
-			 */
-			get_node_details(options) {
-				const query = uni.createSelectorQuery().in(this); //获得实例
-				//获取多个节点方式
-				query.selectAll(".list-r-item").boundingClientRect(data => {
-					this.top_list = data.map(item => {
-						return Math.ceil(item.top);
-					});
-					this.async_detail_msg(options);
-				}).exec();
-			},
-			/**
-			 * @param {Object} options
-			 * 设置滚动的位置
-			 */
-			async_detail_msg(options) {
-				//options  为滚动信息。  options.detail.scrollTop  值为相对于scroll-view。
-				let top_page = options.detail.scrollTop + this.top_list[0];
-				for (let i = 0; i < this.top_list.length; i++) {
-					let node1 = this.top_list[i];
-					let node2 = this.top_list[i + 1];
-					if (node2 && top_page >= node1 && top_page < node2) {
-						this.current = i;
-						break;
-					} else if (node2 && top_page === node2) {
-						this.current = i + 1;
-						break;
-					}
-				}
-			},
-			/**
-			 * 获取学历列表
-			 */
-			getSchools() {
-				this.$Request.get("/app/dict/list", {
-					type: '学历'
-				}).then(res => {
-					if (res.code == 0) {
-						let list = [{
-							value: '不限'
-						}]
-						let obj = {
-							name: '学历要求',
-							list: [...list, ...res.data]
-						}
-						console.log(obj, '学历')
-
-						this.getMoney(obj)
-					}
-				})
-			},
-			/**
-			 * 获取薪资 列表
-			 */
-			getMoney(obj1) {
-				this.$Request.get("/app/dict/list", {
-					type: '薪资 '
-				}).then(res => {
-					if (res.code == 0) {
-						let list = [{
-							value: '不限'
-						}]
-						let obj = {
-							name: '薪资范围（单选）',
-							list: [...list, ...res.data]
-						}
-						this.getJy(obj1, obj)
-
-					}
-				})
-			},
-			/**
-			 * 获取工作经验列表
-			 */
-			getJy(obj1, obj2) {
-				this.$Request.get("/app/dict/list", {
-					type: '工作经验 '
-				}).then(res => {
-					if (res.code == 0) {
-						let list = [{
-							value: '不限'
-						}]
-						let obj = {
-							name: '经验要求',
-							list: [...list, ...res.data]
-						}
-						this.getGm(obj1, obj2, obj)
-					}
-				})
-			},
-			/**
-			 * 获取公司规模列表
-			 */
-			getGm(obj1, obj2, obj3) {
-				this.$Request.get("/app/dict/list", {
-					type: '公司规模 '
-				}).then(res => {
-					if (res.code == 0) {
-						let list = [{
-							value: '不限'
-						}]
-						let obj = {
-							name: '公司规模',
-							list: [...list, ...res.data]
-						}
-						this.getIndustryList(obj1, obj2, obj3, obj)
-					}
-				})
-			},
-			/**
-			 * 获取行业列表
-			 */
-			getIndustryList(obj1, obj2, obj3, obj4) {
-				this.$Request.get("/app/industry/getIndustryList").then(res => {
-					if (res.code == 0) {
-						let list = [{
-							value: '不限'
-						}]
-						let arrAy = []
-						res.data.map(item => {
-							arrAy = [...arrAy, ...item.childrenList]
-						})
-						let arrs = JSON.parse(JSON.stringify(arrAy).replace(/industryName/g, "value"))
-						let obj = {
-							name: '行业',
-							list: [...list, ...arrs]
-						}
-						let arr = []
-						arr[0] = obj1
-						arr[1] = obj2
-						arr[2] = obj3
-						arr[3] = obj4
-						arr[4] = obj
-						arr.map(item => {
-							item.list.map(ite => {
-								ite.select = false
-							})
-						})
+import empty from "../../components/empty.vue";
+import navBar from "@/components/nav-bar/index.vue";
+export default {
+  components: {
+    empty,
+	navBar
+  },
+  data() {
+    return {
+      current: 0,
+      currents: 0,
+      list: [],
+      top_list: [],
+      selectArr: [],
+      type: "",
+      isBrowse: false, //是否是从用户浏览记录里过来的
+      isCompyBrowse: false, //是否是从企业浏览记录过来的
+      isCompyHistory: false, //是否是从企业的投递记录过来的
+    };
+  },
+  onLoad(option) {
+    if (option.type) {
+      this.type = option.type;
+    }
+    if (option.isBrowse) {
+      this.isBrowse = true;
+    } else {
+      this.isBrowse = false;
+    }
+    if (option.isCompyBrowse) {
+      this.isCompyBrowse = true;
+    } else {
+      this.isCompyBrowse = false;
+    }
+    if (option.isCompyHistory) {
+      this.isCompyHistory = true;
+    } else {
+      this.isCompyHistory = false;
+    }
+    this.getSchools();
+  },
+  methods: {
+    /**
+     * 清空筛选条件并清空缓存
+     */
+    cleanSe() {
+      this.list.map((item) => {
+        item.list.map((ite) => {
+          ite.select = false;
+        });
+      });
+      if (this.isBrowse) {
+        uni.removeStorageSync("browse");
+      } else if (this.isCompyBrowse) {
+        uni.removeStorageSync("isCompyBrowse");
+      } else if (this.isCompyHistory) {
+        uni.removeStorageSync("isCompyHistory");
+      } else {
+        uni.removeStorageSync("filter");
+      }
+    },
+    /**
+     * 处理选中的条件
+     */
+    submitSe() {
+      let arr = JSON.parse(JSON.stringify(this.list));
+      arr =
+        arr &&
+        arr.map((item) => {
+          item.list =
+            item.list &&
+            item.list.filter((val) => {
+              if (val.select) return val;
+            });
+          if (item.list.length > 0) {
+            return item;
+          }
+        });
+      arr = arr.filter((val) => {
+        if (val) return val;
+      });
 
-						this.list = arr
-						if (uni.getStorageSync('filter')) {
-							let filter = uni.getStorageSync('filter')
-							let arrs = []
-							filter.map(item => {
-								item.list.map(ite => {
-									arrs.push(ite.value)
-								})
-							})
+      if (this.isBrowse) {
+        //把选中的条件存到本地然后返回首页进行筛选
+        uni.setStorageSync("browse", arr);
+      } else if (this.isCompyBrowse) {
+        uni.setStorageSync("isCompyBrowse", arr);
+      } else if (this.isCompyHistory) {
+        uni.setStorageSync("isCompyHistory", arr);
+      } else {
+        uni.setStorageSync("filter", arr); //把选中的条件存到本地然后返回首页进行筛选
+      }
+      uni.navigateBack();
+    },
+    /**
+     * @param {Object} index 外层下标
+     * @param {Object} name 外层名称
+     * @param {Object} info 内层对象
+     * @param {Object} ind 内层下标
+     * 选择右侧的筛选
+     * 薪资单选，其余可以多选
+     */
+    selectHyList(index, name, info, ind) {
+      //选中
+      if (name == "薪资范围（单选）") {
+        // 薪资单选
+        this.list[1].list.map((item, index) => {
+          item.select = false;
+          info.select = true;
+        });
+      } else {
+        //其余多选
+        if (info.value == "不限") {
+          this.list[index].list.map((item, index) => {
+            item.select = false;
+            info.select = true;
+          });
+        } else {
+          this.list[index].list.map((item, ind) => {
+            if (item.value == "不限") {
+              item.select = false;
+            }
+          });
+          info.select = !info.select;
+        }
+      }
+      this.$forceUpdate();
+    },
+    /**
+     * @param {Object} index
+     * 点击切换分类
+     */
+    change_click_index(index) {
+      this.current = index;
+      //解决最后一个 ***来回*** 问题 (由于点击左侧导航，右侧锚点位置信息变化，此时滚动事件也随之滚动。)
+      uni.setStorageSync("resolve", "last");
+      setTimeout(() => {
+        uni.removeStorageSync("resolve");
+      }, 400);
+    },
+    scrolls(e) {
+      if (!uni.getStorageSync("resolve")) {
+        // this.get_node_details(e);
+      }
+    },
+    /**
+     * @param {Object} options
+     * 获取节点信息
+     */
+    get_node_details(options) {
+      const query = uni.createSelectorQuery().in(this); //获得实例
+      //获取多个节点方式
+      query
+        .selectAll(".list-r-item")
+        .boundingClientRect((data) => {
+          this.top_list = data.map((item) => {
+            return Math.ceil(item.top);
+          });
+          this.async_detail_msg(options);
+        })
+        .exec();
+    },
+    /**
+     * @param {Object} options
+     * 设置滚动的位置
+     */
+    async_detail_msg(options) {
+      //options  为滚动信息。  options.detail.scrollTop  值为相对于scroll-view。
+      let top_page = options.detail.scrollTop + this.top_list[0];
+      for (let i = 0; i < this.top_list.length; i++) {
+        let node1 = this.top_list[i];
+        let node2 = this.top_list[i + 1];
+        if (node2 && top_page >= node1 && top_page < node2) {
+          this.current = i;
+          break;
+        } else if (node2 && top_page === node2) {
+          this.current = i + 1;
+          break;
+        }
+      }
+    },
+    /**
+     * 获取学历列表
+     */
+    getSchools() {
+      this.$Request
+        .get("/app/dict/list", {
+          type: "学历",
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            let list = [
+              {
+                value: "不限",
+              },
+            ];
+            let obj = {
+              name: "学历要求",
+              list: [...list, ...res.data],
+            };
+            console.log(obj, "学历");
 
-							console.log(this.list, 'list')
-							console.log(arrs, 'list')
-							this.list.map((item, index) => {
-								item.list.map((ite, ind) => {
-									arrs.map((it, ins) => {
-										if (ite.value == it) {
-											ite.select = true
-										}
-									})
-								})
-							})
-						}
-						if (uni.getStorageSync('browse')) {
-							let browse = uni.getStorageSync('browse')
-							let arrs = []
-							browse.map(item => {
-								item.list.map(ite => {
-									arrs.push(ite.value)
-								})
-							})
-							this.list.map((item, index) => {
-								item.list.map((ite, ind) => {
-									arrs.map((it, ins) => {
-										if (ite.value == it) {
-											ite.select = true
-										}
-									})
-								})
-							})
-						}
-						if (uni.getStorageSync('isCompyBrowse')) {
-							let isCompyBrowse = uni.getStorageSync('isCompyBrowse')
-							let arrs = []
-							isCompyBrowse.map(item => {
-								item.list.map(ite => {
-									arrs.push(ite.value)
-								})
-							})
-							this.list.map((item, index) => {
-								item.list.map((ite, ind) => {
-									arrs.map((it, ins) => {
-										if (ite.value == it) {
-											ite.select = true
-										}
-									})
-								})
-							})
-						}
-						if (uni.getStorageSync('isCompyHistory')) {
-							let isCompyHistory = uni.getStorageSync('isCompyHistory')
-							let arrs = []
-							isCompyHistory.map(item => {
-								item.list.map(ite => {
-									arrs.push(ite.value)
-								})
-							})
-							this.list.map((item, index) => {
-								item.list.map((ite, ind) => {
-									arrs.map((it, ins) => {
-										if (ite.value == it) {
-											ite.select = true
-										}
-									})
-								})
-							})
-						}
+            this.getMoney(obj);
+          }
+        });
+    },
+    /**
+     * 获取薪资 列表
+     */
+    getMoney(obj1) {
+      this.$Request
+        .get("/app/dict/list", {
+          type: "薪资 ",
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            let list = [
+              {
+                value: "不限",
+              },
+            ];
+            let obj = {
+              name: "薪资范围（单选）",
+              list: [...list, ...res.data],
+            };
+            this.getJy(obj1, obj);
+          }
+        });
+    },
+    /**
+     * 获取工作经验列表
+     */
+    getJy(obj1, obj2) {
+      this.$Request
+        .get("/app/dict/list", {
+          type: "工作经验 ",
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            let list = [
+              {
+                value: "不限",
+              },
+            ];
+            let obj = {
+              name: "经验要求",
+              list: [...list, ...res.data],
+            };
+            this.getGm(obj1, obj2, obj);
+          }
+        });
+    },
+    /**
+     * 获取公司规模列表
+     */
+    getGm(obj1, obj2, obj3) {
+      this.$Request
+        .get("/app/dict/list", {
+          type: "公司规模 ",
+        })
+        .then((res) => {
+          if (res.code == 0) {
+            let list = [
+              {
+                value: "不限",
+              },
+            ];
+            let obj = {
+              name: "公司规模",
+              list: [...list, ...res.data],
+            };
+            this.getIndustryList(obj1, obj2, obj3, obj);
+          }
+        });
+    },
+    /**
+     * 获取行业列表
+     */
+    getIndustryList(obj1, obj2, obj3, obj4) {
+      this.$Request.get("/app/industry/getIndustryList").then((res) => {
+        if (res.code == 0) {
+          let list = [
+            {
+              value: "不限",
+            },
+          ];
+          let arrAy = [];
+          res.data.map((item) => {
+            arrAy = [...arrAy, ...item.childrenList];
+          });
+          let arrs = JSON.parse(JSON.stringify(arrAy).replace(/industryName/g, "value"));
+          let obj = {
+            name: "行业",
+            list: [...list, ...arrs],
+          };
+          let arr = [];
+          arr[0] = obj1;
+          arr[1] = obj2;
+          arr[2] = obj3;
+          arr[3] = obj4;
+          arr[4] = obj;
+          arr.map((item) => {
+            item.list.map((ite) => {
+              ite.select = false;
+            });
+          });
 
+          this.list = arr;
+          if (uni.getStorageSync("filter")) {
+            let filter = uni.getStorageSync("filter");
+            let arrs = [];
+            filter.map((item) => {
+              item.list.map((ite) => {
+                arrs.push(ite.value);
+              });
+            });
 
-					}
-				})
-			},
-		}
-	}
+            console.log(this.list, "list");
+            console.log(arrs, "list");
+            this.list.map((item, index) => {
+              item.list.map((ite, ind) => {
+                arrs.map((it, ins) => {
+                  if (ite.value == it) {
+                    ite.select = true;
+                  }
+                });
+              });
+            });
+          }
+          if (uni.getStorageSync("browse")) {
+            let browse = uni.getStorageSync("browse");
+            let arrs = [];
+            browse.map((item) => {
+              item.list.map((ite) => {
+                arrs.push(ite.value);
+              });
+            });
+            this.list.map((item, index) => {
+              item.list.map((ite, ind) => {
+                arrs.map((it, ins) => {
+                  if (ite.value == it) {
+                    ite.select = true;
+                  }
+                });
+              });
+            });
+          }
+          if (uni.getStorageSync("isCompyBrowse")) {
+            let isCompyBrowse = uni.getStorageSync("isCompyBrowse");
+            let arrs = [];
+            isCompyBrowse.map((item) => {
+              item.list.map((ite) => {
+                arrs.push(ite.value);
+              });
+            });
+            this.list.map((item, index) => {
+              item.list.map((ite, ind) => {
+                arrs.map((it, ins) => {
+                  if (ite.value == it) {
+                    ite.select = true;
+                  }
+                });
+              });
+            });
+          }
+          if (uni.getStorageSync("isCompyHistory")) {
+            let isCompyHistory = uni.getStorageSync("isCompyHistory");
+            let arrs = [];
+            isCompyHistory.map((item) => {
+              item.list.map((ite) => {
+                arrs.push(ite.value);
+              });
+            });
+            this.list.map((item, index) => {
+              item.list.map((ite, ind) => {
+                arrs.map((it, ins) => {
+                  if (ite.value == it) {
+                    ite.select = true;
+                  }
+                });
+              });
+            });
+          }
+        }
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
-	page {
-		background-color: #ffffff;
-	}
+page {
+  background-color: #ffffff;
+}
 
-	.activeRight {
-		color: rgba(1, 107, 246, 1) !important;
-		background-color: rgba(153, 196, 250, 0.4) !important;
-		border-radius: 18rpx !important;
-		border: 0.5px solid rgba(1, 107, 246, 1);
-	}
+.activeRight {
+  color: rgba(1, 107, 246, 1) !important;
+  background-color: rgba(153, 196, 250, 0.4) !important;
+  border-radius: 18rpx !important;
+  border: 0.5px solid rgba(1, 107, 246, 1);
+}
 
-	.active {
-		border-left: 8rpx solid #016BF6 !important;
-		color: #016BF6 !important;
-	}
+.active {
+  border-left: 8rpx solid #016bf6 !important;
+  color: #016bf6 !important;
+}
 
-	.list {
-		width: 100%;
-		/* #ifdef H5 */
-		height: calc(100vh - 200rpx);
-		/* #endif */
-		/* #ifndef H5 */
-		height: calc(100vh - 120rpx);
+.list {
+  width: 100%;
+  /* #ifdef H5 */
+  height: calc(100vh - 200rpx);
+  /* #endif */
+  /* #ifndef H5 */
+  height: calc(100vh - 120rpx);
 
-		/* #endif */
-		.list-l {
-			width: 30%;
-			height: 100%;
+  /* #endif */
+  .list-l {
+    width: 30%;
+    height: 100%;
 
-			.list-l-item {
-				margin-top: 40rpx;
-				font-size: 28rpx;
-				color: #121212;
-				padding-left: 20rpx;
-				border-left: 8rpx solid #ffffff;
-			}
-		}
+    .list-l-item {
+      margin-top: 40rpx;
+      font-size: 28rpx;
+      color: #121212;
+      padding-left: 20rpx;
+      border-left: 8rpx solid #ffffff;
+    }
+  }
 
-		.list-r {
-			width: 100%;
-			height: 100%;
-			border-left: 1rpx solid #F2F2F7;
-			box-sizing: border-box;
+  .list-r {
+    width: 100%;
+    height: 100%;
+    border-left: 1rpx solid #f2f2f7;
+    box-sizing: border-box;
 
-			.list-r-item {
-				width: 100%;
-				margin-top: 40rpx;
+    .list-r-item {
+      width: 100%;
+      margin-top: 40rpx;
 
-				.list-r-item-title {
-					width: 100%;
-					color: #121212;
-					font-size: 32rpx;
-					font-weight: bold;
-					padding-left: 30rpx;
-				}
+      .list-r-item-title {
+        width: 100%;
+        color: #121212;
+        font-size: 32rpx;
+        font-weight: bold;
+        padding-left: 30rpx;
+      }
 
-				.list-r-item-childs {
-					width: 100%;
+      .list-r-item-childs {
+        width: 100%;
 
-					.list-r-item-childs-i {
-						width: calc((100% - 120rpx) / 2);
-						margin-top: 20rpx;
-						padding-top: 16rpx;
-						padding-bottom: 16rpx;
-						padding-left: 16rpx;
-						padding-right: 16rpx;
-						font-size: 26rpx;
-						color: #121212;
-						background: rgba(245, 248, 254, 1);
-						text-align: center;
-						border-radius: 18rpx;
-					}
-				}
-			}
-		}
-	}
+        .list-r-item-childs-i {
+          width: calc((100% - 120rpx) / 2);
+          margin-top: 20rpx;
+          padding-top: 16rpx;
+          padding-bottom: 16rpx;
+          padding-left: 16rpx;
+          padding-right: 16rpx;
+          font-size: 26rpx;
+          color: #121212;
+          background: rgba(245, 248, 254, 1);
+          text-align: center;
+          border-radius: 18rpx;
+        }
+      }
+    }
+  }
+}
 
-	.bottom {
-		width: 100%;
-		height: 120rpx;
-		position: fixed;
-		bottom: 0;
-		background-color: #ffffff;
+.bottom {
+  width: 100%;
+  height: 120rpx;
+  position: fixed;
+  bottom: 0;
+  background-color: #ffffff;
 
-		.bottom-box {
-			width: 686rpx;
-			height: 70rpx;
-			margin-top: 20rpx;
+  .bottom-box {
+    width: 686rpx;
+    height: 70rpx;
+    margin-top: 20rpx;
 
-			.bottom-box-left {
-				width: 40%;
-				height: 80rpx;
-				color: #ffffff;
-				border-radius: 999rpx;
-				background: rgba(153, 196, 250, 1);
-			}
+    .bottom-box-left {
+      width: 40%;
+      height: 80rpx;
+      color: #ffffff;
+      border-radius: 999rpx;
+      background: rgba(153, 196, 250, 1);
+    }
 
-			.bottom-box-right {
-				width: 57%;
-				height: 80rpx;
-				border-radius: 999rpx;
-				background: var(--线性渐变, linear-gradient(90.00deg, rgba(13, 39, 247, 1),rgba(19, 193, 234, 1) 100%));
-				color: #ffffff;
-			}
-		}
-	}
-</style>
+    .bottom-box-right {
+      width: 57%;
+      height: 80rpx;
+      border-radius: 999rpx;
+      background: var(
+        --线性渐变,
+        linear-gradient(90deg, rgba(13, 39, 247, 1), rgba(19, 193, 234, 1) 100%)
+      );
+      color: #ffffff;
+    }
+  }
+}
+</style>

pages/index/game/gameList.vue

@@ -828,7 +828,7 @@ page {
               font-family: DM Sans;
               font-size: 20rpx;
               font-weight: 400;
-              line-height: 13px;
+              line-height: 26rpx;
               letter-spacing: 0%;
               text-align: left;
               white-space: nowrap;

pages/index/index.vue

@@ -1677,7 +1677,7 @@
 		font-family: DM Sans;
 		font-size: 32rpx;
 		font-weight: 700;
-		line-height: 18px;
+		line-height: 36rpx;
 		letter-spacing: 0%;
 		text-align: left;
 	}
@@ -1697,7 +1697,7 @@
 		font-family: DM Sans;
 		font-size: 30rpx;
 		font-weight: 700;
-		line-height: 18px;
+		line-height: 36rpx;
 		letter-spacing: 0%;
 		text-align: left;
 	}
@@ -1714,7 +1714,8 @@
 		z-index: 1;
 
 		.topbg-type-box {
-			width: 686rpx;
+			width: 100%;
+			margin: 0 20rpx;
 		}
 
 		.topbg-type-box-row {
@@ -1732,7 +1733,7 @@
 			font-family: DM Sans;
 			font-size: 28rpx;
 			font-weight: 400;
-			line-height: 18px;
+			line-height: 28rpx;
 			letter-spacing: 0%;
 			text-align: left;
 			margin-right: 14rpx;
@@ -1770,7 +1771,7 @@
 			font-family: DM Sans;
 			font-size: 26rpx;
 			font-weight: 400;
-			line-height: 13px;
+			line-height: 26rpx;
 			letter-spacing: 0%;
 			text-align: left;
 			margin-bottom: 8rpx;
@@ -1782,7 +1783,7 @@
 			font-family: DM Sans;
 			font-size: 24rpx;
 			font-weight: 400;
-			line-height: 10px;
+			line-height: 24rpx;
 			letter-spacing: 0%;
 			text-align: left;
 		}
@@ -1795,7 +1796,7 @@
 				font-family: DM Sans;
 				font-size: 20rpx;
 				font-weight: 400;
-				line-height: 18px;
+				line-height: 36rpx;
 				letter-spacing: 0%;
 				text-align: center;
 				margin-right: 18rpx;
@@ -1812,7 +1813,7 @@
 					font-family: DM Sans;
 					font-size: 20rpx !important;
 					font-weight: 400 !important;
-					line-height: 18px;
+					line-height: 36rpx;
 					letter-spacing: 0%;
 					text-align: left;
 					padding: 8rpx 12rpx !important;
@@ -1827,7 +1828,7 @@
 				font-family: DM Sans;
 				font-size: 20rpx;
 				font-weight: 400;
-				line-height: 18px;
+				line-height: 36rpx;
 				letter-spacing: 0%;
 				text-align: center;
 				margin-right: 20rpx;
@@ -1932,7 +1933,7 @@
 			font-family: DM Sans;
 			font-size: 24rpx;
 			font-weight: 400;
-			line-height: 18px;
+			line-height: 36rpx;
 			letter-spacing: 0%;
 			text-align: center;
 			margin-right: 20rpx;
@@ -1947,7 +1948,7 @@
 				font-family: DM Sans;
 				font-size: 24rpx !important;
 				font-weight: 400 !important;
-				line-height: 18px;
+				line-height: 36rpx;
 				letter-spacing: 0%;
 				text-align: left;
 				padding: 8rpx 12rpx !important;
@@ -1962,7 +1963,7 @@
 			font-family: DM Sans;
 			font-size: 24rpx;
 			font-weight: 400;
-			line-height: 18px;
+			line-height: 36rpx;
 			letter-spacing: 0%;
 			text-align: center;
 			margin-right: 20rpx;
@@ -1982,7 +1983,7 @@
 			font-family: DM Sans;
 			font-size: 24rpx;
 			font-weight: 400;
-			line-height: 18px;
+			line-height: 36rpx;
 			letter-spacing: 0%;
 			text-align: center;
 			border-radius: 6px;
@@ -2031,7 +2032,7 @@
 			font-family: DM Sans;
 			font-size: 18rpx;
 			font-weight: 400;
-			line-height: 20px;
+			line-height: 30rpx;
 			letter-spacing: 0.5%;
 			text-align: left;
 		}
@@ -2235,7 +2236,7 @@
 				font-family: DM Sans;
 				font-size: 28rpx;
 				font-weight: 400;
-				line-height: 18px;
+				line-height: 36rpx;
 				letter-spacing: 0%;
 				text-align: left;
 				margin-right: 14rpx;
@@ -2274,7 +2275,7 @@
 				font-family: DM Sans;
 				font-size: 24rpx;
 				font-weight: 400;
-				line-height: 18px;
+				line-height: 36rpx;
 				letter-spacing: 0%;
 				text-align: center;
 				margin-right: 20rpx;
@@ -2289,7 +2290,7 @@
 					font-family: DM Sans;
 					font-size: 24rpx !important;
 					font-weight: 400 !important;
-					line-height: 18px;
+					line-height: 36rpx;
 					letter-spacing: 0%;
 					text-align: left;
 					padding: 8rpx 12rpx !important;
@@ -2305,7 +2306,7 @@
 				font-family: DM Sans;
 				font-size: 24rpx;
 				font-weight: 400;
-				line-height: 18px;
+				line-height: 36rpx;
 				letter-spacing: 0%;
 				text-align: center;
 				margin-right: 20rpx;
@@ -2326,7 +2327,7 @@
 				font-family: DM Sans;
 				font-size: 24rpx;
 				font-weight: 400;
-				line-height: 18px;
+				line-height: 36rpx;
 				letter-spacing: 0%;
 				text-align: center;
 				border-radius: 6px;

pages/my/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="my-center">
+  <view class="my-center-page">
     <view class="my-bg">
       <image
         src="@/static/images/my/icon/paopao.svg"
@@ -369,7 +369,7 @@
                       用户协议
                     </view>
                   </view>
-                  <view class="util-item" @click="goNavNoLogin('/my/setting/about')">
+                  <view class="util-item" @click="goNavNoLogin('/pages/my/jobApplicant/guidePage')">
                     <!-- goNavNoLogin('/my/setting/about') -->
                     <!-- pages/my/jobApplicant/startPage -->
                     <image
@@ -1889,14 +1889,12 @@ page {
   }
 }
 
-.my-center {
+.my-center-page {
   position: absolute;
   left: 0;
   right: 0;
   top: 0;
   bottom: 0;
-  overflow: hidden;
-  overflow-y: auto;
 }
 .my-bg {
   /* 容器 52 */

pages/my/jobApplicant/workRecord.vue

@@ -107,7 +107,8 @@
               <view class="job-title-txt"
                 >工作经历 <text class="job-txt">请填写专属聘用行业的工作经验</text></view
               >
-              <image
+              <image 
+              @click="goWorkProgress"
                 class="job-image"
                 src="@/static/images/jobApplicant/edit.svg"
                 mode="scaleToFill"
@@ -307,6 +308,9 @@ export default {
       this.showStatus = false;
       this.formData.advantages=this.statusList[e].text
     },
+    goWorkProgress(){
+      uni.navigateTo({ url: '/pages/my/workExperience' })
+    },
     // 选择头像
     chooseAvatar() {
       uni.chooseImage({