add info module

This commit is contained in:
lh_wang
2015-08-07 14:18:14 +08:00
parent b05c79ceee
commit c24a3b1f35
13 changed files with 609 additions and 53 deletions
+1
View File
@@ -0,0 +1 @@
meitu
+3
View File
@@ -0,0 +1,3 @@
<component name="ProjectDictionaryState">
<dictionary name="lihua" />
</component>
+8
View File
@@ -0,0 +1,8 @@
<?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>
+52
View File
@@ -0,0 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JsBowerSettings">
<exe-path />
<config-path />
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State>
<id />
</State>
</expanded-state>
<selected-state>
<State>
<id>CoffeeScript</id>
</State>
</selected-state>
</profile-state>
</entry>
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" />
<component name="SvnConfiguration">
<configuration>$USER_HOME$/.subversion</configuration>
</component>
<component name="masterDetails">
<states>
<state key="ScopeChooserConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/meitu.iml" filepath="$PROJECT_DIR$/.idea/meitu.iml" />
</modules>
</component>
</project>
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="" />
</component>
</project>
+338
View File
@@ -0,0 +1,338 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="a5f34c66-58c1-42aa-9dc2-d4941c1b15c5" name="Default" comment="" />
<ignored path="meitu.iws" />
<ignored path=".idea/workspace.xml" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<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="ChangesViewManager" flattened_view="true" show_ignored="false" />
<component name="CreatePatchCommitExecutor">
<option name="PATCH_PATH" value="" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FavoritesManager">
<favorites_list name="meitu" />
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-25.375">
<caret line="115" column="0" selection-start-line="115" selection-start-column="0" selection-end-line="115" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="info.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/js/home/info.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.813278">
<caret line="77" column="0" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="main.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/main.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-19.555555">
<caret line="231" column="24" selection-start-line="231" selection-start-column="24" selection-end-line="231" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/js/home/tools.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/css/main.css" />
<option value="$PROJECT_DIR$/js/home/info.js" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
</component>
<component name="NamedScopeManager">
<order />
</component>
<component name="ProjectFrameBounds">
<option name="y" value="23" />
<option name="width" value="1440" />
<option name="height" value="820" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="meitu" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="meitu" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="meitu" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="meitu" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="meitu" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="meitu" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="meitu" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="lib" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="meitu" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="meitu" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="home" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="meitu" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="meitu" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="js" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="common" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="meitu" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="meitu" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="css" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="settings.editor.selected.configurable" value="preferences.sourceCode.JavaScript" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="HbShouldOpenHtmlAsHb" value="" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="WebServerToolWindowFactoryState" value="false" />
</component>
<component name="RunManager">
<configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
<method />
</configuration>
<configuration default="true" type="DartUnitRunConfigurationType" factoryName="DartUnit">
<method />
</configuration>
<configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">
<envs />
<method />
</configuration>
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
<method />
</configuration>
<configuration default="true" type="JsTestDriver-test-runner" factoryName="JsTestDriver">
<setting name="configLocationType" value="CONFIG_FILE" />
<setting name="settingsFile" value="" />
<setting name="serverType" value="INTERNAL" />
<setting name="preferredDebugBrowser" value="Chrome" />
<method />
</configuration>
<configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" working-dir="">
<method />
</configuration>
<configuration default="true" type="cucumber.js" factoryName="Cucumber.js">
<option name="cucumberJsArguments" value="" />
<option name="executablePath" />
<option name="filePath" />
<method />
</configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<method />
</configuration>
</component>
<component name="ShelveChangesManager" show_recycled="false" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="a5f34c66-58c1-42aa-9dc2-d4941c1b15c5" name="Default" comment="" />
<created>1438912084296</created>
<option name="number" value="Default" />
<updated>1438912084296</updated>
</task>
<servers />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="820" extended-state="6" />
<editor active="false" />
<layout>
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18888889" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/js/home/map.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/home/tools.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5809129">
<caret line="28" column="53" selection-start-line="28" selection-start-column="53" selection-end-line="28" selection-end-column="53" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/main.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-25.375">
<caret line="115" column="0" selection-start-line="115" selection-start-column="0" selection-end-line="115" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/main.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-19.555555">
<caret line="231" column="24" selection-start-line="231" selection-start-column="24" selection-end-line="231" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/home/info.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.813278">
<caret line="77" column="0" selection-start-line="77" selection-start-column="0" selection-end-line="77" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
+5 -1
View File
@@ -113,7 +113,7 @@ html body {
right: 5px;
top: 60px;
width: 50px;
min-height: 100px;
min-height: 50px;
}
.tools>div {
width: 40px;
@@ -225,8 +225,11 @@ html body {
}
.SN_info_wrapper{
height:130px;
-webkit-transform: translate3d(0px, 0px, 0px);
transform: translate3d(0px, 0px, 0px);
opacity: 0.8;
-webkit-opacity:0.8;
}
@@ -234,3 +237,4 @@ html body {
+58 -50
View File
@@ -36,61 +36,61 @@
<div id="map"></div>
<!--描述:搜索-->
<div class="search">
<div class="fl">
<img src="img/logo.png"/>
</div>
<div class="fl search_input">
<input placeholder="请输入产品路线"/>
</div>
<button class="fl search_btn">
<i class="fa fa-microphone" style="font-size:20px;color:#FFFFFF;"></i>
</button>
<div class="fl">
<img src="img/logo.png"/>
</div>
<div class="fl search_input">
<input placeholder="请输入产品路线"/>
</div>
<button class="fl search_btn">
<i class="fa fa-microphone" style="font-size:20px;color:#FFFFFF;"></i>
</button>
</div>
<!--描述:其他功能-->
<div class="tools">
<div class="sh tools_items">
<div style="width:30px;height:30px;">
<i class="fa fa-windows" style="color:#999999;margin-top:13px;font-size:20px;"></i>
</div>
</div>
<div class="sh tools_items">
<div>
<i class="fa fa-weixin" style="color:#999999;"></i>
</div>
<div>吐槽</div>
</div>
<div class="sh tools_items">
<div>
<i class="fa fa-hand-paper-o" style="color:#999999;"></i>
</div>
<div>活动</div>
</div>
<div class="sh tools_items">
<div>
<i class="fa fa-microphone" style="color:#999999;"></i>
</div>
<div>上报</div>
</div>
<div class="sh tools_items">
<div>
<i class="fa fa-share-alt" style="color:#999999;"></i>
</div>
<div>分享</div>
</div>
<div class="sh tools_items">
<div>
<i class="fa fa-refresh" style="color:#999999;"></i>
</div>
<div onclick="(function(){location.reload();return false;})()">刷新</div>
</div>
<div id="tools_list" class="sh tools_items">
<div style="width:30px;height:30px;">
<i class="fa fa-windows" style="color:#999999;margin-top:13px;font-size:20px;"></i>
</div>
</div>
<div class="sh tools_items">
<div>
<i class="fa fa-weixin" style="color:#999999;"></i>
</div>
<div>吐槽</div>
</div>
<div class="sh tools_items">
<div>
<i class="fa fa-hand-paper-o" style="color:#999999;"></i>
</div>
<div>活动</div>
</div>
<div class="sh tools_items">
<div>
<i class="fa fa-microphone" style="color:#999999;"></i>
</div>
<div>上报</div>
</div>
<div class="sh tools_items">
<div>
<i class="fa fa-share-alt" style="color:#999999;"></i>
</div>
<div>分享</div>
</div>
<div class="sh tools_items">
<div>
<i class="fa fa-refresh" style="color:#999999;"></i>
</div>
<div onclick="(function(){location.reload();return false;})()">刷新</div>
</div>
</div>
<!--仪表盘-->
<div id="charts" class="e_charts sh">
<div>
<div class="e_charts_arrow"></div>
<div class="e_charts_0">0</div>
<div class="e_charts_120">120</div>
</div>
<div>
<div class="e_charts_arrow"></div>
<div class="e_charts_0">0</div>
<div class="e_charts_120">120</div>
</div>
</div>
<!--路线图-->
<div class="router sh">
@@ -98,7 +98,15 @@
</div>
<!--信息窗-->
<div class="SN_info sh">
<div class="SN_info_wrapper"></div>
<script type="text/template" id="tpl">
<% for(var i = 0; i < list.length; i++) { %>
<div style="width:<%=width%>px; height:130px;float:left;">
<h1><%=i%></h1>
<h1>我们哈哈哈</h1>
</div>
<% } %>
</script>
<div class="SN_info_wrapper"></div>
</div>
<script type="text/javascript" src="http://webapi.amap.com/maps?v=1.3&key=6a1180467b5f36714645d22044535ab7"></script>
+92
View File
@@ -0,0 +1,92 @@
define('home/info', function(require, exports, module){
var _ = require('lib/underscore');
var $ = require('lib/zepto_pj');
//渲染数据
var width = document.body.clientWidth;
var wrapper = $('.SN_info_wrapper');
var tpl = $('#tpl').html();
var data = {
width: width,
list:[
{
name: 'ss'
},
{
name: 'ss'
},
{
name: 'ss'
}
]
};
var html = _.template(tpl)(data);
wrapper.html(html);
//动画特效
var wholeLength = width * data.list.length;
wrapper.css('width', wholeLength);
//记录初始位置
var startX = 0;
wrapper.on('touchstart', function(e){
startX = e.changedTouches[0].clientX;
});
wrapper.on('touchend', function(e){
var dis = e.changedTouches[0].clientX - startX;
//获取当前translate3d的位置
var transform = wrapper.css('transform') || wrapper.css('-webkit-transform');
var currentPos = parseInt(transform.split(',')[0].split('(')[1]);
//移动
if(Math.abs(dis) > 30){
//左移
if(dis < -30){
var w = 0;
var handle = setInterval(function(){
if(w <= width && Math.abs(currentPos) < (wholeLength - width - 10)){
var newX = (currentPos - w);
wrapper.css('transform', 'translate3d(' + newX + 'px, 0px, 0px)');
wrapper.css('-webkit-transform', 'translate3d(' + newX + 'px, 0px, 0px)');
}else{
clearInterval(handle);
}
w += 80;
}, 70);
}
//右移
if(dis > 30){
var w = 0;
var handle = setInterval(function(){
if(w <= width && Math.abs(currentPos) > 10){
var newX = (currentPos + w);
wrapper.css('transform', 'translate3d(' + newX + 'px, 0px, 0px)');
wrapper.css('-webkit-transform', 'translate3d(' + newX + 'px, 0px, 0px)');
}else{
clearInterval(handle);
}
w += 80;
}, 70);
}
}
});
});
+1 -1
View File
@@ -26,7 +26,7 @@ define('home/router', function(require, exports, module) {
//circle
for(var i = 0; i < router.length; i++){
ctx.beginPath();
ctx.fillStyle = '#0091FF';
ctx.fillStyle = '#159AFE';
ctx.arc(35, 25 + i * 25, 5, 0, Math.PI*2, true);
ctx.closePath();
ctx.fill();
+34
View File
@@ -2,4 +2,38 @@
define('home/tools', function(require, exports, module){
var $ = require('lib/zepto_pj');
var tools = $('.tools');
var tools_list = $('#tools_list');
//显示隐藏工具集
tools_list.on('click', function(){
tools.css('overflow', 'hidden');
var height = parseInt($('.tools').css('height'));
if(height > 50){
var hideHandle = setInterval(function(){
height -= 50;
if(height < 10){
tools_list.css('border', '1px solid #0091FF');
clearInterval(hideHandle);
}else {
tools.css('height', height + 'px');
}
}, 40);
}else {
var showHandle = setInterval(function(){
height += 50;
if(height > 320){
clearInterval(showHandle);
tools_list.css('border', '1px solid #A3A3A3');
}else {
tools.css('height', height + 'px');
}
}, 40);
}
});
});
+3 -1
View File
@@ -8,7 +8,9 @@ requirejs([
'home/map',
'lib/underscore',
'home/dashboard',
'home/router'
'home/router',
'home/info',
'home/tools'
],
function(zepto_pj, map, underscore, router) {