Commit c48f4aa4 by zhangheng

1

parent 88e3aa5e
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<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" />
...@@ -42,8 +41,8 @@ ...@@ -42,8 +41,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="306"> <state relative-caret-position="173">
<caret line="243" column="67" lean-forward="false" selection-start-line="243" selection-start-column="67" selection-end-line="243" selection-end-column="67" /> <caret line="264" column="32" lean-forward="false" selection-start-line="264" selection-start-column="19" selection-end-line="264" selection-end-column="32" />
<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" />
...@@ -57,8 +56,8 @@ ...@@ -57,8 +56,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="277"> <state relative-caret-position="220">
<caret line="111" column="18" lean-forward="true" selection-start-line="111" selection-start-column="18" selection-end-line="111" selection-end-column="18" /> <caret line="64" column="21" lean-forward="true" selection-start-line="64" selection-start-column="21" selection-end-line="64" selection-end-column="21" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -122,8 +121,8 @@ ...@@ -122,8 +121,8 @@
<find>photo_lock</find> <find>photo_lock</find>
<find>start.png</find> <find>start.png</find>
<find>page-no-prize</find> <find>page-no-prize</find>
<find>b-j-two</find>
<find>btn-prize</find> <find>btn-prize</find>
<find>b-j-two</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>m-</replace> <replace>m-</replace>
...@@ -506,12 +505,12 @@ ...@@ -506,12 +505,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="10964000" /> <workItem from="1567181764126" duration="11085000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="73146000" /> <option name="totallyTimeSpent" value="73267000" />
</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" />
...@@ -756,6 +755,14 @@ ...@@ -756,6 +755,14 @@
</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="1181" column="1" lean-forward="true" selection-start-line="1181" selection-start-column="1" selection-end-line="1181" selection-end-column="1" />
<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">
...@@ -772,18 +779,10 @@ ...@@ -772,18 +779,10 @@
</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="1181" column="1" lean-forward="true" selection-start-line="1181" selection-start-column="1" selection-end-line="1181" selection-end-column="1" />
<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="306"> <state relative-caret-position="173">
<caret line="243" column="67" lean-forward="false" selection-start-line="243" selection-start-column="67" selection-end-line="243" selection-end-column="67" /> <caret line="264" column="32" lean-forward="false" selection-start-line="264" selection-start-column="19" selection-end-line="264" selection-end-column="32" />
<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" />
...@@ -795,8 +794,8 @@ ...@@ -795,8 +794,8 @@
</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="277"> <state relative-caret-position="220">
<caret line="111" column="18" lean-forward="true" selection-start-line="111" selection-start-column="18" selection-end-line="111" selection-end-column="18" /> <caret line="64" column="21" lean-forward="true" selection-start-line="64" selection-start-column="21" selection-end-line="64" selection-end-column="21" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -62,7 +62,7 @@ $(document).ready(function () { ...@@ -62,7 +62,7 @@ $(document).ready(function () {
$('.page-g').show(); $('.page-g').show();
LuckyCard.case({ LuckyCard.case({
coverImg:'Public/static/images/m-c.jpg', coverImg:'Public/static/images/m-c.jpg',
ratio: .4 ratio: .3
}, function() { }, function() {
if (!prize_lock) { if (!prize_lock) {
return; return;
...@@ -75,7 +75,6 @@ $(document).ready(function () { ...@@ -75,7 +75,6 @@ $(document).ready(function () {
'photo_url':$('.h-b').attr('src') 'photo_url':$('.h-b').attr('src')
}, },
success: function (resp) { success: function (resp) {
setTimeout(function () {
prize_lock = true; prize_lock = true;
$('.page-s-c').hide(); $('.page-s-c').hide();
$('.page_checking').hide(); $('.page_checking').hide();
...@@ -103,7 +102,6 @@ $(document).ready(function () { ...@@ -103,7 +102,6 @@ $(document).ready(function () {
} }
} }
} }
}, 1000);
} }
}); });
......
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