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

pages/index/index.vue

@@ -60,7 +60,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="serviceItem" @click="go('/pageMy/my/resume/setWskill')">
+			<view class="serviceItem" @click="toNewTask">
 				<view class="serviceItemContent">
 					<view class="itemIcon">
 						<image class="Icon_size" src="../../static/img/index/skill.png" mode=""></image>
@@ -99,7 +99,7 @@
 					</view>
 				</view>
 			</view> -->
-            <view class="serviceItem" @click="">
+            <view class="serviceItem" @click="toNewWork">
             	<view class="serviceItemContent">
             		<view class="itemIcon">
             			<image class="Icon_size" src="../../static/img/index/gangwei-2.png" mode=""></image>
@@ -433,6 +433,16 @@
 					});
 				}
 			},
+			toNewTask() {
+				uni.navigateTo({
+					url: `/pages/project/newProject?tabIndex=${0}`
+				});
+			},
+			toNewWork() {
+				uni.navigateTo({
+					url: `/pages/project/newProject?tabIndex=${1}`
+				});
+			},
 			toNewProject() {
 				uni.navigateTo({
 					url: `/pages/project/newProject?tabIndex=${2}`

pages/project/newProject.vue

@@ -10,7 +10,7 @@
 			<view class="typeButtonWrapper">
 				<view class="typeButtonLeft">
 
-					<view v-for="(item, index) in nonReactiveArray" :key="index"
+					<view v-for="(item, index) in nonReactiveArray" :key="index" v-show="index == activeTab"
 						:class="['typeButton', index == activeTab ? 'activeButton' : '']" @click="changeTab(index)">{{ item
 						}}</view>
 				</view>