From 0e6467836bbd3fcd85d1cfaefcf763e58c9149be Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 04 七月 2024 15:36:48 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout
---
src/books/artAndDrama/view/components/chapter004.vue | 16 +
src/books/artAndDrama/assets/main.less | 8
src/books/English/view/components/chapter001.vue | 112 ++++++++++------
src/books/artAndDrama/view/components/chapter003.vue | 12 +
src/books/English/view/components/chapter002.vue | 204 +++++++++++++++-------------
src/books/artAndDrama/view/components/chapter002.vue | 12 +
src/books/artAndDrama/view/components/chapter001.vue | 11 +
src/books/English/view/components/index.vue | 2
src/books/artAndDrama/view/components/index.vue | 6
9 files changed, 233 insertions(+), 150 deletions(-)
diff --git a/src/books/English/view/components/chapter001.vue b/src/books/English/view/components/chapter001.vue
index ae1b0a6..3bcae81 100644
--- a/src/books/English/view/components/chapter001.vue
+++ b/src/books/English/view/components/chapter001.vue
@@ -1913,7 +1913,7 @@
<p>
1.We are witnessing the rapid development of modern society.What
impresses you most?
- <span class="btn-box" @click="showAnswerFour = !showAnswerFour">
+ <span class="btn-box" @click="showAnswerFive = !showAnswerFive">
<svg xmlns="http://www.w3.org/2000/svg" width="20.501" height="20.501" viewBox="0 0 20.501 20.501">
<path class="a"
d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
@@ -1922,17 +1922,17 @@
</span>
</p>
<!-- 鏂囨湰妗� -->
- <textarea v-model="questionData.reading.two" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
+ <textarea v-model="questionData.reading.three" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion"></textarea>
<!-- 绛旀妗� -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerFour">
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerFive">
绛旀锛�(1)intercitut rain(2)online shopping (3)electronic payment (4)shared bike (5)take-away service
(6)facial recognition
(7)2022 Beijing Winter Olympics (8)2023 World University Games (9)Hong Kong-Zhuhai-Macao Bridge
(10)Scenery spots, such as Jiuzhaigou, the Palace Museum, the Great Wall
</p>
<p>2.What will our life be like in ten or twenty years?
- <span class="btn-box" @click="showAnswerFour = !showAnswerFour">
+ <span class="btn-box" @click="showAnswerSex = !showAnswerSex">
<svg xmlns="http://www.w3.org/2000/svg" width="20.501" height="20.501" viewBox="0 0 20.501 20.501">
<path class="a"
d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
@@ -1941,10 +1941,10 @@
</span>
</p>
<!-- 鏂囨湰妗� -->
- <textarea v-model="questionData.reading.two" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
+ <textarea v-model="questionData.reading.four" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion"></textarea>
<!-- 绛旀妗� -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerFour">
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerSex">
绛旀锛�(1)population aging (2)worsening climate change
(3)more automation and Al,such as flying cars, driverless
</p>
@@ -2168,7 +2168,8 @@
3.It was at that moment that I knew about the metro system.It was
new,fast,and extraordinary.
</p>
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%"
+ v-if="showlessonTwoQuestionAnswer">
绛旀锛� A.3 B.1 C.2
</p>
<p>
@@ -2202,7 +2203,8 @@
Vanessa鈥檚 life
easier.
</p>
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%"
+ v-if="showlessonTwoQuestionAnswer">
绛旀锛� 1.T 2.F 3.T 4.F 5.T
</p>
<p><b>鈪�.Language focus.</b></p>
@@ -2235,7 +2237,8 @@
of modern people.<input :disabled="testData.isComplete" type="text" class="input-bottom-border"
style="width: 90px" v-model="testData.in.one" @change="setTestData" />
</p>
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%"
+ v-if="showlessonTwoQuestionAnswer">
绛旀锛� 1.witnessed 2.extraordinary 3.via 4.era 5.pace
</p>
<p>
@@ -2287,7 +2290,8 @@
v-model="testData.in.one" @change="setTestData" />,all the people committed to Shenzhou Spacecrafts
deserve respect.
</p>
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%"
+ v-if="showlessonTwoQuestionAnswer">
绛旀锛� 1.went through 2.Type in 3.a matter of 4.well Off 5.Last but not least
</p>
<p><b>鈪�.Grammar focus:The simple sentence.</b></p>
@@ -2310,27 +2314,28 @@
</p>
</div>
<p>1.It is actually an online shopping website.锛�<input :disabled="testData.isComplete" type="text"
- class="input-bottom-border" style="width: 60px" v-model="testData.in.one" @change="setTestData" />锛�</p>
+ class="input-bottom-border" style="width: 80px" v-model="testData.in.one" @change="setTestData" />锛�</p>
<p>
2.Vanessa finally got her own online payment account.锛�<input :disabled="testData.isComplete" type="text"
- class="input-bottom-border" style="width: 60px" v-model="testData.in.one" @change="setTestData" />锛�
+ class="input-bottom-border" style="width: 80px" v-model="testData.in.one" @change="setTestData" />锛�
</p>
<p>
3.China offers researchers world-class advanced research
facilities in the institutes. 锛�<input :disabled="testData.isComplete" type="text"
- class="input-bottom-border" style="width: 60px" v-model="testData.in.one" @change="setTestData" />锛�
+ class="input-bottom-border" style="width: 80px" v-model="testData.in.one" @change="setTestData" />锛�
</p>
<p>
4.These friends made Vanessa see China through the eyes of the
- locals.锛�<input :disabled="testData.isComplete" type="text" class="input-bottom-border" style="width: 60px"
+ locals.锛�<input :disabled="testData.isComplete" type="text" class="input-bottom-border" style="width: 80px"
v-model="testData.in.one" @change="setTestData" />锛�
</p>
<p>5.The list of Chinese food never ends.锛�<input :disabled="testData.isComplete" type="text"
- class="input-bottom-border" style="width: 60px" v-model="testData.in.one" @change="setTestData" />锛�</p>
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
+ class="input-bottom-border" style="width: 80px" v-model="testData.in.one" @change="setTestData" />锛�</p>
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%"
+ v-if="showlessonTwoQuestionAnswer">
绛旀锛� 1.S+V+C 2.S+V+O 3.S+V+O+O 4.S+V+O+C 5.S+V
</p>
-
+ <!-- 鎻愪氦鎸夐挳 -->
<div class="w100 fl">
<ul class="fl ju-ar w100">
<li>
@@ -2344,7 +2349,7 @@
</button>
</li>
<li>
- <button @click="showQuestionAnswer = !showQuestionAnswer" class="parimary-btn">
+ <button @click="showlessonTwoQuestionAnswer = !showlessonTwoQuestionAnswer" class="parimary-btn">
鏌ョ湅绛旀
</button>
</li>
@@ -2500,7 +2505,7 @@
style="width: 60px" v-model="testData.in.one" @change="setTestData" />of Sanya to the rocky seaside
of Laoshan鈥� China is such a beautiful country!
</p>
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showlessonThreeQuestionAnswer">
绛旀锛� 1.culture 2.explore 3.subways 4.convenient 5.surprising 6.beach
</p>
<p>
@@ -2550,7 +2555,7 @@
<h3 id="c009"><span class="bjh3">Practical Writing</span></h3>
<p>Work with your partner to discuss the following questions.</p>
<p>1.How do you let others know about an upcoming event?
- <span class="btn-box" @click="showAnswerFour = !showAnswerFour">
+ <span class="btn-box" @click="showAnswerSeven = !showAnswerSeven">
<svg xmlns="http://www.w3.org/2000/svg" width="20.501" height="20.501" viewBox="0 0 20.501 20.501">
<path class="a"
d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
@@ -2559,15 +2564,16 @@
</span>
</p>
<!-- 鏂囨湰妗� -->
- <textarea v-model="questionData.reading.two" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
+ <textarea v-model="questionData.reading.five" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion"></textarea>
<!-- 绛旀妗� -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerFour">
- 绛旀锛� 1)posters 2)Wechat public account 3)Campus radio 4)Campus TV station 5)Notice
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerSeven">
+ 绛旀锛� (1)posters (2)Wechat public account (3)Campus radio (4)Campus TV station
+ (5)Notice
</p>
<p>
2.What information would you like to tell them about the event?
- <span class="btn-box" @click="showAnswerFour = !showAnswerFour">
+ <span class="btn-box" @click="showAnswerEight = !showAnswerEight">
<svg xmlns="http://www.w3.org/2000/svg" width="20.501" height="20.501" viewBox="0 0 20.501 20.501">
<path class="a"
d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
@@ -2576,10 +2582,10 @@
</span>
</p>
<!-- 鏂囨湰妗� -->
- <textarea v-model="questionData.reading.two" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
+ <textarea v-model="questionData.reading.sex" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion"></textarea>
<!-- 绛旀妗� -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerFour">
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerEight">
绛旀锛�(1)Name of the event(2)Date & time (3)Address (4)Organizer
</p>
<p>
@@ -2695,31 +2701,23 @@
<input :disabled="testData.isComplete" type="text" class="input-bc-t" style="width: 325px"
v-model="testData.in.one" @change="setTestData" />
</p>
- <!-- 绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 绛旀锛� Traditional handicraft show
- </p>
<p>2.What should be included in the exhibition?</p>
<p><input :disabled="testData.isComplete" type="text" class="input-bc-t" style="width: 325px"
v-model="testData.in.one" @change="setTestData" /></p>
- <!-- 绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 绛旀锛� Various handicrafts made by Chinese students in theirtraditional Chinese culture courses
- </p>
<p>3.Where will the exhibition be held?</p>
<p><input :disabled="testData.isComplete" type="text" class="input-bc-t" style="width: 325px"
v-model="testData.in.one" @change="setTestData" /></p>
- <!-- 绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 绛旀锛� Students activity center.
- </p>
<p>4.When will the exhibition be held?</p>
<p><input :disabled="testData.isComplete" type="text" class="input-bc-t" style="width: 325px"
v-model="testData.in.one" @change="setTestData" /></p>
- <!-- 绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 绛旀锛� November 13th -- 19th
- </p>
+ <div class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%"
+ v-if="showlessonThreeQuestionAnswer">
+ <span>绛旀锛�</span>
+ <p>1銆� Traditional handicraft show</p>
+ <p>2銆� Various handicrafts made by Chinese students in theirtraditional Chinese culture courses</p>
+ <p>3銆� Students activity center.</p>
+ <p>4銆� November 13th -- 19th</p>
+ </div>
<p>...</p>
</div>
</div>
@@ -2810,6 +2808,26 @@
<p>What will hold the audience鈥檚 interest?</p>
<p>What do you hope to achieve through this event?</p>
</div>
+ <!-- 鎻愪氦鎸夐挳 -->
+ <div class="w100 fl">
+ <ul class="fl ju-ar w100">
+ <li>
+ <button class="btn-border btn-w" @click="saveData">
+ 鎻愪氦
+ </button>
+ </li>
+ <li>
+ <button @click="changeTestData" class="btn-border btn-w">
+ 閲嶅仛
+ </button>
+ </li>
+ <li>
+ <button @click="showlessonThreeQuestionAnswer = !showlessonThreeQuestionAnswer" class="parimary-btn">
+ 鏌ョ湅绛旀
+ </button>
+ </li>
+ </ul>
+ </div>
</div>
<div class="preface-bottom">
<span class="contet-num-box">18</span>
@@ -2839,8 +2857,14 @@
showAnswerThree: false,
showAnswerFour: false,
showAnswerFive: false,
+ showAnswerSex: false,
+ showAnswerSeven: false,
+ showAnswerEight: false,
+ showAnswerNine: false,
showImg: false,
showQuestionAnswer: false,
+ showlessonTwoQuestionAnswer: false,
+ showlessonThreeQuestionAnswer: false,
rawData: {
left: [
{
@@ -2996,6 +3020,10 @@
reading: {
one: "",
two: "",
+ three: "",
+ four: "",
+ five: "",
+ sex: "",
},
table: {
one: "",
diff --git a/src/books/English/view/components/chapter002.vue b/src/books/English/view/components/chapter002.vue
index e7de1ab..1218b6e 100644
--- a/src/books/English/view/components/chapter002.vue
+++ b/src/books/English/view/components/chapter002.vue
@@ -196,7 +196,7 @@
1.Culture shock is a normal part of the life when moving somewhere
new,such as travelling abroad,or studying abroad.So,what鈥檚 the
definition of culture shock?
- <span class="btn-box" @click="showAnswerThree = !showAnswerThree">
+ <span class="btn-box" @click="showAnswerOne = !showAnswerOne">
<svg xmlns="http://www.w3.org/2000/svg" width="20.501" height="20.501" viewBox="0 0 20.501 20.501">
<path class="a"
d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
@@ -206,7 +206,7 @@
</p>
<textarea v-model="questionData.reading.one" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion"></textarea>
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerThree">
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerOne">
绛旀锛欳ulture shock is a normal process of adapting to a new culture" ltis a time when a person becomes aware
of the differences orconflicts in values and customs between their home culture andthe new culture they
are in,Common feelings may be anxiety,confusion, homesickness or anger.
@@ -215,7 +215,7 @@
2.Can you offer some examples of culture shock in regard to
different languages,different table manners or different food
customs?
- <span class="btn-box" @click="showAnswerThree = !showAnswerThree">
+ <span class="btn-box" @click="showAnswerTwo = !showAnswerTwo">
<svg xmlns="http://www.w3.org/2000/svg" width="20.501" height="20.501" viewBox="0 0 20.501 20.501">
<path class="a"
d="M3344.717-15308.5H3337.4a10.186,10.186,0,0,1-7.25-3,10.185,10.185,0,0,1-3-7.25A10.262,10.262,0,0,1,3337.4-15329a10.26,10.26,0,0,1,10.249,10.248,10.129,10.129,0,0,1-2.2,6.341v3.177A.734.734,0,0,1,3344.717-15308.5Zm-9.606-7.29h4.493l.527,1.419c.071.182.156.386.254.608a2.428,2.428,0,0,0,.273.512.986.986,0,0,0,.315.262.971.971,0,0,0,.454.1,1.05,1.05,0,0,0,.773-.327,1.025,1.025,0,0,0,.319-.723,3.3,3.3,0,0,0-.277-1.051l-.062-.161-2.889-7.313c-.119-.321-.228-.607-.335-.873a2.972,2.972,0,0,0-.323-.616,1.56,1.56,0,0,0-.5-.469,1.552,1.552,0,0,0-.781-.181,1.535,1.535,0,0,0-.773.181,1.475,1.475,0,0,0-.5.477,3.674,3.674,0,0,0-.362.739l-.239.627-.054.135-2.824,7.355c-.095.229-.179.46-.25.688a1.529,1.529,0,0,0-.073.477.978.978,0,0,0,.323.72,1.039,1.039,0,0,0,.746.315.838.838,0,0,0,.716-.3,4.676,4.676,0,0,0,.466-.985l.062-.165.527-1.449Zm3.747-1.5h-3.293l1.812-5.124,1.481,5.123Z"
@@ -225,7 +225,7 @@
</p>
<textarea v-model="questionData.reading.one" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion"></textarea>
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerThree">
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerTwo">
绛旀锛�(1)In Japanese culture, using the wrong levelDolitene5saddress1ng5omeone can beenconsidered rude or
disrespectful
(2)German tends to be a more direct language, while English speakers often use indirectlanguage for
@@ -510,7 +510,8 @@
cross-cultural environment.
</p>
<!-- 绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%"
+ v-if="showLessonOneQuestionAnswer">
绛旀锛� 1.F 2.F 3.F 4.T 5.F 6.T
</p>
<p><b>鈪�.Language focus.</b></p>
@@ -570,7 +571,8 @@
style="width: 70px" v-model="testData.in.one" @change="setTestData" /> you,but can I talk to you for a
moment?
</p>
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%"
+ v-if="showLessonOneQuestionAnswer">
绛旀锛� 1.rewarding 2.traditions 3.unacceptable 4.colleague 5.arise
6.disturb
</p>
@@ -580,34 +582,24 @@
</p>
<p>1.apply for <input :disabled="testData.isComplete" type="text" class="input-bottom-border"
style="width: 370px" v-model="testData.in.one" @change="setTestData" /> </p>
- <!-- 渚嬪彞 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 渚嬪彞锛� I would like to apply for the position of sales assistant in your company.
- </p>
<p>2.in response to <input :disabled="testData.isComplete" type="text" class="input-bottom-border"
style="width: 370px" v-model="testData.in.one" @change="setTestData" /> </p>
- <!-- 渚嬪彞 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 渚嬪彞锛� The product was developed in response to customer demand.
- </p>
<p>3.get familiar with<input :disabled="testData.isComplete" type="text" class="input-bottom-border"
style="width: 370px" v-model="testData.in.one" @change="setTestData" /></p>
- <!-- 渚嬪彞 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 渚嬪彞锛� It is important to get familiar with the company鈥檚 missions and values.
- </p>
<p>4.take over<input :disabled="testData.isComplete" type="text" class="input-bottom-border"
style="width: 370px" v-model="testData.in.one" @change="setTestData" /></p>
- <!-- 渚嬪彞 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 渚嬪彞锛� As employees, we shouldn鈥檛 let negative thoughts take over.
- </p>
<p>5.make an effort<input :disabled="testData.isComplete" type="text" class="input-bottom-border"
style="width: 370px" v-model="testData.in.one" @change="setTestData" /></p>
<!-- 渚嬪彞 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 渚嬪彞锛歍he company is making an effort to improve its services for local markets.
- </p>
+ <div class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%"
+ v-if="showLessonOneQuestionAnswer">
+ <span>渚嬪彞锛�</span>
+ <p>1銆両 would like to apply for the position of sales assistant in your company.</p>
+ <p>2銆乀he product was developed in response to customer demand.</p>
+ <p>3銆両t is important to get familiar with the company鈥檚 missions and values.</p>
+ <p>4銆丄s employees, we shouldn鈥檛 let negative thoughts take over.</p>
+ <p>5銆乀he company is making an effort to improve its services for local markets.</p>
+ </div>
<p>C.Translate the following sentences into Chinese.</p>
<p>
1.When working in a cross-cultural setting,there can be some
@@ -615,10 +607,6 @@
</p>
<p><input :disabled="testData.isComplete" type="text" class="input-bottom-border" style="width: 470px"
v-model="testData.in.one" @change="setTestData" /></p>
- <!--绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 绛旀锛氬湪璺ㄦ枃鍖栫幆澧冧腑宸ヤ綔锛屽憳宸ヤ箣闂村彲鑳戒細瀛樺湪璇█闅滅銆�
- </p>
<p>
2.You could go for a walk or jog to manage your frustration at
work.
@@ -626,20 +614,12 @@
<p><input :disabled="testData.isComplete" type="text" class="input-bottom-border" style="width: 470px"
v-model="testData.in.one" @change="setTestData" />
</p>
- <!--绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 绛旀锛氫綘鍙互閫氳繃鏁ｆ鎴栨參璺戞潵璋冭妭宸ヤ綔涓殑娌抚鎯呯华銆�
- </p>
<p>
3.They gave us some advice on how to correctly handle cultural
differences in the workplace.
</p>
<p><input :disabled="testData.isComplete" type="text" class="input-bottom-border" style="width: 470px"
v-model="testData.in.one" @change="setTestData" />
- </p>
- <!--绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 绛旀锛氫粬浠氨濡備綍鍦ㄥ伐浣滀腑姝ｇ‘澶勭悊鏂囧寲宸紓缁欎簡鎴戜滑涓�浜涘缓璁��
</p>
<p>
4.Wearing appropriate clothes in the office will make you feel
@@ -649,9 +629,14 @@
v-model="testData.in.one" @change="setTestData" />
</p>
<!--绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 绛旀锛氬湪鍔炲叕瀹ょ┛鐫�鍚堥�傜殑琛ｆ湇浼氳浣犳劅鍒拌垝閫傚拰鑷俊銆�
- </p>
+ <div class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%"
+ v-if="showLessonOneQuestionAnswer">
+ <span> 绛旀锛�</span>
+ <p>1銆佸湪璺ㄦ枃鍖栫幆澧冧腑宸ヤ綔锛屽憳宸ヤ箣闂村彲鑳戒細瀛樺湪璇█闅滅銆�</p>
+ <p>2銆佷綘鍙互閫氳繃鏁ｆ鎴栨參璺戞潵璋冭妭宸ヤ綔涓殑娌抚鎯呯华銆�</p>
+ <p>3銆佷粬浠氨濡備綍鍦ㄥ伐浣滀腑姝ｇ‘澶勭悊鏂囧寲宸紓缁欎簡鎴戜滑涓�浜涘缓璁��</p>
+ <p>4銆佸湪鍔炲叕瀹ょ┛鐫�鍚堥�傜殑琛ｆ湇浼氳浣犳劅鍒拌垝閫傚拰鑷俊銆�</p>
+ </div>
<p><b>鈪�.Grammar focus:鈥渋t鈥� as formal subject.</b></p>
<p>
A.Read the example and underline the real subject that 鈥渋t鈥�
@@ -717,18 +702,10 @@
<input :disabled="testData.isComplete" type="text" class="input-bottom-border" style="width: 470px"
v-model="testData.in.one" @change="setTestData" />.
</p>
- <!--绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 绛旀锛欼t makes us feel good to share new ideas with others.
- </p>
<p>2.To get along well with colleagues is really important.</p>
<p>
<input :disabled="testData.isComplete" type="text" class="input-bottom-border" style="width: 470px"
v-model="testData.in.one" @change="setTestData" />.
- </p>
- <!--绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 绛旀锛欼t is really important to get along well with colleagues.
</p>
<p>
3.To have an open mind towards a new culture is necessary in the
@@ -738,10 +715,6 @@
<input :disabled="testData.isComplete" type="text" class="input-bottom-border" style="width: 470px"
v-model="testData.in.one" @change="setTestData" />.
</p>
- <!--绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 绛旀锛欼t is necessary to have an open mind towards a new culture in the workplace.
- </p>
<p>
4.To think twice before acting is always necessary for everyone.
</p>
@@ -749,19 +722,21 @@
<input :disabled="testData.isComplete" type="text" class="input-bottom-border" style="width: 470px"
v-model="testData.in.one" @change="setTestData" />.
</p>
- <!--绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 绛旀锛欼t is always necessary for everyone to think twice before acting.
- </p>
<p>5.You are very kind to help me with my sales report.</p>
<p>
<input :disabled="testData.isComplete" type="text" class="input-bottom-border" style="width: 470px"
v-model="testData.in.one" @change="setTestData" />.
</p>
<!--绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%" v-if="showQuestionAnswer">
- 绛旀锛欼t鈥檚 very kind of you to help me with my sales report.
- </p>
+ <div class="event-header-text-bc pd-5" style="margin-left: 40px; width: 93%"
+ v-if="showLessonOneQuestionAnswer">
+ <span> 绛旀锛�</span>
+ <p>1銆両t makes us feel good to share new ideas with others.</p>
+ <p>2銆両t is really important to get along well with colleagues.</p>
+ <p>3銆両t is necessary to have an open mind towards a new culture in the workplace.</p>
+ <p>4銆両t is always necessary for everyone to think twice before acting.</p>
+ <p>5銆両t鈥檚 very kind of you to help me with my sales report.</p>
+ </div>
<!-- 鎻愪氦鎸夐挳 -->
<div class="w100 fl">
<ul class="fl ju-ar w100">
@@ -776,7 +751,7 @@
</button>
</li>
<li>
- <button @click="showQuestionAnswer = !showQuestionAnswer" class="parimary-btn">
+ <button @click="showLessonOneQuestionAnswer = !showLessonOneQuestionAnswer" class="parimary-btn">
鏌ョ湅绛旀
</button>
</li>
@@ -1283,9 +1258,10 @@
(place).Today she 8. <input :disabled="testData.isComplete" type="text" class="input-bottom-border"
style="width: 70px" v-model="testData.in.one" @change="setTestData" /> (sell) East-meets-West
clothes not only in New York,but also in cities around the world.</p>
- <!-- 绛旀 -->
- <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerThree">
- 绛旀锛�(1)was named (2) taught (3)told (4)were introduced (5) is seen (6) moved (7) were placed (8) sells
+ <!-- 绛旀 -->
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerThree">
+ 绛旀锛�(1)was named (2) taught (3)told (4)were introduced (5) is seen (6)
+ moved (7) were placed (8) sells
</p>
<h3 id="c016"><span class="bjh3">Mini-project</span></h3>
@@ -1381,18 +1357,32 @@
</tr>
<tr class="table-tr-bc">
<td>When is it?</td>
- <td>1.On_______21st</td>
+ <td>1.On<input :disabled="testData.isComplete" type="text" class="input-bottom-border input-bc-t"
+ style="width: 70px" v-model="testData.in.one" @change="setTestData" />21st</td>
</tr>
<tr class="table-tr-bc">
<td>Why do we celebrate it?</td>
- <td>Recognizing cultural 2._______
+ <td>Recognizing cultural 2.<input :disabled="testData.isComplete" type="text"
+ class="input-bottom-border input-bc-t" style="width: 70px" v-model="testData.in.one"
+ @change="setTestData" />
Understanding the concept of culture.
- Getting to know each other through the differences in language,3._______race,
+ Getting to know each other through the differences in language,3.<input
+ :disabled="testData.isComplete" type="text" class="input-bottom-border input-bc-t "
+ style="width: 70px" v-model="testData.in.one" @change="setTestData" />race,
religion and other elements.
- Giving people a sense of 4._______in their own culture.
- .Leading to community 5._______and personal growth.</td>
+ Giving people a sense of 4.<input :disabled="testData.isComplete" type="text"
+ class="input-bottom-border input-bc-t" style="width: 70px" v-model="testData.in.one"
+ @change="setTestData" />in their own culture.
+ .Leading to community 5.<input :disabled="testData.isComplete" type="text"
+ class="input-bottom-border input-bc-t" style="width: 70px" v-model="testData.in.one"
+ @change="setTestData" />and personal growth.</td>
</tr>
</table>
+ <!-- 绛旀 -->
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerThree">
+ 绛旀锛�(1) May (2) differences (3)values (4)pride (5) progress
+
+ </p>
<p><b>鈪�.Listen to the conversation and mark the activities when mentioned.</b></p>
<audio :src="resource.listenThree" controls class="audio" @play="audioPlay"></audio>
<p><input type="checkbox" name="ball" value="Language" id="1" v-model="testData.check" />
@@ -1409,6 +1399,13 @@
Medicine</p>
<p><input type="checkbox" name="ball" value="Language" id="1" v-model="testData.check" />Traditional Chinese
Crafts</p>
+ <!-- 绛旀 -->
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerThree">
+ 绛旀锛�(1) Lecture on Ancient Chinese History (2)Calligraphy &
+ Painting Demonstration (3)Traditional Chinese
+ Music (4)Tea Ceremony (5) Tai Chi (6) Traditional Chinese Crafts
+
+ </p>
</div>
</div>
<div class="preface-bottom">
@@ -1434,7 +1431,19 @@
<h3 id="c018"><span class="bjh3">Practical Writing</span></h3>
<p>Work with your partner to discuss the following questions.</p>
<p>1.Why is a schedule important for everyone attending the event?</p>
+ <textarea v-model="questionData.reading.one" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
+ style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion"></textarea>
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerThree">
+ 绛旀锛�(1)Save time and stress (2)Organize all detail (3) Meet your objectives (4)Manage
+ time for extra tasks
+ </p>
<p>2.What are the elements of a schedule?</p>
+ <textarea v-model="questionData.reading.one" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
+ style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion"></textarea>
+ <p class="event-header-text-bc pd-5" style="margin-left: 40px; width: 91%" v-if="showAnswerThree">
+ 绛旀锛欼t includes dates, locations, programming start and end time.
+ </p>
+
<p><b>鈪�.Read the following tips for making a schedule of an event and find out how you can improve your
schedule.</b></p>
<p>An event schedule is a document that organizers provide for the attendees and participants.It usually
@@ -1503,7 +1512,10 @@
<td class="tl-cn">Place</td>
</tr>
<tr class="table-tr-bc">
- <td>1._________</td>
+ <td style="text-wrap: nowrap">
+ 1<input :disabled="testData.isComplete" type="text" class="input-bottom-border input-bc-t"
+ style="width: 70px" v-model="testData.in.one" @change="setTestData" />
+ </td>
<td>Attend the festival activities</td>
<td>
The International Intangible Cultural Heritage Park
@@ -1513,27 +1525,33 @@
<td>Wednesday</td>
<td>Climb the mountain</td>
<td>
- 2.___________
+ 2.<input :disabled="testData.isComplete" type="text" class="input-bottom-border input-bc-t"
+ style="width: 70px" v-model="testData.in.one" @change="setTestData" />
</td>
</tr>
<tr class="table-tr-bc">
<td>Thursday</td>
<td>Visit attractions in the downtown
- 3.____________ </td>
+ 3.<input :disabled="testData.isComplete" type="text" class="input-bottom-border input-bc-t"
+ style="width: 70px" v-model="testData.in.one" @change="setTestData" /></td>
<td>
Wuhou Temple & Jinsha Site MuseumShunxing Tea House
</td>
</tr>
<tr class="table-tr-bc">
<td>Friday</td>
- <td> 4.____________ Buy souvenirs</td>
+ <td> 4.<input :disabled="testData.isComplete" type="text" class="input-bottom-border input-bc-t"
+ style="width: 70px" v-model="testData.in.one" @change="setTestData" />Buy souvenirs</td>
<td>
- Panda Base 5.____________
+ Panda Base 5.
+ <input :disabled="testData.isComplete" type="text" class="input-bottom-border input-bc-t"
+ style="width: 70px" v-model="testData.in.one" @change="setTestData" />
</td>
</tr>
<tr class="table-tr-bc">
<td>Saturday</td>
- <td>6.___________</td>
+ <td>6.<input :disabled="testData.isComplete" type="text" class="input-bottom-border input-bc-t"
+ style="width: 70px" v-model="testData.in.one" @change="setTestData" /></td>
<td>
Shuangliu International Airport
</td>
@@ -1558,11 +1576,11 @@
</tr>
<tr class="table-tr-bc">
<td>
- <textarea v-model="questionData.table.one" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.one" class="w100 table-tr-bc b0 table-textarea "
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.two" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.two" class="w100 table-tr-bc b0 table-textarea "
@change="setBookQuestion"></textarea>
</td>
<td>
@@ -1570,13 +1588,13 @@
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.four" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.four" class="w100 table-tr-bc b0 table-textarea "
@change="setBookQuestion"></textarea>
</td>
</tr>
<tr class="table-tr-bc">
<td>
- <textarea v-model="questionData.table.five" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.five" class="w100 table-tr-bc b0 table-textarea "
@change="setBookQuestion"></textarea>
</td>
<td>
@@ -1584,11 +1602,11 @@
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.seven" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.seven" class="w100 table-tr-bc b0 table-textarea "
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.enight" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.enight" class="w100 table-tr-bc b0 table-textarea "
@change="setBookQuestion"></textarea>
</td>
</tr>
@@ -1660,7 +1678,7 @@
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.two" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.two" class="w100 table-tr-bc b0 table-textarea "
@change="setBookQuestion"></textarea>
</td>
<td>
@@ -1668,7 +1686,7 @@
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.four" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.four" class="w100 table-tr-bc b0 table-textarea"
@change="setBookQuestion"></textarea>
</td>
</tr>
@@ -1678,11 +1696,11 @@
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.seven" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.seven" class="w100 table-tr-bc b0 table-textarea "
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.enight" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.enight" class="w100 table-tr-bc b0 table-textarea"
@change="setBookQuestion"></textarea>
</td>
</tr>
@@ -1706,7 +1724,7 @@
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.two" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.two" class="w100 table-tr-bc b0 table-textarea"
@change="setBookQuestion"></textarea>
</td>
<td>
@@ -1714,7 +1732,7 @@
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.four" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.four" class="w100 table-tr-bc b0 table-textarea"
@change="setBookQuestion"></textarea>
</td>
</tr>
@@ -1724,11 +1742,11 @@
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.seven" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.seven" class="w100 table-tr-bc b0 table-textarea "
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.enight" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.enight" class="w100 table-tr-bc b0 table-textarea"
@change="setBookQuestion"></textarea>
</td>
</tr>
@@ -1752,7 +1770,7 @@
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.two" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.two" class="w100 table-tr-bc b0 table-textarea"
@change="setBookQuestion"></textarea>
</td>
<td>
@@ -1760,7 +1778,7 @@
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.four" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.four" class="w100 table-tr-bc b0 table-textarea"
@change="setBookQuestion"></textarea>
</td>
</tr>
@@ -1770,11 +1788,11 @@
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.seven" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.seven" class="w100 table-tr-bc b0 table-textarea"
@change="setBookQuestion"></textarea>
</td>
<td>
- <textarea v-model="questionData.table.enight" class="w100 table-tr-bc b0 table-textarea textarea-box"
+ <textarea v-model="questionData.table.enight" class="w100 table-tr-bc b0 table-textarea"
@change="setBookQuestion"></textarea>
</td>
</tr>
@@ -1830,7 +1848,7 @@
showAnswerFour: false,
showAnswerFive: false,
showImg: false,
- showQuestionAnswer: false,
+ showLessonOneQuestionAnswer: false,
rawData: {
left: [
{
diff --git a/src/books/English/view/components/index.vue b/src/books/English/view/components/index.vue
index e6d5b92..eee7bae 100644
--- a/src/books/English/view/components/index.vue
+++ b/src/books/English/view/components/index.vue
@@ -184,7 +184,7 @@
// 娴嬭瘯椤甸潰璺宠浆
setTimeout(() => {
- this.gotoPage(3,37);
+ this.gotoPage(3,30);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
diff --git a/src/books/artAndDrama/assets/main.less b/src/books/artAndDrama/assets/main.less
index 707f5ac..aa0623d 100644
--- a/src/books/artAndDrama/assets/main.less
+++ b/src/books/artAndDrama/assets/main.less
@@ -428,9 +428,14 @@
text-align: left;
}
textarea{
+ outline: none;
font-family: "STkaiti";
font-size: 19px;
}
+ .textarea-focused {
+ border-color: #42b983;
+ box-shadow: 0 0 5px rgba(66, 185, 131, 0.5);
+ }
input{
font-family: "STkaiti";
font-size: 19px;
@@ -570,9 +575,6 @@
}
.m16-0 {
margin: 16px 0;
- }
- .fm-son {
- font-family: "瀹嬩綋", SimSun, sans-serif;
}
.auido-text {
font-size: 22px;
diff --git a/src/books/artAndDrama/view/components/chapter001.vue b/src/books/artAndDrama/view/components/chapter001.vue
index c097982..77e18ae 100644
--- a/src/books/artAndDrama/view/components/chapter001.vue
+++ b/src/books/artAndDrama/view/components/chapter001.vue
@@ -202,11 +202,11 @@
</p>
<p class="text t-l">姝ｄ箟闃熼暱锛�
<textarea v-model="questionData.reading.one" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
- style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion"></textarea>
+ style="margin-left: 40px; width: 92%" class="" @change="setBookQuestion" :class="{ 'textarea-focused': isFocused === 'one' }" @focus="handleFocus('one')" @blur="handleBlur('one')" ></textarea>
</p>
<p class="text t-l">榛戞殫闃熼暱锛�
<textarea v-model="questionData.reading.two" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
- style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion"></textarea>
+ style="margin-left: 40px; width: 92%" class="" @change="setBookQuestion" :class="{ 'textarea-focused': isFocused === 'two' }" @focus="handleFocus('two')" @blur="handleBlur('two')"></textarea>
</p>
</div>
<!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
@@ -426,6 +426,7 @@
auidoPathNine: "",
accentColor: "",
color: "#fff",
+ isFocused: null, // 鐢ㄤ簬璺熻釜textarea鐨勮仛鐒︾姸鎬�
chapterData: {
isCollectImg: false,
isCollectVideo: false,
@@ -733,6 +734,12 @@
"3729175530def1b0baca68e0bd344862"
);
},
+ handleFocus(id) {
+ this.isFocused = id; // 褰搕extarea鑱氱劍鏃讹紝璁剧疆涓簍rue
+ },
+ handleBlur(id) {
+ this.isFocused = null; // 褰搕extarea澶卞幓鐒︾偣鏃讹紝璁剧疆涓篺alse
+ },
setBookQuestion() {
console.log("淇濆瓨");
localStorage.setItem(
diff --git a/src/books/artAndDrama/view/components/chapter002.vue b/src/books/artAndDrama/view/components/chapter002.vue
index 515195d..8c0f6b2 100644
--- a/src/books/artAndDrama/view/components/chapter002.vue
+++ b/src/books/artAndDrama/view/components/chapter002.vue
@@ -115,13 +115,12 @@
<p class="text">甯歌█閬擄細鑹█涓�鍙ヤ笁鍐殩锛屾伓璇激浜哄叚鏈堝瘨銆傝瑷�鍦ㄤ汉涓庝汉鐨勪氦寰�涓捣鐫�閲嶈鐨勪綔鐢紝鏈夌潃鏃犵┓鐨勫姏閲忋��</p>
<p class="text t-l" ><span class="hs1">鈼�</span>濡傛灉鏈嬪弸蹇冩儏涓嶅ソ锛屼綘璇ユ�庝箞瀹夋叞浠�/濂瑰憿锛�
<textarea v-model="questionData.reading.one" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
- style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion"></textarea>
+ style="margin-left: 40px; width: 92%" class="" @change="setBookQuestion" :class="{ 'textarea-focused': isFocused === 'one' }" @focus="handleFocus('one')" @blur="handleBlur('one')" ></textarea>
</p>
<p class="text t-l"><span class="hs1">鈼�</span>濡傛灉浣犻個璇峰ソ鏈嬪弸鏉ュ閲屽仛瀹紝浣犺璇翠粈涔堟潵娆㈣繋浠�/濂瑰憿锛�
<textarea v-model="questionData.reading.two" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
- style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion">
- </textarea>
+ style="margin-left: 40px; width: 92%" class="" @change="setBookQuestion" :class="{ 'textarea-focused': isFocused === 'two' }" @focus="handleFocus('two')" @blur="handleBlur('two')" ></textarea>
</p>
<h3 class="lefth3" id="c016" style="margin-top: 7%;"><img class="img-gn1" alt=""
@@ -294,6 +293,7 @@
auidoPathThree: "",
auidoPathFour: "",
auidoPathFive: "",
+ isFocused: null, // 鐢ㄤ簬璺熻釜textarea鐨勮仛鐒︾姸鎬�
chapterData: {
isCollectImg: false,
isCollectVideo: false,
@@ -469,6 +469,12 @@
"a37bb621b2591e3666e94d1a3bc23bc0"
);
},
+ handleFocus(id) {
+ this.isFocused = id; // 褰搕extarea鑱氱劍鏃讹紝璁剧疆涓簍rue
+ },
+ handleBlur(id) {
+ this.isFocused = null; // 褰搕extarea澶卞幓鐒︾偣鏃讹紝璁剧疆涓篺alse
+ },
setBookQuestion() {
console.log("淇濆瓨");
localStorage.setItem(
diff --git a/src/books/artAndDrama/view/components/chapter003.vue b/src/books/artAndDrama/view/components/chapter003.vue
index 3671807..cdd58ce 100644
--- a/src/books/artAndDrama/view/components/chapter003.vue
+++ b/src/books/artAndDrama/view/components/chapter003.vue
@@ -176,6 +176,7 @@
style="margin-left: 40px; width: 92%"
class="fz-16 fm-son"
@change="setBookQuestion"
+ :class="{ 'textarea-focused': isFocused === 'one' }" @focus="handleFocus('one')" @blur="handleBlur('one')"
>
</textarea>
</p>
@@ -253,6 +254,7 @@
style="margin-left: 40px; width: 92%"
class="fz-16 fm-son"
@change="setBookQuestion"
+ :class="{ 'textarea-focused': isFocused === 'two' }" @focus="handleFocus('two')" @blur="handleBlur('two')"
>
</textarea>
</p>
@@ -265,6 +267,7 @@
style="margin-left: 40px; width: 92%"
class="fz-16 fm-son"
@change="setBookQuestion"
+ :class="{ 'textarea-focused': isFocused === 'three' }" @focus="handleFocus('three')" @blur="handleBlur('three')"
>
</textarea>
</p>
@@ -277,6 +280,7 @@
style="margin-left: 40px; width: 92%"
class="fz-16 fm-son"
@change="setBookQuestion"
+ :class="{ 'textarea-focused': isFocused === 'four' }" @focus="handleFocus('four')" @blur="handleBlur('four')"
>
</textarea>
</p>
@@ -290,6 +294,7 @@
style="margin-left: 40px; width: 92%"
class="fz-16 fm-son"
@change="setBookQuestion"
+ :class="{ 'textarea-focused': isFocused === 'five' }" @focus="handleFocus('five')" @blur="handleBlur('five')"
>
</textarea>
</p>
@@ -520,6 +525,7 @@
audioPathThree: "",
audioPathFour: "",
audioPathFive: "",
+ isFocused: null, // 鐢ㄤ簬璺熻釜textarea鐨勮仛鐒︾姸鎬�
segments: [1, 2, 3, 4, 5],
color: "#fff",
activeIndex: null, // 鐢ㄤ簬杩借釜褰撳墠娲诲姩鐨勬寜閽储寮�
@@ -681,6 +687,12 @@
"f56a9d889d3098fa6800125ae7627481"
);
},
+ handleFocus(id) {
+ this.isFocused = id; // 褰搕extarea鑱氱劍鏃讹紝璁剧疆涓簍rue
+ },
+ handleBlur(id) {
+ this.isFocused = null; // 褰搕extarea澶卞幓鐒︾偣鏃讹紝璁剧疆涓篺alse
+ },
setBookQuestion() {
console.log("淇濆瓨");
localStorage.setItem(
diff --git a/src/books/artAndDrama/view/components/chapter004.vue b/src/books/artAndDrama/view/components/chapter004.vue
index 1635a5e..8e13d67 100644
--- a/src/books/artAndDrama/view/components/chapter004.vue
+++ b/src/books/artAndDrama/view/components/chapter004.vue
@@ -35,8 +35,10 @@
<h3 class="lefth3" id="c031"><img class="img-gn1" alt="" src="../../assets/images/rhybx.jpg" /></h3>
<p class="text"><span class="hs1">鈼�</span>浠ュ皬缁勪负鍗曚綅鍥存垚涓�鍦堬紝闈㈡湞鍦堝韫蹭笅锛岀浉閭讳袱浜轰簰鎸庢墜鑷傦紝缁勫憳鍚屾椂绔欒捣鏉ワ紝鐪嬬湅鍝釜缁勬渶蹇紒</p>
<p class="text t-l"><span class="hs1">鈼�</span>璇翠竴璇达細蹇�熺珯璧锋潵鐨勭璇�鏄粈涔堬紵
- <textarea v-model="questionData.reading.one" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
- style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion">
+ <textarea v-model="questionData.reading.one" placeholder="璇疯緭鍏ュ唴瀹�" rows="6"
+ style="margin-left: 40px; width: 92%" class="fz-16 fm-son" @change="setBookQuestion"
+ :class="{ 'textarea-focused': isFocused === 'one' }" @focus="handleFocus('one')"
+ @blur="handleBlur('one')">
</textarea>
</p>
<h3 class="lefth3" id="c032"><img class="img-gn1" alt="" src="../../assets/images/czysj.jpg" /></h3>
@@ -68,7 +70,8 @@
class="hs1">鈼�</span>鏄ュぉ鏉ヤ簡锛屾槬椋庡惞杩囷紝鏌虫爲鍙戣娊浜嗭紝杩庢槬鑺卞紑浜嗭紝灏忕嚂瀛愬湪澶╃┖鑷敱鍦伴缈斻�備竴鍒囬兘鏄偅涔堢敓鏈哄媰鍕冦�傝涓衡�滄槬澶┾�濇秱涓婁綘鍠滄鐨勯鑹层��</p>
<!-- 鍥剧墖缂哄け -->
<!-- <p class="center"><img class="img-e" alt="" src="./../assets/images/0033-1.jpg" /></p> -->
- <graffiti :page="32" :bcImg="this.config.activeBook.resourceUrl + '/image/0033-1.jpg'" :imgWidth="596" :imgHeight="500" />
+ <graffiti :page="32" :bcImg="this.config.activeBook.resourceUrl + '/image/0033-1.jpg'"
+ :imgWidth="596" :imgHeight="500" />
</div>
<!-- 姝ゆ涓洪〉鑴氶儴鍒嗭紙闇�瑕佽缃〉鐮侊級 -->
<div class="page-footer">
@@ -252,6 +255,7 @@
audioPathThree: "",
audioPathFour: "",
audioPathFive: "",
+ isFocused: null, // 鐢ㄤ簬璺熻釜textarea鐨勮仛鐒︾姸鎬�
chapterData: {
isCollectImg: false,
isCollectVideo: false,
@@ -308,6 +312,12 @@
"7abb747bd16745afb83715fcbb3579ab"
);
},
+ handleFocus(id) {
+ this.isFocused = id; // 褰搕extarea鑱氱劍鏃讹紝璁剧疆涓簍rue
+ },
+ handleBlur(id) {
+ this.isFocused = null; // 褰搕extarea澶卞幓鐒︾偣鏃讹紝璁剧疆涓篺alse
+ },
setBookQuestion() {
console.log("淇濆瓨");
localStorage.setItem(
diff --git a/src/books/artAndDrama/view/components/index.vue b/src/books/artAndDrama/view/components/index.vue
index 6ae3b46..46e60b9 100644
--- a/src/books/artAndDrama/view/components/index.vue
+++ b/src/books/artAndDrama/view/components/index.vue
@@ -159,8 +159,8 @@
}, 500);
// 娴嬭瘯椤甸潰璺宠浆
- // setTimeout(() => {
- // this.gotoPage(2,4);
+ // setTimeout(() => {
+ // this.gotoPage(4,26);
// setTimeout(() => {
// this.renderSign("Highlight", {
// id: "2ACA9359",
@@ -188,7 +188,7 @@
// txt: " 杩愬姩绯荤粺鏄敱楠ㄣ�侀杩炵粨鍜岄楠艰倢涓夐儴鍒嗙粍鎴愮殑銆傚叏韬殑楠ㄩ�氳繃楠ㄨ繛缁撶粍鎴愪汉浣撻楠硷紙瑙佸浘1-1锛夈�傞楠兼槸浜轰綋鐨勬敮鏋讹紝鍏锋湁淇濇姢鍐呰剰鍣ㄥ畼銆佷緵鑲岃倝闄勭潃鍜屼綔涓鸿倢鑲夎繍鍔ㄧ殑鏉犳潌绛変綔鐢ㄣ�傚湪绁炵粡绯荤粺鐨勬敮閰嶄笅锛岃倢鑲夋敹缂╃壍鍔ㄦ墍闄勭潃鐨勯缁曠潃鍏宠妭杞姩锛屼娇韬綋浜х敓鍚勭鍔ㄤ綔銆傛墍浠ワ紝杩愬姩绯荤粺鍏锋湁杩愬姩銆佹敮鎸佸拰淇濇姢绛夊姛鑳斤紝骞煎勾鏃舵湡鐨勯楠艰繕鍏锋湁閫犺鍔熻兘銆� ",
// txtIndex: 57
// });
- // }, 500);
+ // }, 500);
},
methods: {
// setZoom1() {
--
Gitblit v1.9.1