Showing
4 changed files
with
41 additions
and
1 deletions
| @@ -262,7 +262,7 @@ | @@ -262,7 +262,7 @@ | ||
| 262 | this.showBind = false; | 262 | this.showBind = false; |
| 263 | this.isJudgeBindBtn = false; | 263 | this.isJudgeBindBtn = false; |
| 264 | uni.reLaunch({ | 264 | uni.reLaunch({ |
| 265 | - url: '/publicLoginSubPage/public/login' | 265 | + url: '/login-subpackage/public/login' |
| 266 | }); | 266 | }); |
| 267 | this.emptyUserInfo(); | 267 | this.emptyUserInfo(); |
| 268 | } else { | 268 | } else { |
| @@ -151,6 +151,12 @@ import {mapActions } from 'vuex' | @@ -151,6 +151,12 @@ import {mapActions } from 'vuex' | ||
| 151 | }, | 151 | }, |
| 152 | //下拉刷新 | 152 | //下拉刷新 |
| 153 | downCallback() { | 153 | downCallback() { |
| 154 | + if (getApp().getBindNot()) { | ||
| 155 | + setTimeout(()=>{ | ||
| 156 | + this.mescroll.endByPage(0,0) | ||
| 157 | + },200) | ||
| 158 | + return | ||
| 159 | + } | ||
| 154 | this.list.length = 0; | 160 | this.list.length = 0; |
| 155 | this.page.num = 1; | 161 | this.page.num = 1; |
| 156 | this.resetQuery(); | 162 | this.resetQuery(); |
| @@ -158,6 +164,13 @@ import {mapActions } from 'vuex' | @@ -158,6 +164,13 @@ import {mapActions } from 'vuex' | ||
| 158 | }, | 164 | }, |
| 159 | //上拉加载 | 165 | //上拉加载 |
| 160 | upCallback() { | 166 | upCallback() { |
| 167 | + | ||
| 168 | + if (getApp().getBindNot()) { | ||
| 169 | + setTimeout(()=>{ | ||
| 170 | + this.mescroll.endByPage(0,0) | ||
| 171 | + },200) | ||
| 172 | + return | ||
| 173 | + } | ||
| 161 | const condition = Object.values(this.conditions) | 174 | const condition = Object.values(this.conditions) |
| 162 | if (condition.length === 0) { | 175 | if (condition.length === 0) { |
| 163 | this.page.num += 1; | 176 | this.page.num += 1; |
| @@ -117,12 +117,24 @@ | @@ -117,12 +117,24 @@ | ||
| 117 | this.close() | 117 | this.close() |
| 118 | }, | 118 | }, |
| 119 | downCallback() { | 119 | downCallback() { |
| 120 | + if (getApp().getBindNot()) { | ||
| 121 | + setTimeout(()=>{ | ||
| 122 | + this.mescroll.endByPage(0,0) | ||
| 123 | + },200) | ||
| 124 | + return | ||
| 125 | + } | ||
| 120 | this.list = []; | 126 | this.list = []; |
| 121 | this.page.num = 1; | 127 | this.page.num = 1; |
| 122 | this.loadData(this.page.num); | 128 | this.loadData(this.page.num); |
| 123 | this.resetQuery(); | 129 | this.resetQuery(); |
| 124 | }, | 130 | }, |
| 125 | upCallback() { | 131 | upCallback() { |
| 132 | + if (getApp().getBindNot()) { | ||
| 133 | + setTimeout(()=>{ | ||
| 134 | + this.mescroll.endByPage(0,0) | ||
| 135 | + },200) | ||
| 136 | + return | ||
| 137 | + } | ||
| 126 | const condition = Object.values(this.conditions) | 138 | const condition = Object.values(this.conditions) |
| 127 | if (condition.length === 0) { | 139 | if (condition.length === 0) { |
| 128 | this.page.num += 1; | 140 | this.page.num += 1; |
| @@ -83,6 +83,18 @@ | @@ -83,6 +83,18 @@ | ||
| 83 | // 隐藏原生的tabbar | 83 | // 隐藏原生的tabbar |
| 84 | uni.hideTabBar(); | 84 | uni.hideTabBar(); |
| 85 | if (getApp().getBindNot()) { | 85 | if (getApp().getBindNot()) { |
| 86 | + this.basicStatistics.map(item=>{ | ||
| 87 | + const { key, value } = item | ||
| 88 | + if(key === 'device'){ | ||
| 89 | + value.leftValue = 0 | ||
| 90 | + value.centerValue =0 | ||
| 91 | + value.rightValue = 0 | ||
| 92 | + }else{ | ||
| 93 | + value.leftValue = 0 | ||
| 94 | + value.centerValue =0 | ||
| 95 | + value.rightValue = 0 | ||
| 96 | + } | ||
| 97 | + }) | ||
| 86 | return | 98 | return |
| 87 | } | 99 | } |
| 88 | this.getDeviceTotalData(); | 100 | this.getDeviceTotalData(); |
| @@ -92,6 +104,9 @@ | @@ -92,6 +104,9 @@ | ||
| 92 | uni.removeStorageSync('getConfiguration'); | 104 | uni.removeStorageSync('getConfiguration'); |
| 93 | }, | 105 | }, |
| 94 | onPullDownRefresh() { | 106 | onPullDownRefresh() { |
| 107 | + if (getApp().getBindNot()) { | ||
| 108 | + return | ||
| 109 | + } | ||
| 95 | this.getDeviceTotalData(); | 110 | this.getDeviceTotalData(); |
| 96 | setTimeout(function() { | 111 | setTimeout(function() { |
| 97 | uni.stopPullDownRefresh(); | 112 | uni.stopPullDownRefresh(); |