Skip to content

P
penganfangniujie
Commit 84e12773 authored by 李波's avatar 李波
Browse files
Options

2021-04-27

parent 5be858b9
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 64 deletions
.idea/workspace.xml
View file @ 84e12773
......@@ -2,8 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f0421ba8-2ee0-449a-9a4a-029934c6b8ab" name="默认更改列表" comment="">
<change beforePath="$PROJECT_DIR$/page/data.js" beforeDir="false" afterPath="$PROJECT_DIR$/page/data.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/page/img/logo.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/page/img/logo.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/page/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/page/index.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
......@@ -20,48 +19,21 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/page/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="271" column="17" selection-start-line="271" selection-start-column="17" selection-end-line="271" selection-end-column="17" />
<state relative-caret-position="209">
<caret line="467" column="37" selection-start-line="467" selection-start-column="35" selection-end-line="467" selection-end-column="37" />
<folding>
<element signature="n#style#0;n#div#1;n#div#5;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#template#0;n#div#0;n#div#1;n#div#5;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#b#0;n#p#0;n#div#0;n#template#0;n#div#0;n#div#1;n#div#5;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#b#0;n#p#2;n#div#0;n#template#0;n#div#0;n#div#1;n#div#5;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#b#1;n#p#2;n#div#0;n#template#0;n#div#0;n#div#1;n#div#5;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#6;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#template#0;n#div#0;n#div#1;n#div#6;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#template#0;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#0;n#template#0;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#b#0;n#p#0;n#div#0;n#div#0;n#div#1;n#div#0;n#template#0;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#b#0;n#p#2;n#div#0;n#div#0;n#div#1;n#div#0;n#template#0;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#b#1;n#p#2;n#div#0;n#div#0;n#div#1;n#div#0;n#template#0;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#template#1;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#template#0;n#div#0;n#div#1;n#div#0;n#template#1;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/page/data.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="788">
<caret line="1" column="4314" selection-start-line="1" selection-start-column="4314" selection-end-line="1" selection-end-column="4314" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/page/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513">
<caret line="19" column="21" selection-start-line="19" selection-start-column="21" selection-end-line="19" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/page/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="200" column="17" selection-start-line="200" selection-start-column="17" selection-end-line="200" selection-end-column="17" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
......@@ -77,6 +49,8 @@
<find>index</find>
<find>full-img</find>
<find>video-box</find>
<find>在在</find>
<find>乘车</find>
</findStrings>
<replaceStrings>
<replace />
......@@ -162,7 +136,7 @@
<option name="presentableId" value="Default" />
<updated>1619449663855</updated>
<workItem from="1619449668450" duration="9473000" />
<workItem from="1619593151872" duration="6425000" />
<workItem from="1619593151872" duration="8973000" />
</task>
<task id="LOCAL-00001" summary="2021-04-26">
<created>1619451069058</created>
......@@ -213,19 +187,26 @@
<option name="project" value="LOCAL" />
<updated>1619608678505</updated>
</task>
<option name="localTasksCounter" value="8" />
<task id="LOCAL-00008" summary="2021-04-27">
<created>1619613531335</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1619613531335</updated>
</task>
<option name="localTasksCounter" value="9" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="15898000" />
<option name="totallyTimeSpent" value="18446000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25375536" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Messages" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
......@@ -234,9 +215,9 @@
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.49946353" visible="true" />
<window_info anchor="bottom" id="Terminal" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.5005365" side_tool="true" visible="true" />
<window_info anchor="bottom" id="调试" order="11" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
......@@ -269,13 +250,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/page/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="200" column="17" selection-start-line="200" selection-start-column="17" selection-end-line="200" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="243">
......@@ -290,18 +264,25 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/page/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="200" column="17" selection-start-line="200" selection-start-column="17" selection-end-line="200" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/page/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="271" column="17" selection-start-line="271" selection-start-column="17" selection-end-line="271" selection-end-column="17" />
<state relative-caret-position="209">
<caret line="467" column="37" selection-start-line="467" selection-start-column="35" selection-end-line="467" selection-end-column="37" />
<folding>
<element signature="n#style#0;n#div#1;n#div#5;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#template#0;n#div#0;n#div#1;n#div#5;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#b#0;n#p#0;n#div#0;n#template#0;n#div#0;n#div#1;n#div#5;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#b#0;n#p#2;n#div#0;n#template#0;n#div#0;n#div#1;n#div#5;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#b#1;n#p#2;n#div#0;n#template#0;n#div#0;n#div#1;n#div#5;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#6;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#template#0;n#div#0;n#div#1;n#div#6;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#template#0;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#0;n#div#1;n#div#0;n#template#0;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#b#0;n#p#0;n#div#0;n#div#0;n#div#1;n#div#0;n#template#0;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#b#0;n#p#2;n#div#0;n#div#0;n#div#1;n#div#0;n#template#0;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#b#1;n#p#2;n#div#0;n#div#0;n#div#1;n#div#0;n#template#0;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#template#1;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#template#0;n#div#0;n#div#1;n#div#0;n#template#1;n#div#0;n#srcipt#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
......
page/index.html
View file @ 84e12773
......@@ -399,7 +399,7 @@
text: ''
},
{
title: '09:05 乘车前往相如故城。请您在工作人员引导下，步行至百牛渡江转运广场，乘车，前往相如故城，行程约30分钟。',
title: '09:05 乘车前往相如故城。请您在工作人员引导下，步行至百牛渡江转运广场，乘车前往相如故城，行程约30分钟。',
text: ''
},
{
......@@ -440,7 +440,7 @@
text: '<p>相如饭店：入住相如饭店、相如之心的嘉宾；</p><p>柏亚酒店：入住柏亚酒店的嘉宾；</p>'
},
{
title: '19:30 夜游相如故城、品美食。请您在在用餐酒店统一乘车，前往相如故城游览，游览结束后，在桑梓火锅公园品美食。',
title: '19:30 夜游相如故城、品美食。请您在用餐酒店统一乘车前往相如故城游览，游览结束后，在桑梓火锅公园品美食。',
text: ''
},
{
......@@ -465,7 +465,7 @@
text: ''
},
{
title: '09:05 乘车前往相如故城。请您在工作人员引导下，步行至百牛渡江转运广场，乘车，前往相如故城，步行行程约3分钟。',
title: '09:05 乘车前往相如故城。请您在工作人员引导下，步行至百牛渡江转运广场，乘车前往相如故城，步行行程约3分钟。',
text: ''
},
{
......@@ -525,7 +525,7 @@
text: ''
},
{
title: '09:05 乘车前往相如故城。请您在工作人员引导下，步行至百牛渡江转运广场，乘车，前往相如故城，行程约30分钟。',
title: '09:05 乘车前往相如故城。请您在工作人员引导下，步行至百牛渡江转运广场，乘车前往相如故城，行程约30分钟。',
text: ''
},
{
......
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 to comment