徐强 / find_landlord · 提交

转到一个项目

作者 xuqiang
提交 e005432394b47d46ac6737883a71a12f1a373005 1 个父辈 ac051e04

提交

内嵌 并排对比
正在显示 2 个修改的文件 包含 23 行增加 和 22 行删除
@@ -11,11 +11,11 @@ @@ -11,11 +11,11 @@
11 <view class="userIcon"> 11 <view class="userIcon">
12 <image style="width: 130rpx;height: 130rpx;border-radius: 20rpx 0 20rpx 0;" :src="userInfo.avatar" mode=""></image> 12 <image style="width: 130rpx;height: 130rpx;border-radius: 20rpx 0 20rpx 0;" :src="userInfo.avatar" mode=""></image>
13 </view> 13 </view>
14 - <view class="userInfo" :class="{userActive:userInfo.group_id == '1'}"> 14 + <view class="userInfo" :class="{userActive:userInfo.hometown == 0}">
15 <view class="userStar"> 15 <view class="userStar">
16 <image v-for="(item,index) in userInfo.starList" style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_2@2x.png" mode=""></image> 16 <image v-for="(item,index) in userInfo.starList" style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_2@2x.png" mode=""></image>
17 <!-- <image style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_8.png" mode=""></image> --> 17 <!-- <image style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_8.png" mode=""></image> -->
18 - <view style="display: flex;align-items: center;"> 18 + <view style="display: flex;align-items: center;" v-if="userInfo.distance">
19 <image style="width: 15rpx;height: 20rpx;margin: 0 5rpx 0 20rpx;" src="../../static/image/position_1@2x.png" mode=""></image> 19 <image style="width: 15rpx;height: 20rpx;margin: 0 5rpx 0 20rpx;" src="../../static/image/position_1@2x.png" mode=""></image>
20 <text style="font-size: 20rpx;color: #fff;">{{userInfo.distance}}</text> 20 <text style="font-size: 20rpx;color: #fff;">{{userInfo.distance}}</text>
21 </view> 21 </view>
@@ -23,9 +23,9 @@ @@ -23,9 +23,9 @@
23 <view class="nameAddress"> 23 <view class="nameAddress">
24 <text style="font-size: 32rpx;">{{userInfo.nickname}}</text> 24 <text style="font-size: 32rpx;">{{userInfo.nickname}}</text>
25 <!-- <image v-if="userInfo.group_id == '2'" style="width: 30rpx;height: 34rpx;margin-left: 10rpx;"src="../../static/image/Group_481@2x.png" mode=""></image> 25 <!-- <image v-if="userInfo.group_id == '2'" style="width: 30rpx;height: 34rpx;margin-left: 10rpx;"src="../../static/image/Group_481@2x.png" mode=""></image>
26 - <image v-if="userInfo.group_id == '1'" style="width: 30rpx;height: 34rpx;margin-left: 10rpx;"src="../../static/image/Group_528@2x.png" mode=""></image> --> 26 + <image v-if="userInfo.hometown == 1" style="width: 30rpx;height: 34rpx;margin-left: 10rpx;"src="../../static/image/Group_528@2x.png" mode=""></image> -->
27 </view> 27 </view>
28 - <view class="followFansWrap" v-if="userInfo.group_id == '1'"> 28 + <view class="followFansWrap" v-if="userInfo.hometown == 0">
29 <view class="followItem"> 29 <view class="followItem">
30 <view class="followTxt"> 30 <view class="followTxt">
31 {{userInfo.follow_num}} 31 {{userInfo.follow_num}}
@@ -51,17 +51,17 @@ @@ -51,17 +51,17 @@
51 </view> 51 </view>
52 </view> 52 </view>
53 </view> 53 </view>
54 - <!-- <view class="userServiceDesc" v-if="userInfo.group_id == '1'"> 54 + <!-- <view class="userServiceDesc" v-if="userInfo.hometown == 1">
55 {{userInfo.bio}} 55 {{userInfo.bio}}
56 </view> --> 56 </view> -->
57 </view> 57 </view>
58 - <view class="followFansWrap" v-if="userInfo.group_id == '2'"> 58 + <view class="followFansWrap" v-if="userInfo.hometown == 1">
59 <view class="followItem"> 59 <view class="followItem">
60 <view class="followTxt"> 60 <view class="followTxt">
61 {{userInfo.follow_num}} 61 {{userInfo.follow_num}}
62 </view> 62 </view>
63 <view class="followTxt" style="padding-top: 10rpx;"> 63 <view class="followTxt" style="padding-top: 10rpx;">
64 - 关注 64 + 关注{{userInfo.hometown}}
65 </view> 65 </view>
66 </view> 66 </view>
67 <view class="followItem"> 67 <view class="followItem">
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
83 </view> 83 </view>
84 </view> 84 </view>
85 <!-- 服务信息 --> 85 <!-- 服务信息 -->
86 - <view class="serviceInfo" :style="{height:userInfo.group_id == '2' ? '120rpx' : '100rpx'}"> 86 + <view class="serviceInfo">
87 <view class="leftEmp"></view> 87 <view class="leftEmp"></view>
88 <view class="service"> 88 <view class="service">
89 <view class="serviceDesc"> 89 <view class="serviceDesc">
@@ -126,14 +126,14 @@ @@ -126,14 +126,14 @@
126 <view class="handleBtn" @click="showSendGift = true" v-if="plat == 'android' || (plat == 'ios' && switchTab == '1')"> 126 <view class="handleBtn" @click="showSendGift = true" v-if="plat == 'android' || (plat == 'ios' && switchTab == '1')">
127 送礼物 127 送礼物
128 </view> 128 </view>
129 - <view class="handleBtn" @click="checkUserToRoom(userInfo.id)" v-if="userInfo.group_id == '1'"> 129 + <view class="handleBtn" @click="checkUserToRoom(userInfo.id)" v-if="userInfo.hometown == 0">
130 发消息 130 发消息
131 </view> 131 </view>
132 - <view v-if="userInfo.make_switch == '1' && userInfo.group_id == '2' && !landInList" @click="halfVisible = true" class="handleBtn appoint"> 132 + <view v-if="userInfo.make_switch == '1' && userInfo.hometown == 1 && !loginUserInfo.landInList" @click="halfVisible = true" class="handleBtn appoint">
133 <image src="../../static/image/Iconly_Light_Time_Square@2x.png" mode=""></image> 133 <image src="../../static/image/Iconly_Light_Time_Square@2x.png" mode=""></image>
134 预约 134 预约
135 </view> 135 </view>
136 - <view v-if="(userInfo.make_switch == '0' || landInList) && userInfo.group_id == '2'" class="handleList"> 136 + <view v-if="(userInfo.make_switch == '0' || loginUserInfo.landInList) && userInfo.hometown == 1" class="handleList">
137 <image @click="checkUserToRoom(userInfo.id)" class="handleImg" src="../../static/image/xinxiduanxinsixinduihua-21@2x.png" mode=""></image> 137 <image @click="checkUserToRoom(userInfo.id)" class="handleImg" src="../../static/image/xinxiduanxinsixinduihua-21@2x.png" mode=""></image>
138 <image @click="phone(userInfo.phone != '' ? userInfo.phone : userInfo.mobile)" class="handleImg" src="../../static/image/Iconly_Bulk_Calling@2x.png" mode=""></image> 138 <image @click="phone(userInfo.phone != '' ? userInfo.phone : userInfo.mobile)" class="handleImg" src="../../static/image/Iconly_Bulk_Calling@2x.png" mode=""></image>
139 <image @click="openLocation" class="handleImg" src="../../static/image/Iconly_Bulk_Send@2x.png" mode=""></image> 139 <image @click="openLocation" class="handleImg" src="../../static/image/Iconly_Bulk_Send@2x.png" mode=""></image>
@@ -306,6 +306,7 @@ @@ -306,6 +306,7 @@
306 export default{ 306 export default{
307 data(){ 307 data(){
308 return{ 308 return{
  309 + loginUserInfo:{},
309 current_page:1, 310 current_page:1,
310 last_page:0, 311 last_page:0,
311 shareFlag:false, 312 shareFlag:false,
@@ -340,15 +341,7 @@ @@ -340,15 +341,7 @@
340 } 341 }
341 }, 342 },
342 computed:{ 343 computed:{
343 - ...mapState(["isLogin","isSDKReady"]),  
344 - landInList(){  
345 - for(var i = 0; i < this.loginUserInfo.order_user_ids.length; i++){  
346 - if(this.userInfo.id == this.loginUserInfo.order_user_ids[i]){  
347 - return true;  
348 - }  
349 - }  
350 - return false;  
351 - } 344 + ...mapState(["isLogin","isSDKReady"])
352 }, 345 },
353 components:{ 346 components:{
354 sendGift, 347 sendGift,
@@ -395,9 +388,18 @@ @@ -395,9 +388,18 @@
395 //获取用户信息 388 //获取用户信息
396 this.$request('/user/info').then((res)=>{ 389 this.$request('/user/info').then((res)=>{
397 this.loginUserInfo = res.data 390 this.loginUserInfo = res.data
  391 + for(var i = 0; i < this.loginUserInfo.order_user_ids.length; i++){
  392 + if(this.userInfo.id == this.loginUserInfo.order_user_ids[i]){
  393 + this.loginUserInfo.landInList = true
  394 + return
  395 + }
  396 + }
  397 + this.loginUserInfo.landInList = false
  398 + console.log('this.loginUserInfo.landInList',this.loginUserInfo)
398 }) 399 })
399 this.$request('/user/userInfo',this.param).then((res)=>{ 400 this.$request('/user/userInfo',this.param).then((res)=>{
400 this.userInfo = res.data 401 this.userInfo = res.data
  402 + console.log('this.userInfo',this.userInfo)
401 let starList = [] 403 let starList = []
402 if(res.data.star > 0){ 404 if(res.data.star > 0){
403 for(let i = 0; i < res.data.star; i++){ 405 for(let i = 0; i < res.data.star; i++){
@@ -621,7 +623,7 @@ @@ -621,7 +623,7 @@
621 .followItem .followTxt{text-align: center;width: 100%;} 623 .followItem .followTxt{text-align: center;width: 100%;}
622 624
623 /* 服务信息 */ 625 /* 服务信息 */
624 - .serviceInfo{display: flex;} 626 + .serviceInfo{display: flex;height: 120rpx;}
625 .serviceInfo .leftEmp{width: 160rpx;} 627 .serviceInfo .leftEmp{width: 160rpx;}
626 .serviceInfo .service{flex: 1;padding-left: 10rpx;} 628 .serviceInfo .service{flex: 1;padding-left: 10rpx;}
627 .service .serviceDesc{font-size: 26rpx;color: #fff;height: 75rpx;} 629 .service .serviceDesc{font-size: 26rpx;color: #fff;height: 75rpx;}
@@ -111,7 +111,6 @@ @@ -111,7 +111,6 @@
111 </view> 111 </view>
112 </view> --> 112 </view> -->
113 </view> 113 </view>
114 - <view class="rightEmp"></view>  
115 </view> 114 </view>
116 </view> 115 </view>
117 </view> 116 </view>