Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/blindDate

pages.json

@@ -119,7 +119,7 @@
 		{
 			"path": "pages/my/collect",
 			"style": {
-				"navigationBarTitleText": "我的收藏"
+				"navigationBarTitleText": "我喜欢的"
 			}
 		},
 		{
@@ -307,11 +307,6 @@
 	        "iconPath": "static/tabbar/find.png",
 	        "selectedIconPath": "static/tabbar/find-active.png",
 	        "text": "发现"
-	    },{
-	        "pagePath": "pages/messageCenter/index",
-	        "iconPath": "static/tabbar/message.png",
-	        "selectedIconPath": "static/tabbar/message-active.png",
-	        "text": "消息"
 	    },{
 	        "pagePath": "pages/my/index",
 	        "iconPath": "static/tabbar/my.png",
@@ -321,6 +316,12 @@
 		
 		//二期隐藏部分
 		// {
+		//     "pagePath": "pages/messageCenter/index",
+		//     "iconPath": "static/tabbar/message.png",
+		//     "selectedIconPath": "static/tabbar/message-active.png",
+		//     "text": "消息"
+		// },
+		// {
 		//     "pagePath": "pages/personalTailor/personalTailor",
 		//     "iconPath": "static/tabbar/customized.png",
 		//     "selectedIconPath": "static/tabbar/customized-active.png",

pages/find/find.vue

@@ -16,12 +16,12 @@
 					<view class="lf-font-32 lf-color-222 lf-m-t-10">我更新了相册</view>
 					<!-- 图片显示区 -->
 					<view class="images-box">
-						<view class="img2" v-for="item in 3" :key="item">
-							<lf-image src="https://picsum.photos/seed/picsum/200/300" />
+						<view class="img2" v-for="(item,index) in img_list" :key="index">
+							<lf-image :src="item.url" @tap="showImg(index)" />
 						</view>
 					</view>
 					<!-- 赞过的用户头像 -->
-					<lf-nolan-photo></lf-nolan-photo>
+					<!-- <lf-nolan-photo></lf-nolan-photo> -->
 					<!-- 时间和更多按钮 -->
 					<view class="lf-row-between lf-m-t-23">
 						<view class="lf-font-28 lf-color-777">08:38</view>
@@ -50,7 +50,7 @@
 						</view> -->
 					</view>
 					<!-- 评论 -->
-					<view class="comment">
+					<!-- <view class="comment">
 						<view>评论：</view>
 						<view class="lf-m-t-20">
 							<text>等呵呵～：</text>
@@ -62,7 +62,7 @@
 							<text>等呵呵～：</text>
 							<text class="lf-color-333">俺是头大本驴</text>
 						</view>
-					</view>
+					</view> -->
 				</view>
 			</view>
 		</view>
@@ -81,14 +81,28 @@
 			return {
 				current: 0,
 				cover_images: ['https://picsum.photos/seed/picsum/200/300'],
-				show_more: false
+				show_more: false,
+				img_list: [
+					{url: 'https://picsum.photos/seed/picsum/200/300'},
+					{url: 'https://picsum.photos/seed/picsum/200/300'},
+					{url: 'https://picsum.photos/200'}
+				]
 			}
 		},
 		onLoad(){
 			
 		},
 		methods: {
-			
+			showImg(index) {
+				this.$u.throttle(() => {
+					let goods_banner = this.img_list || [];
+					let banners = goods_banner.map(item => item.url);
+					uni.previewImage({
+						urls: banners,
+						current: index
+					})
+				}, 200);
+			},
 		}
 	}
 </script>

pages/my/index.vue

@@ -12,9 +12,9 @@
 						<view class="head-text">资料审核中</view>
 					</view>
 				</view>
-				<view class="lf-bg-white span-btn1" @click="$url('/pages/my/bindPhone')">
+				<!-- <view class="lf-bg-white span-btn1" @click="$url('/pages/my/bindPhone')">
 					绑定手机号
-				</view>
+				</view> -->
 			</view>
 			<view class="lf-row-between" style="height: 98rpx;padding: 0 32rpx;">
 				<view class="lf-row-round lf-flex-column" @click="showRedthread()">
@@ -51,9 +51,8 @@
 				</view>
 			</view> -->
 		</view>
-		<view class="adv" @click="$url('/pages/my/getRedLine')">
+		<!-- <view class="adv" @click="$url('/pages/my/getRedLine')">
 			<view>
-				<!-- <image src="../../static/logo.png" mode="widthFix" class="adv-pic"></image> -->
 				<view class="logo-my">
 					<text class="lf-iconfont icon-dingzhi" style="font-size: 60rpx;color: white;"></text>
 				</view>
@@ -64,7 +63,7 @@
 				</view>
 				<view class="lf-color-777">促成您和心仪对象线下见面 <u-icon class="lf-m-l-20" name="arrow-right"></u-icon></view>
 			</view>
-		</view>
+		</view> -->
 		
 		<view class="classify lf-m-t-30">
 			<view class="card" v-for="(item,index) in list" :key="index" @click="$url(item.path)">

pages/wallMember/contactedMember.vue

@@ -13,7 +13,6 @@
 						<button class="agree-btn">同意</button>
 					</view>
 				</view>
-				
 			</view>
 		</view>
 		<view class="lf-color-222 lf-font-32 authen-title lf-p-l-20 lf-m-l-30">历史记录</view>
@@ -24,7 +23,6 @@
 					<view class="lf-line-1 lf-font-28 lf-color-222" style="font-weight: 500;">嘉宾xxx <text class="lf-iconfont icon-nan lf-m-l-10 lf-color-blue"></text></view>
 					<view class="lf-line-1 lf-font-24 lf-color-555">25岁·牛·180cm·本科·未婚</view>
 				</view>
-				
 			</view>
 		</view>
 		<!-- 加载更多 -->