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 {

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>