1.4 修改概念中心日期默认传值

pages/mine/basicInfo/basicInfo.vue

@@ -30,7 +30,10 @@
 				<textarea v-model="profile" placeholder="简单介绍一下自己吧" placeholder-style="color:#AAA"></textarea>
 			</view>
 		</view>
-		<view class="next fixed" @click="clickNext()">下一步</view>
+		<view class="bottomC fixed flex">
+			<view class="finish btn" @click="clickFinishOrNext(0)">完成</view>
+			<view class="next btn flex1" @click="clickFinishOrNext(1)">下一步</view>
+		</view>
 	</view>
 </template>
 
@@ -104,9 +107,9 @@
 				}
 			},
 			/**
-			 * 点击下一步
+			 * 点击完成或下一步
 			 */
-			clickNext()
+			clickFinishOrNext(type)
 			{
 				if(!this.avatar&&!this.avatarUrl)
 				{
@@ -146,9 +149,12 @@
 					let param = {avatar:this.avatar,nickname:this.nickname,gender:this.sex=='男'?'male':'female',phone:this.mobile,
 					bio:this.profile,isFile:1}
 					updateBasicInfo(param).then(res=>{
-						uni.navigateTo({
-							url:'/pages/mine/investPreference/investPreference'
-						})
+						if (type==1) {
+							uni.navigateTo({
+								url:'/pages/mine/investPreference/investPreference'
+							})
+						}else 
+							uni.navigateBack()
 					}).catch(error=>{
 						
 					})
@@ -158,9 +164,12 @@
 					let param = {nickname:this.nickname,gender:this.sex=='男'?'male':'female',phone:this.mobile,
 					bio:this.profile}
 					updateBasicInfo(param).then(res=>{
-						uni.navigateTo({
-							url:'/pages/mine/investPreference/investPreference'
-						})
+						if (type==1) {
+							uni.navigateTo({
+								url:'/pages/mine/investPreference/investPreference'
+							})
+						}else 
+							uni.navigateBack()
 					}).catch(error=>{
 						
 					})
@@ -305,18 +314,33 @@
 		}
 	}
 }
-.next 
+
+.bottomC 
 {
-	background-color: #F97316;
 	left: 0;
 	right: 0;
 	bottom: 73rpx;
 	margin: 0 25rpx;
-	line-height: 80rpx;
-	border-radius: 20rpx;
-	font-size: 26rpx;
-	font-weight: 500;
-	color: white;
-	text-align: center;
+	
+	.btn 
+	{
+		line-height: 80rpx;
+		border-radius: 20rpx;
+		font-size: 26rpx;
+		text-align: center;
+	}
+	.finish 
+	{
+		background-color: #FFE9D9; 
+		width: 226rpx;
+		color: #F97316;
+	}
+	.next
+	{
+		background-color: #F97316; 
+		margin-left: 20rpx;
+		color: white;
+	}
 }
+
 </style>

pages/mine/followCollect/followCollect.vue

@@ -44,7 +44,7 @@
 							<text>{{item.comment_count}}</text>
 						</view>
 						<view class="toolItem flex" @click.stop="clickFollowEvent(item.event_id,index)">
-							<image class="icon" src="/static/icon/home/follow_s.png" mode="widthFix"></image>
+							<image class="icon" src="/static/icon/home/collect_s.png" mode="widthFix"></image>
 							<text>{{item.follower_count}}</text>
 						</view>
 					</view>