文件迁移

czf2015 · Jun 27, 2019 · d7eb731 · d7eb731
1 parent 9a097c0
commit d7eb731
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/components/base/._.DS_Store b/components/base/._.DS_Store
diff --git a/components/questionnaire/control/Fore.vue → components/questionnaire/control/Next.vue b/components/questionnaire/control/Fore.vue → components/questionnaire/control/Next.vue
diff --git a/components/questionnaire/control/Back.vue → components/questionnaire/control/Prev.vue b/components/questionnaire/control/Back.vue → components/questionnaire/control/Prev.vue
@@ -1,24 +1,20 @@
 <template>
-  <span class="back" @click="back">
+  <span class="prev" @click="prev">
     <i class="fas fa-chevron-left"/>
-    {{prev}}
+    上一题
   </span>
 </template>
 
 <script>
-import {prerequisite} from "@/services/Questionnaire.js";
+import { prerequisite } from "@/services/Questionnaire.js";
 
 export default {
   props: {
-    r: Object,
-    prev: {
-      type: String,
-      default: "上一题"
-    }
+    r: Object
   },
 
   methods: {
-    back() {
+    prev() {
       const that = this;
       let id = that.$store.state.questionId;
       do {
@@ -31,7 +27,7 @@ export default {
 </script>
 
 <style scoped>
-.back {
+.prev {
   font-size: 16px;
   line-height: 2;
 }

diff --git a/pages/questionnaire/index.vue b/pages/questionnaire/index.vue
@@ -1,14 +1,14 @@
 <template>
   <section class="page">
-    <Back class="back" v-show="questionId !== 1" :r="r"/>
+    <Prev class="prev" v-show="questionId !== 1" :r="r"/>
     <Question :question="q[questionId]" :r="r" :key="questionId"/>
   </section>
 </template>
 
 <script>
 import api from "@/utils/api.js";
 import { convert, prerequisite } from "@/services/Questionnaire.js";
-import Back from "@/components/questionnaire/control/Back.vue";
+import Prev from "@/components/questionnaire/control/Prev.vue";
 import Question from "@/components/questionnaire/Question.vue";
 
 export default {
@@ -28,7 +28,7 @@ export default {
   },
 
   components: {
-    Back,
+    Prev,
     Question
   },
 
@@ -74,7 +74,7 @@ export default {
   padding: 0 8px;
 }
 
-.back {
+.prev {
   position: absolute;
 }
 </style>
diff --git a/services/Questionnaire.js b/services/Questionnaire.js
@@ -26,7 +26,6 @@ export function matchType(requiredOption, answer/* Array */) {
         case "exclude":
             return answer && !requiredOption.optionId.some(item => answer.includes(item))
     }
-
 }
 
 //
-Original file line number
+Diff line change
@@ Expand Up @@
             case "exclude":
                 return answer && !requiredOption.optionId.some(item => answer.includes(item))
         }
     }
     //
@@ Expand Down @@