Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

闫增涛

2024-06-25 0b4098777d6115c0f8ae8703c049d7d2fe8a5164

Merge branch 'master' of http://182.92.203.7:2001/r/testbookLayout

 src/App.vue

@@ -65,7 +65,7 @@
        process.env.VUE_APP_RESOURCE_CTX +
          (process.env.VUE_APP_ENV == "product"
            ? process.env.VUE_APP_BOOK_ID
            : "artAndDrama")
            : "english")
      );
      // 测试试读30页
      // this.activeBook.tryPageCount = 10;

 src/books/English/assets/images/0063-1.jpg

 src/books/English/assets/images/0065-1.jpg

 src/books/English/view/components/chapter003.vue

@@ -1140,7 +1140,13 @@
                <!-- 内容 -->
                <div class="padding-93">
                    <div class="bodystyle">
                        
                        <h3 id="c027"><span class="bjh3">Practical Writing</span></h3>
                        <p>For volunteer work,it usually starts with creating a volunteer profile.Whether you’re just
                            starting out or a seasoned volunteer,you can save your volunteering preferences and capture
                            your volunteering experiences in your volunteer profile.</p>
                        <p><b>Ⅰ.Look at the following sample and discuss with your partner what are usually included in
                                a volunteer profile.Mark the items listed in the box.</b></p>
                        <p class="center"><img class="img-a" alt="" src="../../assets/images/0063-1.jpg" /></p>
                    </div>
                </div>
                <div class="preface-bottom">
@@ -1162,10 +1168,43 @@
                </div>
                <!-- 内容 -->
                <div class="padding-93">
                    <div class="bodystyle"></div>
                    <div class="bodystyle">
                        <p><b>Ⅱ.Match the following descriptions with their corresponding Chinese.</b></p>
                        <p><b>1.gender</b></p>
                        <p>1) male　a.女性</p>
                        <p>2) female　b.男性</p>
                        <p><b>2.degree level</b></p>
                        <p>1) bachelor’s degree or equivalent　a.技术/职业文凭</p>
                        <p>2) doctoral degree　b.中学教育</p>
                        <p>3) master’s degree or equivalent　c.学士学位或同等学力</p>
                        <p>4) secondary education　d.博士学位</p>
                        <p>5) technical/vocational diploma　e.硕士学位或同等学力</p>
                        <p><b>3.language level</b></p>
                        <p>1) basic　a.流利</p>
                        <p>2) fair　b.母语</p>
                        <p>3) fluent　c.工作用语</p>
                        <p>4) native　d.一般</p>
                        <p>5) working knowledge　e.基础水平</p>
                        <p><b>Ⅲ.Mark the appropriate statement for a profile.</b></p>
                        <p><b>1.国籍：中国</b></p>
                        <p>(　) a.Nationality:China</p>
                        <p>(　) b.Nationality:Chinese</p>
                        <p><b>2.北京市高新区盛邦路30号</b></p>
                        <p>(　) a.No.30 Shengbang Road,Hi-tech Zone,Beijing</p>
                        <p>(　) b.Beijing,Hi-tech Zone,Shengbang Road,No.30</p>
                        <p><b>3.英文流利，普通话母语水平</b></p>
                        <p>(　) a.Fluent in English; native in Mandarin</p>
                        <p>(　) b.I speak fluent English,and I’m a native speaker of Mandarin.</p>
                        <p><b>4.熟练使用Word、Excel和PPT</b></p>
                        <p>(　) a.I can use Word,Excel and PPT frequently.</p>
                        <p>(　) b.Proficient user of Word,Excel and PPT</p>
                        <p><b>5.担任世博会翻译和接待工作</b></p>
                        <p>(　) a.Served as an interpreter and receptionist at the World Expo</p>
                        <p>(　) b.Working as an interpreter and receptionist at the World Expo</p>
                    </div>
                </div>
                <div class="preface-bottom">
                    <span class="contet-num-box">12</span>
                    <span class="contet-num-box">54</span>
                </div>
            </div>
        </div>
