Commit 4dbe48d6 by zhangheng

1

parent 0e928dbf
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<project version="4"> <project version="4">
<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$/Public/static/audio/b-j.mp3" afterPath="$PROJECT_DIR$/Public/static/audio/b-j.mp3" />
<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$/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>
...@@ -41,8 +42,8 @@ ...@@ -41,8 +42,8 @@
<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="97"> <state relative-caret-position="266">
<caret line="231" column="30" lean-forward="true" selection-start-line="231" selection-start-column="30" selection-end-line="231" selection-end-column="36" /> <caret line="243" column="28" lean-forward="true" selection-start-line="243" selection-start-column="28" selection-end-line="243" selection-end-column="36" />
<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" />
...@@ -56,9 +57,13 @@ ...@@ -56,9 +57,13 @@
<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="314"> <state relative-caret-position="219">
<caret line="86" column="40" lean-forward="false" selection-start-line="86" selection-start-column="40" selection-end-line="86" selection-end-column="40" /> <caret line="61" column="30" lean-forward="false" selection-start-line="61" selection-start-column="30" selection-end-line="61" selection-end-column="30" />
<folding /> <folding>
<marker date="1567555575000" expanded="true" signature="1951:3897" ph="{...}" />
<marker date="1567555575000" expanded="true" signature="2073:3854" ph="{&quot;url&quot;: '/index/get_prize'...}" />
<marker date="1567555575000" expanded="true" signature="2284:3840" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -80,8 +85,8 @@ ...@@ -80,8 +85,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="420"> <state relative-caret-position="344">
<caret line="1157" column="5" lean-forward="true" selection-start-line="1157" selection-start-column="5" selection-end-line="1157" selection-end-column="5" /> <caret line="1153" column="7" lean-forward="true" selection-start-line="1153" selection-start-column="7" selection-end-line="1153" selection-end-column="7" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -103,8 +108,6 @@ ...@@ -103,8 +108,6 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>batchDraw</find>
<find>arrow</find>
<find>page_home</find> <find>page_home</find>
<find>type_id</find> <find>type_id</find>
<find>.btn-next</find> <find>.btn-next</find>
...@@ -131,8 +134,10 @@ ...@@ -131,8 +134,10 @@
<find>start.png</find> <find>start.png</find>
<find>page-no-prize</find> <find>page-no-prize</find>
<find>b-j-two</find> <find>b-j-two</find>
<find>btn-prize</find>
<find>btn-info</find> <find>btn-info</find>
<find>btn-submit</find>
<find>btn-prize</find>
<find>btn-j-x</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>m-</replace> <replace>m-</replace>
...@@ -515,12 +520,12 @@ ...@@ -515,12 +520,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="11765000" /> <workItem from="1567181764126" duration="12501000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="73947000" /> <option name="totallyTimeSpent" value="74683000" />
</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" />
...@@ -620,7 +625,11 @@ ...@@ -620,7 +625,11 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3515"> <state relative-caret-position="3515">
<caret line="185" column="22" lean-forward="false" selection-start-line="185" selection-start-column="22" selection-end-line="185" selection-end-column="22" /> <caret line="185" column="22" lean-forward="false" selection-start-line="185" selection-start-column="22" selection-end-line="185" selection-end-column="22" />
<folding /> <folding>
<marker date="1567555575000" expanded="true" signature="1951:3897" ph="{...}" />
<marker date="1567555575000" expanded="true" signature="2073:3854" ph="{&quot;url&quot;: '/index/get_prize'...}" />
<marker date="1567555575000" expanded="true" signature="2284:3840" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -681,7 +690,11 @@ ...@@ -681,7 +690,11 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="7486"> <state relative-caret-position="7486">
<caret line="394" column="32" lean-forward="false" selection-start-line="394" selection-start-column="32" selection-end-line="394" selection-end-column="32" /> <caret line="394" column="32" lean-forward="false" selection-start-line="394" selection-start-column="32" selection-end-line="394" selection-end-column="32" />
<folding /> <folding>
<marker date="1567555575000" expanded="true" signature="1951:3897" ph="{...}" />
<marker date="1567555575000" expanded="true" signature="2073:3854" ph="{&quot;url&quot;: '/index/get_prize'...}" />
<marker date="1567555575000" expanded="true" signature="2284:3840" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -757,14 +770,6 @@ ...@@ -757,14 +770,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="1157" column="5" lean-forward="true" selection-start-line="1157" selection-start-column="5" selection-end-line="1157" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<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">
<state relative-caret-position="230"> <state relative-caret-position="230">
...@@ -789,10 +794,18 @@ ...@@ -789,10 +794,18 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="344">
<caret line="1153" column="7" lean-forward="true" selection-start-line="1153" selection-start-column="7" selection-end-line="1153" selection-end-column="7" />
<folding />
</state>
</provider>
</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="97"> <state relative-caret-position="266">
<caret line="231" column="30" lean-forward="true" selection-start-line="231" selection-start-column="30" selection-end-line="231" selection-end-column="36" /> <caret line="243" column="28" lean-forward="true" selection-start-line="243" selection-start-column="28" selection-end-line="243" selection-end-column="36" />
<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" />
...@@ -804,9 +817,13 @@ ...@@ -804,9 +817,13 @@
</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="314"> <state relative-caret-position="219">
<caret line="86" column="40" lean-forward="false" selection-start-line="86" selection-start-column="40" selection-end-line="86" selection-end-column="40" /> <caret line="61" column="30" lean-forward="false" selection-start-line="61" selection-start-column="30" selection-end-line="61" selection-end-column="30" />
<folding /> <folding>
<marker date="1567555575000" expanded="true" signature="1951:3897" ph="{...}" />
<marker date="1567555575000" expanded="true" signature="2073:3854" ph="{&quot;url&quot;: '/index/get_prize'...}" />
<marker date="1567555575000" expanded="true" signature="2284:3840" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -59,6 +59,7 @@ $(document).ready(function () { ...@@ -59,6 +59,7 @@ $(document).ready(function () {
var prize_lock = true; var prize_lock = true;
$('.btn-prize').on(clickEvent, function () { $('.btn-prize').on(clickEvent, function () {
$('.page-s-c').hide(); $('.page-s-c').hide();
$('.no-prize').show();
$('.page-g').show(); $('.page-g').show();
LuckyCard.case({ LuckyCard.case({
coverImg:'Public/static/images/m-c.jpg', coverImg:'Public/static/images/m-c.jpg',
...@@ -131,7 +132,10 @@ $(document).ready(function () { ...@@ -131,7 +132,10 @@ $(document).ready(function () {
$('.dialog-share').show(); $('.dialog-share').show();
}); });
$('.btn-j-x').on('click',function () { $('.btn-j-x').on('click',function () {
$('.page-no-prize').hide(); $('#card').find('img').attr('src','');
$('.m-prize').hide();
$('.y-prize').hide();
$('.page-g').hide();
$('.page-s-c').show(); $('.page-s-c').show();
}); });
$('.dialog-share').on('click',function () { $('.dialog-share').on('click',function () {
......
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