1

db970637 · zhangheng · 9e65fddf · db970637 · db970637 · db970637
Commit db970637 authored Aug 31, 2019 by zhangheng
6 changed files
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,9 @@
  <component name="ChangeListManager">
    <list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/btn-b-y.png" afterPath="$PROJECT_DIR$/Public/static/images/btn-b-y.png" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.css" afterPath="$PROJECT_DIR$/Public/static/css/main.css" />
      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
    </list>
@@ -84,8 +86,8 @@
          <file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true">
            <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="2377">
+                <state relative-caret-position="190">
-                  <caret line="282" column="0" lean-forward="true" selection-start-line="282" selection-start-column="0" selection-end-line="282" selection-end-column="0" />
+                  <caret line="47" column="30" lean-forward="true" selection-start-line="47" selection-start-column="30" selection-end-line="47" selection-end-column="30" />
                  <folding>
                    <element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
                  </folding>
@@ -122,8 +124,8 @@
          <file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
            <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="399">
+                <state relative-caret-position="209">
-                  <caret line="332" column="4" lean-forward="false" selection-start-line="332" selection-start-column="4" selection-end-line="332" selection-end-column="4" />
+                  <caret line="343" column="55" lean-forward="false" selection-start-line="343" selection-start-column="55" selection-end-line="343" selection-end-column="55" />
                  <folding />
                </state>
              </provider>
@@ -184,8 +186,8 @@
        <option value="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" />
        <option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
        <option value="$PROJECT_DIR$/Public/static/js/index.js" />
-        <option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
        <option value="$PROJECT_DIR$/Public/static/css/main.scss" />
+        <option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
      </list>
    </option>
  </component>
@@ -546,12 +548,12 @@
      <updated>1566667513502</updated>
      <workItem from="1566667516612" duration="55749000" />
      <workItem from="1567098016695" duration="6433000" />
-      <workItem from="1567181764126" duration="4085000" />
+      <workItem from="1567181764126" duration="4213000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="66267000" />
+    <option name="totallyTimeSpent" value="66395000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="0" y="23" width="1440" height="815" extended-state="6" />
@@ -564,7 +566,7 @@
      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2461964" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17289074" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17289074" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -934,21 +936,21 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
+    <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2377">
+        <state relative-caret-position="209">
-          <caret line="282" column="0" lean-forward="true" selection-start-line="282" selection-start-column="0" selection-end-line="282" selection-end-column="0" />
+          <caret line="343" column="55" lean-forward="false" selection-start-line="343" selection-start-column="55" selection-end-line="343" selection-end-column="55" />
-          <folding>
+          <folding />
-            <element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
+    <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
+        <state relative-caret-position="190">
-          <caret line="332" column="4" lean-forward="false" selection-start-line="332" selection-start-column="4" selection-end-line="332" selection-end-column="4" />
+          <caret line="47" column="30" lean-forward="true" selection-start-line="47" selection-start-column="30" selection-end-line="47" selection-end-column="30" />
-          <folding />
+          <folding>
+            <element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
        </state>
      </provider>
    </entry>

--- a/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
+++ b/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc
--- a/Application/Home/View/default/Index_index.tpl
+++ b/Application/Home/View/default/Index_index.tpl
@@ -42,7 +42,7 @@
    </script>
    <title>冷热酸甜八十年</title>
    <link href="__CDN__/css/swiper.min.css" rel="stylesheet">
-    <link href="__CDN__/css/main.css?t=1" rel="stylesheet">
+    <link href="__CDN__/css/main.css?t=2" rel="stylesheet">
    <style>
        #container.transform {

--- a/Public/static/css/main.css
+++ b/Public/static/css/main.css
@@ -380,10 +380,10 @@ ul, li {
  position: absolute;
  display: inline-block;
  left: 94px;
-  top: 945px;
+  top: 979px;
  background: url("../images/btn-b-y.png") left top;
  width: 435px;
-  height: 97px;
+  height: 49px;
  display: flex;
  justify-content: space-around;
  align-items: flex-end;
@@ -396,7 +396,7 @@ ul, li {
  position: absolute;
  display: inline-block;
  left: 94px;
-  top: 945px;
+  top: 979px;
  background: url("../images/word-2.png") left top;
  width: 425px;
  height: 49px;

--- a/Public/static/css/main.scss
+++ b/Public/static/css/main.scss
@@ -339,10 +339,9 @@ ul, li {
      width: 114px;
      height: 134px;
    }
  }
  .b-y {
-    @include image_bounds_by_pos("../images/btn-b-y.png", 94px, 945px);
+    @include image_bounds_by_pos("../images/btn-b-y.png", 94px, 979px);
    display: flex;
    justify-content: space-around;
    align-items: flex-end;
@@ -353,7 +352,7 @@ ul, li {
  }
  .btn-w-p {
-    @include image_bounds_by_pos("../images/word-2.png", 94px, 945px);
+    @include image_bounds_by_pos("../images/word-2.png", 94px, 979px);
    display: flex;
    justify-content: space-around;
    align-items: flex-end;

--- a/Public/static/images/btn-b-y.png
+++ b/Public/static/images/btn-b-y.png