Commit 00db46f4 by zhangheng

j

parent c851b4ed
......@@ -2,8 +2,17 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="83262c17-7030-4f8f-af17-e1cc55f76944" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/bj.jpg" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/btn-prize.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/prize.png" afterPath="" />
<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$/Application/Home/Controller/ControllerTrait.class.php" afterPath="$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php" />
<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.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>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -17,26 +26,26 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.7478992">
<splitter split-orientation="horizontal" split-proportion="0.4712838">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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 relative-caret-position="1767">
<state relative-caret-position="102">
<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 />
</state>
</provider>
</entry>
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="369">
<caret line="55" column="25" lean-forward="false" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="25" />
<state relative-caret-position="311">
<caret line="75" column="61" lean-forward="false" selection-start-line="75" selection-start-column="61" selection-end-line="75" selection-end-column="61" />
<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#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
......@@ -45,23 +54,20 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="14" column="5" lean-forward="false" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
<state relative-caret-position="190">
<caret line="16" column="14" lean-forward="true" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IndexController.class.php" pinned="false" current-in-tab="true">
<file leaf-file-name="IndexController.class.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="128" column="5" lean-forward="false" selection-start-line="128" selection-start-column="5" selection-end-line="134" selection-end-column="11" />
<state relative-caret-position="0">
<caret line="12" column="51" lean-forward="true" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<folding>
<element signature="e#34#44#0#PHP" expanded="true" />
<marker date="1563379102000" expanded="true" signature="3338:3497" ph="..." />
<marker date="1563379102000" expanded="true" signature="3371:3462" ph="..." />
<marker date="1563379102000" expanded="true" signature="3377:3461" ph="..." />
</folding>
</state>
</provider>
......@@ -70,8 +76,8 @@
<file leaf-file-name="ControllerTrait.class.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1900">
<caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="103" selection-end-column="43" />
<state relative-caret-position="-1342">
<caret line="104" column="0" lean-forward="true" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -124,9 +130,7 @@
<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>
<marker date="1563378892000" expanded="true" signature="4793:4911" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -138,28 +142,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="388">
<caret line="212" column="15" lean-forward="false" selection-start-line="212" selection-start-column="15" selection-end-line="212" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="db.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/db.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="15" column="12" lean-forward="false" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="config.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state relative-caret-position="122">
<caret line="201" column="21" lean-forward="false" selection-start-line="201" selection-start-column="21" selection-end-line="201" selection-end-column="21" />
<folding />
</state>
</provider>
......@@ -169,6 +153,11 @@
</split-second>
</splitter>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>window.type</find>
</findStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
......@@ -180,10 +169,11 @@
<option value="$PROJECT_DIR$/Application/User/View/default/Check_index.tpl" />
<option value="$PROJECT_DIR$/Application/User/Controller/CheckController.class.php" />
<option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
<option value="$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php" />
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.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/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
</list>
</option>
</component>
......@@ -197,7 +187,7 @@
<component name="ProjectFrameBounds">
<option name="y" value="23" />
<option name="width" value="1440" />
<option name="height" value="815" />
<option name="height" value="813" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
......@@ -510,8 +500,8 @@
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -601,25 +591,27 @@
<workItem from="1563354519051" duration="69000" />
<workItem from="1563355155211" duration="115000" />
<workItem from="1563355311998" duration="122000" />
<workItem from="1563377354829" duration="1467000" />
<workItem from="1563377354829" duration="1609000" />
<workItem from="1563441996623" duration="114000" />
<workItem from="1563716562750" duration="724000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="17315000" />
<option name="totallyTimeSpent" value="18295000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
<frame x="0" y="23" width="1440" height="813" extended-state="6" />
<editor active="true" />
<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.14878398" 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.15307583" 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="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="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.32918397" 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.22821577" 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.22746186" 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" />
......@@ -673,7 +665,7 @@
<state relative-caret-position="1064">
<caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" 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="true" />
<element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
......@@ -692,9 +684,6 @@
<caret line="58" column="22" lean-forward="true" selection-start-line="58" selection-start-column="22" selection-end-line="58" selection-end-column="22" />
<folding>
<element signature="e#34#44#0#PHP" expanded="true" />
<marker date="1563379102000" expanded="true" signature="3338:3497" ph="..." />
<marker date="1563379102000" expanded="true" signature="3371:3462" ph="..." />
<marker date="1563379102000" expanded="true" signature="3377:3461" ph="..." />
</folding>
</state>
</provider>
......@@ -721,9 +710,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4047">
<caret line="213" column="13" lean-forward="true" selection-start-line="213" selection-start-column="13" selection-end-line="213" selection-end-column="13" />
<folding>
<marker date="1563378892000" expanded="true" signature="4793:4911" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -756,7 +743,7 @@
<state relative-caret-position="1064">
<caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" 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="true" />
<element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
......@@ -773,9 +760,7 @@
<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>
<marker date="1563378892000" expanded="true" signature="4793:4911" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -801,9 +786,6 @@
<caret line="128" column="31" lean-forward="true" selection-start-line="128" selection-start-column="31" selection-end-line="128" selection-end-column="31" />
<folding>
<element signature="e#34#44#0#PHP" expanded="true" />
<marker date="1563379102000" expanded="true" signature="3338:3497" ph="..." />
<marker date="1563379102000" expanded="true" signature="3371:3462" ph="..." />
<marker date="1563379102000" expanded="true" signature="3377:3461" ph="..." />
</folding>
</state>
</provider>
......@@ -821,7 +803,7 @@
<state relative-caret-position="1064">
<caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" 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="true" />
<element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
......@@ -870,9 +852,7 @@
<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>
<marker date="1563378892000" expanded="true" signature="4793:4911" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -905,7 +885,7 @@
<state relative-caret-position="1007">
<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#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
......@@ -924,9 +904,6 @@
<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" />
<marker date="1563379102000" expanded="true" signature="3338:3497" ph="..." />
<marker date="1563379102000" expanded="true" signature="3371:3462" ph="..." />
<marker date="1563379102000" expanded="true" signature="3377:3461" ph="..." />
</folding>
</state>
</provider>
......@@ -935,9 +912,7 @@
<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>
<marker date="1563378892000" expanded="true" signature="4793:4911" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -964,14 +939,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/User/View/default/Home_signin.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-646">
......@@ -996,44 +963,36 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/User/View/default/Check_index.tpl">
<entry file="file://$PROJECT_DIR$/Application/User/Controller/ReportController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="817">
<caret line="43" column="43" lean-forward="false" selection-start-line="43" selection-start-column="36" selection-end-line="43" selection-end-column="43" />
<folding />
<state relative-caret-position="1976">
<caret line="104" column="5" lean-forward="false" selection-start-line="104" selection-start-column="5" selection-end-line="104" selection-end-column="5" />
<folding>
<marker date="1563255647000" expanded="true" signature="2376:2507" ph="select a.id,... user" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<entry file="file://$PROJECT_DIR$/Application/User/View/default/Report_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1767">
<caret line="93" column="37" lean-forward="false" selection-start-line="93" selection-start-column="37" selection-end-line="93" selection-end-column="37" />
<state relative-caret-position="342">
<caret line="18" column="36" lean-forward="false" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_share.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1900">
<caret line="102" column="13" lean-forward="false" selection-start-line="102" selection-start-column="13" selection-end-line="103" selection-end-column="43" />
<state relative-caret-position="722">
<caret line="38" column="0" lean-forward="false" selection-start-line="38" selection-start-column="0" selection-end-line="41" selection-end-column="74" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/User/Controller/ReportController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1976">
<caret line="104" column="5" lean-forward="false" selection-start-line="104" selection-start-column="5" selection-end-line="104" selection-end-column="5" />
<folding>
<marker date="1563255647000" expanded="true" signature="2376:2507" ph="select a.id,... user" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/User/View/default/Report_index.tpl">
<entry file="file://$PROJECT_DIR$/Application/User/View/default/Check_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="18" column="36" lean-forward="false" selection-start-line="18" selection-start-column="36" selection-end-line="18" selection-end-column="36" />
<state relative-caret-position="817">
<caret line="43" column="43" lean-forward="false" selection-start-line="43" selection-start-column="36" selection-end-line="43" selection-end-column="43" />
<folding />
</state>
</provider>
......@@ -1046,51 +1005,62 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_share.tpl">
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="722">
<caret line="38" column="0" lean-forward="false" selection-start-line="38" selection-start-column="0" selection-end-line="41" selection-end-column="74" />
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/ControllerTrait.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="14" column="5" lean-forward="false" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
<state relative-caret-position="-1342">
<caret line="104" column="0" lean-forward="true" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="369">
<caret line="55" column="25" lean-forward="false" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="25" />
<state relative-caret-position="0">
<caret line="12" column="51" lean-forward="true" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="e#34#44#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<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 />
</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="190">
<caret line="16" column="14" lean-forward="true" selection-start-line="16" selection-start-column="14" selection-end-line="16" selection-end-column="14" />
<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>
<marker date="1563378892000" expanded="true" signature="4793:4911" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="128" column="5" lean-forward="false" selection-start-line="128" selection-start-column="5" selection-end-line="134" selection-end-column="11" />
<state relative-caret-position="311">
<caret line="75" column="61" lean-forward="false" selection-start-line="75" selection-start-column="61" selection-end-line="75" selection-end-column="61" />
<folding>
<element signature="e#34#44#0#PHP" expanded="true" />
<marker date="1563379102000" expanded="true" signature="3338:3497" ph="..." />
<marker date="1563379102000" expanded="true" signature="3371:3462" ph="..." />
<marker date="1563379102000" expanded="true" signature="3377:3461" ph="..." />
<element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
......
......@@ -103,6 +103,7 @@ trait ControllerTrait
// $user['reg_ip'] = $this->getIP();
// $user['last_visit'] = time();
$user['play_num'] =2;
$user['last_ip'] = $this->getIP();
M('User')->token(false)->add($user);
}
......
......@@ -46,7 +46,7 @@ class IndexController extends Controller
'id'=>1
))->getField('sate');
if($openSate==0){
die();
die("活动未开始!");
}
$user = $this->get_user_info_from_cookie();
if (!$user) {
......@@ -126,13 +126,13 @@ class IndexController extends Controller
));
return;
}
// if($user['play_num']==0){
// $this->ajaxReturn(array(
// 'errcode' => 2,
// 'errmsg' => null
// ));
// return;
// }
if($user['play_num']==0){
$this->ajaxReturn(array(
'errcode' => 2,
'errmsg' => null
));
return;
}
$type_list = array('6JTjh8cPcQ6Rh4Zs','wrwSQkP7aBSTSz6Q','DQxcxExXHmrrJhpW','Mx7cz5zBhJ4XTWWw','BnFaQJ23ddQ6CcfG','4fzkwfPHZZZmnQJx','NCnWMkSN5jSBErP6','Ce238NWT3GAkmXNB','7QnGFjs7JDxWe2xQ','5Qtk2aKHsG42PbRz');
$channel_urt=$_POST['channel'];
$c_z=in_array($channel_urt,$type_list);
......@@ -146,9 +146,6 @@ class IndexController extends Controller
));
return;
}
M('User')->where(array(
'id' => $user['id']
))->setDec('play_num');
$channel=M('Prize')->where(array(
'channel'=>$channel_urt
))->find();
......@@ -176,7 +173,9 @@ class IndexController extends Controller
));
return;
}
M('User')->where(array(
'id' => $user['id']
))->setDec('play_num');
$prize = $this->get_random_prize($user,$channel_urt);
if ($prize) {
$this->ajaxReturn(array(
......
......@@ -43,7 +43,7 @@
// })(document, window);
</script>
<title>谁是桃源幸运锦鲤</title>
<link href="__CDN__/css/main.css?t=1.94" rel="stylesheet">
<link href="__CDN__/css/main.css?t=2" rel="stylesheet">
<style>
</style>
......@@ -51,14 +51,11 @@
<body>
<div id="container">
<div class="btn-prize" style="display: none">
点击抽奖
<div class="map-bj">
<span>正在开奖...</span>
<img src="__CDN__/images/prize.png">
</div>
<img class="prize-type" src="__CDN__/images/prize.png" style="display: none">
</div>
<script>
if (!/android/i.test(navigator.userAgent)) {
......@@ -76,7 +73,7 @@
src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all&app_stat_key=t6NkwipRePFcidTJ"></script>
<script type="text/javascript" src="__CDN__/js/jquery.qrcode.min.js"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=1.54"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=2"></script>
<link href="__CDN__/css/notify.css" rel="stylesheet">
<script type="text/javascript" src="__CDN__/js/jquery-notify.js"></script>
......
......@@ -158,7 +158,7 @@ ul, li {
height: 100%;
}
.flex, #container .btn-prize {
.flex {
display: -webkit-box;
/* OLD - iOS 6-, Safari 3.1-6 */
display: -moz-box;
......@@ -173,29 +173,25 @@ ul, li {
#container {
position: relative;
background: url("../images/bj.jpg") no-repeat center;
width: 640px;
height: 1238px;
}
#container .btn-prize {
background: url("../images/btn-prize.png") no-repeat center;
background-size: 100% 100%;
#container .map-bj {
position: absolute;
top: 460px;
left: 182px;
justify-content: center;
align-items: center;
width: 250px;
height: 250px;
font-size: 35px;
color: red;
font-weight: bold;
top: 398px;
}
#container .map-bj img {
width: 314px;
height: 312px;
}
#container .map-bj span {
font-size: 30px;
color: #e9674f;
}
#container .prize-type {
position: absolute;
width: 250px;
height: 250px;
/* opacity: 0; */
top: 420px;
left: 182px;
}
......
......@@ -195,36 +195,28 @@ ul, li {
#container {
position: relative;
background: url("../images/bj.jpg") no-repeat center;
width: torem(640px);
height: torem(1238px);
.btn-prize {
background: url("../images/btn-prize.png") no-repeat center;
background-size: 100% 100%;
.map-bj {
position: absolute;
top: 460px;
left: 182px;
@extend .flex;
justify-content: center;
align-items: center;
width: 250px;
height: 250px;
font-size: 35px;
color: red;
font-weight: bold;
top:torem(398px);
img {
width: torem(314px);
height: torem(312px);
}
span{
font-size: 30px;
color: #e9674f;
}
}
.prize-type {
position: absolute;
width: 250px;
height: 250px;
/* opacity: 0; */
top: 420px;
left: 182px;
//.bounceInDown {
// -webkit-animation: bounceInDown 1s ease 0s 1;
// @include animate_forwards;
// opacity: 0;
//}
}
.word {
font-size: 40px;
......
var prize_word=[
'家和万事兴',
'和谐美满',
'和和美美',
'和和睦睦 ',
'和气生财',
'和蔼可亲'
];
var prize_lock=1;
$(document).ready(function () {
try {
......@@ -20,21 +12,14 @@ $(document).ready(function () {
this.css('z-index', window['max_zindex']);
this.show();
};
if(window.type==1){
$('.prize-type').show();
}else {
$('.btn-prize').show();
}
$('.btn-prize').on('click',function () {
if(prize_lock==2){
return;
}
btnPrize();
});
// if(window.type==1){
// $('.prize-type').show();
// }else {
// $('.btn-prize').show();
// }
});
function btnPrize() {
prize_lock=2;
$('.btn-prize').text('抽奖中...');
$.ajax({
url: '/index/tryPrize',
type: 'post',
......
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