@@ -1183,10 +1222,18 @@
                </ul>
                <!-- 内容 -->
                <div class="padding-93">
                    <div class="bodystyle"></div>
                    <div class="bodystyle">
                        <p>Ⅳ<b>.A college student wants to be a volunteer in an international sports game.Please
                                complete the following volunteer profile for him,covering the following basic
                                information given in Chinese.</b></p>
                        <p>李海，男，中国人，2000年8月21日出生，电话号码为153××××8901，邮箱是simonli@
                            email.com，现居住在四川省成都市天府区天府5街1600号。毕业于成都职业技术学院，商务英语专业，获专科文凭。大学期间，考取了教师资格证、驾照，接受过为期两周的“有效沟通”培训。英语口语流利，普通话标准。2023年7月至8月，作为志愿者参加了世界大学生运动会，从事过语言服务相关工作。
                        </p>
                        <p class="center"><img class="img-0" alt="" src="../../assets/images/0065-1.jpg" /></p>
                    </div>
                </div>
                <div class="preface-bottom">
                    <span class="contet-num-box">39</span>
                    <span class="contet-num-box">55</span>
                </div>
            </div>
        </div>

 src/books/English/view/components/index.vue

@@ -153,7 +153,7 @@

    // 测试页面跳转
    setTimeout(() => {
      this.gotoPage(4,56);
      this.gotoPage(4,59);
      //   setTimeout(() => {
      //     this.renderSign("Highlight", {
      //       id: "2ACA9359",

 src/books/artAndDrama/view/components/chapter001.vue

@@ -552,7 +552,7 @@
          questionType: "singleChoice",
          score: 2,
          stem: {
            "stemTxt": "1、蚂蚁是典型的(  )昆虫。(多选)"
            "stemTxt": "1、蚂蚁是典型的(　)昆虫。(多选)"
          },
          stemStyle: "Txt",
          userAnswer: "",
@@ -594,7 +594,7 @@
          questionType: "singleChoice",
          score: 2,
          stem: {
            "stemTxt": "2、蚂蚁内部又(  )分工。(多选)"
            "stemTxt": "2、蚂蚁内部又(　)分工。(多选)"
          },
          stemStyle: "Txt",
          userAnswer: "",
@@ -636,7 +636,7 @@
          questionType: "singleChoice",
          score: 2,
          stem: {
            "stemTxt": "3、一个(  )群体少不了默契的配合。(多选)"
            "stemTxt": "3、一个(　)群体少不了默契的配合。(多选)"
          },
          stemStyle: "Txt",
          userAnswer: "",

 src/books/artAndDrama/view/components/chapter002.vue

@@ -97,11 +97,11 @@
          <h3 class="lefth3" id="c014" style="margin-top: 7%;"><img class="img-gn1" alt=""
              src="../../assets/images/czysj.jpg" /></h3>
          <p class="text"><span class="hs1">◇</span>阅读下面的文字，为小蚂蚁选择一种性格吧。</p>
          <drag :question="dragQuestion" :page="16"/> 
          <drag class="text" :question="dragQuestion" :page="16"/> 
          <!-- <choice class="text" :questions="questions"  :primaryColor="accentColor"  hoverBackgroundColor="green" hoverColor="white"></choice> -->
          <p class="center  openImgBox"><img class="img-e" alt="" src="../../assets/images/2-2.gif" /></p>
        </div>
        <!-- 此次为页脚部分（需要设置页码） -->choice
        <!-- 此次为页脚部分（需要设置页码） -->
        <div class="page-footer">
          <img class="page-footer-image" src="../../assets/images/ym.jpg" alt="Page Image" />
          <div class="page-footer-number-right">13</div>
@@ -315,7 +315,7 @@
      dragQuestion:[
          {
          analysisCon: null,
          answer: ['A','B','C'],
          answer: ['C','A','B'],
          difficulty: 0,
          id: "7BC7B760",
          isCollect: false,