Skip to content

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

2021-04-27

parent 651d849d
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 46 deletions
.idea/workspace.xml
View file @ f3293b41
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="f0421ba8-2ee0-449a-9a4a-029934c6b8ab" name="默认更改列表" comment=""> <list default="true" id="f0421ba8-2ee0-449a-9a4a-029934c6b8ab" name="默认更改列表" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/page/data.js" beforeDir="false" afterPath="$PROJECT_DIR$/page/data.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/page/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/page/index.html" afterDir="false" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
...@@ -18,21 +20,26 @@ ...@@ -18,21 +20,26 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/page/index.html"> <entry file="file://$PROJECT_DIR$/page/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323"> <state relative-caret-position="491">
<caret line="65" column="27" selection-start-line="65" selection-start-column="18" selection-end-line="65" selection-end-column="27" /> <caret line="475" column="71" selection-start-line="475" selection-start-column="71" selection-end-line="475" selection-end-column="71" />
<folding> <folding>
<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#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#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#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" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/page/data.js"> <entry file="file://$PROJECT_DIR$/page/data.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="81"> <state relative-caret-position="135">
<caret line="3" selection-start-line="3" selection-end-line="3" /> <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -49,8 +56,8 @@ ...@@ -49,8 +56,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/page/index.css"> <entry file="file://$PROJECT_DIR$/page/index.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5346"> <state relative-caret-position="189">
<caret line="198" column="17" selection-start-line="198" selection-start-column="17" selection-end-line="198" selection-end-column="17" /> <caret line="200" column="17" selection-start-line="200" selection-start-column="17" selection-end-line="200" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -69,6 +76,7 @@ ...@@ -69,6 +76,7 @@
<find>xcAttr1</find> <find>xcAttr1</find>
<find>index</find> <find>index</find>
<find>full-img</find> <find>full-img</find>
<find>video-box</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace /> <replace />
...@@ -154,7 +162,7 @@ ...@@ -154,7 +162,7 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1619449663855</updated> <updated>1619449663855</updated>
<workItem from="1619449668450" duration="9473000" /> <workItem from="1619449668450" duration="9473000" />
<workItem from="1619593151872" duration="1367000" /> <workItem from="1619593151872" duration="3380000" />
</task> </task>
<task id="LOCAL-00001" summary="2021-04-26"> <task id="LOCAL-00001" summary="2021-04-26">
<created>1619451069058</created> <created>1619451069058</created>
...@@ -191,16 +199,24 @@ ...@@ -191,16 +199,24 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1619593994796</updated> <updated>1619593994796</updated>
</task> </task>
<option name="localTasksCounter" value="6" /> <task id="LOCAL-00006" summary="2021-04-27">
<created>1619594585082</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1619594585082</updated>
</task>
<option name="localTasksCounter" value="7" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="10840000" /> <option name="totallyTimeSpent" value="12853000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25375536" /> <window_info 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="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
...@@ -232,41 +248,44 @@ ...@@ -232,41 +248,44 @@
<option name="LAST_COMMIT_MESSAGE" value="2021-04-27" /> <option name="LAST_COMMIT_MESSAGE" value="2021-04-27" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/page/data.js"> <entry file="file://$PROJECT_DIR$/page/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="81"> <state relative-caret-position="513">
<caret line="3" selection-start-line="3" selection-end-line="3" /> <caret line="19" column="21" selection-start-line="19" selection-start-column="21" selection-end-line="19" selection-end-column="21" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/page/index.js"> <entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513"> <state relative-caret-position="-4807">
<caret line="19" column="21" selection-start-line="19" selection-start-column="21" selection-end-line="19" selection-end-column="21" /> <caret line="228" column="41" selection-start-line="228" selection-start-column="26" selection-end-line="228" selection-end-column="41" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/page/index.css"> <entry file="file://$PROJECT_DIR$/page/index.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="5346"> <state relative-caret-position="189">
<caret line="198" column="17" selection-start-line="198" selection-start-column="17" selection-end-line="198" selection-end-column="17" /> <caret line="200" column="17" selection-start-line="200" selection-start-column="17" selection-end-line="200" selection-end-column="17" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/index.html"> <entry file="file://$PROJECT_DIR$/page/data.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-4807"> <state relative-caret-position="135">
<caret line="228" column="41" selection-start-line="228" selection-start-column="26" selection-end-line="228" selection-end-column="41" /> <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/page/index.html"> <entry file="file://$PROJECT_DIR$/page/index.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323"> <state relative-caret-position="491">
<caret line="65" column="27" selection-start-line="65" selection-start-column="18" selection-end-line="65" selection-end-column="27" /> <caret line="475" column="71" selection-start-line="475" selection-start-column="71" selection-end-line="475" selection-end-column="71" />
<folding> <folding>
<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#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#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#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" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
page/data.js
View file @ f3293b41
let vips=[]; let vips=[];
let vipStr=''; let vipStr='';
vips=JSON.parse(vipStr); if (vipStr!= null&&vipStr!='') {
vips=JSON.parse(vipStr);
}
page/index.html
View file @ f3293b41
...@@ -227,7 +227,29 @@ ...@@ -227,7 +227,29 @@
</el-carousel> </el-carousel>
</div> </div>
<!-- 行程 --> <!-- 行程 -->
<div class="xc-box-1" v-if="vip.name"> <!-- <div class="xc-box-1" v-if="vip.name">-->
<!-- <div class="xc-title-box">-->
<!-- <img src="img/xc-title@2x.png" alt="" srcset="" class="xc-title-img">-->
<!-- </div>-->
<!-- <div style="padding-top: 1rem;">-->
<!-- <div class="xc-box xc-box-1-bg">-->
<!-- <template>-->
<!-- <div style="font-size: 0.3rem;line-height: 2em;font-weight: bold;" class="vip-box">-->
<!-- <p>-->
<!-- 尊敬的<b style="color: #C42C2D">{{vip.name}}</b>巡视员:</p>-->
<!-- <p>印象嘉陵江，千年相如城。</p>-->
<!-- <p>我们怀着激动的心情，终于迎来南充市2021年嘉陵江放牛季启动仪式暨相如故城开城活动启航。我们对您的到来表示最热烈的欢迎和最诚挚的感谢。您在蓬安期间的专属服务人员是：<b-->
<!-- style="color: #C42C2D">{{vip.workername}}</b>，联系电话：<b-->
<!-- style="color: #C42C2D">{{vip.workerphone}}</b>。如您有需要的地方，我们随时竭诚为您服务。</p>-->
<!-- <p>-->
<!-- 为了您能够在蓬安享受更加热情周到的服务，我们特地为您梳理具体行程如下：-->
<!-- </p>-->
<!-- </div>-->
<!-- </template>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="xc-box-1">
<div class="xc-title-box"> <div class="xc-title-box">
<img src="img/xc-title@2x.png" alt="" srcset="" class="xc-title-img"> <img src="img/xc-title@2x.png" alt="" srcset="" class="xc-title-img">
</div> </div>
...@@ -236,13 +258,9 @@ ...@@ -236,13 +258,9 @@
<template> <template>
<div style="font-size: 0.3rem;line-height: 2em;font-weight: bold;" class="vip-box"> <div style="font-size: 0.3rem;line-height: 2em;font-weight: bold;" class="vip-box">
<p> <p>
尊敬的<b style="color: #C42C2D">{{vip.name}}</b>巡视员:</p> 尊敬的来宾：</p>
<p>印象嘉陵江，千年相如城。</p>
<p>我们怀着激动的心情，终于迎来南充市2021年嘉陵江放牛季启动仪式暨相如故城开城活动启航。我们对您的到来表示最热烈的欢迎和最诚挚的感谢。您在蓬安期间的专属服务人员是：<b
style="color: #C42C2D">{{vip.workername}}</b>，联系电话：<b
style="color: #C42C2D">{{vip.workerphone}}</b>。如您有需要的地方，我们随时竭诚为您服务。</p>
<p> <p>
为了您能够在蓬安享受更加热情周到的服务，我们特地为您梳理具体行程如下： 首先，感谢您在百忙之中莅临蓬安指导工作，南充市2021年嘉陵江放牛季启动暨相如故城开城仪式将于2021年4月29日-30日举行，您在蓬安的具体行程如下：
</p> </p>
</div> </div>
</template> </template>
...@@ -268,7 +286,7 @@ ...@@ -268,7 +286,7 @@
<span class="item-tip-icon"></span> <span class="item-tip-icon"></span>
<span>{{item.title}}</span> <span>{{item.title}}</span>
</div> </div>
<!-- <div class="xc-item-text">{{item.text}}</div>--> <div class="xc-item-text" v-if="item.text">{{item.text}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -341,12 +359,14 @@ ...@@ -341,12 +359,14 @@
workername: '', workername: '',
workerphone: '', workerphone: '',
xcAttr1: [{ xcAttr1: [{
title: '15:00—18:00 报到入住。房卡已提前交给您的专属服务人员。', title: '15:00—18:00 报到入住。酒店房卡已提前交给您的专属服务人员，请在服务人员的协助下，办理报到入住。',
text: '' text: ''
}, },
{ {
title: '18:30 举行欢迎晚宴。请您在百牛渡江田园生活馆用餐。', title: '18:30 举行欢迎晚宴。请您在酒店用自助餐。',
text: '。' text: '田园生活馆：入住百牛渡江民宿的嘉宾；\n' +
'相如饭店：入住相如饭店、相如之心的嘉宾；\n' +
'柏亚酒店：入住柏亚酒店的嘉宾；'
}, },
{ {
title: '20:30 集中观光影、品美食。请您在百牛渡江观光影、品美食。', title: '20:30 集中观光影、品美食。请您在百牛渡江观光影、品美食。',
...@@ -407,12 +427,13 @@ ...@@ -407,12 +427,13 @@
workername: '', workername: '',
workerphone: '', workerphone: '',
xcAttr1: [{ xcAttr1: [{
title: '15:00—18:00 报到入住。房卡已提前交给您的专属服务人员。', title: '15:00—18:00 报到入住。酒店房卡已提前交给您的专属服务人员，请在服务人员的协助下，办理报到入住',
text: '' text: ''
}, },
{ {
title: '18:30 举行欢迎晚宴。请您在相如饭店一楼用餐。', title: '18:30 举行欢迎晚宴。请您在酒店用自助餐。',
text: '。' text: '相如饭店：入住相如饭店、相如之心的嘉宾；\n' +
'柏亚酒店：入住柏亚酒店的嘉宾；'
}, },
{ {
title: '19:30 夜游相如故城、品美食。请您在在用餐酒店统一乘车，前往相如故城游览，游览结束后，在桑梓火锅公园品美食。', title: '19:30 夜游相如故城、品美食。请您在在用餐酒店统一乘车，前往相如故城游览，游览结束后，在桑梓火锅公园品美食。',
...@@ -452,7 +473,7 @@ ...@@ -452,7 +473,7 @@
text: '' text: ''
}, },
{ {
title: '12:00 返回酒店。游览结束后，在相如故城东门广场乘车，返回下榻酒店用自助餐。', title: '12:00 返回酒店。游览结束后，在相如故城东门广场统一乘车，返回下榻酒店用自助餐。',
text: '' text: ''
}, },
{ {
...@@ -467,12 +488,14 @@ ...@@ -467,12 +488,14 @@
workername: '', workername: '',
workerphone: '', workerphone: '',
xcAttr1: [{ xcAttr1: [{
title: '15:00—18:00 报到入住。房卡已提前交给您的专属服务人员。', title: '15:00—18:00 报到入住。酒店房卡已提前交给您的专属服务人员，请在服务人员的协助下，办理报到入住。',
text: '' text: ''
}, },
{ {
title: '18:30 举行欢迎晚宴。请您在百牛渡江田园生活馆用餐。', title: '18:30 举行欢迎晚宴。请您在酒店用自助餐。',
text: '。' text: '田园生活馆：入住百牛渡江民宿的嘉宾；\n' +
'相如饭店：入住相如饭店、相如之心的嘉宾；\n' +
'柏亚酒店：入住柏亚酒店的嘉宾；'
}, },
{ {
title: '20:30 集中观光影、品美食。请您在百牛渡江观光影、品美食。', title: '20:30 集中观光影、品美食。请您在百牛渡江观光影、品美食。',
......
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