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

main.js

@@ -10,6 +10,27 @@ import uView from '@/uni_modules/uview-ui'
 // Vue.component('mescroll-body', MescrollBody)
 // Vue.component('mescroll-uni', MescrollUni)
 
+function navTo(url, needLogin) {
+    if(needLogin) {
+        return
+    }
+    uni.navigateTo({
+        url: url
+    })
+}
+
+const msg = (title, duration=1500, mask=false, icon='none')=>{
+	if(typeof title === 'string'){
+		return;
+	}
+	uni.showToast({
+		title,
+		duration,
+		mask,
+		icon
+	});
+}
+
 // 注册全局组件
 import JlButton from "@/components/jl-button/main.vue"
 import JlForm from "@/components/jl-form/main.vue"
@@ -20,6 +41,8 @@ Vue.component('jl-form', JlForm)
 Vue.component('jl-form-item', JlFormItem)
 Vue.component('cs-button', CSButton)
 
+Vue.prototype.$api = { msg }
+Vue.prototype.navTo = navTo
 Vue.config.productionTip = false
 
 Vue.use(util)

pageMy/my/resume/addInd.vue

@@ -1,5 +1,5 @@
 <template>
-	<select-template ref="select" title="请选择行业" slo="请选择行业，帮你定制个性化推荐任务信息" :list="skillLevel" @submit="goAdd"></select-template>
+	<select-template ref="select" title="请选择行业" slo="" :list="skillLevel" @submit="goAdd"></select-template>
 </template>
 
 <script>

pageMy/my/resume/addSkill.vue

@@ -9,7 +9,7 @@
 		<view class="jobcontent" @click="goAddind">
 			<view class="jobinfo">
 				<view class="jobAddress">
-					我从事的行业
+					我所属的行业
 				</view>
 				<view v-if="tradeName" class="jobText">{{ tradeName }}</view>
 				<view v-else class="jobText nochoose">请选择</view>
@@ -20,7 +20,7 @@
 		<view class="jobcontent" @click="skill">
 			<view class="jobinfo">
 				<view class="jobAddress">
-					我具备的技能
+					我具备的工种
 				</view>
 				<view v-if="worktypesName" class="jobText">{{ worktypesName }}</view>
 				<view v-else class="jobText nochoose">请选择</view>
@@ -31,7 +31,7 @@
 		<view class="jobcontent" @click="skillLevel">
 			<view class="jobinfo">
 				<view class="jobAddress">
-					我的技能水平
+					我从事的岗位
 				</view>
 				<view v-if="skillsName" class="jobText">{{ skillsName }}</view>
 				<view v-else class="jobText nochoose">请选择</view>

pageMy/my/resume/index.vue

@@ -19,7 +19,7 @@
 			<view class="title_text">
 				我的职业技能
 			</view>
-			<image v-if="mySkills.length < 2" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image>
+			<image v-if="mySkills.length < 5" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image>
 		</view>
 
 		<view class="listBody">
@@ -29,7 +29,7 @@
 				:button="buttonList">
 				<view class="list">
 					<view class="list_text">
-						{{ item.trade }}·{{ item.worktypes }}·{{ item.skills }}
+						{{ item.trade }}、{{ item.worktypes }}、{{ item.skills }}
 					</view>
 				</view>
 			</m-slide-list>
@@ -37,11 +37,11 @@
 		<view class="jobcontent" @click="goSetCity">
 			<view class="jobinfo">
 				<view
-					v-bind:class="['jobAddress', { 'input-error':!myResume.city.id && !myResume.city.workplace && isShowBorder }]">
+					v-bind:class="['jobAddress', { 'input-error': (!myResume.city.id || !myResume.city.workplace) && isShowBorder }]">
 					您想工作的地点
 				</view>
 				<view v-bind:class="['jobText']">
