Skip to content

php / sx-prize

Go to a project
Commit fb4b7aa0 by 张恒
Options

j

parent 3a1feab2
Showing with 176 additions and 137 deletions
.idea/workspace.xml
...@@ -4,8 +4,11 @@ ...@@ -4,8 +4,11 @@
<list default="true" id="83262c17-7030-4f8f-af17-e1cc55f76944" name="Default" comment=""> <list default="true" id="83262c17-7030-4f8f-af17-e1cc55f76944" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" afterPath="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<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.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" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
</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" />
...@@ -19,9 +22,9 @@ ...@@ -19,9 +22,9 @@
</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.19947276"> <splitter split-orientation="horizontal" split-proportion="0.5579965">
<split-first> <split-first>
<leaf> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
...@@ -35,28 +38,31 @@ ...@@ -35,28 +38,31 @@
<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="false">
<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="405"> <state relative-caret-position="253">
<caret line="73" column="63" lean-forward="false" selection-start-line="73" selection-start-column="63" selection-end-line="73" selection-end-column="63" /> <caret line="53" column="16" lean-forward="false" selection-start-line="53" selection-start-column="16" selection-end-line="53" selection-end-column="25" />
<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#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</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="304"> <state relative-caret-position="380">
<caret line="16" column="9" lean-forward="false" selection-start-line="16" selection-start-column="9" selection-end-line="16" selection-end-column="9" /> <caret line="53" column="42" lean-forward="true" selection-start-line="53" selection-start-column="42" selection-end-line="53" selection-end-column="42" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="IndexController.class.php" pinned="false" current-in-tab="false"> <file leaf-file-name="IndexController.class.php" pinned="false" current-in-tab="true">
<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="38"> <state relative-caret-position="425">
<caret line="8" column="14" lean-forward="true" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" /> <caret line="155" column="32" lean-forward="true" selection-start-line="155" selection-start-column="32" selection-end-line="155" selection-end-column="32" />
<folding> <folding>
<element signature="e#34#44#0#PHP" expanded="true" /> <element signature="e#34#44#0#PHP" expanded="true" />
</folding> </folding>
...@@ -67,7 +73,7 @@ ...@@ -67,7 +73,7 @@
<file leaf-file-name="main.scss" pinned="false" current-in-tab="false"> <file leaf-file-name="main.scss" pinned="false" current-in-tab="false">
<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="1148"> <state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" /> <caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding /> <folding />
</state> </state>
...@@ -77,12 +83,12 @@ ...@@ -77,12 +83,12 @@
</leaf> </leaf>
</split-first> </split-first>
<split-second> <split-second>
<leaf> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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="234"> <state relative-caret-position="406">
<caret line="198" column="15" lean-forward="false" selection-start-line="198" selection-start-column="15" selection-end-line="198" selection-end-column="15" /> <caret line="207" column="0" lean-forward="true" selection-start-line="207" selection-start-column="0" selection-end-line="207" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -101,7 +107,7 @@ ...@@ -101,7 +107,7 @@
<file leaf-file-name="config.php" pinned="false" current-in-tab="false"> <file leaf-file-name="config.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php"> <entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-133"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
...@@ -119,10 +125,10 @@ ...@@ -119,10 +125,10 @@
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/Application/Common/Conf/db.php" /> <option value="$PROJECT_DIR$/Application/Common/Conf/db.php" />
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.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/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" /> <option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" /> <option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
</list> </list>
</option> </option>
</component> </component>
...@@ -153,7 +159,6 @@ ...@@ -153,7 +159,6 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
...@@ -377,6 +382,7 @@ ...@@ -377,6 +382,7 @@
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
...@@ -414,6 +420,12 @@ ...@@ -414,6 +420,12 @@
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js"> <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<node-interpreter>project</node-interpreter>
<node-options />
<gulpfile />
<tasks />
<arguments />
<envs />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="js.build_tools.npm" factoryName="npm"> <configuration default="true" type="js.build_tools.npm" factoryName="npm">
...@@ -447,26 +459,26 @@ ...@@ -447,26 +459,26 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1562502557206</updated> <updated>1562502557206</updated>
<workItem from="1562502558877" duration="1907000" /> <workItem from="1562502558877" duration="2926000" />
<workItem from="1562505554364" duration="570000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1907000" /> <option name="totallyTimeSpent" value="3496000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="821" extended-state="6" /> <frame x="0" y="23" width="1440" height="821" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18597998" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1881259" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" 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="7" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" 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="1" side_tool="false" content_ui="tabs" />
<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="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.32921812" sideWeight="0.5" order="2" 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.32921812" 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="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.15912208" 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="true" show_stripe_button="true" weight="0.15775034" 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="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="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" /> <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" />
...@@ -476,6 +488,7 @@ ...@@ -476,6 +488,7 @@
<window_info id="npm" 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="2" side_tool="true" content_ui="tabs" /> <window_info id="npm" 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="2" side_tool="true" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Grunt " 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="3" side_tool="true" content_ui="tabs" /> <window_info id="Grunt " 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="3" side_tool="true" content_ui="tabs" />
<window_info id="Find" 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="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" show_stripe_button="true" weight="0.25" 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" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout> </layout>
</component> </component>
...@@ -490,18 +503,47 @@ ...@@ -490,18 +503,47 @@
<watches-manager /> <watches-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.css"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3163"> <state relative-caret-position="1767">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="93" column="37" lean-forward="false" selection-start-line="93" selection-start-column="37" selection-end-line="93" selection-end-column="37" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index.html"> <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="1767"> <state relative-caret-position="1007">
<caret line="93" column="37" lean-forward="false" selection-start-line="93" selection-start-column="37" selection-end-line="93" selection-end-column="37" /> <caret line="53" column="37" lean-forward="true" selection-start-line="53" selection-start-column="37" selection-end-line="53" selection-end-column="37" />
<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#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="950">
<caret line="50" column="41" lean-forward="false" selection-start-line="50" selection-start-column="41" selection-end-line="50" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2622">
<caret line="138" column="36" lean-forward="true" selection-start-line="138" selection-start-column="36" selection-end-line="138" selection-end-column="36" />
<folding>
<element signature="e#34#44#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -516,46 +558,80 @@ ...@@ -516,46 +558,80 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php"> <entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-133"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php"> <entry file="file://$PROJECT_DIR$/Public/static/css/main.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38"> <state relative-caret-position="-3163">
<caret line="8" column="14" lean-forward="true" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#34#44#0#PHP" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"> <entry file="file://$PROJECT_DIR$/Application/Common/Conf/db.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="7" column="33" lean-forward="true" selection-start-line="7" selection-start-column="33" selection-end-line="7" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405"> <state relative-caret-position="0">
<caret line="73" column="63" lean-forward="false" selection-start-line="73" selection-start-column="63" selection-end-line="73" selection-end-column="63" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304"> <state relative-caret-position="1767">
<caret line="16" column="9" lean-forward="false" selection-start-line="16" selection-start-column="9" selection-end-line="16" selection-end-column="9" /> <caret line="93" column="37" lean-forward="false" selection-start-line="93" selection-start-column="37" selection-end-line="93" selection-end-column="37" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<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="234"> <state relative-caret-position="3306">
<caret line="198" column="15" lean-forward="false" selection-start-line="198" selection-start-column="15" selection-end-line="198" selection-end-column="15" /> <caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="53" column="16" lean-forward="false" selection-start-line="53" selection-start-column="16" selection-end-line="53" selection-end-column="25" />
<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#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="53" column="42" lean-forward="true" selection-start-line="53" selection-start-column="42" selection-end-line="53" selection-end-column="42" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="155" column="32" lean-forward="true" selection-start-line="155" selection-start-column="32" selection-end-line="155" selection-end-column="32" />
<folding>
<element signature="e#34#44#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
......
Application/Home/Controller/IndexController.class.php
...@@ -46,13 +46,22 @@ class IndexController extends Controller ...@@ -46,13 +46,22 @@ class IndexController extends Controller
$this->request_auth($this->get_url()); $this->request_auth($this->get_url());
return; return;
} }
$prize_type = M('Prize')->where(array('user_id' => $user['id']))->find();
if ($prize_type) {
$type = 1;
} else {
$type = 0;
}
$this->assign('type', $type);
$this->display(); $this->display();
} }
public function get_random_prize($user) public function get_random_prize($user)
{ {
$v = rand(0, 1000000) / 1000000; $v = rand(0, 1000000) / 1000000;
$today_ratio = 1; $today_ratio = 1;
if ($v > $today_ratio) { if ($v > $today_ratio) {
return false; return false;
...@@ -69,7 +78,7 @@ class IndexController extends Controller ...@@ -69,7 +78,7 @@ class IndexController extends Controller
))->count(); ))->count();
if ($type == 1) { if ($type == 1) {
if ($c >= 1000) { if ($c >= 10) {
continue; continue;
} }
} }
...@@ -87,7 +96,6 @@ class IndexController extends Controller ...@@ -87,7 +96,6 @@ class IndexController extends Controller
if (!$prize) { if (!$prize) {
return false; return false;
} }
$result = M('Prize')->where(array( $result = M('Prize')->where(array(
'id' => $prize['id'], 'id' => $prize['id'],
'is_get' => 0, 'is_get' => 0,
...@@ -114,17 +122,7 @@ class IndexController extends Controller ...@@ -114,17 +122,7 @@ class IndexController extends Controller
)); ));
return; return;
} }
$type_sate = $c = M('Sate')->where(array(
'id' => 1,
))->getField('sate');
if ($type_sate == 0) {
$this->ajaxReturn(array(
'errcode' => 1,
'errmsg' => '用户信息错误',
));
return;
}
$prize = M('Prize')->where(array( $prize = M('Prize')->where(array(
'user_id' => $user['id'] 'user_id' => $user['id']
))->find(); ))->find();
...@@ -134,27 +132,13 @@ class IndexController extends Controller ...@@ -134,27 +132,13 @@ class IndexController extends Controller
'errmsg' => null, 'errmsg' => null,
'data' => array( 'data' => array(
'prize' => 1, 'prize' => 1,
'url' => $prize['prize_url'], 'type' => 1,
'type'=>1,
)
));
return;
}
$ip = M('Prize')->where(array(
'last_ip' => $user['last_ip']
))->count();
if ($ip >= 9) {
$this->ajaxReturn(array(
'errcode' => 0,
'errmsg' => null,
'data' => array(
'prize' => 0,
) )
)); ));
return; return;
} }
$now = time();
$from = strtotime(date('Y-m-d', $now));
$prize = $this->get_random_prize($user); $prize = $this->get_random_prize($user);
if ($prize) { if ($prize) {
$this->ajaxReturn(array( $this->ajaxReturn(array(
...@@ -162,8 +146,6 @@ class IndexController extends Controller ...@@ -162,8 +146,6 @@ class IndexController extends Controller
'errmsg' => null, 'errmsg' => null,
'data' => array( 'data' => array(
'prize' => 1, 'prize' => 1,
'url' => $prize['prize_url'],
'type'=>0,
) )
)); ));
...@@ -173,6 +155,7 @@ class IndexController extends Controller ...@@ -173,6 +155,7 @@ class IndexController extends Controller
'errmsg' => null, 'errmsg' => null,
'data' => array( 'data' => array(
'prize' => 0, 'prize' => 0,
'time'=>$from
) )
)); ));
......
Application/Home/View/default/Index_index.tpl
...@@ -51,7 +51,8 @@ ...@@ -51,7 +51,8 @@
<body ontouchmove="return false;"> <body ontouchmove="return false;">
<div id="container"> <div id="container">
<div class="btn-prize">点击抽奖</div> <div class="btn-prize" style="display: none">点击抽奖</div>
<div class="prize-type" style="display: none"></div>
</div> </div>
<script> <script>
if (!/android/i.test(navigator.userAgent)) { if (!/android/i.test(navigator.userAgent)) {
...@@ -63,7 +64,7 @@ ...@@ -63,7 +64,7 @@
} }
</script> </script>
<script> <script>
{*window.type='{:$type}'*} window.type='{:$type}'
</script> </script>
<script type="text/javascript" <script type="text/javascript"
src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all&app_stat_key=t6NkwipRePFcidTJ"></script> src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all&app_stat_key=t6NkwipRePFcidTJ"></script>
......
Public/static/css/main.css
...@@ -158,7 +158,7 @@ ul, li { ...@@ -158,7 +158,7 @@ ul, li {
height: 100%; height: 100%;
} }
.flex, #container, #container .btn-prize { .flex, #container, #container .btn-prize, #container .prize-type {
display: -webkit-box; display: -webkit-box;
/* OLD - iOS 6-, Safari 3.1-6 */ /* OLD - iOS 6-, Safari 3.1-6 */
display: -moz-box; display: -moz-box;
...@@ -176,7 +176,7 @@ ul, li { ...@@ -176,7 +176,7 @@ ul, li {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
#container .btn-prize { #container .btn-prize, #container .prize-type {
width: 200px; width: 200px;
height: 200px; height: 200px;
font-size: 27px; font-size: 27px;
......
Public/static/css/main.scss
...@@ -197,7 +197,7 @@ ul, li { ...@@ -197,7 +197,7 @@ ul, li {
@extend .flex; @extend .flex;
width: 100%; width: 100%;
height: 100%; height: 100%;
.btn-prize { .btn-prize,.prize-type {
@extend .flex; @extend .flex;
width: torem(200px); width: torem(200px);
height: torem(200px); height: torem(200px);
......
Public/static/js/index.js
var prize_word=[
'家和万事兴',
'和谐美满',
'和和美美',
'和和睦睦 ',
'和气生财',
'和蔼可亲'
];
var prize_lock=1;
$(document).ready(function () { $(document).ready(function () {
try { try {
...@@ -14,86 +23,57 @@ $(document).ready(function () { ...@@ -14,86 +23,57 @@ $(document).ready(function () {
this.css('z-index', window['max_zindex']); this.css('z-index', window['max_zindex']);
this.show(); this.show();
}; };
alert(1); if(window.type==1){
$('.prize-type').text('已中奖，请麻烦找官方登记信息').show();
}else {
$('.btn-prize').show();
}
$('.btn-prize').on('click',function () {
if(prize_lock==2){
my_notify('点击太快');
return;
}
btnPrize();
});
}); });
function btnPrize() { function btnPrize() {
prize_lock=2;
$.ajax({ $.ajax({
url: '/index/tryPrize', url: '/index/tryPrize',
type: 'post', type: 'post',
data:'', data:'',
success: function (resp) { success: function (resp) {
setTimeout(function () {
prize_lock=1;
},500);
var rank=RandomNumBoth(0,10);
if (resp.errcode != 0) { if (resp.errcode != 0) {
my_notify(resp.errmsg); my_notify(resp.errmsg);
return; return;
}else{ }else{
$('.page').hide();
if (resp.data.prize ==0) { if (resp.data.prize ==0) {
$('.page_result').show(); my_notify(prize_word[rank])
$('.no-prize').show();
}else{ }else{
if(resp.data.type==1){
$('.t-s').show();
setTimeout(function () {
$('.t-s').hide();
},2500)
}
$('#code').qrcode(resp.data.url);
var mycanvas1 = document.getElementsByTagName('canvas')[0];
var img = convertCanvasToImage(mycanvas1);
$('.code').append(img);//imagQrDiv表示你要插入的容器id
$('.page').hide();
$('.page_prize').show();
} }
} }
}, },
error: function () { error: function () {
setTimeout(function () {
prize_lock=1;
},500);
my_notify('网络异常，请稍后重试'); my_notify('网络异常，请稍后重试');
} }
}); });
} }
function convertCanvasToImage(canvas) { function RandomNumBoth(Min, Max) {
//新Image对象，可以理解为DOM var Range = Max - Min;
var image = new Image(); var Rand = Math.random();
// canvas.toDataURL 返回的是一串Base64编码的URL，当然,浏览器自己肯定支持 var num = Min + Math.round(Rand * Range); //四舍五入
// 指定格式 PNG return num;
image.src = canvas.toDataURL("image/png");
return image;
} }
window.wx && wx.ready(function () { window.wx && wx.ready(function () {
document.getElementById('y-x').play();
document.getElementById('b-j').play();
// document.getElementById('b-j').pause();
document.getElementById('y-x').pause();
var base = location.origin;
var wxFriendData = {
'link': base,
'imgUrl': base + '/Public/static/images/share.png',
// 内容
'desc': '小伙伴快抢！',
// 标题
'title': '【现在大乐透】进来抽吃喝玩乐福利，不定期限时派送！小伙伴快抢！',
trigger: function () {
},
success: function () {
}
};
var wxTimelineData = {
'link': base,
'imgUrl': base + '/Public/static/images/share.png',
'title': '【现在大乐透】进来抽吃喝玩乐福利，不定期限时派送！小伙伴快抢！',
trigger: function () {
},
success: function () {
}
};
wx.onMenuShareAppMessage(wxFriendData);
wx.onMenuShareTimeline(wxTimelineData);
}); });
\ No newline at end of file
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