Commit 83cec8f6 by zhangheng

1

parent 29f2ac83
...@@ -2,11 +2,8 @@ ...@@ -2,11 +2,8 @@
<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$/.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$/.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/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" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
...@@ -41,10 +38,10 @@ ...@@ -41,10 +38,10 @@
</provider> </provider>
</entry> </entry>
</file> </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"> <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="1218">
<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="238" column="38" lean-forward="false" selection-start-line="238" selection-start-column="38" selection-end-line="238" selection-end-column="38" />
<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" />
...@@ -56,11 +53,21 @@ ...@@ -56,11 +53,21 @@
</provider> </provider>
</entry> </entry>
</file> </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"> <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="285"> <state relative-caret-position="190">
<caret line="67" column="23" lean-forward="false" selection-start-line="67" selection-start-column="23" selection-end-line="67" selection-end-column="23" /> <caret line="86" column="55" lean-forward="true" selection-start-line="86" selection-start-column="55" selection-end-line="86" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="db.php" pinned="false" current-in-tab="false">
<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 /> <folding />
</state> </state>
</provider> </provider>
...@@ -73,8 +80,8 @@ ...@@ -73,8 +80,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="230"> <state relative-caret-position="420">
<caret line="1147" column="24" lean-forward="true" selection-start-line="1147" selection-start-column="24" selection-end-line="1147" selection-end-column="24" /> <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 /> <folding />
</state> </state>
</provider> </provider>
...@@ -124,8 +131,8 @@ ...@@ -124,8 +131,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>btn-prize</find>
<find>b-j-two</find> <find>b-j-two</find>
<find>btn-prize</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>m-</replace> <replace>m-</replace>
...@@ -145,9 +152,9 @@ ...@@ -145,9 +152,9 @@
<option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" /> <option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
<option value="$PROJECT_DIR$/Public/static/js/lucky-card.js" /> <option value="$PROJECT_DIR$/Public/static/js/lucky-card.js" />
<option value="$PROJECT_DIR$/index.html" /> <option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" /> <option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" /> <option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -508,12 +515,12 @@ ...@@ -508,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="11337000" /> <workItem from="1567181764126" duration="11580000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="73519000" /> <option name="totallyTimeSpent" value="73762000" />
</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" />
...@@ -703,14 +710,6 @@ ...@@ -703,14 +710,6 @@
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/hammer.min.js" /> <entry file="file://$PROJECT_DIR$/Public/static/js/hammer.min.js" />
<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="43" lean-forward="false" selection-start-line="6" selection-start-column="43" selection-end-line="6" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/User/View/default/Report_index.tpl"> <entry file="file://$PROJECT_DIR$/Application/User/View/default/Report_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="285">
...@@ -760,16 +759,8 @@ ...@@ -760,16 +759,8 @@
</entry> </entry>
<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="230"> <state relative-caret-position="420">
<caret line="1147" column="24" lean-forward="true" selection-start-line="1147" selection-start-column="24" selection-end-line="1147" selection-end-column="24" /> <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$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285">
<caret line="67" column="23" lean-forward="false" selection-start-line="67" selection-start-column="23" selection-end-line="67" selection-end-column="23" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -792,7 +783,7 @@ ...@@ -792,7 +783,7 @@
</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="306"> <state relative-caret-position="1218">
<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="238" column="38" lean-forward="false" selection-start-line="238" selection-start-column="38" selection-end-line="238" selection-end-column="38" />
<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" />
...@@ -803,5 +794,21 @@ ...@@ -803,5 +794,21 @@
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="86" column="55" lean-forward="true" selection-start-line="86" selection-start-column="55" selection-end-line="86" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -80,13 +80,13 @@ $(document).ready(function () { ...@@ -80,13 +80,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) {
$('#card').attr('src','Public/static/images/no-przie.jpg') $('#card src').attr('src','Public/static/images/no-przie.jpg')
$('.m-prize').show(); $('.m-prize').show();
$('.y-prize').hide(); $('.y-prize').hide();
}else { }else {
$('#card').attr('src','Public/static/images/prize-map.jpg') $('#card src').attr('src','Public/static/images/prize-map.jpg')
$('.m-prize').show(); $('.m-prize').hide();
$('.y-prize').hide(); $('.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){
$('.btn-submit').show(); $('.btn-submit').show();
}else { }else {
......
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