Merge branch 'master' into dev

.idea/.gitignore

+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/lumastoreapp.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

.idea/misc.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
\ No newline at end of file

.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/lumastoreapp.iml" filepath="$PROJECT_DIR$/.idea/lumastoreapp.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

App.vue

@@ -45,16 +45,16 @@
 				console.info("66344554");
 				var date = new Date();
 				let hours = date.getHours();//当前 时间 小时
-				let datestime = 15000;//默认15秒
+				let datestime = 5000;//默认15秒
 				console.info(hours);
-				if(hours==11 || hours==12 || hours==13 ){//1级别 高峰时间
-					datestime = 5000;//高峰时期 5s一次
-				}else if(hours==10 ||  hours==14){//1级别
-					datestime = 8000;//高峰时期 5s一次
-				}
-				else{
-					datestime = 15000;
-				}
+				// if(hours==11 || hours==12 || hours==13 ){//1级别 高峰时间
+				// 	datestime = 5000;//高峰时期 5s一次
+				// }else if(hours==10 ||  hours==14){//1级别
+				// 	datestime = 8000;//高峰时期 5s一次
+				// }
+				// else{
+				// 	datestime = 15000;
+				// }
 				
 				
 				if(this.$store.state.token!=""){//判断是否 已登录