优化了计时器功能

main.js

@@ -4,6 +4,8 @@ Vue.use(uView);
 // #ifndef VUE3
 import Vue from 'vue'
 import App from './App'
+import store from './pages/store/index.js'
+Vue.prototype.$store = store
 
 import moment from 'moment'
 Vue.prototype.$moment = moment;
@@ -34,7 +36,8 @@ Vue.config.productionTip = false
 App.mpType = 'app'
 
 const app = new Vue({
-    ...App
+    ...App,
+	store
 })
 app.$mount()
 // #endif

pages.json

@@ -4,17 +4,17 @@
 	},
 	"pages": [
 		{
-			"path": "pages/lampControls/lampControls",
+			"path": "pages/login/login",
 			"style": {
-				"onReachBottomDistance": 150,
-				"navigationBarTitleText" : "照明控制",
+				"navigationBarTitleText" : "登录",
 				"navigationBarTextStyle": "#ffffff"
 			}
 		},
 		{
-			"path": "pages/login/login",
+			"path": "pages/lampControls/lampControls",
 			"style": {
-				"navigationBarTitleText" : "登录",
+				"onReachBottomDistance": 150,
+				"navigationBarTitleText" : "照明控制",
 				"navigationBarTextStyle": "#ffffff"
 			}
 		},

pages/Supervisory/Supervisory.vue

@@ -1,10 +1,10 @@
 <template>
 	<view>
 		<view class="onekeep" v-for="(item,index) in keeplist" :key="item.id">
-			<view class="onekeeplabel" @click="show = !show">
+			<view class="onekeeplabel" @click="optionShow(index)">
 				<text>{{item.poleGroupName}}</text>
 			</view>
-			<view class="twokeep" v-for="(item2,index2) in item.cameraList" :key="item2.id" v-show="show">
+			<view class="twokeep" v-for="(item2,index2) in item.cameraList" :key="item2.id" v-show="item.show">
 				<text>{{item2.poleGroupName}}</text>
 				<button type="primary" @click="lookVedio(index,index2)">查看</button>
 			</view>
@@ -19,8 +19,7 @@
 	export default {
 		data() {
 			return {
-				keeplist: [],
-				show:false
+				keeplist: []
 			};
 		},
 		methods: {
@@ -28,12 +27,22 @@
 				uni.navigateTo({
 					url:'/pages/Supervisory_keep/Supervisory_keep?index=' + index + '&index2=' + index2,
 				})
+			},
+			optionShow(index){
+				var that = this
+				var keeplist = that.keeplist
+				keeplist[index].show == true ? keeplist[index].show = false : keeplist[index].show = true
+				that.keeplist = keeplist
 			}
 		},
 		onLoad() {
 			direct().then(res => {
 				if (res.code == 200) {
-					this.keeplist = res.data
+					var keeplist = res.data
+					for(let arr of keeplist){
+						arr.show = false
+					}
+					this.keeplist = keeplist
 				}
 			})
 		},
@@ -41,7 +50,11 @@
 			if(this.keeplist.length == 0){
 				direct().then(res => {
 					if (res.code == 200) {
-						this.keeplist = res.data
+						var keeplist = res.data
+						for(let arr of keeplist){
+							arr.show = false
+						}
+						this.keeplist = keeplist
 					}
 				})
 			}

pages/lampControls/lampControls.vue

@@ -243,13 +243,36 @@
 					shutsh: 1,
 				},
 				imageAddress: 'https://cloud.long-chi.com/resource/miniprogram-lightcontrol/image',
+				//定时器id
+				timerId:'',
+				permit:true
 			}
 		},
 		onLoad() {
 			this.load()
 		},
 		onShow() {
-
+			var that = this
+			setTimeout(function(){
+				var permit = that.permit
+				//通过vuex中储存的quantity来记录执行的次数，以确保在第一次执行时不执行onshow中的方法
+				var token = uni.getStorageSync('token')
+				that.$store.commit('changeQuan',1)
+				var quantity = that.$store.state.quantity
+				//permit为true表示数据尚未加载成功，此时定时器尚未打开,
+				//为false表示定时器打开过，但此时由于页面隐藏关闭了定时器，所以再次显示时重新打开
+				if(quantity != 1){
+					permit == true && token != ''? that.load() : that.timerId = setInterval(that.renovate,15000)
+				}
+			},1000)
+		},
+		onHide() {
+			var that = this
+			var permit = that.permit
+			//在确保定时器打开且页面隐藏时关闭定时器
+			if(permit == false){
+				clearInterval(this.timerId)
+			}
 		},
 		methods: {
 			load() {
@@ -267,11 +290,12 @@
 								this.tworacords = children
 								this.divide.publicId = records[0].id
 								this.divide.publicName = records[0].poleGroupName
+								this.timerId = setInterval(this.renovate,15000)
+								this.permit = false
 							}
 						})
 					}
 				})
-				setInterval(this.renovate,15000)
 			},
 			//过度动画
 			cartoon(title, duration) {
@@ -293,6 +317,7 @@
 					if (res.code == 200) {
 						this.tworacords = res.data.records[0].children
 						this.page.current = 1
+						this.page.total = res.data.total
 					}
 				})
 			},
@@ -431,6 +456,7 @@
 			//分页器页数改变
 			pageTatble(e) {
 				var that = this
+				that.cartoon('加载中',1000)
 				var publicId = that.divide.publicId
 				var pageSize = that.page.pageSize
 				that.page.current = e.current

pages/login/login.vue

@@ -77,7 +77,6 @@
 			// },
 			login(record) {
 				var that = this
-				console.log(record.code)
 				uni.request({
 					url:'https://cloud.long-chi.com/api/blade-auth/oauth/token?tenantId='+ record.tenantId + '&username=' +
 						record.User + '&password=' + md5(record.password) + '&grant_type=captcha&scope=all&type=account',
@@ -192,6 +191,7 @@
 	.login-button {
 		width: 550rpx;
 		height: 70rpx;
+		margin-top: 70rpx;
 	}
 	.remember{
 		width: 500rpx;
@@ -200,6 +200,6 @@
 		align-items: center;
 		flex-direction:row-reverse;
 		position: absolute;
-		top: 550rpx;
+		top: 520rpx;
 	}
 </style>

pages/store/index.js

@@ -0,0 +1,22 @@
+import Vue from 'vue'
+
+import Vuex from 'vuex'
+
+Vue.use(Vuex)
+
+const store = new Vuex.Store({
+    state: {
+		//公共的变量，这里的变量不能随便修改，只能通过触发mutations的方法才能改变
+		quantity:0
+	},
+    mutations: {
+		//相当于同步的操作
+		changeQuan(state,data){
+			state.quantity = state.quantity + data
+		}
+	},
+    actions: {
+		//相当于异步的操作,不能直接改变state的值，只能通过触发mutations的方法才能改变
+	}
+})
+export default store

wisdom

@@ -0,0 +1 @@
+Subproject commit 6f13167546c1e94d396d299701ea858bcf211699