diff --git a/components/base/navbar.vue b/components/base/navbar.vue
index 909f33c..e774ef4 100644
--- a/components/base/navbar.vue
+++ b/components/base/navbar.vue
@@ -4,8 +4,14 @@
+
+
+
@@ -72,9 +78,18 @@
},
data() {
return {
+ length : getCurrentPages().length
};
},
methods : {
+ toHome(){
+ if(this.length != 1){
+ return
+ }
+ uni.reLaunch({
+ url: '/pages/index/index'
+ })
+ }
}
}
diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index e6e06ff..50c2a3a 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -51,15 +51,15 @@
};
},
mounted() {
- this.inter = setInterval(() => {
- console.log('$forceUpdate', this.isVedio);
- this.$forceUpdate()
- }, 500)
+ // this.inter = setInterval(() => {
+ // console.log('$forceUpdate', this.isVedio);
+ // this.$forceUpdate()
+ // }, 500)
- setTimeout(() => {
- clearInterval(this.inter)
- this.inter = null
- }, 20000)
+ // setTimeout(() => {
+ // clearInterval(this.inter)
+ // this.inter = null
+ // }, 20000)
},
beforeDestroy() {
if(this.inter){
@@ -71,7 +71,7 @@
if(index == this.select){
return
}
- uni.redirectTo({
+ uni.reLaunch({
url: item.pagePath
})
},
diff --git a/components/content/contentControls.vue b/components/content/contentControls.vue
index 2dcc150..8818b10 100644
--- a/components/content/contentControls.vue
+++ b/components/content/contentControls.vue
@@ -1,7 +1,7 @@
+ @click="$refs.confirmationPopup.open('bottom')">
举报
@@ -34,12 +34,51 @@
size="35rpx" name="thumb-down">
踩
+
+
+
+
+
+
+