作者 xuqiang

提交

... ... @@ -22,7 +22,8 @@
"VideoPlayer" : {},
"OAuth" : {},
"Maps" : {},
"Statistic" : {}
"Statistic" : {},
"Share" : {}
},
/* 应用发布信息 */
"distribute" : {
... ... @@ -105,7 +106,7 @@
"share" : {
"weixin" : {
"appid" : "wx71e7bfe66057f7fb",
"UniversalLinks" : ""
"UniversalLinks" : "https://yuebang.brofirst.cn/ulink/"
}
},
"oauth" : {
... ...
... ... @@ -327,24 +327,23 @@
title:'加载中...'
})
// 历史消息列表
let conversationID = this.conversationActive.conversationID
let promise = this.tim.getMessageList({conversationID: conversationID, count: this.count});
promise.then((res)=> {
this.$store.commit('pushCurrentMessageList', res.data.messageList)
this.nextReqMessageID = res.data.nextReqMessageID // 用于续拉,分页续拉时需传入该字段。
this.isCompleted = res.data.isCompleted
this.scrollToView = res.data.messageList[res.data.messageList.length-1].ID
console.log(this.nextReqMessageID)
uni.hideLoading()
this.showRoom = true
});
let conversationID = this.conversationActive.conversationID
let promise = this.tim.getMessageList({conversationID: conversationID, count: this.count});
promise.then((res)=> {
console.log('88888888888888888888',res)
this.$store.commit('pushCurrentMessageList', res.data.messageList)
this.nextReqMessageID = res.data.nextReqMessageID // 用于续拉,分页续拉时需传入该字段。
this.isCompleted = res.data.isCompleted
this.scrollToView = res.data.messageList[res.data.messageList.length-1].ID
})
// 滚动到底部
this.$nextTick(function() {
//进入页面滚动到底部
this.scrollTop = 9999;
this.$nextTick(function() {
this.scrollAnimation = true;
uni.hideLoading()
this.showRoom = true
});
});
},
... ...
... ... @@ -527,6 +527,19 @@
}
}
}
.statusTxt{
width: 100rpx;
height: 48rpx;
background: rgba(0,53,46,0.50);
text-align: center;
line-height: 48rpx;
font-size: 20rpx;
color:#fff;
position:absolute;
top: 0;
right: 0;
border-radius: 0 $border-radius 0 0;
}
}
}
.playTabList{
... ...
<template>
<view>
<map id="around-food-map" @regionchange="regionchange" :style="{width: '750rpx',height:mapHeight + 'px'}" :scale="scale" @markertap="markertap" :latitude="latitude" :longitude="longitude" :markers="covers"></map>
<view :style="{width: '750rpx',height:mapHeight + 'rpx'}">
<map id="around-food-map" @regionchange="regionchange" :style="{width: '750rpx',height:mapHeight + 'rpx'}" :scale="scale" @markertap="markertap" :latitude="latitude" :longitude="longitude" :markers="covers"></map>
<!-- layer-style="d5f046428dcc29769f0256117754064b" -->
<!-- 查询地址区域 -->
<view class="searchWrap" :style="{top:statusBarHeight + 'rpx'}">
... ... @@ -30,7 +30,7 @@
<view class="positionWrap" @click="position" :style="{bottom:'400rpx'}">
<image style="width: 90rpx;height: 90rpx;" src="../../static/image/dingwei.png" mode=""></image>
</view>
<touch-slide v-if="landList.length > 0" style="background-color: #509d94;" :landIndex="0" :showSlide="landList[0].showSlide" @callback="callback" :top="mapHeight - platFormH" :bottom="mapHeight - (landList.length > 1 ? 40 : 10)" :titleHeight="30">
<!-- <touch-slide v-if="landList.length > 0" style="background-color: #509d94;" :landIndex="0" :showSlide="landList[0].showSlide" @callback="callback" :top="mapHeight - platFormH" :bottom="mapHeight - (landList.length > 1 ? 40 : 10)" :titleHeight="30">
<view class="handleLine" slot="title">
<view class="line"></view>
</view>
... ... @@ -58,7 +58,6 @@
<image @click="openLocation(landList[0])" class="handleImg" src="../../static/image/Group_205.png" mode=""></image>
</view>
</view>
<!-- 服务信息 -->
<view class="serviceInfo">
<view class="leftEmp"></view>
<view class="service">
... ... @@ -124,7 +123,6 @@
<image @click="openLocation(landList[1])" class="handleImg" src="../../static/image/Group_205.png" mode=""></image>
</view>
</view>
<!-- 服务信息 -->
<view class="serviceInfo">
<view class="leftEmp"></view>
<view class="service">
... ... @@ -226,7 +224,7 @@
<view class="rightEmp"></view>
</view>
</view>
</touch-slide>
</touch-slide> -->
<!-- 查询地址列表弹框区域 -->
<view class="searchLandWrap" v-if="showSearchLand" @click="showSearchLand = false">
... ... @@ -241,6 +239,22 @@
</view>
</scroll-view>
</view>
<!-- 成为地主弹框区域 -->
<view class="becomeLandWrap">
<view class="closeBtn">
<image style="width: 44rpx;height: 44rpx;" src="../../../static/image/guanbi-70_1@2x.png" mode=""></image>
</view>
<view class="becomeLand">
<view class="becomeLandImg">
<image style="width: 588rpx;height: 656rpx;border-top-left-radius: 30rpx;border-top-right-radius: 30rpx;" :src="becomeLandImg" mode="aspectFill"></image>
</view>
<view class="bottomBtnWrap">
<view class="bottomBtn" @click="agree">
<text style="text-align: center;line-height: 78rpx;color: #fff;font-size: 32rpx;">成为地主</text>
</view>
</view>
</view>
</view>
</view>
</template>
... ... @@ -257,7 +271,7 @@
return {
markerId:'',
scale:13,//地图缩放级别
mapHeight:650,
mapHeight:0,
latitude: 0,
longitude: 0,
city:'',
... ... @@ -287,10 +301,7 @@
//获取状态栏高度
uni.getSystemInfo({
success: (res) => {
this.mapHeight = res.screenHeight - res.statusBarHeight
// #ifdef APP-NVUE || MP-WEIXIN
this.mapHeight = this.mapHeight - 45
// #endif
this.mapHeight = res.windowHeight * 2 + res.statusBarHeight*2
this.statusBarHeight = res.statusBarHeight*2
}
})
... ... @@ -430,18 +441,6 @@
this.longitude = option.longitude
this.latitude = option.latitude
}
//获取系统信息
uni.getSystemInfo({
success: (res) => {
//#ifdef APP-PLUS
this.mapHeight = res.windowHeight*2 + res.statusBarHeight*2
//#endif
//#ifdef H5
this.mapHeight = res.windowHeight*2
//#endif
}
})
},
watch:{
conversationList(newVal,oldVal){
... ... @@ -656,6 +655,13 @@
},
search(){
uni.hideKeyboard()
if(this.keywords.indexOf('河鲜') != -1){
uni.showToast({
title:'暂无结果',
icon:'none'
})
return
}
if(this.keywords == ''){
uni.showToast({
title:'请输入搜索地址',
... ...
... ... @@ -9,10 +9,6 @@
},
onShow() {
if(!this.isLogin || !this.isSDKReady){
uni.showLoading({
title:'正在重连即时通讯,请稍后...',
})
let userID = this.userinfo.id.toString()
let userSig = this.userinfo.user_sign
let userInfo = {
... ... @@ -41,6 +37,9 @@
})
}).catch((err) => {
// 登录失败的相关信息
uni.switchTab({
url:'/pages/index/index'
})
console.warn('腾讯云即时通讯登录报错', err);
});
}else{
... ...
... ... @@ -115,7 +115,69 @@
</view>
<scroll-view scroll-y @scrolltolower="scrolltolower">
<view class="otherContent">
<waterfallsFlow v-if="showList" :list="list" :listType="listType" @wapper-lick="wapperLick"></waterfallsFlow>
<u-waterfall v-model="list" ref="uWaterfall" v-if="showList">
<template v-slot:left="{ leftList }">
<view class="demo-warter" v-for="(item, index) in leftList" :key="index">
<!-- 微信小程序需要hx2.8.11版本才支持在template中引入其他组件,比如下方的u-lazy-load组件 -->
<u-lazy-load @click="wapperLick(item)" threshold="-450" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
<view class="userInfo" :style="{height: listType != 'mainAct' ? '90rpx' : '60rpx'}">
<view class="userDesc">
{{item.title}}
</view>
<view class="userIconLike" v-if="listType != 'mainAct'">
<view class="userIcon">
<image :src="item.user.avatar" mode=""></image>
{{item.user.nickname}}
</view>
<view class="likeNum">
<image src="../../static/image/dianzan2.png" mode=""></image>
{{item.like_num}}
</view>
</view>
</view>
<view class="statusTxt" v-if="listType == 'findPlay' && item.switch == '1'">
精选
</view>
<view class="statusTxt" v-if="listType == 'mainAct'">
{{item.state_text}}
</view>
<!-- "check_status": 审核状态:0=审核中,1=已通过,2=未通过 -->
<view class="statusTxt" v-if="listType == 'myStory' && item.check_status != '1'">
{{item.check_status == '0' ? '审核中' : '未通过'}}
</view>
</view>
</template>
<template v-slot:right="{ rightList }">
<view class="demo-warter" v-for="(item, index) in rightList" :key="index">
<u-lazy-load @click="wapperLick(item)" threshold="-450" border-radius="10" :image="item.image" :index="index"></u-lazy-load>
<view class="userInfo" :style="{height: listType != 'mainAct' ? '90rpx' : '60rpx'}">
<view class="userDesc">
{{item.title}}
</view>
<view class="userIconLike" v-if="listType != 'mainAct'">
<view class="userIcon">
<image :src="item.user.avatar" mode=""></image>
{{item.user.nickname}}
</view>
<view class="likeNum">
<image src="../../static/image/dianzan2.png" mode=""></image>
{{item.like_num}}
</view>
</view>
</view>
<view class="statusTxt" v-if="listType == 'findPlay' && item.switch == '1'">
精选
</view>
<view class="statusTxt" v-if="listType == 'mainAct'">
{{item.state_text}}
</view>
<!-- "check_status": 审核状态:0=审核中,1=已通过,2=未通过 -->
<view class="statusTxt" v-if="listType == 'myStory' && item.check_status != '1'">
{{item.check_status == '0' ? '审核中' : '未通过'}}
</view>
</view>
</template>
</u-waterfall>
</view>
</scroll-view>
</view>
... ... @@ -251,6 +313,7 @@
...mapState(["isLogin","userinfo","isSDKReady"])
},
onShow(){
this.showList = false
this.current_page = 1
this.last_page = 0
this.param.page = 1
... ... @@ -448,6 +511,7 @@
</script>
<style lang="scss" scoped>
$border-radius: 10px;
.myWrap{
/* 导航栏区域 */
.navBarWrap{height: 88rpx;padding: 0 42rpx;display: flex;align-items: center;justify-content: space-between;
... ... @@ -475,7 +539,63 @@
.otherTabList .otherTabItem{flex: 1;text-align: center;line-height: 88rpx;color: #969799;font-size: 28rpx;font-weight: 600;}
.otherTabItem.active{color: #35655f;}
.otherTabList .otherTabLine{position: absolute;width: 48rpx;height: 5rpx;background: #35655f;bottom: 18rpx;transition: 0.5s;}
.otherContent{height: calc(100vh - 88rpx - 473rpx - 88rpx);padding: 0 20rpx;}
.otherContent{height: calc(100vh - 88rpx - 473rpx - 88rpx);padding: 0 20rpx;
.demo-warter{
border-radius: 8px;
margin: 5px;
background-color: #ffffff;
position: relative;
.userInfo{
background: linear-gradient(135deg,rgba(0,0,0,0.00), rgba(0,0,0,0.60));
border-radius: 0 0 $border-radius $border-radius;
position:absolute;
bottom: 0;
width: 100%;
.userDesc{
font-size: 26rpx;
color: #fff;
padding: 0 24rpx;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp:1;
-webkit-box-orient:vertical;
height: 45rpx;
line-height: 45rpx;
}
.userIconLike{
display: flex;
justify-content: space-between;
font-size: 20rpx;
color: rgba(255,255,255,0.80);
padding: 0 24rpx;
.userIcon{
display: flex;
align-items: center;
image{width: 38rpx;height: 38rpx;margin-right: 10rpx;border-radius: 100%;}
}
.likeNum{
display: flex;
align-items: center;
image{width: 28rpx;height: 28rpx;margin-right: 5rpx;}
}
}
}
.statusTxt{
width: 100rpx;
height: 48rpx;
background: rgba(0,53,46,0.50);
text-align: center;
line-height: 48rpx;
font-size: 20rpx;
color:#fff;
position:absolute;
top: 0;
right: 0;
border-radius: 0 $border-radius 0 0;
}
}
}
/* 地主信息区域 */
.landItem{padding: 0 32rpx 0 32rpx;}
.landInfo{height: 160rpx;display: flex;align-items: center;}
... ...