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

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 {