李涵 / shipin · 提交

转到一个项目

作者 李洪娟
提交 2d7be3f78bbfe0d814f744a4cfd98383c591f0c6 2 个父辈 39644f5e 9fa7b78f

合并分支 'lihongjuan' 到 'master' 

Lihongjuan



查看合并请求 !9
内嵌 并排对比
正在显示 3 个修改的文件 包含 89 行增加 和 107 行删除
... ... @@ -27,7 +27,7 @@
<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="10.642858" vertical-offset="4798" max-vertical-offset="8925">
<state vertical-scroll-proportion="0.0" vertical-offset="3420" max-vertical-offset="6783">
<caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" />
<folding>
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -39,18 +39,18 @@
<file leaf-file-name="order.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/order.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-23.64" vertical-offset="4653" max-vertical-offset="10672">
<state vertical-scroll-proportion="0.0" vertical-offset="4332" max-vertical-offset="8816">
<caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="jquery-weui.css" pinned="false" current-in-tab="true">
<file leaf-file-name="jquery-weui.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/jquery-weui.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0011111111" vertical-offset="37372" max-vertical-offset="44061">
<caret line="1967" column="9" selection-start-line="1967" selection-start-column="9" selection-end-line="1967" selection-end-column="9" />
<state vertical-scroll-proportion="0.0" vertical-offset="37372" max-vertical-offset="44061">
<caret line="1978" column="14" selection-start-line="1978" selection-start-column="14" selection-end-line="1978" selection-end-column="14" />
<folding>
<element signature="e#433#1880#2" expanded="true" />
<element signature="e#23094#23349#2" expanded="true" />
... ... @@ -70,31 +70,36 @@
</provider>
</entry>
</file>
<file leaf-file-name="hopeaddress.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/hopeaddress.js">
<file leaf-file-name="jquery-weui.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/jquery-weui.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.08" vertical-offset="3376" max-vertical-offset="6032">
<caret line="153" column="49" selection-start-line="147" selection-start-column="23" selection-end-line="153" selection-end-column="49" />
<folding />
<state vertical-scroll-proportion="82.76363" vertical-offset="163798" max-vertical-offset="175230">
<caret line="5898" column="26" selection-start-line="5898" selection-start-column="26" selection-end-line="5898" selection-end-column="26" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="shopcar.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/shopcar.html">
<file leaf-file-name="order.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/order.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-29.785715" vertical-offset="2018" max-vertical-offset="4255">
<caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" />
<folding />
<state vertical-scroll-proportion="0.522807" vertical-offset="13512" max-vertical-offset="21087">
<caret line="517" column="54" selection-start-line="517" selection-start-column="54" selection-end-line="517" selection-end-column="54" />
<folding>
<element signature="n#style#0;n#label#0;n#div#0;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="research.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/research.js">
<file leaf-file-name="shopcar.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/shopcar.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-17.0" vertical-offset="7825" max-vertical-offset="13000">
<caret line="330" column="44" selection-start-line="330" selection-start-column="44" selection-end-line="330" selection-end-column="44" />
<state vertical-scroll-proportion="0.0" vertical-offset="2356" max-vertical-offset="3515">
<caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" />
<folding />
</state>
</provider>
... ... @@ -103,7 +108,7 @@
<file leaf-file-name="PersonCenter.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-17.535715" vertical-offset="1863" max-vertical-offset="4180">
<state vertical-scroll-proportion="0.0" vertical-offset="2033" max-vertical-offset="3610">
<caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" />
<folding />
</state>
... ... @@ -113,7 +118,7 @@
<file leaf-file-name="research.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/research.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-14.285714" vertical-offset="2525" max-vertical-offset="5250">
<state vertical-scroll-proportion="0.0" vertical-offset="2223" max-vertical-offset="3990">
<caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -132,7 +137,7 @@
<file leaf-file-name="evalute.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/evalute.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.04" vertical-offset="5449" max-vertical-offset="6850">
<state vertical-scroll-proportion="0.0" vertical-offset="4598" max-vertical-offset="5206">
<caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" />
<folding>
<marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." />
... ... @@ -144,7 +149,7 @@
<file leaf-file-name="research.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/research.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="4641" max-vertical-offset="6164">
<state vertical-scroll-proportion="0.0" vertical-offset="4237" max-vertical-offset="5092">
<caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" />
<folding />
</state>
... ... @@ -164,7 +169,6 @@
<option value="$PROJECT_DIR$/js/index.js" />
<option value="$PROJECT_DIR$/js/shopcar.js" />
<option value="$PROJECT_DIR$/js/personcenter.js" />
<option value="$PROJECT_DIR$/order.html" />
<option value="$PROJECT_DIR$/hopeaddress.html" />
<option value="$PROJECT_DIR$/js/hopeaddress.js" />
<option value="$PROJECT_DIR$/js/research.js" />
... ... @@ -176,6 +180,8 @@
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/js/order.js" />
<option value="$PROJECT_DIR$/css/jquery-weui.css" />
<option value="$PROJECT_DIR$/js/jquery-weui.js" />
<option value="$PROJECT_DIR$/order.html" />
</list>
</option>
</component>
... ... @@ -292,7 +298,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="G:/project" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="HbShouldOpenHtmlAsHb" value="" />
<property name="JavaScriptLanguageLevel" value="ES6" />
<property name="JavaScriptPreferStrict" value="false" />
... ... @@ -307,14 +313,10 @@
</key>
</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 />
<configuration default="true" type="DartCommandLineRunConfigurationType" factoryName="Dart Command Line Application">
<method />
</configuration>
<configuration default="true" type="JSTestDriver:ConfigurationType" factoryName="JsTestDriver">
... ... @@ -324,6 +326,10 @@
<setting name="preferredDebugBrowser" value="Chrome" />
<method />
</configuration>
<configuration default="true" type="JavaScriptTestRunnerKarma" factoryName="Karma" config-file="">
<envs />
<method />
</configuration>
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
<method />
</configuration>
... ... @@ -358,8 +364,8 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-7" y="2" width="1932" height="1051" extended-state="1" />
<editor active="false" />
<frame x="-7" y="2" width="1932" height="1051" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<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="7" side_tool="false" content_ui="tabs" />
... ... @@ -367,18 +373,18 @@
<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="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.107515655" 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="2" 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="7" 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="7" 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="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="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="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="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="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" />
<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" />
<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" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
... ... @@ -402,14 +408,20 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/css/research.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="4237" max-vertical-offset="5092">
<caret line="223" column="25" selection-start-line="223" selection-start-column="25" selection-end-line="223" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="4503" max-vertical-offset="6688">
<caret line="237" column="52" selection-start-line="237" selection-start-column="52" selection-end-line="237" selection-end-column="52" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
... ... @@ -426,9 +438,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909">
<caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
<folding>
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -436,7 +445,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541">
<caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -444,7 +452,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="5928" max-vertical-offset="13832">
<caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
... ... @@ -452,7 +459,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
<caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />
<folding />
</state>
</provider>
</entry>
... ... @@ -468,10 +474,7 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3211">
<caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
<folding>
<element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
... ... @@ -479,7 +482,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">
<caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
... ... @@ -487,7 +489,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779">
<caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
... ... @@ -496,9 +497,7 @@
<state vertical-scroll-proportion="0.0" vertical-offset="4275" max-vertical-offset="6707">
<caret line="225" column="8" selection-start-line="225" selection-start-column="8" selection-end-line="225" selection-end-column="8" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
... ... @@ -515,9 +514,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="2812" max-vertical-offset="5909">
<caret line="148" column="51" selection-start-line="148" selection-start-column="51" selection-end-line="148" selection-end-column="51" />
<folding>
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -525,7 +521,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4427">
<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>
... ... @@ -533,7 +528,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="5928" max-vertical-offset="13832">
<caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
... ... @@ -541,7 +535,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
<caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />
<folding />
</state>
</provider>
</entry>
... ... @@ -557,10 +550,7 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">
<caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
<folding>
<element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
... ... @@ -568,7 +558,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">
<caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
... ... @@ -576,7 +565,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779">
<caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
... ... @@ -585,9 +573,7 @@
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="6707">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
... ... @@ -596,7 +582,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="4408" max-vertical-offset="13870">
<caret line="232" column="23" selection-start-line="232" selection-start-column="23" selection-end-line="232" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
... ... @@ -612,10 +597,7 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="722" max-vertical-offset="3116">
<caret line="38" column="61" selection-start-line="38" selection-start-column="61" selection-end-line="38" selection-end-column="61" />
<folding>
<element signature="n#style#0;n#img#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#img#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
... ... @@ -623,7 +605,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="437" max-vertical-offset="1634">
<caret line="23" column="52" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
... ... @@ -638,7 +619,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="247" max-vertical-offset="779">
<caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
... ... @@ -653,7 +633,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="276" max-vertical-offset="1189">
<caret line="13" column="44" selection-start-line="13" selection-start-column="44" selection-end-line="13" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
... ... @@ -661,7 +640,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="380">
<caret line="14" column="1460" selection-start-line="14" selection-start-column="1460" selection-end-line="14" selection-end-column="1460" />
<folding />
</state>
</provider>
</entry>
... ... @@ -669,7 +647,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="8906" max-vertical-offset="21840">
<caret line="312" column="24" selection-start-line="312" selection-start-column="24" selection-end-line="312" selection-end-column="24" />
<folding />
</state>
</provider>
</entry>
... ... @@ -677,7 +654,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="589" max-vertical-offset="4541">
<caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -693,9 +669,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="1083" max-vertical-offset="5909">
<caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
<folding>
<element signature="n#!!doc" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -703,15 +676,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-18.8" vertical-offset="718" max-vertical-offset="2398">
<caret line="54" column="29" selection-start-line="54" selection-start-column="29" selection-end-line="54" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/order.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-15.785714" vertical-offset="7748" max-vertical-offset="20306">
<caret line="315" column="17" selection-start-line="315" selection-start-column="17" selection-end-line="315" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
... ... @@ -719,7 +683,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-14.25" vertical-offset="843" max-vertical-offset="2457">
<caret line="46" column="11" selection-start-line="46" selection-start-column="11" selection-end-line="46" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
... ... @@ -727,7 +690,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-23.0" vertical-offset="207" max-vertical-offset="1219">
<caret line="37" column="13" selection-start-line="37" selection-start-column="13" selection-end-line="37" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
... ... @@ -735,13 +697,12 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.964285" vertical-offset="150" max-vertical-offset="1325">
<caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/hopeaddress.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.08" vertical-offset="3376" max-vertical-offset="6032">
<state vertical-scroll-proportion="0.0" vertical-offset="2907" max-vertical-offset="4408">
<caret line="153" column="49" selection-start-line="147" selection-start-column="23" selection-end-line="153" selection-end-column="49" />
<folding />
</state>
... ... @@ -749,7 +710,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/js/research.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-17.0" vertical-offset="7825" max-vertical-offset="13000">
<state vertical-scroll-proportion="0.0" vertical-offset="6270" max-vertical-offset="9880">
<caret line="330" column="44" selection-start-line="330" selection-start-column="44" selection-end-line="330" selection-end-column="44" />
<folding />
</state>
... ... @@ -765,7 +726,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/research.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-14.285714" vertical-offset="2525" max-vertical-offset="5250">
<state vertical-scroll-proportion="0.0" vertical-offset="2223" max-vertical-offset="3990">
<caret line="117" column="59" selection-start-line="117" selection-start-column="59" selection-end-line="117" selection-end-column="59" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#3;n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -782,7 +743,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/js/evalute.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-24.04" vertical-offset="5449" max-vertical-offset="6850">
<state vertical-scroll-proportion="0.0" vertical-offset="4598" max-vertical-offset="5206">
<caret line="242" column="5" selection-start-line="242" selection-start-column="5" selection-end-line="242" selection-end-column="5" />
<folding>
<marker date="1534760479292" expanded="true" signature="2037:2047" placeholder="..." />
... ... @@ -792,7 +753,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/PersonCenter/PersonCenter.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-17.535715" vertical-offset="1863" max-vertical-offset="4180">
<state vertical-scroll-proportion="0.0" vertical-offset="2033" max-vertical-offset="3610">
<caret line="107" column="75" selection-start-line="107" selection-start-column="75" selection-end-line="107" selection-end-column="75" />
<folding />
</state>
... ... @@ -800,7 +761,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/shopcar.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-29.785715" vertical-offset="2018" max-vertical-offset="4255">
<state vertical-scroll-proportion="0.0" vertical-offset="2356" max-vertical-offset="3515">
<caret line="124" column="18" selection-start-line="124" selection-start-column="18" selection-end-line="124" selection-end-column="18" />
<folding />
</state>
... ... @@ -808,7 +769,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="10.642858" vertical-offset="4798" max-vertical-offset="8925">
<state vertical-scroll-proportion="0.0" vertical-offset="3420" max-vertical-offset="6783">
<caret line="180" column="17" selection-start-line="180" selection-start-column="17" selection-end-line="180" selection-end-column="17" />
<folding>
<element signature="n#style#0;n#ul#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -818,7 +779,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/js/order.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-23.64" vertical-offset="4653" max-vertical-offset="10672">
<state vertical-scroll-proportion="0.0" vertical-offset="4332" max-vertical-offset="8816">
<caret line="228" column="31" selection-start-line="228" selection-start-column="31" selection-end-line="228" selection-end-column="31" />
<folding />
</state>
... ... @@ -826,8 +787,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/css/jquery-weui.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0011111111" vertical-offset="37372" max-vertical-offset="44061">
<caret line="1967" column="9" selection-start-line="1967" selection-start-column="9" selection-end-line="1967" selection-end-column="9" />
<state vertical-scroll-proportion="0.0" vertical-offset="37372" max-vertical-offset="44061">
<caret line="1978" column="14" selection-start-line="1978" selection-start-column="14" selection-end-line="1978" selection-end-column="14" />
<folding>
<element signature="e#433#1880#2" expanded="true" />
<element signature="e#23094#23349#2" expanded="true" />
... ... @@ -846,5 +807,26 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/js/jquery-weui.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="82.76363" vertical-offset="163798" max-vertical-offset="175230">
<caret line="5898" column="26" selection-start-line="5898" selection-start-column="26" selection-end-line="5898" selection-end-column="26" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/order.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.522807" vertical-offset="13512" max-vertical-offset="21087">
<caret line="517" column="54" selection-start-line="517" selection-start-column="54" selection-end-line="517" selection-end-column="54" />
<folding>
<element signature="n#style#0;n#label#0;n#div#0;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#2;n#div#4;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
此 diff 太大无法显示。
... ... @@ -293,7 +293,7 @@
box-sizing: border-box;
-webkit-transition: 300ms;
transition: 300ms;
font-size:0.2rem;
font-size:0.3rem;
}
[v-cloak]{
display:none;
... ... @@ -509,7 +509,7 @@
<div class="weui-cell">
<div class="weui-cell__hd"><label for="time4" class="weui-label" style="font-size:0.3rem;color:#333333">定制时间</label></div>
<div class="weui-cell__bd" style="margin-left: 47px;font-size: 0.3rem;color:#333333">
<div class="weui-cell__bd" style="margin-left: 0.2rem;font-size: 0.3rem;color:#333333">
<input class="weui-input" id="time4" type="text" value="">
</div>
</div>
... ...