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

components/vertical-menu/classifyData.js

@@ -95,7 +95,7 @@ export default [
     ],
   },
   {
-    name: "省市区县",
+    name: "区域",
     data: [
       {
         name: "薪资不限",

components/vertical-menu/vertical-menu.vue

@@ -16,7 +16,7 @@
                             <text>{{ item.name }}</text>
                         </view>
                         <view class="item-container">
-                            <view @click="clickFunc({ 'type': 'address' })" v-if="item.name === `省市区县`"
+                            <view @click="clickFunc({ 'type': 'address' })" v-if="item.name === `区域`"
                                 class="thumb-box thumb-box1">
                                 <u-cell-group>
                                     <u-cell icon="map" :title="areaModal.address" :isLink="true"
@@ -388,10 +388,11 @@ export default {
 
 .page-view {
     padding: 8rpx;
+    padding-left: 4rpx;
 }
 
 .class-item {
-    margin-bottom: 30rpx;
+    margin-bottom: 10rpx;
     background-color: #fff;
     padding: 16rpx;
     border-radius: 8rpx;

main.js

@@ -11,6 +11,7 @@ import uView from '@/uni_modules/uview-ui'
 // Vue.component('mescroll-uni', MescrollUni)
 
 function navTo(url, needLogin) {
+    console.log(url)
     if(needLogin) {
         return
     }

pageMy/my/resume/index.vue

@@ -19,7 +19,7 @@
 			<view class="title_text">
 				我的职业技能
 			</view>
-			<image v-if="mySkills.length < 5" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image>
+			<image v-if="mySkills.length < 2" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image>
 		</view>
 
 		<view class="listBody">
@@ -34,14 +34,28 @@
 				</view>
 			</m-slide-list>
 		</view>
-		<view class="jobcontent" @click="goSetCity">
+		<!-- <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>
+			<image src="../../../static/img/right.svg" mode=""></image>
+		</view> -->
+		<view class="jobcontent" @click="areaModal.addressShow = true">
+			<view class="jobinfo">
+				<view
+					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 :
+						'请选择'
 					}}
 				</view>
 			</view>
@@ -53,7 +67,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>
@@ -89,6 +103,12 @@
 			keyName="label"></u-picker>
 
 		<u-toast ref="uToast"></u-toast>
+
+		<!-- 省市 -->
+		<data-picker :show="areaModal.addressShow" @confirm='confirmAddress' @cancel='areaModal.addressShow = false'
+			@close='areaModal.addressShow = false' :defaultNames="areaModal.defaultNames" :indexs="areaModal.indexs"
+			:defaultIds="areaModal.defaultIds" :showToolbar="false" :showBottombar="true"
+			:labelName="areaModal.labelName"></data-picker>
 	</view>
 </template>
 
@@ -135,7 +155,18 @@ export default {
 			canSubMit: false,
 			isShowButton: false,
 			isShowBorder: false,
-			isShowAddSkill: true
+			isShowAddSkill: true,
+
+			areaModal: {
+				address: '',
+				addressShow: false,
+				title: 'Hello',
+				// indexs: [0, 0, 8],
+				// defaultIds: [1, 110000, 110106],
+				defaultNames: ['北京市', '北京市', '东城区'],
+				labelName: "areaName"
+
+			},
 		}
 	},
 	onShow() {
@@ -217,6 +248,7 @@ export default {
 			})
 		},
 		goAdd: function () {
+
 			uni.navigateTo({
 				url: './addSkill'
 			})
@@ -306,7 +338,7 @@ export default {
 				// 电话号码格式正确
 				console.log(phone, "电话号码格式正确");
 				setResume({
-					id: this.id, education: education.label, workplace: city.parentLabel + '-' + city.label, telephone: phone, wage
+					id: this.id, education: education.label, workplace: city.workplace ? city.workplace : city.parentLabel + '-' + city.label, telephone: phone, wage
 				}).then(res => {
 					this.isShowButton = false;
 					this.getResume()
@@ -321,7 +353,17 @@ export default {
 
 
 
-		}
+		},
+
+		confirmAddress(val) {
+			console.log(val);
+			var valArr = val.value;
+			// this.areaModal.address = [...new Set(val.value)].join(' / ')
+			this.isShowButton = true
+			this.myResume.city.workplace = [...new Set(val.value)].join('/')
+			console.log(this.areaModal.address);
+			this.areaModal.addressShow = false
+		},
 	}
 }
 </script>

pages.json

@@ -174,14 +174,23 @@
 		        "navigationBarTextStyle" : "white"
 		    }
 		}
-       
-        
         ,{
             "path" : "pages/user/policyContent",
             "style" : {
 				"navigationBarTitleText" : "新政详情",
 				"navigationBarBackgroundColor" : "#FFFFFF"
 			}
+        },
+        {
+            "path" : "pages/project/projectList",
+            "style": {
+                "navigationBarTitleText": "位置",
+                "navigationBarBackgroundColor": "#FFFFFF",
+                "enablePullDownRefresh": true,
+                "navigationBarShadow": {
+                    "colorType": "none"
+                }
+            }
         }
     ],
     "subPackages": [{

pages/index/index.vue

@@ -48,7 +48,7 @@
 			<view class="serviceItem" @click="goures()">
 				<view class="serviceItemContent">
 					<view class="itemIcon">
-						<image src="../../static/img/index/jobRegister.png" mode=""></image>
+						<image class="Icon_size" src="../../static/img/index/jobRegister.png" mode=""></image>
 					</view>
 					<view class="itemText">
 						<view class="font30">简历登记</view>
@@ -59,7 +59,7 @@
 			<view class="serviceItem" @click="go('/pageMy/my/resume/setWskill')">
 				<view class="serviceItemContent">
 					<view class="itemIcon">
-						<image src="../../static/img/index/skill.png" mode=""></image>
+						<image class="Icon_size" src="../../static/img/index/skill.png" mode=""></image>
 					</view>
 					<view class="itemText">
 						<view class="font30">最新任务</view>
@@ -70,7 +70,7 @@
 			<!-- <view class="serviceItem" @click="">
 				<view class="serviceItemContent">
 					<view class="itemIcon">
-						<image src="../../static/img/index/union.png" mode=""></image>
+						<image class="Icon_size" src="../../static/img/index/union.png" mode=""></image>
 					</view>
 					<view class="itemText">
 						<view class="font30">监管投诉</view>
@@ -81,7 +81,7 @@
 			<!-- <view class="serviceItem" @click="goLocation()">
 				<view class="serviceItemContent">
 					<view class="itemIcon">
-						<image src="../../static/img/index/near.png" mode=""></image>
+						<image class="Icon_size" src="../../static/img/index/near.png" mode=""></image>
 					</view>
 					<view class="itemText">
 						<view class="font30">就近任务</view>
@@ -98,7 +98,7 @@
             <view class="serviceItem" @click="">
             	<view class="serviceItemContent">
             		<view class="itemIcon">
-            			<image src="../../static/img/index/union.png" mode=""></image>
+            			<image class="Icon_size" src="../../static/img/index/gangwei-2.png" mode=""></image>
             		</view>
             		<view class="itemText">
             			<view class="font30">最新岗位</view>
@@ -109,7 +109,7 @@
             <view class="serviceItem" @click="">
             	<view class="serviceItemContent">
             		<view class="itemIcon">
-            			<image src="../../static/img/index/union.png" mode=""></image>
+            			<image class="Icon_size" src="../../static/img/index/shenqing.png" mode=""></image>
             		</view>
             		<view class="itemText">
             			<view class="font30">我的申请</view>
@@ -120,7 +120,7 @@
             <view class="serviceItem" @click="">
             	<view class="serviceItemContent">
             		<view class="itemIcon">
-            			<image src="../../static/img/index/union.png" mode=""></image>
+            			<image class="Icon_size" src="../../static/img/index/shoucang.png" mode=""></image>
             		</view>
             		<view class="itemText">
             			<view class="font30">我的收藏</view>
@@ -131,7 +131,7 @@
             <view class="serviceItem" @click="">
             	<view class="serviceItemContent">
             		<view class="itemIcon">
-            			<image src="../../static/img/index/union.png" mode=""></image>
+            			<image class="Icon_size" src="../../static/img/index/icon-liulan.png" mode=""></image>
             		</view>
             		<view class="itemText">
             			<view class="font30">我的浏览</view>
@@ -162,7 +162,7 @@
                 </view>
                 <view class="helpCardItem" style="border-right: 1px solid #F5F6F7;" @click="">
                 	<view class="cardItemIcon">
-                		<image src="../../static/img/index/consult.png" mode=""></image>
+                		<image src="../../static/img/index/bangzhu.png" mode=""></image>
                 	</view>
                 	<view class="font24">就业帮助</view>
                 </view>
@@ -481,7 +481,7 @@
 	};
 </script>
 
-<style>
+<style lang="scss">
     .search_style{
         color: #2297fa;
     }
@@ -674,7 +674,7 @@
 	}
 
 	.serviceItem .serviceItemContent {
-		padding: 42rpx 50rpx 42rpx 32rpx;
+		padding: 42rpx 0rpx 42rpx 32rpx;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
@@ -686,6 +686,7 @@
 		margin-left: 16rpx;
 	}
 
