代码提交
This commit is contained in:
parent
8ac4784129
commit
91e751adcd
@ -5,7 +5,8 @@
|
|||||||
<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
|
<view class="site-box flex_a_c_j_sb" :style="{'background-color':backColor}">
|
||||||
|
|
||||||
<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="selectLocation">
|
<view :class="['place_wrapper','flex_a_c',isFshow?'sitebox':'']" @click="selectLocation">
|
||||||
<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']" style="color:#000;margin-left: 20rpx;">
|
<view :class="['iconfont','icon-weizhi',isFshow?'sitebox':'']"
|
||||||
|
style="color:#000;margin-left: 20rpx;">
|
||||||
</view>
|
</view>
|
||||||
<view class="town_name" style="color:#000;">{{street}}</view>
|
<view class="town_name" style="color:#000;">{{street}}</view>
|
||||||
</view>
|
</view>
|
||||||
@ -22,8 +23,8 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
<zbpSwiper ref='list' :isSelectPlace="true" :town='street' :show='show' :location_Arr="locationArr" @kkchange='kkchange'
|
<zbpSwiper ref='list' :isSelectPlace="true" :town='street' :show='show' :location_Arr="locationArr"
|
||||||
@change='dchange'>
|
@kkchange='kkchange' @change='dchange'>
|
||||||
</zbpSwiper>
|
</zbpSwiper>
|
||||||
|
|
||||||
|
|
||||||
@ -168,9 +169,9 @@
|
|||||||
this.Area()
|
this.Area()
|
||||||
//this.setPermissions()
|
//this.setPermissions()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// this.openTongZhi()
|
// this.openTongZhi()
|
||||||
uni.$on('connectstatusChange', (connectstatus) => {
|
uni.$on('connectstatusChange', (connectstatus) => {
|
||||||
var connectstr = ''
|
var connectstr = ''
|
||||||
@ -184,7 +185,9 @@
|
|||||||
})
|
})
|
||||||
|
|
||||||
},
|
},
|
||||||
|
onTabItemTap(e) {
|
||||||
|
console.log(e)
|
||||||
|
},
|
||||||
onReachBottom() {
|
onReachBottom() {
|
||||||
if (this.status == 'nomore') return;
|
if (this.status == 'nomore') return;
|
||||||
this.status = 'loading';
|
this.status = 'loading';
|
||||||
@ -201,7 +204,7 @@
|
|||||||
this.$bus.$on('value-updated', (newValue) => {
|
this.$bus.$on('value-updated', (newValue) => {
|
||||||
// 更新父组件的值
|
// 更新父组件的值
|
||||||
this.street = newValue.split(',')[0]
|
this.street = newValue.split(',')[0]
|
||||||
|
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
// #ifdef APP-PLUS
|
// #ifdef APP-PLUS
|
||||||
@ -216,11 +219,11 @@
|
|||||||
this.isFshow = false
|
this.isFshow = false
|
||||||
this.show = true
|
this.show = true
|
||||||
} else if (20 < scrollTop && scrollTop <= 100) {
|
} else if (20 < scrollTop && scrollTop <= 100) {
|
||||||
this.backColor = 'rgba(255, 255, 255, 0.5)'
|
this.backColor = 'rgba(255, 255, 255, 0.5)'
|
||||||
this.isFshow = true
|
this.isFshow = true
|
||||||
this.show = false
|
this.show = false
|
||||||
} else if (scrollTop > 100) {
|
} else if (scrollTop > 100) {
|
||||||
this.backColor = 'rgba(252, 252, 252, 1.0)'
|
this.backColor = 'rgba(252, 252, 252, 1.0)'
|
||||||
this.isFshow = true
|
this.isFshow = true
|
||||||
this.show = false
|
this.show = false
|
||||||
}
|
}
|
||||||
@ -228,9 +231,9 @@
|
|||||||
|
|
||||||
},
|
},
|
||||||
// #endif
|
// #endif
|
||||||
beforeDestroy () {
|
beforeDestroy() {
|
||||||
// 销毁监听事件
|
// 销毁监听事件
|
||||||
this.$bus.$off('value-updated')
|
this.$bus.$off('value-updated')
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
||||||
@ -267,7 +270,13 @@
|
|||||||
this.backColor = 'rgba(252, 252, 252, 1.0)'
|
this.backColor = 'rgba(252, 252, 252, 1.0)'
|
||||||
this.isFshow = true
|
this.isFshow = true
|
||||||
|
|
||||||
|
uni.setTabBarItem({
|
||||||
|
index: 0,
|
||||||
|
text: '',
|
||||||
|
id:'1',
|
||||||
|
iconPath: '/static/tabbar_icon/top.png',
|
||||||
|
selectedIconPath: '/static/tabbar_icon/top.png'
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -332,10 +341,10 @@
|
|||||||
confirm(e) {
|
confirm(e) {
|
||||||
|
|
||||||
this.street = e.value[1].name
|
this.street = e.value[1].name
|
||||||
|
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code);
|
this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
|
||||||
|
|
||||||
})
|
})
|
||||||
this.showPicker = false
|
this.showPicker = false
|
||||||
},
|
},
|
||||||
@ -412,7 +421,7 @@
|
|||||||
|
|
||||||
graphicLstApi(this.where).then(res => {
|
graphicLstApi(this.where).then(res => {
|
||||||
this.cateGoods.push(...res.data.list)
|
this.cateGoods.push(...res.data.list)
|
||||||
|
|
||||||
if (res.data.list.length < this.where.limit) this.status = 'nomore'
|
if (res.data.list.length < this.where.limit) this.status = 'nomore'
|
||||||
|
|
||||||
if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
|
if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
|
||||||
@ -476,11 +485,12 @@
|
|||||||
let town = res.data.address_reference.town.title
|
let town = res.data.address_reference.town.title
|
||||||
let street_id = res.data.address_reference.town.id
|
let street_id = res.data.address_reference.town.id
|
||||||
this.street = res.data.address_component.street
|
this.street = res.data.address_component.street
|
||||||
|
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
this.$bus.$emit('value-updated',this.street + ',' +street_id);
|
this.$bus.$emit('value-updated', this.street + ',' +
|
||||||
|
street_id);
|
||||||
})
|
|
||||||
|
})
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: err,
|
title: err,
|
||||||
|
@ -320,7 +320,7 @@
|
|||||||
<view class="sys-head" :style="{height:statusBarHeight}"></view>
|
<view class="sys-head" :style="{height:statusBarHeight}"></view>
|
||||||
<view class="tool-bar" @click='goBack()'>
|
<view class="tool-bar" @click='goBack()'>
|
||||||
|
|
||||||
<image class="icon-xiangzuo" src="../static/img/index/icon-back.png"></image>
|
<image class="icon-xiangzuo" src="@/static/image/icon-back.png"></image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -15,9 +15,14 @@
|
|||||||
<!-- 头部导航 -->
|
<!-- 头部导航 -->
|
||||||
|
|
||||||
|
|
||||||
<!-- <view v-if="!isUser" class="header" :style="{backgroundColor:'#Fff'}">
|
|
||||||
|
|
||||||
|
<view class="header" >
|
||||||
<view class="tool-bar">
|
<view class="tool-bar">
|
||||||
|
<view class='xiangzuo' @tap='goBack'>
|
||||||
|
<image src="@/static/images/icon-back.png" mode="aspectFit"></image>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
<!-- <view class="tool-bar">
|
||||||
<view class='iconfont icon-xiangzuo' @tap='goBack'></view>
|
<view class='iconfont icon-xiangzuo' @tap='goBack'></view>
|
||||||
</view>
|
</view>
|
||||||
<view class="items" @click.stop="navTap(2)">
|
<view class="items" @click.stop="navTap(2)">
|
||||||
@ -31,11 +36,12 @@
|
|||||||
</view>
|
</view>
|
||||||
<view class="items" @click.stop="navTap(4)">
|
<view class="items" @click.stop="navTap(4)">
|
||||||
<text class="tName" :class="currentNav==4?'on':''">社区</text>
|
<text class="tName" :class="currentNav==4?'on':''">社区</text>
|
||||||
</view>
|
</view> -->
|
||||||
|
|
||||||
</view> -->
|
</view>
|
||||||
<swiper v-show="currentNav !== 3&¤tNav != 4" :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'"
|
<swiper v-show="currentNav !== 3&¤tNav != 4"
|
||||||
:vertical="true" @animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false">
|
:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'" :vertical="true"
|
||||||
|
@animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false">
|
||||||
<swiper-item v-for="(list,index) in dataList">
|
<swiper-item v-for="(list,index) in dataList">
|
||||||
<view v-if="max > index">
|
<view v-if="max > index">
|
||||||
|
|
||||||
@ -249,7 +255,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</block>
|
</block>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
|
|
||||||
<!-- <view class="video-list" v-if="currentNav === 3"
|
<!-- <view class="video-list" v-if="currentNav === 3"
|
||||||
:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'">
|
:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'">
|
||||||
|
|
||||||
@ -317,7 +323,7 @@
|
|||||||
} from '@/utils';
|
} from '@/utils';
|
||||||
import comment from '@/components/comment.vue';
|
import comment from '@/components/comment.vue';
|
||||||
import mentioned from '@/components/mentioned.vue';
|
import mentioned from '@/components/mentioned.vue';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
HTTP_REQUEST_URL
|
HTTP_REQUEST_URL
|
||||||
} from '@/config/app';
|
} from '@/config/app';
|
||||||
@ -343,12 +349,12 @@
|
|||||||
comment,
|
comment,
|
||||||
mentioned,
|
mentioned,
|
||||||
authorize,
|
authorize,
|
||||||
|
|
||||||
},
|
},
|
||||||
computed: configMap({
|
computed: configMap({
|
||||||
community_reply_status: 0
|
community_reply_status: 0
|
||||||
}, mapGetters(['isLogin', 'uid'])),
|
}, mapGetters(['isLogin', 'uid'])),
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
isTriggered: false,
|
isTriggered: false,
|
||||||
@ -424,7 +430,7 @@
|
|||||||
communityId: '',
|
communityId: '',
|
||||||
Listcount: '',
|
Listcount: '',
|
||||||
loadMore: true,
|
loadMore: true,
|
||||||
videoshow:true
|
videoshow: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
@ -742,49 +748,49 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
get() {
|
get() {
|
||||||
|
|
||||||
let that = this
|
let that = this
|
||||||
|
|
||||||
// 1.这里引入后端请求数据
|
// 1.这里引入后端请求数据
|
||||||
if(that.videoshow){
|
if (that.videoshow) {
|
||||||
deoList(this.videoID).then(res => {
|
deoList(this.videoID).then(res => {
|
||||||
that.videoData([res.data])
|
that.videoData([res.data])
|
||||||
if (res.data.list.length < that.limit) {
|
if (res.data.list.length < that.limit) {
|
||||||
this.loadMore = false;
|
this.loadMore = false;
|
||||||
}
|
}
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
return uni.showToast({
|
return uni.showToast({
|
||||||
title: err,
|
title: err,
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
duration: 2000
|
duration: 2000
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
this.videoshow=false
|
this.videoshow = false
|
||||||
}else{
|
} else {
|
||||||
// videoList().then(res=>{
|
// videoList().then(res=>{
|
||||||
// that.videoData(res.data.list);
|
// that.videoData(res.data.list);
|
||||||
// })
|
// })
|
||||||
// console.log(that.userUid,that.videoID)
|
// console.log(that.userUid,that.videoID)
|
||||||
videoList({
|
videoList({
|
||||||
page: that.page,
|
page: that.page,
|
||||||
limit: that.limit,
|
limit: that.limit,
|
||||||
id:this.videoID
|
id: this.videoID
|
||||||
// is_star: that.isSatrt,
|
// is_star: that.isSatrt,
|
||||||
// community_id: that.videoID
|
// community_id: that.videoID
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
that.videoData(res.data.list)
|
that.videoData(res.data.list)
|
||||||
if (res.data.list.length < that.limit) {
|
if (res.data.list.length < that.limit) {
|
||||||
this.loadMore = false;
|
this.loadMore = false;
|
||||||
}
|
}
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
return uni.showToast({
|
return uni.showToast({
|
||||||
title: err,
|
title: err,
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
duration: 2000
|
duration: 2000
|
||||||
});
|
});
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// that.isUser ?
|
// that.isUser ?
|
||||||
// myVideoList(that.userUid, {
|
// myVideoList(that.userUid, {
|
||||||
// page: that.page,
|
// page: that.page,
|
||||||
@ -803,7 +809,7 @@
|
|||||||
// duration: 2000
|
// duration: 2000
|
||||||
// });
|
// });
|
||||||
// })
|
// })
|
||||||
//:
|
//:
|
||||||
// graphicLstApi({
|
// graphicLstApi({
|
||||||
// page: that.page,
|
// page: that.page,
|
||||||
// limit: that.limit,
|
// limit: that.limit,
|
||||||
@ -1329,12 +1335,15 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
|
|
||||||
.icon-xiangzuo {
|
.xiangzuo {
|
||||||
margin-right: 40rpx;
|
width: 23rpx;
|
||||||
margin-left: 20rpx;
|
height: 42rpx;
|
||||||
font-size: 30rpx;
|
margin-right: 40rpx;
|
||||||
color: #333;
|
margin-left: 20rpx;
|
||||||
margin-top: 60rpx;
|
image {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user