徐强 / find_landlord · 提交

转到一个项目

作者 xuqiang
提交 cee8f0ad64aa490a0468f134c3824e3a34eea484 1 个父辈 f2f5e8cd

提交

内嵌 并排对比
正在显示 8 个修改的文件 包含 19 行增加 和 25 行删除
... ... @@ -77,7 +77,6 @@
type:String,
default:''
}
},
data() {
return {
... ... @@ -186,7 +185,7 @@
chooseVideo(thisNum){
uni.chooseVideo({
count: thisNum,
sourceType: this.sourceType,
sourceType: ['camera', 'album'],
success: (res) => {
if(res.size/(1024*1024) > 100){
uni.showToast({
... ...
... ... @@ -410,7 +410,7 @@
background-color: #FFFFFF;
border-top-left-radius: 50rpx;
border-top-right-radius: 50rpx;
height: 500rpx;
height: 250px;
overflow: hidden;
}
.content-title {
... ...
... ... @@ -175,8 +175,6 @@
//文字消息
textMsg:'',
//消息列表
isHistoryLoading:false,
scrollAnimation:false,
scrollTop:0,
scrollToView:'',
... ... @@ -365,14 +363,13 @@
});
//这段代码很重要，不然每次加载历史数据都会跳到顶部
this.$nextTick(function() {
/* this.$nextTick(function() {
this.scrollToView = this.nextReqMessageID;//跳转上次的第一行信息位置
this.$nextTick(function() {
this.scrollAnimation = true;//恢复滚动动画
});
});
this.isHistoryLoading = false;
}); */
},
// 加载初始页面消息
getMsgList(){
... ...
... ... @@ -104,7 +104,7 @@
</view>
</view>
<view class="otherContent">
<u-waterfall v-model="list" ref="uWaterfall" v-if="showWaterFalls">
<u-waterfall v-model="list" ref="uWaterfall" v-if="showWaterFalls && list.length > 0">
<template v-slot:left="{ leftList }">
<view class="demo-warter" v-for="(item, index) in leftList" :key="index">
<!-- 微信小程序需要hx2.8.11版本才支持在template中引入其他组件，比如下方的u-lazy-load组件 -->
... ... @@ -221,7 +221,6 @@
this.getData()
},
onShow(){
console.log('是否刷新帖子',uni.getStorageSync('refreshFindWonderful'))
if(uni.getStorageSync('refreshFindWonderful')){
uni.setStorageSync('refreshFindWonderful',false)
this.param.page = 1
... ... @@ -239,7 +238,6 @@
this.list = []
this.showWaterFalls = false
this.getData()
console.log('refresh');
setTimeout(function () {
uni.stopPullDownRefresh();
}, 1000);
... ...
... ... @@ -24,11 +24,11 @@
</view>
<view class="empTopH"></view>
<!-- @change="changeImg" -->
<!-- :style="{height:swiperHeight+'px'}" -->
<!-- :style="{height:swiperHeight+'px'}" 990 1010-->
<swiper class="imgSwiper" @change="changeImg" :indicator-dots="articleInfo.images.length > 1 ? true : false" :indicator-active-color="'#35655f'" :indicator-color="'rgba(0,0,0,0.3)'" :circular="true" :duration="300">
<swiper-item v-for="(item,index) in articleInfo.images" :key="index" @click="closeAllAlert">
<view class="swiper-item" :style="{'align-items':swiperHeight >= 480 ? 'flex-start' : 'center'}">
<image :src="item" :mode="swiperHeight < 480 || swiperHeight > 481 ? 'widthFix' : 'aspectFill'" :class="{tempH:swiperHeight >= 480 && swiperHeight <= 481}"></image>
<image :src="item" mode="aspectFill" :class="{tempH:swiperHeight >= 480}"></image>
</view>
</swiper-item>
</swiper>
... ... @@ -71,7 +71,7 @@
<view class="commentList">
<view v-for="(item,index) in remarkList" :key="index">
<view class="commentItem">
<image @click="goMainPage(item.user.id)" :src="item.user.avatar" style="width: 93rpx;height: 93rpx;border-radius: 20rpx 0 20rpx 0;" mode=""></image>
<image @click="goMainPage(item.user.id)" :src="item.user.avatar" style="width: 93rpx;height: 93rpx;border-radius: 20rpx 0 20rpx 0;" mode="aspectFill"></image>
<view class="commentRight">
<view class="userNickName">
<text style="color: #969799;font-size: 28rpx;">{{item.user.nickname}}</text>
... ... @@ -95,7 +95,7 @@
</view>
<view v-if="item.showReply" class="commentSubItem" v-for="(subItem,subIndex) in item.article_reply" :key="subIndex">
<view style="display: flex;align-items: center;">
<image @click="goMainPage(subItem.user.id)" :src="subItem.user.avatar" style="width: 68rpx;height: 68rpx;border-radius: 20rpx 0 20rpx 0;" mode=""></image>
<image @click="goMainPage(subItem.user.id)" :src="subItem.user.avatar" style="width: 68rpx;height: 68rpx;border-radius: 20rpx 0 20rpx 0;" mode="aspectFill"></image>
</view>
<view class="commentRight">
<view class="userNickName">
... ... @@ -188,6 +188,8 @@
export default{
data(){
return{
imgWidth:0,
imgHeight:0,
swiperHeight:0,
keyboardHeight:0,
showPostImg:false,
... ... @@ -244,6 +246,7 @@
success: function(image) {
uni.getSystemInfo({
success: function (res) {
that.imgHeight = image.height
that.swiperHeight = res.windowWidth/image.width * image.height;
that.showPostImg = true
}
... ... @@ -261,8 +264,10 @@
success: function(image) {
uni.getSystemInfo({
success: function (res) {
console.log('111111111111',image.height,image.width)
that.imgWidth = image.width
that.imgHeight = image.height
that.swiperHeight = res.windowWidth/image.width * image.height;
console.log('轮播高度',that.swiperHeight)
}
});
}
... ...
... ... @@ -95,7 +95,7 @@
<scroll-view scroll-y class="commentList">
<div v-for="(item,index) in remarkList" :key="index" @click="closeAllAlert">
<div class="commentItem">
<image @click="goMainPage(item.user.id)" :src="item.user.avatar" style="width: 93rpx;height: 93rpx;border-radius: 20rpx 0 20rpx 0;" mode=""></image>
<image @click="goMainPage(item.user.id)" :src="item.user.avatar" style="width: 93rpx;height: 93rpx;border-radius: 20rpx 0 20rpx 0;" mode="aspectFill"></image>
<div class="commentRight">
<div class="userNickName">
<text style="color: #969799;font-size: 28rpx;">{{item.user.nickname}}</text>
... ... @@ -123,7 +123,7 @@
</div>
</div>
<div v-if="item.showReply" class="commentSubItem">
<image @click="goMainPage(subItem.user.id)" :src="subItem.user.avatar" style="width: 68rpx;height: 68rpx;border-radius: 20rpx 0 20rpx 0;" mode=""></image>
<image @click="goMainPage(subItem.user.id)" :src="subItem.user.avatar" style="width: 68rpx;height: 68rpx;border-radius: 20rpx 0 20rpx 0;" mode="aspectFill"></image>
<div class="commentRight">
<div class="userNickName">
<text style="color: #969799;font-size: 28rpx;">{{subItem.user.nickname}}</text>
... ...
... ... @@ -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 - 40" :titleHeight="30">
<view class="handleLine" slot="title">
<view class="line"></view>
</view>
... ... @@ -412,7 +412,7 @@
iconPath: '../../static/image/Group_673.png'
})
tempArr.forEach(item => {
if(index == 0 && this.versiondata == null && !uni.getStorageSync('landAlertFlag')){
if(index == 0 && this.versiondata && !uni.getStorageSync('landAlertFlag')){
item.showSlide = true
}else{
item.showSlide = false
... ...
... ... @@ -315,7 +315,6 @@
this.getData()
},
onShow(){
console.log('是否刷新帖子',uni.getStorageSync('refreshMy'))
if(uni.getStorageSync('refreshMy')){
uni.setStorageSync('refreshMy',false)
this.showList = false
... ... @@ -366,7 +365,6 @@
this.current_page = res.data.current_page
this.last_page = res.data.last_page
this.list = this.list.concat(res.data.data)
console.log('我赞过的帖子',this.list)
this.showList = true
})
}else if(this.otherTabIndex == 2){
... ... @@ -374,13 +372,11 @@
this.current_page = res.data.current_page
this.last_page = res.data.last_page
this.list = this.list.concat(res.data.data)
console.log('我收藏的帖子',this.list)
this.showList = true
})
}
},
scrolltolower(){
console.log('滚动到底部了')
if(this.current_page == this.last_page){
uni.showToast({
title:'无更多数据',
... ... @@ -440,7 +436,6 @@
if(this.isSDKReady){
let promise = this.tim.logout();
promise.then(res=> {
console.log('即时通讯退出成功',res)
this.$store.commit('reset')
}).catch(err=> {
console.log('即时通讯退出失败',err)
... ...