Skip to content

L
lumastoreapp
Commit f9e5a609 authored by tz's avatar tz
Browse files
Options

Merge branch 'dev'

parents eb24b7fe d7f78265
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 9 deletions
.idea/.gitignore 0 → 100644
View file @ f9e5a609
# Default ignored files
/shelf/
/workspace.xml
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
# Editor-based HTTP Client requests
/httpRequests/
.idea/lumastoreapp.iml 0 → 100644
View file @ f9e5a609
<?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 0 → 100644
View file @ f9e5a609
<?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 0 → 100644
View file @ f9e5a609
<?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 0 → 100644
View file @ f9e5a609
<?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
.idea/workspace.xml 0 → 100644
View file @ f9e5a609
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a3e4d1c4-910d-4b8e-ae0a-c3b9bec9b7c3" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/App.vue" beforeDir="false" afterPath="$PROJECT_DIR$/App.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/utils/debug.js" beforeDir="false" afterPath="$PROJECT_DIR$/utils/debug.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ComposerSettings">
<execution />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectId" id="1dtKpRM8nA1Xb9LfqDTnnonHd79" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="a3e4d1c4-910d-4b8e-ae0a-c3b9bec9b7c3" name="Default Changelist" comment="" />
<created>1593239131534</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1593239131534</updated>
<workItem from="1593239132729" duration="1731000" />
<workItem from="1593241788165" duration="1764000" />
</task>
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="2" />
</component>
<component name="WindowStateProjectService">
<state x="549" y="167" key="FileChooserDialogImpl" timestamp="1593240863812">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1593240863812" />
<state x="467" y="144" width="602" height="536" key="find.popup" timestamp="1593241868941">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="467" y="144" width="602" height="536" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1593241868941" />
</component>
</project>
\ No newline at end of file
App.vue
View file @ f9e5a609
...@@ -45,16 +45,16 @@ ...@@ -45,16 +45,16 @@
console.info("66344554"); console.info("66344554");
var date = new Date(); var date = new Date();
let hours = date.getHours();//当前 时间 小时 let hours = date.getHours();//当前 时间 小时
let datestime = 15000;//默认15秒 let datestime = 5000;//默认15秒
console.info(hours); console.info(hours);
if(hours==11 || hours==12 || hours==13 ){//1级别 高峰时间 // if(hours==11 || hours==12 || hours==13 ){//1级别 高峰时间
datestime = 5000;//高峰时期 5s一次 // datestime = 5000;//高峰时期 5s一次
}else if(hours==10 || hours==14){//1级别 // }else if(hours==10 || hours==14){//1级别
datestime = 8000;//高峰时期 5s一次 // datestime = 8000;//高峰时期 5s一次
} // }
else{ // else{
datestime = 15000; // datestime = 15000;
} // }
if(this.$store.state.token!=""){//判断是否 已登录 if(this.$store.state.token!=""){//判断是否 已登录
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment