Skip to content

php / sx-prize

Go to a project
Commit 566d038b by zhangheng
Options

j

parent cfc16217
Showing with 75 additions and 68 deletions
.idea/workspace.xml
...@@ -4,8 +4,10 @@ ...@@ -4,8 +4,10 @@
<list default="true" id="83262c17-7030-4f8f-af17-e1cc55f76944" name="Default" comment=""> <list default="true" id="83262c17-7030-4f8f-af17-e1cc55f76944" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/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/css/main.css" afterPath="$PROJECT_DIR$/Public/static/css/main.css" /> <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/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> </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" />
...@@ -19,7 +21,7 @@ ...@@ -19,7 +21,7 @@
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.6184874"> <splitter split-orientation="horizontal" split-proportion="0.41092438">
<split-first> <split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
...@@ -32,21 +34,21 @@ ...@@ -32,21 +34,21 @@
</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="285"> <state relative-caret-position="19">
<caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" /> <caret line="14" column="5" lean-forward="false" selection-start-line="14" selection-start-column="5" selection-end-line="24" selection-end-column="9" />
<folding /> <folding />
</state> </state>
</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="532"> <state relative-caret-position="266">
<caret line="28" column="31" lean-forward="false" selection-start-line="28" selection-start-column="31" selection-end-line="28" selection-end-column="31" /> <caret line="14" column="5" lean-forward="false" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -122,7 +124,7 @@ ...@@ -122,7 +124,7 @@
<state relative-caret-position="3306"> <state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" /> <caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding> <folding>
<marker date="1563378009000" expanded="true" signature="4641:4759" ph="{...}" /> <marker date="1563378109000" expanded="true" signature="4592:4710" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -135,8 +137,8 @@ ...@@ -135,8 +137,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="95"> <state relative-caret-position="331">
<caret line="202" column="4" lean-forward="false" selection-start-line="202" selection-start-column="4" selection-end-line="202" selection-end-column="4" /> <caret line="197" column="55" lean-forward="false" selection-start-line="197" selection-start-column="55" selection-end-line="197" selection-end-column="55" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -177,10 +179,10 @@ ...@@ -177,10 +179,10 @@
<option value="$PROJECT_DIR$/Application/User/View/default/Check_index.tpl" /> <option value="$PROJECT_DIR$/Application/User/View/default/Check_index.tpl" />
<option value="$PROJECT_DIR$/Application/User/Controller/CheckController.class.php" /> <option value="$PROJECT_DIR$/Application/User/Controller/CheckController.class.php" />
<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/index.js" />
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" /> <option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<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/css/main.scss" /> <option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
</list> </list>
</option> </option>
</component> </component>
...@@ -598,12 +600,12 @@ ...@@ -598,12 +600,12 @@
<workItem from="1563354519051" duration="69000" /> <workItem from="1563354519051" duration="69000" />
<workItem from="1563355155211" duration="115000" /> <workItem from="1563355155211" duration="115000" />
<workItem from="1563355311998" duration="122000" /> <workItem from="1563355311998" duration="122000" />
<workItem from="1563377354829" duration="562000" /> <workItem from="1563377354829" duration="655000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="16410000" /> <option name="totallyTimeSpent" value="16503000" />
</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" />
...@@ -713,7 +715,9 @@ ...@@ -713,7 +715,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4047"> <state relative-caret-position="4047">
<caret line="213" column="13" lean-forward="true" selection-start-line="213" selection-start-column="13" selection-end-line="213" selection-end-column="13" /> <caret line="213" column="13" lean-forward="true" selection-start-line="213" selection-start-column="13" selection-end-line="213" selection-end-column="13" />
<folding /> <folding>
<marker date="1563378109000" expanded="true" signature="4592:4710" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -761,7 +765,9 @@ ...@@ -761,7 +765,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3306"> <state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" /> <caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding /> <folding>
<marker date="1563378109000" expanded="true" signature="4592:4710" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -851,7 +857,9 @@ ...@@ -851,7 +857,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3306"> <state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" /> <caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding /> <folding>
<marker date="1563378109000" expanded="true" signature="4592:4710" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -909,7 +917,9 @@ ...@@ -909,7 +917,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3306"> <state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" /> <caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding /> <folding>
<marker date="1563378109000" expanded="true" signature="4592:4710" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1026,14 +1036,6 @@ ...@@ -1026,14 +1036,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="532">
<caret line="28" column="31" lean-forward="false" selection-start-line="28" selection-start-column="31" selection-end-line="28" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php"> <entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="171"> <state relative-caret-position="171">
...@@ -1046,16 +1048,26 @@ ...@@ -1046,16 +1048,26 @@
</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="285"> <state relative-caret-position="19">
<caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" /> <caret line="14" column="5" lean-forward="false" selection-start-line="14" selection-start-column="5" selection-end-line="24" selection-end-column="9" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</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="95"> <state relative-caret-position="3306">
<caret line="202" column="4" lean-forward="false" selection-start-line="202" selection-start-column="4" selection-end-line="202" selection-end-column="4" /> <caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding>
<marker date="1563378109000" expanded="true" signature="4592:4710" ph="{...}" />
</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="266">
<caret line="14" column="5" lean-forward="false" selection-start-line="14" selection-start-column="5" selection-end-line="14" selection-end-column="5" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
Application/Home/View/default/Index_index.tpl
...@@ -12,35 +12,35 @@ ...@@ -12,35 +12,35 @@
<meta content="email=no" name="format-detection"/> <meta content="email=no" name="format-detection"/>
<script type="text/javascript" src="__CDN__/js/jquery-2.1.3.min.js"></script> <script type="text/javascript" src="__CDN__/js/jquery-2.1.3.min.js"></script>
<script type="text/javascript"> <script type="text/javascript">
// if (/Android (\d+\.\d+)/.test(navigator.userAgent)) { if (/Android (\d+\.\d+)/.test(navigator.userAgent)) {
// var version = parseFloat(RegExp.$1); var version = parseFloat(RegExp.$1);
// if (version > 2.3) { if (version > 2.3) {
// var phoneScale = parseInt(window.screen.width) / 640; var phoneScale = parseInt(window.screen.width) / 640;
// document.write('<meta name="viewport" content="width=640, minimum-scale = ' + phoneScale + ', maximum-scale = ' + phoneScale + ', target-densitydpi=device-dpi">'); document.write('<meta name="viewport" content="width=640, minimum-scale = ' + phoneScale + ', maximum-scale = ' + phoneScale + ', target-densitydpi=device-dpi">');
// } else { } else {
// document.write('<meta name="viewport" content="width=640, target-densitydpi=device-dpi">'); document.write('<meta name="viewport" content="width=640, target-densitydpi=device-dpi">');
// } }
// } else { } else {
// document.write('<meta name="viewport" content="width=640, user-scalable=no, target-densitydpi=device-dpi">'); document.write('<meta name="viewport" content="width=640, user-scalable=no, target-densitydpi=device-dpi">');
// }
(function (doc, win) {
var docEl = doc.documentElement,
resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
recalc = function () {
var clientWidth = docEl.clientWidth;
if (!clientWidth) return;
if(clientWidth>=640){
docEl.style.fontSize = '100px';
}else{
docEl.style.fontSize = 100 * (clientWidth / 640) + 'px';
} }
};
if (!doc.addEventListener) return; // (function (doc, win) {
win.addEventListener(resizeEvt, recalc, false); // var docEl = doc.documentElement,
doc.addEventListener('DOMContentLoaded', recalc, false); // resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize',
})(document, window); // recalc = function () {
// var clientWidth = docEl.clientWidth;
// if (!clientWidth) return;
// if(clientWidth>=640){
// docEl.style.fontSize = '100px';
// }else{
// docEl.style.fontSize = 100 * (clientWidth / 640) + 'px';
// }
// };
//
// if (!doc.addEventListener) return;
// win.addEventListener(resizeEvt, recalc, false);
// doc.addEventListener('DOMContentLoaded', recalc, false);
// })(document, window);
</script> </script>
<title>谁是桃源幸运锦鲤</title> <title>谁是桃源幸运锦鲤</title>
<link href="__CDN__/css/main.css?t=1.94" rel="stylesheet"> <link href="__CDN__/css/main.css?t=1.94" rel="stylesheet">
......
Public/static/css/main.css
...@@ -174,21 +174,20 @@ ul, li { ...@@ -174,21 +174,20 @@ ul, li {
#container { #container {
position: relative; position: relative;
background: url("../images/bj.jpg") no-repeat center; background: url("../images/bj.jpg") no-repeat center;
background-size: 100% 100%; width: 640px;
width: 6.4rem; height: 1238px;
height: 12.38rem;
} }
#container .btn-prize { #container .btn-prize {
justify-content: center; justify-content: center;
width: 2rem; width: 200px;
height: 2rem; height: 200px;
font-size: 27px; font-size: 27px;
border: 1px solid red; border: 1px solid red;
} }
#container .prize-type { #container .prize-type {
position: absolute; position: absolute;
width: 3rem; width: 300px;
height: 3rem; height: 300px;
opacity: 0; opacity: 0;
} }
#container .word { #container .word {
......
Public/static/css/main.scss
...@@ -51,7 +51,7 @@ $ea-prefix-for-spec: false !global; ...@@ -51,7 +51,7 @@ $ea-prefix-for-spec: false !global;
// height:torem($h); // height:torem($h);
//} //}
@function torem($px) { @function torem($px) {
@return $px / 100px * 1rem; @return $px;
} }
@mixin bounds_by_pos($x, $y, $w, $h) { @mixin bounds_by_pos($x, $y, $w, $h) {
...@@ -196,7 +196,6 @@ ul, li { ...@@ -196,7 +196,6 @@ ul, li {
#container { #container {
position: relative; position: relative;
background: url("../images/bj.jpg") no-repeat center; background: url("../images/bj.jpg") no-repeat center;
background-size: 100% 100%;
width: torem(640px); width: torem(640px);
height: torem(1238px); height: torem(1238px);
.btn-prize { .btn-prize {
......
Public/static/js/index.js
...@@ -13,9 +13,6 @@ $(document).ready(function () { ...@@ -13,9 +13,6 @@ $(document).ready(function () {
window.Origami.fastclick(document.body); window.Origami.fastclick(document.body);
} catch (e) { } catch (e) {
} }
document.addEventListener("touchmove", function (e) {
e.preventDefault();
}, false);
var clickEvent = $.isFunction($.fn.tap) ? 'tap' : 'click'; var clickEvent = $.isFunction($.fn.tap) ? 'tap' : 'click';
window['max_zindex'] = 100; window['max_zindex'] = 100;
$.fn.show_dialog = function () { $.fn.show_dialog = 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