Commit 19c700cf by zhangheng

y

parent 7f35694c
......@@ -2,39 +2,8 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/1.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/10.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/11.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/12.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/13.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/14.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/16.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/17.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/18.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/19.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/2.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/20.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/21.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/22.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/23.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/24.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/25.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/26.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/27.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/28.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/3.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/4.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/5.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/6.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/7.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/8.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/9.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/btn.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/lang/word.png" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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" />
......@@ -48,14 +17,14 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.545977">
<splitter split-orientation="horizontal" split-proportion="0.7422003">
<split-first>
<leaf>
<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="247">
<caret line="48" column="12" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="235" selection-end-column="7" />
<state relative-caret-position="380">
<caret line="193" column="26" lean-forward="false" selection-start-line="193" selection-start-column="16" selection-end-line="193" selection-end-column="26" />
<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" />
......@@ -110,11 +79,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true">
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="167">
<caret line="106" column="20" lean-forward="false" selection-start-line="106" selection-start-column="20" selection-end-line="106" selection-end-column="26" />
<state relative-caret-position="57">
<caret line="212" column="25" lean-forward="false" selection-start-line="212" selection-start-column="12" selection-end-line="212" 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" />
......@@ -175,18 +144,18 @@
<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="-513">
<state relative-caret-position="-1717">
<caret line="12" column="51" lean-forward="false" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3648">
<caret line="192" column="39" lean-forward="false" selection-start-line="192" selection-start-column="39" selection-end-line="192" selection-end-column="39" />
<state relative-caret-position="380">
<caret line="20" column="9" lean-forward="true" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
<folding />
</state>
</provider>
......@@ -200,7 +169,7 @@
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186">
<caret line="661" column="4" lean-forward="false" selection-start-line="661" selection-start-column="4" selection-end-line="661" selection-end-column="4" />
<caret line="661" column="0" lean-forward="false" selection-start-line="661" selection-start-column="0" selection-end-line="661" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -230,8 +199,8 @@
<find>w-p</find>
<find>btn-close</find>
<find>page-lang</find>
<find>mix/</find>
<find>btn-next-map</find>
<find>mix/</find>
</findStrings>
<replaceStrings>
<replace>m-</replace>
......@@ -247,8 +216,8 @@
<option value="$PROJECT_DIR$/Public/static/js/hammer.min.js" />
<option value="$PROJECT_DIR$/index.html" />
<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/css/main.scss" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
</list>
</option>
</component>
......@@ -260,8 +229,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="-43" />
<option name="y" value="39" />
<option name="x" value="17" />
<option name="y" value="42" />
<option name="width" value="1440" />
<option name="height" value="817" />
</component>
......@@ -528,15 +497,15 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="42238000" />
<workItem from="1566667516612" duration="42646000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="42238000" />
<option name="totallyTimeSpent" value="42646000" />
</component>
<component name="ToolWindowManager">
<frame x="-43" y="39" width="1440" height="817" extended-state="0" />
<frame x="17" y="42" width="1440" height="817" extended-state="0" />
<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.12875536" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
......@@ -547,7 +516,7 @@
<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.24689655" 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="false" show_stripe_button="true" weight="0.32965517" 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.17517242" 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" />
......@@ -603,10 +572,26 @@
</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="186">
<caret line="661" column="0" lean-forward="false" selection-start-line="661" selection-start-column="0" selection-end-line="661" selection-end-column="0" />
<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="-1717">
<caret line="12" column="51" lean-forward="false" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="48" column="12" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="235" selection-end-column="7" />
<state relative-caret-position="380">
<caret line="193" column="26" lean-forward="false" selection-start-line="193" selection-start-column="16" selection-end-line="193" selection-end-column="26" />
<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" />
......@@ -660,26 +645,10 @@
</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="-513">
<caret line="12" column="51" lean-forward="false" selection-start-line="12" selection-start-column="51" selection-end-line="12" selection-end-column="51" />
<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="3648">
<caret line="192" column="39" lean-forward="false" selection-start-line="192" selection-start-column="39" selection-end-line="192" selection-end-column="39" />
<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="167">
<caret line="106" column="20" lean-forward="false" selection-start-line="106" selection-start-column="20" selection-end-line="106" selection-end-column="26" />
<state relative-caret-position="57">
<caret line="212" column="25" lean-forward="false" selection-start-line="212" selection-start-column="12" selection-end-line="212" 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" />
......@@ -736,10 +705,10 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186">
<caret line="661" column="4" lean-forward="false" selection-start-line="661" selection-start-column="4" selection-end-line="661" selection-end-column="4" />
<state relative-caret-position="380">
<caret line="20" column="9" lean-forward="true" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
<folding />
</state>
</provider>
......
......@@ -13,6 +13,52 @@ $(document).ready(function () {
this.css('z-index', window['max_zindex']);
this.show();
};
var prize_lock = true;
$('.btn-prize').on(clickEvent, function () {
if (!prize_lock) {
return;
}
$('.text_').html('抽奖中,<br>莫捉急~');
$('.page_checking').show();
prize_lock = false;
$.ajax({
url: '/index/get_prize',
type: 'post',
data: {
'photo_url':$('.h-b').attr('src')
},
success: function (resp) {
setTimeout(function () {
prize_lock = true;
$('.page-s-c').hide();
$('.page_checking').hide();
if (resp.errcode == 0) {
if (resp.data.prize_type == 0) {
$('.page-no-prize').show();
}else {
$('.page-prize').show();
if(resp.data.info_type==0 || resp.data.info_type==2){
$('.btn-submit').show();
}else {
$('.page-prize input').attr('disabled','disabled');
$('.btn-submit').addClass('lock').show();
$('.name').val(resp.data.name);
$('.tel').val(resp.data.tel);
$('.address').val(resp.data.address);
}
if(resp.data.info_type==2 || resp.data.info_type==1){
my_notify('你已中过奖');
}
}
}
}, 2500);
}
});
});
$('.btn-close-two').on('click',function () {
$('.page_home').hide();
$('.dialog_game_rule').hide();
......@@ -216,7 +262,8 @@ $(document).ready(function () {
// var url =stage.toDataURL();
});
$('.btn-j-c').on('click',function () {
$('.page_checking').show()
$('.text_').html('海报合成中,<br>莫捉急~');
$('.page_checking').show();
var url =stage.toDataURL();
mergeImage_two(url)
......
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