Commit a7a63fc2 by 张恒

j

parent 7b6b3dbc
...@@ -2,9 +2,7 @@ ...@@ -2,9 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<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$/.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/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/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" /> <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" />
...@@ -48,8 +46,8 @@ ...@@ -48,8 +46,8 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="true"> <file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<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="438"> <state relative-caret-position="172">
<caret line="57" column="41" lean-forward="false" selection-start-line="57" selection-start-column="41" selection-end-line="57" selection-end-column="41" /> <caret line="43" column="16" lean-forward="true" selection-start-line="43" selection-start-column="16" selection-end-line="43" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -58,8 +56,8 @@ ...@@ -58,8 +56,8 @@
<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="false">
<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="418"> <state relative-caret-position="209">
<caret line="83" column="29" lean-forward="true" selection-start-line="83" selection-start-column="29" selection-end-line="83" selection-end-column="29" /> <caret line="157" column="31" lean-forward="true" selection-start-line="157" selection-start-column="31" selection-end-line="157" selection-end-column="31" />
<folding> <folding>
<element signature="e#34#44#0#PHP" expanded="true" /> <element signature="e#34#44#0#PHP" expanded="true" />
</folding> </folding>
...@@ -84,8 +82,8 @@ ...@@ -84,8 +82,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="330"> <state relative-caret-position="273">
<caret line="177" column="0" lean-forward="true" selection-start-line="177" selection-start-column="0" selection-end-line="177" selection-end-column="0" /> <caret line="174" column="21" lean-forward="true" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -123,8 +121,8 @@ ...@@ -123,8 +121,8 @@
<list> <list>
<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$/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" /> <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$/Public/static/js/index.js" /> <option value="$PROJECT_DIR$/Public/static/js/index.js" />
</list> </list>
</option> </option>
...@@ -457,12 +455,12 @@ ...@@ -457,12 +455,12 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1562502557206</updated> <updated>1562502557206</updated>
<workItem from="1562502558877" duration="2926000" /> <workItem from="1562502558877" duration="2926000" />
<workItem from="1562505554364" duration="2519000" /> <workItem from="1562505554364" duration="2710000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="5445000" /> <option name="totallyTimeSpent" value="5636000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="817" extended-state="6" /> <frame x="0" y="23" width="1440" height="817" extended-state="6" />
...@@ -584,12 +582,21 @@ ...@@ -584,12 +582,21 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="919">
<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$/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="418"> <state relative-caret-position="329">
<caret line="83" column="29" lean-forward="true" selection-start-line="83" selection-start-column="29" selection-end-line="83" selection-end-column="29" /> <caret line="56" column="12" lean-forward="false" selection-start-line="56" selection-start-column="8" selection-end-line="56" selection-end-column="12" />
<folding> <folding>
<element signature="e#34#44#0#PHP" 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" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -602,29 +609,20 @@ ...@@ -602,29 +609,20 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="919">
<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$/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="329"> <state relative-caret-position="209">
<caret line="56" column="12" lean-forward="false" selection-start-line="56" selection-start-column="8" selection-end-line="56" selection-end-column="12" /> <caret line="157" column="31" lean-forward="true" selection-start-line="157" selection-start-column="31" selection-end-line="157" selection-end-column="31" />
<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="e#34#44#0#PHP" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<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="438"> <state relative-caret-position="172">
<caret line="57" column="41" lean-forward="false" selection-start-line="57" selection-start-column="41" selection-end-line="57" selection-end-column="41" /> <caret line="43" column="16" lean-forward="true" selection-start-line="43" selection-start-column="16" selection-end-line="43" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -155,7 +155,7 @@ class IndexController extends Controller ...@@ -155,7 +155,7 @@ class IndexController extends Controller
)); ));
} else { } else {
$this->ajaxReturn(array( $this->ajaxReturn(array(
'errcode' => 0, 'errcode' => 1,
'errmsg' => null, 'errmsg' => null,
'data' => array( 'data' => array(
'prize' => 0, 'prize' => 0,
......
...@@ -43,17 +43,14 @@ function btnPrize() { ...@@ -43,17 +43,14 @@ function btnPrize() {
type: 'post', type: 'post',
data:'', data:'',
success: function (resp) { success: function (resp) {
var rank=RandomNumBoth(0,10); var rank=RandomNumBoth(0,9);
console.log(rank)
if (resp.errcode != 0) { if (resp.errcode != 0) {
my_notify(resp.errmsg); my_notify(prize_word[rank]);
return; return;
}else{ }else{
if (resp.data.prize ==0) { $('.btn-prize').hide();
my_notify(prize_word[rank]) $('.prize-type').text('已中奖,请麻烦找官方登记信息').show();
}else{
$('.btn-prize').hide();
$('.prize-type').text('已中奖,请麻烦找官方登记信息').show();
}
} }
$('.btn-prize').text('点击抽奖'); $('.btn-prize').text('点击抽奖');
prize_lock=1; prize_lock=1;
......
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