-					{{ myResume.city !== "{}" ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace : '请选择'
+					{{ myResume.city == {} ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace : '请选择'
 					}}
 				</view>
 			</view>
@@ -53,7 +53,7 @@
 					您的学历
 				</view>
 				<view v-bind:class="['jobText']">
-					{{ myResume.education !== "{}" ? myResume.education.label : '请选择' }}
+					{{ myResume.education == {} ? myResume.education.label : '请选择' }}
 				</view>
 			</view>
 			<image src="../../../static/img/right.svg" mode=""></image>
@@ -306,7 +306,7 @@ export default {
 				// 电话号码格式正确
 				console.log(phone, "电话号码格式正确");
 				setResume({
-					id: this.id, education: education.label, workplace:city.workplace?city.workplace: city.parentLabel + '-' + city.label, telephone: phone, wage
+					id: this.id, education: education.label, workplace: city.parentLabel + '-' + city.label, telephone: phone, wage
 				}).then(res => {
 					this.isShowButton = false;
 					this.getResume()
@@ -440,7 +440,7 @@ export default {
 }
 
 page {
-	background-color: #f6f6f6;
+	background-color: #FFFFFF;
 }
 
 .head {

pageMy/my/resume/selectTemplate.vue

@@ -71,9 +71,9 @@
 			this.activeId = id
 		},
 		mounted() {
-			uni.createSelectorQuery().in(this).select('.select-template-head').boundingClientRect().exec((node) => {
+			// uni.createSelectorQuery().in(this).select('.select-template-head').boundingClientRect().exec((node) => {
-				this.height = node[0].height + 'px'
+			// 	this.height = node[0].height + 'px'
-			});
+			// });
 		},
 		computed: {
 			searchResultList() {

pages/index/index.vue

@@ -1,9 +1,13 @@
 <template>
 	<view class="home-body">
+<!--        <view class="home_top">
+            
+        </view> -->
 		<uni-nav-bar :shadow="false" >
 			<view class="headd" @click="goSeach">
-				<image  src="../../static/img/search.svg" style="width: 32rpx;height: 32rpx;" mode=""></image>
+				<!-- <image  src="../../static/img/search.svg" style="width: 32rpx;height: 32rpx; color: blue;" mode=""></image> -->
-				<input type="text" confirm-type="搜索"  v-model="keywords" placeholder="请搜索任务名称或公司名称" />
+                <u-icon name="search" color="#2979ff" size="28"></u-icon>
+				<input placeholder-class="search_style" type="text" confirm-type="搜索"  v-model="keywords" placeholder="请搜索任务名称或公司名称" />
 			</view>
 		</uni-nav-bar>
 		<view class="homeHead">
@@ -56,12 +60,12 @@
 						<image src="../../static/img/index/skill.png" mode=""></image>
 					</view>
 					<view class="itemText">
-						<view class="font30">技能学习</view>
+						<view class="font30">最新任务</view>
-						<view class="font22">提升个人技能</view>
+						<view class="font22">最新任务推荐</view>
 					</view>
 				</view>
 			</view>
-			<view class="serviceItem" @click="">
+			<!-- <view class="serviceItem" @click="">
 				<view class="serviceItemContent">
 					<view class="itemIcon">
 						<image src="../../static/img/index/union.png" mode=""></image>
@@ -71,8 +75,8 @@
 						<view class="font22">构建和谐劳动关系</view>
 					</view>
 				</view>
-			</view>
+			</view> -->
-			<view class="serviceItem" @click="goLocation()">
+			<!-- <view class="serviceItem" @click="goLocation()">
 				<view class="serviceItemContent">
 					<view class="itemIcon">
 						<image src="../../static/img/index/near.png" mode=""></image>
@@ -87,14 +91,57 @@
 						</view>
 						<image src="../../static/img/index/hotBg.png" class="hot_img" mode=""></image>
 					</view>
-
+				</view>
+			</view> -->
+            <view class="serviceItem" @click="">
+            	<view class="serviceItemContent">
+            		<view class="itemIcon">
+            			<image src="../../static/img/index/union.png" mode=""></image>
+            		</view>
+            		<view class="itemText">
+            			<view class="font30">最新岗位</view>
+            			<view class="font22">最新人岗推荐</view>
+            		</view>
+            	</view>
+            </view>
+            <view class="serviceItem" @click="">
+            	<view class="serviceItemContent">
+            		<view class="itemIcon">
+            			<image src="../../static/img/index/union.png" mode=""></image>
+            		</view>
+            		<view class="itemText">
+            			<view class="font30">我的申请</view>
+            			<view class="font22">我申请的信息</view>
+            		</view>
+            	</view>
+            </view>
+            <view class="serviceItem" @click="">
+            	<view class="serviceItemContent">
+            		<view class="itemIcon">
+            			<image src="../../static/img/index/union.png" mode=""></image>
+            		</view>
+            		<view class="itemText">
+            			<view class="font30">我的收藏</view>
+            			<view class="font22">我收藏的信息</view>
+            		</view>
+            	</view>
+            </view>
+            <view class="serviceItem" @click="">
+            	<view class="serviceItemContent">
+            		<view class="itemIcon">
+            			<image src="../../static/img/index/union.png" mode=""></image>
+            		</view>
+            		<view class="itemText">
+            			<view class="font30">我的浏览</view>
+            			<view class="font22">我浏览的信息</view>
+            		</view>
             	</view>
             </view>
 		</view>
 		<view class="helpSupport">
 			<view class="cardTips">帮助与支持</view>
 			<view class="helpCard">
-				<button type="default" open-type="contact" plain style="width: 266rpx;
+				<!-- <button type="default" open-type="contact" plain style="width: 266rpx;
 					text-align: center;
 					border: none;
 					border-right: 1px solid #F5F6F7;padding-left: 0;">
@@ -104,7 +151,19 @@
 						</view>
 						<view class="font24" style="margin-top: 22rpx !important;">在线咨询</view>
 					</view>
-				</button>
+				</button> -->
+                <view class="helpCardItem" style="border-right: 1px solid #F5F6F7;" @click="">
+                	<view class="cardItemIcon">
+                		<image src="../../static/img/index/consult.png" mode=""></image>
+                	</view>
+                	<view class="font24">在线咨询</view>
+                </view>
+                <view class="helpCardItem" style="border-right: 1px solid #F5F6F7;" @click="">
+                	<view class="cardItemIcon">
+                		<image src="../../static/img/index/consult.png" mode=""></image>
+                	</view>
+                	<view class="font24">就业帮助</view>
+                </view>
 				<view class="helpCardItem" style="border-right: 1px solid #F5F6F7;" @click="">
 					<view class="cardItemIcon">
 						<image src="../../static/img/index/legal.png" mode=""></image>
@@ -417,6 +476,9 @@
 </script>
 
 <style>
+    .search_style{
+        color: blue;
+    }
 	.home-body {
 		overflow-x: hidden;
 		/* background-color: #FFFFFF; */
@@ -438,6 +500,7 @@
 	.headd {
 		background-color: #f6f6f6;
 		border-radius: 200rpx;
+        border: 2rpx solid blue;
 		display: flex;
 		justify-content: center;
 		align-items: center;
@@ -550,7 +613,7 @@
 
 	.jobService {
 		width: 100%;
-		height: 440rpx;
+		height: 660rpx;
 		background: #FEFFFE;
 		margin-top: 16rpx;
 		padding: 24rpx 0rpx 0rpx 32rpx;
@@ -683,6 +746,8 @@
 		width: 100%;
 		height: auto;
 		background: #FEFFFE;
+        margin-top: 16rpx;
+        padding: 24rpx 0 0 0;
 
 	}