From 73af405b02dce2e6fdaa8da3f948ca489c821a16 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 08 七月 2024 11:52:22 +0800
Subject: [PATCH] 合并

---
 src/books/English/view/components/chapter001.vue |  117 +++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 74 insertions(+), 43 deletions(-)

diff --git a/src/books/English/view/components/chapter001.vue b/src/books/English/view/components/chapter001.vue
index ae1b0a6..74b839e 100644
--- a/src/books/English/view/components/chapter001.vue
+++ b/src/books/English/view/components/chapter001.vue
@@ -1131,7 +1131,10 @@
                 </svg>
               </span>
             </p>
-            <el-image v-if="showImg" :src="imgThirteen" :preview-src-list="[imgThirteen]" />
+            <div class="openImgBox">
+              <img src="../../assets/images/grammar.jpg" class="w100" />
+            </div>
+            <!-- <el-image v-if="showImg" :src="imgThirteen" :preview-src-list="[imgThirteen]" /> -->
             <p>A.Combine the following sentences into if-clauses.</p>
             <p>
               1.Try using sticks.You can enjoy the fun of having a real Chinese
@@ -1913,7 +1916,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 +1925,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 +1944,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 +2171,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 &nbsp; B.1 &nbsp; C.2 &nbsp;
             </p>
             <p>
@@ -2202,7 +2206,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 &nbsp; 2.F &nbsp; 3.T &nbsp; 4.F &nbsp; 5.T
             </p>
             <p><b>鈪�.Language focus.</b></p>
@@ -2235,7 +2240,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 &nbsp; 2.extraordinary &nbsp; 3.via &nbsp; 4.era &nbsp; 5.pace
             </p>
             <p>
@@ -2287,7 +2293,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 &nbsp; 2.Type in &nbsp; 3.a matter of &nbsp; 4.well Off &nbsp; 5.Last but not least
             </p>
             <p><b>鈪�.Grammar focus:The simple sentence.</b></p>
@@ -2310,27 +2317,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 &nbsp; 2.S+V+O &nbsp; 3.S+V+O+O &nbsp; 4.S+V+O+C &nbsp; 5.S+V
             </p>
-
+            <!-- 鎻愪氦鎸夐挳 -->
             <div class="w100 fl">
               <ul class="fl ju-ar w100">
                 <li>
@@ -2344,7 +2352,7 @@
                   </button>
                 </li>
                 <li>
-                  <button @click="showQuestionAnswer = !showQuestionAnswer" class="parimary-btn">
+                  <button @click="showlessonTwoQuestionAnswer = !showlessonTwoQuestionAnswer" class="parimary-btn">
                     鏌ョ湅绛旀
                   </button>
                 </li>
@@ -2500,7 +2508,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 &nbsp; 2.explore &nbsp; 3.subways &nbsp; 4.convenient &nbsp; 5.surprising &nbsp; 6.beach
             </p>
             <p>
@@ -2550,7 +2558,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 +2567,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 &nbsp; (2)Wechat public account &nbsp; (3)Campus radio &nbsp; (4)Campus TV station &nbsp;
+              (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 +2585,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 +2704,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 +2811,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 +2860,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 +3023,10 @@
         reading: {
           one: "",
           two: "",
+          three: "",
+          four: "",
+          five: "",
+          sex: "",
         },
         table: {
           one: "",

--
Gitblit v1.9.1