徐强 / find_landlord · 提交

转到一个项目

作者 xuqiang
提交 e005432394b47d46ac6737883a71a12f1a373005 1 个父辈 ac051e04

提交

内嵌 并排对比
正在显示 2 个修改的文件 包含 23 行增加 和 22 行删除
... ... @@ -11,11 +11,11 @@
<view class="userIcon">
<image style="width: 130rpx;height: 130rpx;border-radius: 20rpx 0 20rpx 0;" :src="userInfo.avatar" mode=""></image>
</view>
<view class="userInfo" :class="{userActive:userInfo.group_id == '1'}">
<view class="userInfo" :class="{userActive:userInfo.hometown == 0}">
<view class="userStar">
<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>
<!-- <image style="width: 25rpx;height: 24rpx;margin-right: 5rpx;" src="../../static/image/xingji_8.png" mode=""></image> -->
<view style="display: flex;align-items: center;">
<view style="display: flex;align-items: center;" v-if="userInfo.distance">
<image style="width: 15rpx;height: 20rpx;margin: 0 5rpx 0 20rpx;" src="../../static/image/position_1@2x.png" mode=""></image>
<text style="font-size: 20rpx;color: #fff;">{{userInfo.distance}}</text>
</view>
... ... @@ -23,9 +23,9 @@
<view class="nameAddress">
<text style="font-size: 32rpx;">{{userInfo.nickname}}</text>
<!-- <image v-if="userInfo.group_id == '2'" style="width: 30rpx;height: 34rpx;margin-left: 10rpx;"src="../../static/image/Group_481@2x.png" mode=""></image>
<image v-if="userInfo.group_id == '1'" style="width: 30rpx;height: 34rpx;margin-left: 10rpx;"src="../../static/image/Group_528@2x.png" mode=""></image> -->
<image v-if="userInfo.hometown == 1" style="width: 30rpx;height: 34rpx;margin-left: 10rpx;"src="../../static/image/Group_528@2x.png" mode=""></image> -->
</view>
<view class="followFansWrap" v-if="userInfo.group_id == '1'">
<view class="followFansWrap" v-if="userInfo.hometown == 0">
<view class="followItem">
<view class="followTxt">
{{userInfo.follow_num}}
... ... @@ -51,17 +51,17 @@
</view>
</view>
</view>
<!-- <view class="userServiceDesc" v-if="userInfo.group_id == '1'">
<!-- <view class="userServiceDesc" v-if="userInfo.hometown == 1">
{{userInfo.bio}}
</view> -->
</view>
<view class="followFansWrap" v-if="userInfo.group_id == '2'">
<view class="followFansWrap" v-if="userInfo.hometown == 1">
<view class="followItem">
<view class="followTxt">
{{userInfo.follow_num}}
</view>
<view class="followTxt" style="padding-top: 10rpx;">
关注
关注{{userInfo.hometown}}
</view>
</view>
<view class="followItem">
... ... @@ -83,7 +83,7 @@
</view>
</view>
<!-- 服务信息 -->
<view class="serviceInfo" :style="{height:userInfo.group_id == '2' ? '120rpx' : '100rpx'}">
<view class="serviceInfo">
<view class="leftEmp"></view>
<view class="service">
<view class="serviceDesc">
... ... @@ -126,14 +126,14 @@
<view class="handleBtn" @click="showSendGift = true" v-if="plat == 'android' || (plat == 'ios' && switchTab == '1')">
送礼物
</view>
<view class="handleBtn" @click="checkUserToRoom(userInfo.id)" v-if="userInfo.group_id == '1'">
<view class="handleBtn" @click="checkUserToRoom(userInfo.id)" v-if="userInfo.hometown == 0">
发消息
</view>
<view v-if="userInfo.make_switch == '1' && userInfo.group_id == '2' && !landInList" @click="halfVisible = true" class="handleBtn appoint">
<view v-if="userInfo.make_switch == '1' && userInfo.hometown == 1 && !loginUserInfo.landInList" @click="halfVisible = true" class="handleBtn appoint">
<image src="../../static/image/Iconly_Light_Time_Square@2x.png" mode=""></image>
预约
</view>
<view v-if="(userInfo.make_switch == '0' || landInList) && userInfo.group_id == '2'" class="handleList">
<view v-if="(userInfo.make_switch == '0' || loginUserInfo.landInList) && userInfo.hometown == 1" class="handleList">
<image @click="checkUserToRoom(userInfo.id)" class="handleImg" src="../../static/image/xinxiduanxinsixinduihua-21@2x.png" mode=""></image>
<image @click="phone(userInfo.phone != '' ? userInfo.phone : userInfo.mobile)" class="handleImg" src="../../static/image/Iconly_Bulk_Calling@2x.png" mode=""></image>
<image @click="openLocation" class="handleImg" src="../../static/image/Iconly_Bulk_Send@2x.png" mode=""></image>
... ... @@ -306,6 +306,7 @@
export default{
data(){
return{
loginUserInfo:{},
current_page:1,
last_page:0,
shareFlag:false,
... ... @@ -340,15 +341,7 @@
}
},
computed:{
...mapState(["isLogin","isSDKReady"]),
landInList(){
for(var i = 0; i < this.loginUserInfo.order_user_ids.length; i++){
if(this.userInfo.id == this.loginUserInfo.order_user_ids[i]){
return true;
}
}
return false;
}
...mapState(["isLogin","isSDKReady"])
},
components:{
sendGift,
... ... @@ -395,9 +388,18 @@
//获取用户信息
this.$request('/user/info').then((res)=>{
this.loginUserInfo = res.data
for(var i = 0; i < this.loginUserInfo.order_user_ids.length; i++){
if(this.userInfo.id == this.loginUserInfo.order_user_ids[i]){
this.loginUserInfo.landInList = true
return
}
}
this.loginUserInfo.landInList = false
console.log('this.loginUserInfo.landInList',this.loginUserInfo)
})
this.$request('/user/userInfo',this.param).then((res)=>{
this.userInfo = res.data
console.log('this.userInfo',this.userInfo)
let starList = []
if(res.data.star > 0){
for(let i = 0; i < res.data.star; i++){
... ... @@ -621,7 +623,7 @@
.followItem .followTxt{text-align: center;width: 100%;}
/* 服务信息 */
.serviceInfo{display: flex;}
.serviceInfo{display: flex;height: 120rpx;}
.serviceInfo .leftEmp{width: 160rpx;}
.serviceInfo .service{flex: 1;padding-left: 10rpx;}
.service .serviceDesc{font-size: 26rpx;color: #fff;height: 75rpx;}
... ...
... ... @@ -111,7 +111,6 @@
</view>
</view> -->
</view>
<view class="rightEmp"></view>
</view>
</view>
</view>
... ...