+
 	.hotFunction {
 		font-size: 24rpx;
 		font-family: PingFangSC-Regular, PingFang SC;
@@ -830,4 +831,18 @@
 		height: 64rpx;
 		text-align: center;
 	}
+    .serviceItemContent .itemIcon{
+        background-color: rgba(0, 0, 0, 0.06);
+        width: 90rpx;
+        height: 90rpx;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+ 
+        .Icon_size{
+            width: 60rpx;
+            height: 60rpx;
+            border-radius: 0;
+        }
+    }
 </style>

pages/project/project.vue

@@ -5,7 +5,11 @@
 
 			<u-search placeholder="搜任务/搜岗位/搜政策" @focus="goSeach" shape="round" :showAction="false"></u-search>
 		</view>
-
+        <view class="navPosition" @click="navTo('/pages/project/projectList')">
+            <u-icon name="map" color="#2979ff" size="16"></u-icon>
+            <view class="positionText">四川德阳市</view>
+            <u-icon name="arrow-right" color="#666666" size="14"></u-icon>
+        </view>
 		<view class="content">
 			<view class="typeButtonWrapper">
 				<view class="typeButtonLeft">
@@ -402,6 +406,15 @@ export default {
 </script>
 
 <style scoped>
+.navPosition{
+    padding: 0 24rpx 20rpx 30rpx;
+    display: flex;
+    align-item: center;
+    font-size: 26rpx;
+    .positionText{
+        margin: 0 10rpx;
+    }
+}
 .titleSearch {
 	display: flex;
 	width: 80%;
@@ -448,6 +461,7 @@ export default {
 
 .typeButtonLeft {
 	display: flex;
+    
 }
 
 .typeButton {
@@ -456,6 +470,7 @@ export default {
 	background: #fff;
 	border-radius: 50px;
 	margin-right: 10rpx;
+    white-space: nowrap;
 }
 
 .activeButton {

pages/project/projectList.vue

@@ -0,0 +1,73 @@
+<template>
+    <view class="app_container">
+        <view class="content_list">
+            <view class="list_top">
+                <view class="top_position"><u-icon name="map" color="#2979ff" size="16"></u-icon>当前位置</view>
+                <view class="top_text">四川省成都市金牛区校园路7号</view>
+            </view>
+            <view class="list_card">
+                <view class="card_title">四川省德阳市</view>
+                <view class="card_text">四川省成都市金牛区校园路</view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            
+        }
+    },
+    onLoad() {
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+
+.app_container{
+    background-color: #f3f4f8;
+    padding: 24rpx;
+    height: calc(100vh - var(--window-top) - var(--status-bar-height) - var(--window-bottom));
+    .content_list{
+        display: flex;
+        justify-content: center;
+        flex-direction: column;
+        .list_top{
+            width: 100%;
+            border-radius: 30rpx;
+            background-color: #FFFFFF;
+            padding: 24rpx;
+            .top_position{
+                display: flex;
+                color: blue;
+                font-size: 32rpx;
+                font-weight: bold;
+            }
+            .top_text{
+                margin-top: 20rpx;
+                font-size: 32rpx;
+                color: #666666;
+            }
+        }
+        .list_card{
+            margin-top: 24rpx;
+            width: 100%;
+            border-radius: 30rpx;
+            background-color: #FFFFFF;
+            padding: 24rpx;
+            .card_title{
+                font-size: 32rpx;
+                font-weight: bold;
+            }
+            .card_text{
+                margin-top: 20rpx;
+                font-size: 32rpx;
+                color: #666666;
+            }
+        }
+    }
+}
+</style>

vue.config.js

@@ -3,9 +3,9 @@ module.exports = {
         port: 1887,
         proxy: {
             '/api': {
-                target: 'http://192.168.0.104:8000', // 本地服务接口地址
+                // target: 'http://192.168.0.102:8000', // 本地服务接口地址
-				// target: "http://39.98.184.58:8000",  // 阿里云后台地址
+				target: "http://39.98.184.58:8000",  // 阿里云后台地址
-				// target: "http://192.168.0.100:8000",  // 本地网关
+				// target: "http://192.168.0.101:8000",  // 本地网关
                 ws: true,
                 pathRewrite: {
                     '^/api': '/'