Merge branch 'zyd'

src/components/practice/pMultiple.vue

@@ -91,7 +91,8 @@ export default {
           answer5:0,
           answer6:0,
         }
-        this.$forceUpdate()
+      this.activeName = []
+      this.$forceUpdate()
     },
     choiseSelect(name){
       if(this.showButton !== 'curent') return 

src/components/practice/single.vue

@@ -85,14 +85,14 @@ export default {
   methods: {
     changeStatus(){ // 初始化状态
       this.currentStatus={
-          answer1:0,
-          answer2:0,
-          answer3:0,
-          answer4:0,
-          answer5:0,
-          answer6:0,
-        }
-        this.$forceUpdate()
+        answer1:0,
+        answer2:0,
+        answer3:0,
+        answer4:0,
+        answer5:0,
+        answer6:0,
+      }
+      this.activeName = ''
     },
     choiseSelect(name){
       if(this.showButton !== 'curent') return 

src/views/answerRecord/index.vue

@@ -50,16 +50,16 @@
     </div>
     <div class="record-list">
       <div v-for="(item,index) in list" :key="index" class="list-item">
-        <p>{{item.title}}</p>
+        <p>{{item.name}}</p>
         <div class="item-detail">
           <div style="font-size:0">
             <span class="item-right-num">{{item.rightNum}}</span>
-            <span class="item-num">/{{item.num}}道</span>
-            <span class="item-time">{{item.createTime}}</span>
+            <span class="item-num">/{{item.sumNum}}道</span>
+            <span class="item-time">{{item.submit}}</span>
           </div>
-          <div>
+          <div v-if="item.score !== null">
             <span class="">成绩:</span>
-            <span class="item-mark">{{item.percent}}分</span>
+            <span class="item-mark">{{item.score}}分</span>
           </div>
         </div>
       </div>
@@ -90,8 +90,6 @@ export default {
   methods: {
     getDetail(){
       getDetailAPI().then(res=>{
-        console.log(res.data.data,1111);
-        
         if(res.data.code == 0){
           this.detail = res.data.data
         }
@@ -99,14 +97,14 @@ export default {
     },
     getList(){
       getRecordList().then(res=>{
-        console.log(res.data.data,1111);
-        
         if(res.data.code == 0){
           this.list = res.data.data
         }
       })
     },
-    backTo() {}
+    backTo() {
+        this.$router.push({name:'my'})
+    }
   }
 };
 </script>
@@ -241,6 +239,7 @@ export default {
     color: #999;
   }
   .item-time {
+    margin-left: .1rem;
     font-size: .11rem;
     color: #999;
   }

src/views/moonMatch/index.vue

 <template>
   <!--在线考试-->
   <div class="week-list">
-    <topHeader header-title="在线考试" :showCol="false"></topHeader>
+    <topHeader header-title="在线考试" :showCol="false"  @back="$router.push({name:'home'})"></topHeader>
     <div class="list-cnt">
       <div v-for="(item,key) in list" :key="key" class="list-item">
         <div class="item-name"  @click="linkTo(item)">{{item.name}}</div>
@@ -68,6 +68,8 @@ export default {
   methods: {
     getList(){
       getMoonListAPI(this.listQuery).then(res=>{
+        console.log(res.data.data,22);
+        
         if(res.data.code == 0){
           this.list = res.data.data.list
         }