Commit ed5cf8c5 by zhangheng

j

parent cfbf30ee
......@@ -2,7 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<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$/.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.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -17,7 +19,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.41689622">
<splitter split-orientation="horizontal" split-proportion="0.6134454">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -33,9 +35,15 @@
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513">
<caret line="43" column="13" lean-forward="true" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
<folding />
<state relative-caret-position="38">
<caret line="26" column="7" lean-forward="false" selection-start-line="26" selection-start-column="7" selection-end-line="42" selection-end-column="37" />
<folding>
<marker date="1563377844000" expanded="true" signature="769:1271" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="855:1126" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1132:1259" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1277:1414" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1424:2307" ph="//..." />
</folding>
</state>
</provider>
</entry>
......@@ -120,7 +128,7 @@
<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" />
<folding>
<marker date="1563377562000" expanded="true" signature="4562:4680" ph="{...}" />
<marker date="1563377831000" expanded="true" signature="4590:4708" ph="{...}" />
</folding>
</state>
</provider>
......@@ -134,7 +142,7 @@
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<caret line="197" column="55" lean-forward="false" selection-start-line="197" selection-start-column="55" selection-end-line="197" selection-end-column="55" />
<caret line="211" column="25" lean-forward="true" selection-start-line="211" selection-start-column="25" selection-end-line="211" selection-end-column="25" />
<folding />
</state>
</provider>
......@@ -177,8 +185,8 @@
<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/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
</list>
</option>
</component>
......@@ -596,12 +604,12 @@
<workItem from="1563354519051" duration="69000" />
<workItem from="1563355155211" duration="115000" />
<workItem from="1563355311998" duration="122000" />
<workItem from="1563377354829" duration="206000" />
<workItem from="1563377354829" duration="406000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="16054000" />
<option name="totallyTimeSpent" value="16254000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -614,7 +622,7 @@
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32918397" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22821577" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22821577" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
......@@ -667,7 +675,13 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1064">
<caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding />
<folding>
<marker date="1563377844000" expanded="true" signature="769:1271" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="855:1126" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1132:1259" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1277:1414" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1424:2307" ph="//..." />
</folding>
</state>
</provider>
</entry>
......@@ -711,7 +725,9 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
<folding>
<marker date="1563377831000" expanded="true" signature="4590:4708" ph="{...}" />
</folding>
</state>
</provider>
</entry>
......@@ -743,7 +759,13 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1064">
<caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding />
<folding>
<marker date="1563377844000" expanded="true" signature="769:1271" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="855:1126" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1132:1259" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1277:1414" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1424:2307" ph="//..." />
</folding>
</state>
</provider>
</entry>
......@@ -759,7 +781,9 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
<folding>
<marker date="1563377831000" expanded="true" signature="4590:4708" ph="{...}" />
</folding>
</state>
</provider>
</entry>
......@@ -801,7 +825,13 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1064">
<caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding />
<folding>
<marker date="1563377844000" expanded="true" signature="769:1271" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="855:1126" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1132:1259" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1277:1414" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1424:2307" ph="//..." />
</folding>
</state>
</provider>
</entry>
......@@ -849,7 +879,9 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
<folding>
<marker date="1563377831000" expanded="true" signature="4590:4708" ph="{...}" />
</folding>
</state>
</provider>
</entry>
......@@ -881,7 +913,13 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1007">
<caret line="53" column="37" lean-forward="true" selection-start-line="53" selection-start-column="37" selection-end-line="53" selection-end-column="37" />
<folding />
<folding>
<marker date="1563377844000" expanded="true" signature="769:1271" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="855:1126" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1132:1259" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1277:1414" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1424:2307" ph="//..." />
</folding>
</state>
</provider>
</entry>
......@@ -907,7 +945,9 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
<folding>
<marker date="1563377831000" expanded="true" signature="4590:4708" ph="{...}" />
</folding>
</state>
</provider>
</entry>
......@@ -1042,19 +1082,27 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513">
<caret line="43" column="13" lean-forward="true" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
<folding />
<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" />
<folding>
<marker date="1563377831000" expanded="true" signature="4590:4708" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<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 />
<state relative-caret-position="38">
<caret line="26" column="7" lean-forward="false" selection-start-line="26" selection-start-column="7" selection-end-line="42" selection-end-column="37" />
<folding>
<marker date="1563377844000" expanded="true" signature="769:1271" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="855:1126" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1132:1259" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1277:1414" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1424:2307" ph="//..." />
</folding>
</state>
</provider>
</entry>
......
......@@ -12,35 +12,35 @@
<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">
if (/Android (\d+\.\d+)/.test(navigator.userAgent)) {
var version = parseFloat(RegExp.$1);
if (version > 2.3) {
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">');
} else {
document.write('<meta name="viewport" content="width=640, target-densitydpi=device-dpi">');
}
} else {
document.write('<meta name="viewport" content="width=640, user-scalable=no, target-densitydpi=device-dpi">');
}
// if (/Android (\d+\.\d+)/.test(navigator.userAgent)) {
// var version = parseFloat(RegExp.$1);
// if (version > 2.3) {
// 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">');
// } else {
// document.write('<meta name="viewport" content="width=640, target-densitydpi=device-dpi">');
// }
// } else {
// 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';
}
};
// (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;
// win.addEventListener(resizeEvt, recalc, false);
// doc.addEventListener('DOMContentLoaded', recalc, false);
// })(document, window);
if (!doc.addEventListener) return;
win.addEventListener(resizeEvt, recalc, false);
doc.addEventListener('DOMContentLoaded', recalc, false);
})(document, window);
</script>
<title>谁是桃源幸运锦鲤</title>
<link href="__CDN__/css/main.css?t=1.94" rel="stylesheet">
......
......@@ -196,8 +196,8 @@ ul, li {
#container {
position: relative;
background: url("../images/bj.jpg") no-repeat center;
width: 640px;
height: 1238px;
width: torem(640px);
height: torem(1238px);
.btn-prize {
@extend .flex;
justify-content: center;
......@@ -208,8 +208,8 @@ ul, li {
}
.prize-type {
position: absolute;
width: 300px;
height: 300px;
width: torem(300px);
height: torem(300px);
opacity: 0;
//.bounceInDown {
// -webkit-animation: bounceInDown 1s ease 0s 1;
......
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