Commit 66841837 by zhangheng

1

parent a1bbd2ec
......@@ -20,7 +20,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.5407464">
<splitter split-orientation="horizontal" split-proportion="0.52170604">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -85,8 +85,8 @@
<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="266">
<caret line="273" column="5" lean-forward="true" selection-start-line="273" selection-start-column="5" selection-end-line="273" selection-end-column="5" />
<state relative-caret-position="325">
<caret line="275" column="36" lean-forward="false" selection-start-line="275" selection-start-column="36" selection-end-line="275" selection-end-column="36" />
<folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
......@@ -123,8 +123,8 @@
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="342">
<caret line="367" column="12" lean-forward="true" selection-start-line="367" selection-start-column="12" selection-end-line="367" selection-end-column="12" />
<state relative-caret-position="-95">
<caret line="240" column="9" lean-forward="false" selection-start-line="240" selection-start-column="9" selection-end-line="240" selection-end-column="9" />
<folding />
</state>
</provider>
......@@ -547,12 +547,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="2852000" />
<workItem from="1567181764126" duration="3062000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="65034000" />
<option name="totallyTimeSpent" value="65244000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -927,21 +927,21 @@
</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="266">
<caret line="273" column="5" lean-forward="true" selection-start-line="273" selection-start-column="5" selection-end-line="273" selection-end-column="5" />
<folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="-95">
<caret line="240" column="9" lean-forward="false" selection-start-line="240" selection-start-column="9" selection-end-line="240" selection-end-column="9" />
<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="342">
<caret line="367" column="12" lean-forward="true" selection-start-line="367" selection-start-column="12" selection-end-line="367" selection-end-column="12" />
<folding />
<state relative-caret-position="325">
<caret line="275" column="36" lean-forward="false" selection-start-line="275" selection-start-column="36" selection-end-line="275" selection-end-column="36" />
<folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
......
......@@ -139,23 +139,24 @@
<div class="map-36" style="display: none"></div>
<div class="map-37" style="display: none"></div>
</div>
<div class="page-m-b" style="display: none">
<div class="zhou m-b-zhou-sate"></div>
<div class="c-d m-b-sate"></div>
<div class="ceshi"></div>
<div class="swiper-container">
<div class="swiper-wrapper">
<img class="side-1 swiper-slide" src="__CDN__/images/side-1-1.png">
<img class="side-2 swiper-slide" src="__CDN__/images/side-2-2.png">
<img class="side-3 swiper-slide" src="__CDN__/images/side-3-3.png">
<img class="side-4 swiper-slide" src="__CDN__/images/side-4-4.png">
<div class="page-sate page-m-b" style="display: none">
<div class="b-j-two">
<div class="zhou m-b-zhou-sate"></div>
<div class="c-d m-b-sate"></div>
<div class="swiper-container">
<div class="swiper-wrapper">
<img class="side-1 swiper-slide" src="__CDN__/images/side-1-1.png">
<img class="side-2 swiper-slide" src="__CDN__/images/side-2-2.png">
<img class="side-3 swiper-slide" src="__CDN__/images/side-3-3.png">
<img class="side-4 swiper-slide" src="__CDN__/images/side-4-4.png">
</div>
</div>
<div class="btn-right" style="display: none"></div>
<div class="btn-left"></div>
<div class="btn-next"></div>
<div class="word"></div>
</div>
<div class="btn-right" style="display: none"></div>
<div class="btn-left"></div>
<div class="btn-next"></div>
<div class="word"></div>
</div>
<div class="page-x-z" style="display: none">
<div class="zhou m-b-zhou-sate"></div>
......@@ -272,6 +273,7 @@
$('body').css('height', '1234px');
}
}
console.log(window.screen.height)
</script>
<script type="text/javascript" src="__CDN__/js/konva.min.js"></script>
<script type="text/javascript" src="__CDN__/js/swiper.min.js"></script>
......
......@@ -76,7 +76,7 @@ html, body {
}
@media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 2) {
.page-sate {
html, body {
height: 1030px;
}
}
......@@ -250,7 +250,6 @@ ul, li {
}
.page-m-b {
background: url("../images/m-b-bj-1.jpg") no-repeat center;
width: 640px;
height: 1238px;
}
......
......@@ -239,7 +239,6 @@ ul, li {
}
.page-m-b {
background: url("../images/m-b-bj-1.jpg") no-repeat center;
width: 640px;
height: 1238px;
.side-1, .side-2, .side-3, .side-4 {
......
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