Skip to content

php / dencare-game

Go to a project
Commit 9ec15bc7 by zhangheng
Options

y

parent 93252ec5
Showing with 40 additions and 37 deletions
.idea/workspace.xml
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment=""> <list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" /> <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.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
...@@ -16,7 +17,7 @@ ...@@ -16,7 +17,7 @@
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.5862069"> <splitter split-orientation="horizontal" split-proportion="0.24608295">
<split-first> <split-first>
<leaf> <leaf>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
...@@ -78,11 +79,11 @@ ...@@ -78,11 +79,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="false"> <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"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475"> <state relative-caret-position="228">
<caret line="42" column="12" lean-forward="false" selection-start-line="42" selection-start-column="12" selection-end-line="42" selection-end-column="12" /> <caret line="209" column="40" lean-forward="false" selection-start-line="209" selection-start-column="40" selection-end-line="209" selection-end-column="40" />
<folding> <folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;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#0;n#body#0;n#html#0;n#!!top" expanded="true" />
...@@ -131,7 +132,7 @@ ...@@ -131,7 +132,7 @@
<element signature="n#style#0;n#div#10;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#10;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#11;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#11;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#12;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#12;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#12;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#2;n#div#12;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
...@@ -160,14 +161,12 @@ ...@@ -160,14 +161,12 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="true"> <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js"> <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258"> <state relative-caret-position="1227">
<caret line="385" column="1" lean-forward="true" selection-start-line="385" selection-start-column="1" selection-end-line="385" selection-end-column="1" /> <caret line="385" column="1" lean-forward="true" selection-start-line="385" selection-start-column="1" selection-end-line="385" selection-end-column="1" />
<folding> <folding />
<marker date="1566838533000" expanded="true" signature="9861:10780" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -179,8 +178,8 @@ ...@@ -179,8 +178,8 @@
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true"> <file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss"> <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222"> <state relative-caret-position="200">
<caret line="925" column="3" lean-forward="false" selection-start-line="925" selection-start-column="3" selection-end-line="925" selection-end-column="3" /> <caret line="315" column="38" lean-forward="false" selection-start-line="315" selection-start-column="38" selection-end-line="315" selection-end-column="38" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -211,8 +210,8 @@ ...@@ -211,8 +210,8 @@
<find>btn-close</find> <find>btn-close</find>
<find>page-lang</find> <find>page-lang</find>
<find>btn-next-map</find> <find>btn-next-map</find>
<find>btn-info</find>
<find>mix/</find> <find>mix/</find>
<find>btn-info</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>m-</replace> <replace>m-</replace>
...@@ -228,12 +227,12 @@ ...@@ -228,12 +227,12 @@
<option value="$PROJECT_DIR$/Public/static/js/hammer.min.js" /> <option value="$PROJECT_DIR$/Public/static/js/hammer.min.js" />
<option value="$PROJECT_DIR$/index.html" /> <option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/Application/Common/Conf/db.php" /> <option value="$PROJECT_DIR$/Application/Common/Conf/db.php" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" /> <option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" /> <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$/Application/User/Controller/ReportController.class.php" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" /> <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" />
</list> </list>
</option> </option>
</component> </component>
...@@ -587,12 +586,12 @@ ...@@ -587,12 +586,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="44084000" /> <workItem from="1566667516612" duration="44195000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="44084000" /> <option name="totallyTimeSpent" value="44195000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="2" y="23" width="1440" height="817" extended-state="6" /> <frame x="2" y="23" width="1440" height="817" extended-state="6" />
...@@ -740,14 +739,6 @@ ...@@ -740,14 +739,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="222">
<caret line="925" column="3" lean-forward="false" selection-start-line="925" selection-start-column="3" selection-end-line="925" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php"> <entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="143"> <state relative-caret-position="143">
...@@ -772,10 +763,18 @@ ...@@ -772,10 +763,18 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1227">
<caret line="385" column="1" lean-forward="true" selection-start-line="385" selection-start-column="1" selection-end-line="385" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475"> <state relative-caret-position="228">
<caret line="42" column="12" lean-forward="false" selection-start-line="42" selection-start-column="12" selection-end-line="42" selection-end-column="12" /> <caret line="209" column="40" lean-forward="false" selection-start-line="209" selection-start-column="40" selection-end-line="209" selection-end-column="40" />
<folding> <folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;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#0;n#body#0;n#html#0;n#!!top" expanded="true" />
...@@ -824,7 +823,7 @@ ...@@ -824,7 +823,7 @@
<element signature="n#style#0;n#div#10;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#10;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#11;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#11;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#12;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#12;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#12;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#2;n#div#12;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
...@@ -832,13 +831,11 @@ ...@@ -832,13 +831,11 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js"> <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="258"> <state relative-caret-position="200">
<caret line="385" column="1" lean-forward="true" selection-start-line="385" selection-start-column="1" selection-end-line="385" selection-end-column="1" /> <caret line="315" column="38" lean-forward="false" selection-start-line="315" selection-start-column="38" selection-end-line="315" selection-end-column="38" />
<folding> <folding />
<marker date="1566838533000" expanded="true" signature="9861:10780" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
Application/Home/View/default/Index_index.tpl
...@@ -191,18 +191,23 @@ ...@@ -191,18 +191,23 @@
<img src="__CDN__/images/share.png"> <img src="__CDN__/images/share.png">
</div> </div>
<div class="page-no-prize" style="display: none"> <div class="page-no-prize" style="display: none">
<div class="zhou m-b-zhou-sate"></div>
<div class="c-d m-b-sate"></div>
<div class="btn"> <div class="btn">
<div class="btn-share"></div> <div class="btn-share"></div>
<div class="btn-j-x"></div> <div class="btn-j-x"></div>
</div> </div>
</div> </div>
<div class="page-prize" style="display: none"> <div class="page-prize" style="display: none">
<div class="zhou m-b-zhou-sate"></div>
<div class="c-d m-b-sate"></div>
<img class="prize-map" src="__CDN__/images/prize-1.jpg"> <img class="prize-map" src="__CDN__/images/prize-1.jpg">
<div class="btn-info"></div> <div class="btn-info"></div>
</div> </div>
<div class="page-info" style="display: none"> <div class="page-info" style="display: none">
<div class="zhou m-b-zhou-sate"></div>
<div class="c-d m-b-sate"></div>
<input class="name" type="text" value="" maxlength="6"> <input class="name" type="text" value="" maxlength="6">
<input class="address" type="text" value="" maxlength="200"> <input class="address" type="text" value="" maxlength="200">
<input class="tel" type="text" value="" maxlength="11"> <input class="tel" type="text" value="" maxlength="11">
......
Public/static/css/main.css
...@@ -343,6 +343,7 @@ ul, li { ...@@ -343,6 +343,7 @@ ul, li {
-webkit-transform: scale(0.1); -webkit-transform: scale(0.1);
} }
.page-x-z .w-p { .page-x-z .w-p {
-webkit-overflow-scrolling: touch;
overflow-y: hidden; overflow-y: hidden;
overflow-x: scroll; overflow-x: scroll;
display: flex; display: flex;
......
Public/static/css/main.scss
...@@ -313,7 +313,7 @@ ul, li { ...@@ -313,7 +313,7 @@ ul, li {
-webkit-transform: scale(0.1); -webkit-transform: scale(0.1);
} }
.w-p { .w-p {
-webkit-overflow-scrolling: touch;
overflow-y: hidden; overflow-y: hidden;
overflow-x: scroll; overflow-x: scroll;
display: flex; display: flex;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment