Commit 0e928dbf by zhangheng

1

parent 83cec8f6
...@@ -41,8 +41,8 @@ ...@@ -41,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="1218"> <state relative-caret-position="97">
<caret line="238" column="38" lean-forward="false" selection-start-line="238" selection-start-column="38" selection-end-line="238" selection-end-column="38" /> <caret line="231" column="30" lean-forward="true" selection-start-line="231" selection-start-column="30" selection-end-line="231" 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,8 +56,8 @@ ...@@ -56,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="190"> <state relative-caret-position="314">
<caret line="86" column="55" lean-forward="true" selection-start-line="86" selection-start-column="55" selection-end-line="86" selection-end-column="55" /> <caret line="86" column="40" lean-forward="false" selection-start-line="86" selection-start-column="40" selection-end-line="86" selection-end-column="40" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -115,7 +115,6 @@ ...@@ -115,7 +115,6 @@
<find>btn-close</find> <find>btn-close</find>
<find>page-lang</find> <find>page-lang</find>
<find>btn-next-map</find> <find>btn-next-map</find>
<find>btn-info</find>
<find>mergeImage_two</find> <find>mergeImage_two</find>
<find>mix/</find> <find>mix/</find>
<find>hasc</find> <find>hasc</find>
...@@ -133,6 +132,7 @@ ...@@ -133,6 +132,7 @@
<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-prize</find>
<find>btn-info</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>m-</replace> <replace>m-</replace>
...@@ -515,12 +515,12 @@ ...@@ -515,12 +515,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="11580000" /> <workItem from="1567181764126" duration="11765000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="73762000" /> <option name="totallyTimeSpent" value="73947000" />
</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" />
...@@ -781,10 +781,18 @@ ...@@ -781,10 +781,18 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/db.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
<caret line="6" column="18" lean-forward="false" selection-start-line="6" selection-start-column="18" selection-end-line="6" selection-end-column="43" />
<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="1218"> <state relative-caret-position="97">
<caret line="238" column="38" lean-forward="false" selection-start-line="238" selection-start-column="38" selection-end-line="238" selection-end-column="38" /> <caret line="231" column="30" lean-forward="true" selection-start-line="231" selection-start-column="30" selection-end-line="231" 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" />
...@@ -794,18 +802,10 @@ ...@@ -794,18 +802,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/db.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
<caret line="6" column="18" lean-forward="false" selection-start-line="6" selection-start-column="18" selection-end-line="6" selection-end-column="43" />
<folding />
</state>
</provider>
</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="190"> <state relative-caret-position="314">
<caret line="86" column="55" lean-forward="true" selection-start-line="86" selection-start-column="55" selection-end-line="86" selection-end-column="55" /> <caret line="86" column="40" lean-forward="false" selection-start-line="86" selection-start-column="40" selection-end-line="86" selection-end-column="40" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -80,11 +80,11 @@ $(document).ready(function () { ...@@ -80,11 +80,11 @@ $(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) {
$('#card src').attr('src','Public/static/images/no-przie.jpg') $('#card').find('img').attr('src','Public/static/images/no-przie.jpg')
$('.m-prize').show(); $('.m-prize').show();
$('.y-prize').hide(); $('.y-prize').hide();
}else { }else {
$('#card src').attr('src','Public/static/images/prize-map.jpg') $('#card').find('img').attr('src','Public/static/images/prize-map.jpg')
$('.m-prize').hide(); $('.m-prize').hide();
$('.y-prize').show(); $('.y-prize').show();
if(resp.data.info_type==0 || resp.data.info_type==2){ if(resp.data.info_type==0 || resp.data.info_type==2){
...@@ -138,7 +138,7 @@ $(document).ready(function () { ...@@ -138,7 +138,7 @@ $(document).ready(function () {
$('.dialog').hide(); $('.dialog').hide();
}); });
$('.btn-info').on('click',function () { $('.btn-info').on('click',function () {
$('.page-prize').hide(); $('.page-g').hide();
$('.page-info').show(); $('.page-info').show();
}); });
$('.c-d').on('click',function () { $('.c-d').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