Commit 718a7d61 by zhangheng

1

parent b6ad0754
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<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$/.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/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" />
...@@ -41,12 +42,13 @@ ...@@ -41,12 +42,13 @@
<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="458"> <state relative-caret-position="192">
<caret line="281" column="0" lean-forward="true" selection-start-line="281" selection-start-column="0" selection-end-line="281" selection-end-column="0" /> <caret line="237" column="37" lean-forward="false" selection-start-line="237" selection-start-column="33" selection-end-line="237" selection-end-column="37" />
<folding> <folding>
<element signature="n#style#0;n#div#10;n#div#0;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#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#3;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#4;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#5;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -55,8 +57,8 @@ ...@@ -55,8 +57,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="336"> <state relative-caret-position="277">
<caret line="56" column="14" lean-forward="false" selection-start-line="56" selection-start-column="14" selection-end-line="56" selection-end-column="14" /> <caret line="89" column="53" lean-forward="true" selection-start-line="89" selection-start-column="53" selection-end-line="89" selection-end-column="53" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -504,12 +506,12 @@ ...@@ -504,12 +506,12 @@
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" /> <workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" /> <workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="10384000" /> <workItem from="1567181764126" duration="10866000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="72566000" /> <option name="totallyTimeSpent" value="73048000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" /> <frame x="0" y="23" width="1440" height="815" extended-state="6" />
...@@ -592,6 +594,7 @@ ...@@ -592,6 +594,7 @@
<element signature="n#style#0;n#div#10;n#div#0;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#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#3;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#4;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#5;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -644,6 +647,7 @@ ...@@ -644,6 +647,7 @@
<element signature="n#style#0;n#div#10;n#div#0;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#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#3;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#4;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#5;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -778,20 +782,21 @@ ...@@ -778,20 +782,21 @@
</entry> </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="458"> <state relative-caret-position="192">
<caret line="281" column="0" lean-forward="true" selection-start-line="281" selection-start-column="0" selection-end-line="281" selection-end-column="0" /> <caret line="237" column="37" lean-forward="false" selection-start-line="237" selection-start-column="33" selection-end-line="237" selection-end-column="37" />
<folding> <folding>
<element signature="n#style#0;n#div#10;n#div#0;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#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#3;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#4;n#div#0;n#div#10;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#5;n#div#0;n#div#10;n#div#0;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="336"> <state relative-caret-position="277">
<caret line="56" column="14" lean-forward="false" selection-start-line="56" selection-start-column="14" selection-end-line="56" selection-end-column="14" /> <caret line="89" column="53" lean-forward="true" selection-start-line="89" selection-start-column="53" selection-end-line="89" selection-end-column="53" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -241,11 +241,11 @@ ...@@ -241,11 +241,11 @@
</div> </div>
<div class="btn-g-g-bj"></div> <div class="btn-g-g-bj"></div>
</div> </div>
<div class="no-prize" style="display: block"></div> <div class="no-prize m-prize" style="display: none"></div>
<div class="prize" style="display: none"> <div class="prize y-prize" style="display: none">
<div class="btn-info"></div> <div class="btn-info"></div>
</div> </div>
<div class="btn"> <div class="btn m-prize" style="display: none">
<div class="btn-share"></div> <div class="btn-share"></div>
<div class="btn-j-x"></div> <div class="btn-j-x"></div>
</div> </div>
......
...@@ -64,18 +64,9 @@ $(document).ready(function () { ...@@ -64,18 +64,9 @@ $(document).ready(function () {
coverImg:'Public/static/images/m-c.jpg', coverImg:'Public/static/images/m-c.jpg',
ratio: .4 ratio: .4
}, function() { }, function() {
alert('至于你信不信,我反正不信!');
this.clearCover();
})
return;
if (!prize_lock) { if (!prize_lock) {
return; return;
} }
$('.text_').html('抽奖中,<br>莫捉急~');
$('.page_checking').show();
prize_lock = false; prize_lock = false;
$.ajax({ $.ajax({
url: '/index/get_prize', url: '/index/get_prize',
...@@ -90,9 +81,13 @@ $(document).ready(function () { ...@@ -90,9 +81,13 @@ $(document).ready(function () {
$('.page_checking').hide(); $('.page_checking').hide();
if (resp.errcode == 0) { if (resp.errcode == 0) {
if (resp.data.prize_type == 0) { if (resp.data.prize_type == 0) {
$('.page-no-prize').show(); $('#card').attr('src','Public/static/images/no-przie.jpg')
$('.m-prize').show();
$('.y-prize').hide();
}else { }else {
$('.page-prize').show(); $('#card').attr('src','Public/static/images/prize-map.jpg')
$('.m-prize').show();
$('.y-prize').hide();
if(resp.data.info_type==0 || resp.data.info_type==2){ if(resp.data.info_type==0 || resp.data.info_type==2){
$('.btn-submit').show(); $('.btn-submit').show();
}else { }else {
...@@ -103,6 +98,7 @@ $(document).ready(function () { ...@@ -103,6 +98,7 @@ $(document).ready(function () {
$('.address').val(resp.data.address); $('.address').val(resp.data.address);
} }
if(resp.data.info_type==2 || resp.data.info_type==1){ if(resp.data.info_type==2 || resp.data.info_type==1){
my_notify('你已中过奖'); my_notify('你已中过奖');
} }
} }
...@@ -111,6 +107,13 @@ $(document).ready(function () { ...@@ -111,6 +107,13 @@ $(document).ready(function () {
} }
}); });
this.clearCover();
});
return;
$('.text_').html('抽奖中,<br>莫捉急~');
$('.page_checking').show();
}); });
$('.btn-close-two').on('click',function () { $('.btn-close-two').on('click',function () {
$('.page_home').hide(); $('.page_home').hide();
......
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