zhengkaixin 3 лет назад
Родитель
Сommit
627c1bb69b
4 измененных файлов с 26 добавлено и 41 удалено
  1. 2 2
      pages/friend/index.vue
  2. 21 20
      pages/friend/personal.vue
  3. 2 10
      pages/index/index.vue
  4. 1 9
      pages/news/index.vue

+ 2 - 2
pages/friend/index.vue

@@ -128,13 +128,13 @@
 		</u-popup>
 
 		<view class="friendList">
-			<view class="friendList-item" v-for="(item ,index) in friendList" :key="item.id" @click="gotoUrl('pages/user/index?id='+item.id)">
+			<view class="friendList-item" v-for="(item ,index) in friendList" :key="item.id" @click="gotoUrl('pages/friend/personal?id='+item.id)">
 				<u-image class="friendList-img" :src="item.faceImage" height="160" width="160" border-radius="10">
 				</u-image>
 				<view class="friendList-text">
 					<view class="friendList-name">
 						<span>{{item.realName}}</span>
-						<u-icon v-if="item.gender" custom-prefix="custom-icon" name="women-line" color="#1677FF"></u-icon>
+						<u-icon v-if="item.gender" custom-prefix="custom-icon" name="women-line" color="#FF695B"></u-icon>
 						<u-icon v-else custom-prefix="custom-icon" name="men-line" color="#1677FF"></u-icon>
 					</view>
 					<view class="friendList-info">

+ 21 - 20
pages/friend/personal.vue

@@ -156,27 +156,28 @@
 				
 			
 			</view>
-			<view class="personal-btn"  v-if="!islogin">
-				<u-button type="error" @click="gotoUrl('pagesA/pages/login/index')" shape="circle" :custom-style="customStyle">
-					<span>注册 / 登录</span>
-				</u-button>
-				
+			<template v-if="detail.realName">
+				<view class="personal-btn"  v-if="!islogin">
+					<u-button type="error" @click="gotoUrl('pagesA/pages/login/index')" shape="circle" :custom-style="customStyle">
+						<span>注册 / 登录</span>
+					</u-button>
+					
+				</view>
+				<view class="personal-btn"  v-if="islogin">
+					<u-button type="error"  v-if="isedit" @click="gotoUrl('pages/user/edit')" shape="circle" :custom-style="customStyle">
+						<span>编辑</span>
+						<u-icon custom-prefix="custom-icon" name="edit-2-line"></u-icon>
+					</u-button>
+					
+					
+					<u-button type="error"  v-if="!isedit"  @click="likeBtn" shape="circle" :custom-style="customStyle">
+						<span>{{isLike?'已赞':'赞Ta'}}</span>
+						<u-icon custom-prefix="custom-icon" name="thumb-up-line"></u-icon>
+					</u-button>
+					
+				</view>
+			</template>
 			
-				
-			</view>
-			<view class="personal-btn"  v-if="islogin">
-				<u-button type="error"  v-if="isedit" @click="gotoUrl('pages/user/edit')" shape="circle" :custom-style="customStyle">
-					<span>编辑</span>
-					<u-icon custom-prefix="custom-icon" name="edit-2-line"></u-icon>
-				</u-button>
-				
-				
-				<u-button type="error"  v-if="!isedit"  @click="likeBtn" shape="circle" :custom-style="customStyle">
-					<span>{{isLike?'已赞':'赞Ta'}}</span>
-					<u-icon custom-prefix="custom-icon" name="thumb-up-line"></u-icon>
-				</u-button>
-				
-			</view>
 			
 			 
 		</view>

+ 2 - 10
pages/index/index.vue

@@ -26,7 +26,7 @@
 				<view class="homeUser-text">
 					<view class="homeUser-name">
 						<span>{{item.realName}}</span>
-						<u-icon custom-prefix="custom-icon" :name="item?'women-line':'men-line'" color="#FF695B"></u-icon>
+						<u-icon custom-prefix="custom-icon" :name="(item.gender?'women-line':'men-line')" :color="item.gender?'#FF695B':'#1677FF'"></u-icon>
 					</view>
 					<view class="homeUser-info">
 						{{item.age}}岁 · {{item.height}}cm {{item.weight?'· '+item.weight+'kg':''}}
@@ -61,15 +61,7 @@
 					name: '最热'
 				}],
 				current: 0,
-				wrapList: [{
-						image: 'http://rccs.oss-cn-hangzhou.aliyuncs.com/jp-xqjy/banner.png',
-					},
-					{
-						image: 'http://rccs.oss-cn-hangzhou.aliyuncs.com/jp-xqjy/banner.png',
-					},
-					{
-						image: 'http://rccs.oss-cn-hangzhou.aliyuncs.com/jp-xqjy/banner.png',
-					}
+				wrapList: [
 				],
 			}
 		},

+ 1 - 9
pages/news/index.vue

@@ -53,15 +53,7 @@
 					name: '问题解答'
 				}],
 				current: 0,
-				wrapList: [{
-						image: 'http://rccs.oss-cn-hangzhou.aliyuncs.com/jp-xqjy/banner.png',
-					},
-					{
-						image: 'http://rccs.oss-cn-hangzhou.aliyuncs.com/jp-xqjy/banner.png',
-					},
-					{
-						image: 'http://rccs.oss-cn-hangzhou.aliyuncs.com/jp-xqjy/banner.png',
-					}
+				wrapList: [
 				],
 			}
 		},