From b0f5da59f1bf1a4786da6cc89487820b565afb58 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 31 Jan 2023 09:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E6=B3=95=E8=80=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppLegalLearning/AppLegalLearning.vue     | 17 +++--
 ...pGeneralLawExam.vue => GeneralLawExam.vue} | 13 ++--
 .../{AppOnlineClass.vue => OnlineClass.vue}   | 14 ++--
 .../AppLegalLearning/components/question.vue  | 31 --------
 .../conv/AppLegalLearning/components/test.vue | 26 -------
 src/mods/conv/AppLegalLearning/testForm.vue   | 70 +++++++++++++++++++
 6 files changed, 93 insertions(+), 78 deletions(-)
 rename src/mods/conv/AppLegalLearning/components/{AppGeneralLawExam.vue => GeneralLawExam.vue} (91%)
 rename src/mods/conv/AppLegalLearning/components/{AppOnlineClass.vue => OnlineClass.vue} (62%)
 delete mode 100644 src/mods/conv/AppLegalLearning/components/question.vue
 delete mode 100644 src/mods/conv/AppLegalLearning/components/test.vue
 create mode 100644 src/mods/conv/AppLegalLearning/testForm.vue

diff --git a/src/mods/conv/AppLegalLearning/AppLegalLearning.vue b/src/mods/conv/AppLegalLearning/AppLegalLearning.vue
index cf5bc88..4fd5777 100644
--- a/src/mods/conv/AppLegalLearning/AppLegalLearning.vue
+++ b/src/mods/conv/AppLegalLearning/AppLegalLearning.vue
@@ -4,14 +4,14 @@
       <u-tabs :list="tabs" font-size="32" bg-color="#f3f5f7" inactive-color="#999999"
      :active-item-style="{color: '#222222'}" :is-scroll="true" :current="currIndex" @change="(i) => (currIndex = i)"> </u-tabs>
     </div>
-    <AppOnlineClass ref="OnlineClass" v-show="currIndex == 0"></AppOnlineClass>
-    <AppGeneralLawExam ref="GeneralLawExam" v-show="currIndex == 1"></AppGeneralLawExam>
+    <OnlineClass ref="OnlineClass" v-show="currIndex == 0"></OnlineClass>
+    <GeneralLawExam ref="GeneralLawExam" @LinkToTest="LinkToTest" v-show="currIndex == 1"></GeneralLawExam>
   </div>
 </template>
 
 <script>
-import AppOnlineClass from './components/AppOnlineClass.vue'
-import AppGeneralLawExam from './components/AppGeneralLawExam.vue'
+import OnlineClass from './components/OnlineClass.vue'
+import GeneralLawExam from './components/GeneralLawExam.vue'
 export default {
   name: 'AppLegalLearning',
   appName: '法治学习',
@@ -31,8 +31,8 @@ export default {
   onShow() {
   },
   components: {
-    AppOnlineClass,
-    AppGeneralLawExam
+    OnlineClass,
+    GeneralLawExam
   },
   watch: {
     currIndex: {
@@ -44,6 +44,11 @@ export default {
         }
       }
     }
+  },
+  methods: {
+    LinkToTest() {
+      uni.navigateTo({url: "./testForm"})
+    }
   }
 }
 </script>
diff --git a/src/mods/conv/AppLegalLearning/components/AppGeneralLawExam.vue b/src/mods/conv/AppLegalLearning/components/GeneralLawExam.vue
similarity index 91%
rename from src/mods/conv/AppLegalLearning/components/AppGeneralLawExam.vue
rename to src/mods/conv/AppLegalLearning/components/GeneralLawExam.vue
index c61dfef..fe721c9 100644
--- a/src/mods/conv/AppLegalLearning/components/AppGeneralLawExam.vue
+++ b/src/mods/conv/AppLegalLearning/components/GeneralLawExam.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="AppGeneralLawExam">
+  <div class="GeneralLawExam">
     <div class="search_box">
       <u-search placeholder="请输入需要搜索的考试" bg-color="#FFF" v-model="keyword" :show-action="false"></u-search>
     </div>
@@ -21,7 +21,7 @@
           </div>
           <div class="grade">98</div>
         </div>
-        <div class="card_bottom col_blue" @click="toTest">参加考试</div>
+        <div class="card_bottom col_blue" @click="toTest()">参加考试</div>
       </div>
     </div>
   </div>
