From 91e751adcd5a649bca26d50d5a672250b6d75aeb Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Tue, 5 Sep 2023 13:50:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/index/index.vue | 54 ++++++----
pages/short_video/appSwiper/index.nvue | 2 +-
pages/short_video/nvueSwiper/index.nvue | 127 +++++++++++++-----------
3 files changed, 101 insertions(+), 82 deletions(-)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 0de3ecd..1ce2725 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,7 +5,8 @@
<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="['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 class="town_name" style="color:#000;">{{street}}</view>
</view>
@@ -22,8 +23,8 @@
</view>
- <zbpSwiper ref='list' :isSelectPlace="true" :town='street' :show='show' :location_Arr="locationArr" @kkchange='kkchange'
- @change='dchange'>
+ <zbpSwiper ref='list' :isSelectPlace="true" :town='street' :show='show' :location_Arr="locationArr"
+ @kkchange='kkchange' @change='dchange'>
</zbpSwiper>
@@ -168,9 +169,9 @@
this.Area()
//this.setPermissions()
-
-
+
+
// this.openTongZhi()
uni.$on('connectstatusChange', (connectstatus) => {
var connectstr = ''
@@ -184,7 +185,9 @@
})
},
-
+ onTabItemTap(e) {
+ console.log(e)
+ },
onReachBottom() {
if (this.status == 'nomore') return;
this.status = 'loading';
@@ -201,7 +204,7 @@
this.$bus.$on('value-updated', (newValue) => {
// 更新父组件的值
this.street = newValue.split(',')[0]
-
+
});
},
// #ifdef APP-PLUS
@@ -216,11 +219,11 @@
this.isFshow = false
this.show = true
} 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.show = false
} else if (scrollTop > 100) {
- this.backColor = 'rgba(252, 252, 252, 1.0)'
+ this.backColor = 'rgba(252, 252, 252, 1.0)'
this.isFshow = true
this.show = false
}
@@ -228,9 +231,9 @@
},
// #endif
- beforeDestroy () {
- // 销毁监听事件
- this.$bus.$off('value-updated')
+ beforeDestroy() {
+ // 销毁监听事件
+ this.$bus.$off('value-updated')
},
methods: {
@@ -267,7 +270,13 @@
this.backColor = 'rgba(252, 252, 252, 1.0)'
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) {
this.street = e.value[1].name
-
- this.$nextTick(() => {
- this.$bus.$emit('value-updated',e.value[1].name + ',' +e.value[1].code);
-
+
+ this.$nextTick(() => {
+ this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
+
})
this.showPicker = false
},
@@ -412,7 +421,7 @@
graphicLstApi(this.where).then(res => {
this.cateGoods.push(...res.data.list)
-
+
if (res.data.list.length < this.where.limit) this.status = 'nomore'
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 street_id = res.data.address_reference.town.id
this.street = res.data.address_component.street
-
+
this.$nextTick(() => {
- this.$bus.$emit('value-updated',this.street + ',' +street_id);
-
- })
+ this.$bus.$emit('value-updated', this.street + ',' +
+ street_id);
+
+ })
}).catch(err => {
uni.showToast({
title: err,
diff --git a/pages/short_video/appSwiper/index.nvue b/pages/short_video/appSwiper/index.nvue
index 802388f..2c9e80f 100644
--- a/pages/short_video/appSwiper/index.nvue
+++ b/pages/short_video/appSwiper/index.nvue
@@ -320,7 +320,7 @@
<view class="sys-head" :style="{height:statusBarHeight}"></view>
<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>
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 7103afe..4dac07e 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -15,9 +15,14 @@
<!-- 头部导航 -->
- <!-- <view v-if="!isUser" class="header" :style="{backgroundColor:'#Fff'}">
+ <view class="header" >
<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>
<view class="items" @click.stop="navTap(2)">
@@ -31,11 +36,12 @@
</view>
<view class="items" @click.stop="navTap(4)">
<text class="tName" :class="currentNav==4?'on':''">社区</text>
- </view>
-
- </view> -->
- <swiper v-show="currentNav !== 3&¤tNav != 4" :style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'"
- :vertical="true" @animationfinish="animationfinish" @change="change" :current="k" :indicator-dots="false">
+ </view> -->
+
+ </view>
+ <swiper v-show="currentNav !== 3&¤tNav != 4"
+ :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">
<view v-if="max > index">
@@ -249,7 +255,7 @@
</view>
</block>
</scroll-view>
-
+
<!-- <view class="video-list" v-if="currentNav === 3"
:style="'width: '+ windowWidth +'px; height: '+ windowHeight +'px;'">
@@ -317,7 +323,7 @@
} from '@/utils';
import comment from '@/components/comment.vue';
import mentioned from '@/components/mentioned.vue';
-
+
import {
HTTP_REQUEST_URL
} from '@/config/app';
@@ -343,12 +349,12 @@
comment,
mentioned,
authorize,
-
+
},
computed: configMap({
community_reply_status: 0
}, mapGetters(['isLogin', 'uid'])),
-
+
data() {
return {
isTriggered: false,
@@ -424,7 +430,7 @@
communityId: '',
Listcount: '',
loadMore: true,
- videoshow:true
+ videoshow: true
}
},
watch: {
@@ -742,49 +748,49 @@
}
},
get() {
-
+
let that = this
-
+
// 1.这里引入后端请求数据
- if(that.videoshow){
- deoList(this.videoID).then(res => {
- that.videoData([res.data])
- if (res.data.list.length < that.limit) {
- this.loadMore = false;
- }
- }).catch(err => {
- return uni.showToast({
- title: err,
- icon: 'none',
- duration: 2000
- });
- })
- this.videoshow=false
- }else{
- // videoList().then(res=>{
- // that.videoData(res.data.list);
- // })
- // console.log(that.userUid,that.videoID)
- videoList({
- page: that.page,
- limit: that.limit,
- id:this.videoID
- // is_star: that.isSatrt,
- // community_id: that.videoID
- }).then(res => {
- that.videoData(res.data.list)
- if (res.data.list.length < that.limit) {
- this.loadMore = false;
- }
- }).catch(err => {
- return uni.showToast({
- title: err,
- icon: 'none',
- duration: 2000
- });
- })
- }
-
+ if (that.videoshow) {
+ deoList(this.videoID).then(res => {
+ that.videoData([res.data])
+ if (res.data.list.length < that.limit) {
+ this.loadMore = false;
+ }
+ }).catch(err => {
+ return uni.showToast({
+ title: err,
+ icon: 'none',
+ duration: 2000
+ });
+ })
+ this.videoshow = false
+ } else {
+ // videoList().then(res=>{
+ // that.videoData(res.data.list);
+ // })
+ // console.log(that.userUid,that.videoID)
+ videoList({
+ page: that.page,
+ limit: that.limit,
+ id: this.videoID
+ // is_star: that.isSatrt,
+ // community_id: that.videoID
+ }).then(res => {
+ that.videoData(res.data.list)
+ if (res.data.list.length < that.limit) {
+ this.loadMore = false;
+ }
+ }).catch(err => {
+ return uni.showToast({
+ title: err,
+ icon: 'none',
+ duration: 2000
+ });
+ })
+ }
+
// that.isUser ?
// myVideoList(that.userUid, {
// page: that.page,
@@ -803,7 +809,7 @@
// duration: 2000
// });
// })
- //:
+ //:
// graphicLstApi({
// page: that.page,
// limit: that.limit,
@@ -1329,12 +1335,15 @@
display: flex;
justify-content: center;
- .icon-xiangzuo {
- margin-right: 40rpx;
- margin-left: 20rpx;
- font-size: 30rpx;
- color: #333;
- margin-top: 60rpx;
+ .xiangzuo {
+ width: 23rpx;
+ height: 42rpx;
+ margin-right: 40rpx;
+ margin-left: 20rpx;
+ image {
+ width: 100%;
+ height: 100%;
+ }
}
}