张亚鹏 / Wechat_project_1 · 提交

转到一个项目

作者 乔爽
提交 4853a2cf6abe23975b755db7142949347ba1f601 1 个父辈 0089dacf

update

内嵌 并排对比
正在显示 8 个修改的文件 包含 499 行增加 和 321 行删除
... ... @@ -2,7 +2,14 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="140167ac-33fb-4284-bf2f-897ad51069a4" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/css/dropload.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/js/dropload.min.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/common.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/common.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/gift.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gift.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gift.html" beforeDir="false" afterPath="$PROJECT_DIR$/gift.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -99,99 +106,83 @@
<session id="-271560078">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="1" />
<entry key="project.open.time.0" value="1" />
<entry key="project.open.time.1" value="1" />
<entry key="project.opened" value="2" />
<entry key="project.closed" value="8" />
<entry key="project.open.time.0" value="6" />
<entry key="project.open.time.1" value="2" />
<entry key="project.open.time.23" value="1" />
<entry key="project.opened" value="9" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="css" value="8" />
<entry key="html" value="9" />
<entry key="css" value="13" />
<entry key="html" value="12" />
<entry key="js" value="2" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="8" />
<entry key="HTML" value="9" />
<entry key="CSS" value="13" />
<entry key="HTML" value="12" />
<entry key="JavaScript" value="2" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="875" />
<entry key="html" value="977" />
<entry key="css" value="1012" />
<entry key="html" value="1138" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="876" />
<entry key="HTML" value="976" />
<entry key="CSS" value="1013" />
<entry key="HTML" value="1137" />
</counts>
</usages-collector>
</session>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/css/gift.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="648">
<caret line="24" column="23" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" />
<state relative-caret-position="153">
<caret line="31" column="25" lean-forward="true" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/ggbt.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="6" column="65" lean-forward="true" selection-start-line="6" selection-start-column="65" selection-end-line="6" selection-end-column="65" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/gift.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="10" column="38" lean-forward="true" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
<state relative-caret-position="178">
<caret line="55" column="31" selection-start-line="55" selection-start-column="31" selection-end-line="55" selection-end-column="31" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/first.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/slxz.html">
<entry file="file://$PROJECT_DIR$/css/common.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1296">
<caret line="48" column="47" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" />
<folding>
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
<state relative-caret-position="108">
<caret line="4" column="38" lean-forward="true" selection-start-line="4" selection-start-column="38" selection-end-line="4" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/slxz.css">
<entry file="file://$PROJECT_DIR$/css/wtfk.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1485">
<caret line="55" column="1" lean-forward="true" selection-start-line="55" selection-start-column="1" selection-end-line="55" selection-end-column="1" />
<state relative-caret-position="2106">
<caret line="78" column="26" selection-start-line="78" selection-start-column="26" selection-end-line="78" selection-end-column="26" />
</state>
</provider>
</entry>
... ... @@ -200,7 +191,7 @@
<entry file="file://$PROJECT_DIR$/spxq.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="21" column="44" lean-forward="true" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
<caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
</state>
</provider>
</entry>
... ... @@ -217,29 +208,36 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="387">
<caret line="40" column="22" lean-forward="true" selection-start-line="40" selection-start-column="22" selection-end-line="40" selection-end-column="22" />
<state relative-caret-position="54">
<caret line="2" column="6" lean-forward="true" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#6;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#7;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#9;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/dropload.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/dropload.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1485">
<caret line="55" column="20" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" />
<state relative-caret-position="1863">
<caret line="69" column="28" lean-forward="true" selection-start-line="69" selection-start-column="28" selection-end-line="69" selection-end-column="28" />
</state>
</provider>
</entry>
... ... @@ -256,11 +254,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>btn_top</find>
<find>icon_</find>
<find>icon_price</find>
<find>.main_search</find>
<find>.main_item_time</find>
<find>.main_top</find>
<find>main_top_le</find>
<find>menu_container</find>
... ... @@ -286,6 +279,11 @@
<find>main_top_right</find>
<find>main_text</find>
<find>banner</find>
<find>mid_box</find>
<find>mid_box_item</find>
<find>items</find>
<find>item_a</find>
<find>index_item_a</find>
</findStrings>
<dirStrings>
<dir>F:\ljh\上传资料企业微信\images</dir>
... ... @@ -318,11 +316,9 @@
<option value="$PROJECT_DIR$/last.html" />
<option value="$PROJECT_DIR$/wtfk.html" />
<option value="$PROJECT_DIR$/iconfont/iconfont.css" />
<option value="$PROJECT_DIR$/css/common.css" />
<option value="$PROJECT_DIR$/first.html" />
<option value="$PROJECT_DIR$/css/first.css" />
<option value="$PROJECT_DIR$/css/list_turn.css" />
<option value="$PROJECT_DIR$/css/wtfk.css" />
<option value="$PROJECT_DIR$/cpgg.html" />
<option value="$PROJECT_DIR$/css/cpgg.css" />
<option value="$PROJECT_DIR$/cpxq.html" />
... ... @@ -331,14 +327,16 @@
<option value="$PROJECT_DIR$/cplb.html" />
<option value="$PROJECT_DIR$/ggbt.html" />
<option value="$PROJECT_DIR$/css/ggbt.css" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/css/spxq.css" />
<option value="$PROJECT_DIR$/spxq.html" />
<option value="$PROJECT_DIR$/slxz.html" />
<option value="$PROJECT_DIR$/css/slxz.css" />
<option value="$PROJECT_DIR$/css/gift.css" />
<option value="$PROJECT_DIR$/css/wtfk.css" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/css/common.css" />
<option value="$PROJECT_DIR$/gift.html" />
<option value="$PROJECT_DIR$/css/gift.css" />
</list>
</option>
</component>
... ... @@ -349,10 +347,10 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="317" />
<option name="y" value="83" />
<option name="width" value="1361" />
<option name="height" value="969" />
<option name="x" value="194" />
<option name="y" value="122" />
<option name="width" value="1270" />
<option name="height" value="765" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
... ... @@ -376,6 +374,11 @@
<item name="Wechat_project_1" type="462c0819:PsiDirectoryNode" />
<item name="iconfont" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="Wechat_project_1" type="b2602c69:ProjectViewProjectNode" />
<item name="Wechat_project_1" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
... ... @@ -386,7 +389,7 @@
<component name="PropertiesComponent">
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../可耐美手机端/clime" />
<property name="list.type.of.created.stylesheet" value="CSS" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
... ... @@ -394,6 +397,8 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="F:\ljh项目\企业微信\Wechat_project_1\css" />
<recent name="F:\ljh项目\企业微信\Wechat_project_1\js" />
<recent name="F:\ljh\Wechat_project_1\images" />
<recent name="F:\ljh\上传资料企业微信\js" />
<recent name="F:\ljh\上传资料企业微信\images" />
... ... @@ -453,18 +458,25 @@
<workItem from="1547550818174" duration="368000" />
<workItem from="1547598324930" duration="428000" />
<workItem from="1547620624212" duration="14866000" />
<workItem from="1547685110397" duration="343000" />
<workItem from="1547685110397" duration="2882000" />
<workItem from="1547716836889" duration="1296000" />
<workItem from="1547797642912" duration="58000" />
<workItem from="1547798565804" duration="418000" />
<workItem from="1547867735214" duration="38000" />
<workItem from="1547890177744" duration="605000" />
<workItem from="1548141691608" duration="8523000" />
<workItem from="1548203100300" duration="1293000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="189905000" />
<option name="totallyTimeSpent" value="204675000" />
</component>
<component name="ToolWindowManager">
<frame x="317" y="83" width="1361" height="969" extended-state="0" />
<frame x="201" y="223" width="1270" height="765" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18896447" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.17045455" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
... ... @@ -476,7 +488,7 @@
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.2326139" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.22698413" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
... ... @@ -493,9 +505,6 @@
<entry file="file://$PROJECT_DIR$/js/base.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/js/jquery.min.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/iconfont/iconfont.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
... ... @@ -503,13 +512,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/common.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="81">
<caret line="3" column="17" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/first.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
... ... @@ -524,13 +526,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/wtfk.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="292">
<caret line="106" column="26" selection-start-line="106" selection-start-column="26" selection-end-line="106" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/list_turn.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
... ... @@ -538,13 +533,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/wtfk.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cpxq.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
... ... @@ -594,50 +582,62 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gift.css">
<entry file="file://$PROJECT_DIR$/slxz.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="648">
<caret line="24" column="23" selection-start-line="24" selection-start-column="23" selection-end-line="24" selection-end-column="23" />
<state relative-caret-position="1296">
<caret line="48" column="47" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/slxz.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1485">
<caret line="55" column="1" lean-forward="true" selection-start-line="55" selection-start-column="1" selection-end-line="55" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/ggbt.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="6" column="65" lean-forward="true" selection-start-line="6" selection-start-column="65" selection-end-line="6" selection-end-column="65" />
<caret line="6" column="65" selection-start-line="6" selection-start-column="65" selection-end-line="6" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/first.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
<state relative-caret-position="189">
<caret line="7" column="64" selection-start-line="7" selection-start-column="64" selection-end-line="7" selection-end-column="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/slxz.html">
<entry file="file://$PROJECT_DIR$/wtfk.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1296">
<caret line="48" column="47" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" />
<folding>
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
<state relative-caret-position="756">
<caret line="28" column="6" selection-start-line="28" selection-start-column="6" selection-end-line="28" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/slxz.css">
<entry file="file://$PROJECT_DIR$/js/jquery.min.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/css/common.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1485">
<caret line="55" column="1" lean-forward="true" selection-start-line="55" selection-start-column="1" selection-end-line="55" selection-end-column="1" />
<state relative-caret-position="108">
<caret line="4" column="38" lean-forward="true" selection-start-line="4" selection-start-column="38" selection-end-line="4" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/wtfk.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2106">
<caret line="78" column="26" selection-start-line="78" selection-start-column="26" selection-end-line="78" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/spxq.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="21" column="44" lean-forward="true" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
<caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
</state>
</provider>
</entry>
... ... @@ -648,42 +648,56 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/dropload.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/js/dropload.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1485">
<caret line="55" column="20" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" />
<state relative-caret-position="1863">
<caret line="69" column="28" lean-forward="true" selection-start-line="69" selection-start-column="28" selection-end-line="69" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="387">
<caret line="40" column="22" lean-forward="true" selection-start-line="40" selection-start-column="22" selection-end-line="40" selection-end-column="22" />
<state relative-caret-position="54">
<caret line="2" column="6" lean-forward="true" selection-start-line="2" selection-start-column="6" selection-end-line="2" selection-end-column="6" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#6;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#7;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#9;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gift.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
<caret line="10" column="38" lean-forward="true" selection-start-line="10" selection-start-column="38" selection-end-line="10" selection-end-column="38" />
<state relative-caret-position="178">
<caret line="55" column="31" selection-start-line="55" selection-start-column="31" selection-end-line="55" selection-end-column="31" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gift.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="31" column="25" lean-forward="true" selection-start-line="31" selection-start-column="25" selection-end-line="31" selection-end-column="25" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -2,6 +2,7 @@ body ,html{
margin: 0 auto;
padding: 0 auto;
height: 100%;
 -webkit-overflow-scrolling:touch;
}
p{
font-size: 0.33rem;
... ...
.dropload-up,.dropload-down{
position: relative;
height: 0;
overflow: hidden;
font-size: 12px;
/* 开启硬件加速 */
-webkit-transform:translateZ(0);
transform:translateZ(0);
}
.dropload-down{
height: 50px;
}
.dropload-refresh,.dropload-update,.dropload-load,.dropload-noData{
height: 50px;
line-height: 50px;
text-align: center;
}
.dropload-load .loading{
display: inline-block;
height: 15px;
width: 15px;
border-radius: 100%;
margin: 6px;
border: 2px solid #666;
border-bottom-color: transparent;
vertical-align: middle;
-webkit-animation: rotate 0.75s linear infinite;
animation: rotate 0.75s linear infinite;
}
@-webkit-keyframes rotate {
0% {
-webkit-transform: rotate(0deg);
}
50% {
-webkit-transform: rotate(180deg);
}
100% {
-webkit-transform: rotate(360deg);
}
}
@keyframes rotate {
0% {
transform: rotate(0deg);
}
50% {
transform: rotate(180deg);
}
100% {
transform: rotate(360deg);
}
}
\ No newline at end of file
... ...
... ... @@ -3,10 +3,9 @@ body{
background: url("../images/bg02@2x.png");
background-size: 100% 100%;
background-attachment: fixed;
-webkit-overflow-scrolling:touch;
}
.container{
min-height: 100%;
top: 0;
right: 0;
bottom: 0;
... ... @@ -27,6 +26,7 @@ body{
left: 0;
right: 0;
background-color: #E77387;
z-index: 99;
}
.index_item_a{
padding-top: 3.81rem;
... ...
... ... @@ -51,6 +51,7 @@ body{
flex-flow: column;
align-items: center;
justify-content: center;
margin: 0 0 1rem 0;
}
.mid_box_item{
margin-top: 0.22rem;
... ... @@ -68,10 +69,13 @@ body{
color: #ffffff;
letter-spacing: 0.06rem;
}
.mid_box_item:first-child{
margin-top: 0;
.first_item{
background-color: #4FB233;
}
/*.mid_box_item:first-child{*/
/*margin-top: 0;*/
/*background-color: #4FB233;*/
/*}*/
/*.items{*/
/*height: 0.64rem;*/
... ...
... ... @@ -5,11 +5,12 @@
<title>礼品页</title>
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<link rel="stylesheet" href="https://at.alicdn.com/t/font_1002144_2sqi5z7stwm.css">
<link rel="stylesheet" type="text/css" href="css/dropload.css">
<link rel="stylesheet" type="text/css" href="css/common.css">
<link rel="stylesheet" type="text/css" href="css/gift.css">
<script src="js/base.js"></script>
<script src="js/jquery.min.js"></script>
</head>
<body>
... ... @@ -67,83 +68,102 @@
</div>
</div>
</div>
<div class="item">
<div class="item_img">
<img src="images/pic01@2x.png" width="100%">
</div>
<div class="item_text">
<div class="item_text_intro">
小米AI音响mini
</div>
<div class="item_text_price">
<span>$ 217.0</span>
<span>库存: 10</span>
</div>
</div>
</div>
<div class="item">
<div class="item_img">
<img src="images/pic01@2x.png" width="100%">
</div>
<div class="item_text">
<div class="item_text_intro">
小米AI音响mini
</div>
<div class="item_text_price">
<span>$ 217.0</span>
<span>库存: 10</span>
</div>
</div>
</div>
<div class="item">
<div class="item_img">
<img src="images/pic01@2x.png" width="100%">
</div>
<div class="item_text">
<div class="item_text_intro">
小米AI音响mini
</div>
<div class="item_text_price">
<span>$ 217.0</span>
<span>库存: 10</span>
</div>
</div>
</div>
<div class="item">
<div class="item_img">
<img src="images/pic01@2x.png" width="100%">
</div>
<div class="item_text">
<div class="item_text_intro">
小米AI音响mini
</div>
<div class="item_text_price">
<span>$ 217.0</span>
<span>库存: 10</span>
</div>
</div>
</div>
<div class="item">
<div class="item_img">
<img src="images/pic01@2x.png" width="100%">
</div>
<div class="item_text">
<div class="item_text_intro">
小米AI音响mini
</div>
<div class="item_text_price">
<span>$ 217.0</span>
<span>库存: 10</span>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<script src="js/jquery.min.js"></script>
<script src="js/dropload.min.js"></script>
<script type="text/javascript">
//上拉加载
$(document).ready(function () {
// 页数
var page = 0;
// 每页展示10个
var size = 3;
$('.content').dropload({
scrollArea: window,
domUp: {
domClass: 'dropload-up',
domRefresh: '<div class="dropload-refresh">↓下拉刷新</div>',
domUpdate: '<div class="dropload-update">↑释放更新</div>',
domLoad: '<div class="dropload-load"><span class="loading"></span>加载中...</div>'
},
domDown: {
domClass: 'dropload-down',
domRefresh: '<div class="dropload-refresh">↑上拉加载更多</div>',
domLoad: '<div class="dropload-load"><span class="loading"></span>加载中...</div>',
domNoData: '<div class="dropload-noData">暂无数据</div>'
},
loadDownFn: function (me) {
page++;
// 拼接HTML
var result = '';
var s = "";
var show = "";
var list_compressor = "";
var list_answer = "";
$.ajax({
type: 'GET',
url: 'http://ons.me/tools/dropload/json.php?page=' + page + '&size=' + size,
dataType: 'json',
success: function (data) {
console.log(data);
var arrLen = data.length;
if (arrLen > 0) {
for (var i = 0; i < arrLen; i++) {
result += '<div class="item">\n' +
' <div class="item_img">\n' +
' <img src="images/pic01@2x.png" width="100%" onclick="btn_next()">\n' +
' </div>\n' +
' <div class="item_text">\n' +
' <div class="item_text_intro">\n' +
' 小米AI音响mini\n' +
' </div>\n' +
' <div class="item_text_price">\n' +
' <span>$ 217.0</span>\n' +
' <span>库存: 10</span>\n' +
' </div>\n' +
' </div>\n' +
' </div>'
}
// 如果没有数据
} else {
// 锁定
me.lock();
// 无数据
me.noData();
}
// 为了测试，延迟1秒加载
setTimeout(function () {
// 插入数据到页面，放到最后面
$('.items').append(result);
// 每次数据插入，必须重置
me.resetload();
}, 500);
},
error: function (xhr, type) {
alert('Ajax error!');
// 即使加载出错，也得重置
me.resetload();
}
});
},
threshold: 50
});
})
$(function () {
$(".menu_item").click(function () {
var index = $(this).index()
... ... @@ -153,28 +173,11 @@
})
})
function btn_next() {
window.location.href = "spxq.html";
}
//价格颜色切换
// $('.menu_price').click(function () {
// console.log($(this).children(".icon_price").children(".icon-shangjiantou").attr("class"))
// console.log($(this).children(".icon_price").children(".icon-xiajiantou").attr("class"));
//
// if($(this).children(".icon_price").children(".icon-shangjiantou").attr("class")=='iconfont icon-shangjiantou btn_top'){
// $(this).children(".icon_price").children(".icon-shangjiantou").removeClass("btn_top")
// $(this).children(".icon_price").children(".icon-xiajiantou").addClass("btn_top");
//
// }else if ($(this).children(".icon_price").children(".icon-xiajiantou").attr("class")=='iconfont icon-xiajiantou btn_top'){
// console.log(666)
// $(this).children(".icon_price").children(".icon-xiajiantou").removeClass("btn_top")
// $(this).children(".icon_price").children(".icon-shangjiantou").addClass("btn_top")
// }
// })
var num1=0
$('.menu_price').click(function () {
num1++;
... ...
... ... @@ -3,121 +3,127 @@
<head>
<meta charset="UTF-8">
<title>产品页</title>
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
<meta name="viewport"
content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no"/>
<link rel="stylesheet" type="text/css" href="css/common.css">
<link rel="stylesheet" type="text/css" href="css/index.css">
<link rel="stylesheet" type="text/css" href="css/dropload.css">
<script src="js/base.js"></script>
<script src="js/jquery.min.js"></script>
</head>
<body>
<div class="container">
<div class="home_container">
<!--头部-->
<div class="banner">
<div class="banner_img">
<img src="images/logo@2x.png" width="100%" height="100%">
</div>
<div class="banner_title">
Emerson品牌承诺
</div>
<div class="container">
<div class="home_container">
<!--头部-->
<div class="banner">
<div class="banner_img">
<img src="images/logo@2x.png" width="100%" height="100%">
</div>
<div class="banner_title">
Emerson品牌承诺
</div>
</div>
<!--列表-->
<div class="mid_box">
<!--列表-->
<div class="mid_box">
<!--列表-->
<div class="mid_box_item" onclick="btn_next()">
总介样本
</div>
<div class="mid_box_item first_item" onclick="btn_next()">
总介样本
</div>
<div class="mid_box_items">
<div class="mid_box_item" onclick="btn_next_2()">
总介样本
</div>
<div class="mid_box_item">
总介样本
</div>
<div class="mid_box_item">
总介样本
</div>
<div class="mid_box_item">
总介样本
</div>
<div class="mid_box_item">
总介样本
</div>
<div class="mid_box_item">
总介样本
</div>
<div class="mid_box_item">
总介样本
</div>
<div class="mid_box_item">
总介样本
</div>
<div class="mid_box_item">
总介样本
</div>
<!--<div class="items">-->
<!--<div class="item item_first" onclick="btn_next()">-->
<!--总介样本-->
<!--</div>-->
<!--</div>-->
<!--<div class="items">-->
<!--<div class="item" onclick="btn_next_2()">-->
<!--蝶阀/三偏心阀-->
<!--</div>-->
<!--</div>-->
<!--<div class="items">-->
<!--<div class="item">-->
<!--球阀-->
<!--</div>-->
<!--</div>-->
<!--<div class="items">-->
<!--<div class="item">-->
<!--闸截止阀-->
<!--</div>-->
<!--</div>-->
<!--<div class="items">-->
<!--<div class="item">-->
<!--刀闸阀-->
<!--</div>-->
<!--</div>-->
<!--<div class="items">-->
<!--<div class="item">-->
<!--安全阀-->
<!--</div>-->
<!--</div>-->
<!--<div class="items">-->
<!--<div class="item">-->
<!--调节阀-->
<!--</div>-->
<!--</div>-->
<!--<div class="items">-->
<!--<div class="item">-->
<!--调压阀-->
<!--</div>-->
<!--</div>-->
<!--<div class="items">-->
<!--<div class="item">-->
<!--其他阀门-->
<!--</div>-->
<!--</div>-->
<!--<div class="items item_last">-->
<!--<div class="item">-->
<!--执行机构-->
<!--</div>-->
<!--</div>-->
</div>
</div>
</div>
</div>
</body>
<script src="js/jquery.min.js"></script>
<script src="js/dropload.min.js"></script>
<script>
function btn_next() {
// alert(111)
window.location.href="cplb.html";
window.location.href = "cplb.html";
}
function btn_next_2() {
window.location.href="gift.html";
window.location.href = "gift.html";
}
// JavaScript Document
//上拉加载
$(document).ready(function () {
// 页数
var page = 0;
// 每页展示10个
var size = 3;
$('.content').dropload({
scrollArea: window,
domUp: {
domClass: 'dropload-up',
domRefresh: '<div class="dropload-refresh">↓下拉刷新</div>',
domUpdate: '<div class="dropload-update">↑释放更新</div>',
domLoad: '<div class="dropload-load"><span class="loading"></span>加载中...</div>'
},
domDown: {
domClass: 'dropload-down',
domRefresh: '<div class="dropload-refresh">↑上拉加载更多</div>',
domLoad: '<div class="dropload-load"><span class="loading"></span>加载中...</div>',
domNoData: '<div class="dropload-noData">暂无数据</div>'
},
loadDownFn: function (me) {
page++;
// 拼接HTML
var result = '';
var s = "";
var show = "";
var list_compressor = "";
var list_answer = "";
$.ajax({
type: 'GET',
url: 'http://ons.me/tools/dropload/json.php?page=' + page + '&size=' + size,
dataType: 'json',
success: function (data) {
console.log(data);
var arrLen = data.length;
if (arrLen > 0) {
for (var i = 0; i < arrLen; i++) {
result += '<div class="mid_box_item" onclick="btn_next_2()">\n' +
' 总介样本\n' +
' </div>'
}
// 如果没有数据
} else {
// 锁定
me.lock();
// 无数据
me.noData();
}
// 为了测试，延迟1秒加载
setTimeout(function () {
// 插入数据到页面，放到最后面
$('.mid_box_items').append(result);
// 每次数据插入，必须重置
me.resetload();
}, 500);
},
error: function (xhr, type) {
alert('Ajax error!');
// 即使加载出错，也得重置
me.resetload();
}
});
},
threshold: 50
});
})
</script>
</html>
... ...
/**
* dropload
* 西门(http://ons.me/526.html)
* 0.9.1(161205)
*/
!function (a) {
"use strict";
function g(a) {
a.touches || (a.touches = a.originalEvent.touches)
}
function h(a, b) {
b._startY = a.touches[0].pageY, b.touchScrollTop = b.$scrollArea.scrollTop()
}
function i(b, c) {
c._curY = b.touches[0].pageY, c._moveY = c._curY - c._startY, c._moveY > 0 ? c.direction = "down" : c._moveY < 0 && (c.direction = "up");
var d = Math.abs(c._moveY);
"" != c.opts.loadUpFn && c.touchScrollTop <= 0 && "down" == c.direction && !c.isLockUp && (b.preventDefault(), c.$domUp = a("." + c.opts.domUp.domClass), c.upInsertDOM || (c.$element.prepend('<div class="' + c.opts.domUp.domClass + '"></div>'), c.upInsertDOM = !0), n(c.$domUp, 0), d <= c.opts.distance ? (c._offsetY = d, c.$domUp.html(c.opts.domUp.domRefresh)) : d > c.opts.distance && d <= 2 * c.opts.distance ? (c._offsetY = c.opts.distance + .5 * (d - c.opts.distance), c.$domUp.html(c.opts.domUp.domUpdate)) : c._offsetY = c.opts.distance + .5 * c.opts.distance + .2 * (d - 2 * c.opts.distance), c.$domUp.css({height: c._offsetY}))
}
function j(b) {
var c = Math.abs(b._moveY);
"" != b.opts.loadUpFn && b.touchScrollTop <= 0 && "down" == b.direction && !b.isLockUp && (n(b.$domUp, 300), c > b.opts.distance ? (b.$domUp.css({height: b.$domUp.children().height()}), b.$domUp.html(b.opts.domUp.domLoad), b.loading = !0, b.opts.loadUpFn(b)) : b.$domUp.css({height: "0"}).on("webkitTransitionEnd mozTransitionEnd transitionend", function () {
b.upInsertDOM = !1, a(this).remove()
}), b._moveY = 0)
}
function k(a) {
"" != a.opts.loadDownFn && a.opts.autoLoad && a._scrollContentHeight - a._threshold <= a._scrollWindowHeight && m(a)
}
function l(a) {
a._scrollContentHeight = a.opts.scrollArea == b ? e.height() : a.$element[0].scrollHeight
}
function m(a) {
a.direction = "up", a.$domDown.html(a.opts.domDown.domLoad), a.loading = !0, a.opts.loadDownFn(a)
}
function n(a, b) {
a.css({"-webkit-transition": "all " + b + "ms", transition: "all " + b + "ms"})
}
var f, b = window, c = document, d = a(b), e = a(c);
a.fn.dropload = function (a) {
return new f(this, a)
}, f = function (a, b) {
var c = this;
c.$element = a, c.upInsertDOM = !1, c.loading = !1, c.isLockUp = !1, c.isLockDown = !1, c.isData = !0, c._scrollTop = 0, c._threshold = 0, c.init(b)
}, f.prototype.init = function (f) {
var l = this;
l.opts = a.extend(!0, {}, {
scrollArea: l.$element,
domUp: {
domClass: "dropload-up",
domRefresh: '<div class="dropload-refresh">↓下拉刷新</div>',
domUpdate: '<div class="dropload-update">↑释放更新</div>',
domLoad: '<div class="dropload-load"><span class="loading"></span>加载中...</div>'
},
domDown: {
domClass: "dropload-down",
domRefresh: '<div class="dropload-refresh">↑上拉加载更多</div>',
domLoad: '<div class="dropload-load"><span class="loading"></span>加载中...</div>',
domNoData: '<div class="dropload-noData">暂无数据</div>'
},
autoLoad: !0,
distance: 50,
threshold: "",
loadUpFn: "",
loadDownFn: ""
}, f), "" != l.opts.loadDownFn && (l.$element.append('<div class="' + l.opts.domDown.domClass + '">' + l.opts.domDown.domRefresh + "</div>"), l.$domDown = a("." + l.opts.domDown.domClass)), l._threshold = l.$domDown && "" === l.opts.threshold ? Math.floor(1 * l.$domDown.height() / 3) : l.opts.threshold, l.opts.scrollArea == b ? (l.$scrollArea = d, l._scrollContentHeight = e.height(), l._scrollWindowHeight = c.documentElement.clientHeight) : (l.$scrollArea = l.opts.scrollArea, l._scrollContentHeight = l.$element[0].scrollHeight, l._scrollWindowHeight = l.$element.height()), k(l), d.on("resize", function () {
clearTimeout(l.timer), l.timer = setTimeout(function () {
l._scrollWindowHeight = l.opts.scrollArea == b ? b.innerHeight : l.$element.height(), k(l)
}, 150)
}), l.$element.on("touchstart", function (a) {
l.loading || (g(a), h(a, l))
}), l.$element.on("touchmove", function (a) {
l.loading || (g(a, l), i(a, l))
}), l.$element.on("touchend", function () {
l.loading || j(l)
}), l.$scrollArea.on("scroll", function () {
l._scrollTop = l.$scrollArea.scrollTop(), "" != l.opts.loadDownFn && !l.loading && !l.isLockDown && l._scrollContentHeight - l._threshold <= l._scrollWindowHeight + l._scrollTop && m(l)
})
}, f.prototype.lock = function (a) {
var b = this;
void 0 === a ? "up" == b.direction ? b.isLockDown = !0 : "down" == b.direction ? b.isLockUp = !0 : (b.isLockUp = !0, b.isLockDown = !0) : "up" == a ? b.isLockUp = !0 : "down" == a && (b.isLockDown = !0, b.direction = "up")
}, f.prototype.unlock = function () {
var a = this;
a.isLockUp = !1, a.isLockDown = !1, a.direction = "up"
}, f.prototype.noData = function (a) {
var b = this;
void 0 === a || 1 == a ? b.isData = !1 : 0 == a && (b.isData = !0)
}, f.prototype.resetload = function () {
var b = this;
"down" == b.direction && b.upInsertDOM ? b.$domUp.css({height: "0"}).on("webkitTransitionEnd mozTransitionEnd transitionend", function () {
b.loading = !1, b.upInsertDOM = !1, a(this).remove(), l(b)
}) : "up" == b.direction && (b.loading = !1, b.isData ? (b.$domDown.html(b.opts.domDown.domRefresh), l(b), k(b)) : b.$domDown.html(b.opts.domDown.domNoData))
}
}(window.Zepto || window.jQuery);
\ No newline at end of file
... ...