@@ -40,13 +40,10 @@ export default {
   },
   methods: {
     getList() {
-      console.log('111');
+      console.log('普法考试列表');
     },
     toTest() {
-      console.log('tiaozhuan');
-      uni.navigateTo({
-        url: './test'
-      })
+      this.$emit('LinkToTest')
     }
   },
   onReachBottom() {
@@ -57,7 +54,7 @@ export default {
 </script>
 
 <style lang="scss" socped>
-.AppGeneralLawExam {
+.GeneralLawExam {
   .search_box {
     margin: 24px 0;
     padding: 0 32px;
diff --git a/src/mods/conv/AppLegalLearning/components/AppOnlineClass.vue b/src/mods/conv/AppLegalLearning/components/OnlineClass.vue
similarity index 62%
rename from src/mods/conv/AppLegalLearning/components/AppOnlineClass.vue
rename to src/mods/conv/AppLegalLearning/components/OnlineClass.vue
index 294388c..41405f6 100644
--- a/src/mods/conv/AppLegalLearning/components/AppOnlineClass.vue
+++ b/src/mods/conv/AppLegalLearning/components/OnlineClass.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="AppOnlineClass">
+  <div class="OnlineClass">
     在线课堂
   </div>
 </template>
@@ -17,18 +17,18 @@ export default {
   
   methods: {
     getList() {
-      console.log('222');
+      console.log('在线课堂列表');
     }
   },
-  // onReachBottom() {
-  //   this.current ++;
-  //   this.getList()
-  // },
+  onReachBottom() {
+    this.current ++;
+    this.getList()
+  },
 }
 </script>
 
 <style lang="scss" socped>
-.AppOnlineClass {
+.OnlineClass {
   
 }
 </style>
diff --git a/src/mods/conv/AppLegalLearning/components/question.vue b/src/mods/conv/AppLegalLearning/components/question.vue
deleted file mode 100644
index 352a10e..0000000
--- a/src/mods/conv/AppLegalLearning/components/question.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<template>
-  <div class="question">
-    
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      
-    }
-  },
-  onLoad() {
-    
-  },
-  
-  methods: {
-    
-  },
-  onReachBottom() {
-
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.question {
-
-}
-</style>
\ No newline at end of file
diff --git a/src/mods/conv/AppLegalLearning/components/test.vue b/src/mods/conv/AppLegalLearning/components/test.vue
deleted file mode 100644
index 0423572..0000000
--- a/src/mods/conv/AppLegalLearning/components/test.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-  <div class="test">
-    哈哈
-    <!-- <Question></Question> -->
-  </div>
-</template>
-
-<script>
-import Question from "./question.vue";
-export default {
-  data() {
-    return {
-
-    }
-  },
-  components: {
-    Question
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.test {
-  
-}
-</style>
\ No newline at end of file
diff --git a/src/mods/conv/AppLegalLearning/testForm.vue b/src/mods/conv/AppLegalLearning/testForm.vue
new file mode 100644
index 0000000..1d00aa2
--- /dev/null
+++ b/src/mods/conv/AppLegalLearning/testForm.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="testForm">
+    答题
+    <div v-for="(item,index) in questionList" :key="index">
+      <div v-if="activeIndex === index">
+        <div>{{ item.subject }}</div>
+        <div @click="next">下一题</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      activeIndex: 0,
+      questionList: [
+        {
+          index: 0,
+          subject: "第1题",
+          answer: "答案",
+          jiexi: '解析'
+        },
+        {
+          index: 1,
+          subject: "第2题",
+          answer: "答案",
+          jiexi: '解析'
+        },
+        {
+          index: 2,
+          subject: "第3题",
+          answer: "答案",
+          jiexi: '解析'
+        },
+        {
+          index: 3,
+          subject: "第4题",
+          answer: "答案",
+          jiexi: '解析'
+        },
+        {
+          index: 4,
+          subject: "第5题",
+          answer: "答案",
+          jiexi: '解析'
+        }
+      ]
+    }
+  },
+  methods: {
+    getList() {
+      console.log('题目列表');
+    },
+    next() {
+      this.activeIndex ++;
+    }
+  },
+  onReachBottom() {
+    this.current ++;
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.testForm {
+
+}
+</style>
\ No newline at end of file