Merge branch 'dev-question-bank-0916' into 'release'

UI优化调整 code reviewer:张平



See merge request !5

src/components/question/directory-info.vue

@@ -10,8 +10,8 @@
         </div>
       </div>
       <div class="info-second">
-        <div class="item" @click="wrongBook(1)"><img src="../../images/question/text.png">错题集<span v-if="directoryInfo.wrongTitleBook">({{directoryInfo.wrongTitleBook}})</span></div>
-        <div class="item" @click="wrongBook(2)"><img src="../../images/question/heart-h.png">收藏<span v-if="directoryInfo.collectTitleBook">({{directoryInfo.collectTitleBook}})</span></div>
+        <div class="item" @click="wrongBook(1)"><img src="../../images/question/text.png"><span>错题集</span><span v-if="directoryInfo.wrongTitleBook">({{directoryInfo.wrongTitleBook}})</span></div>
+        <div class="item" @click="wrongBook(2)"><img src="../../images/question/heart-h.png"><span>收藏</span><span v-if="directoryInfo.collectTitleBook">({{directoryInfo.collectTitleBook}})</span></div>
       </div>
     </div>
   </div>
@@ -91,26 +91,31 @@ export default {
         .item{
           width: 165.5px;
           height: 40px;
-          /*line-height: 40px;*/
-          text-align: center;
           border-radius: 6px;
           background-color: #F8F9FA;
-          font-size: 14px;
-          font-weight: 700;
-          color: #373839;
           display: flex;
           align-items: center;
           justify-content: center;
+          padding: 10px 0;
+          vertical-align: middle;
           img{
             width: 20px;
             height: 20px;
             margin-right: 8px;
           }
-          span{
+          span:first-of-type{
+            font-size: 14px;
+            font-weight: 700;
+            color: #373839;
+            height: 20px;
+            line-height: 20px;
+          }
+          span:last-of-type{
             font-size: 12px;
             margin-left: 2px;
-            height: 40px;
-            line-height: 40px;
+            height: 20px;
+            line-height: 20px;
+            margin-top: -1px;
           }
         }
       }

src/components/question/question-content.vue

@@ -120,7 +120,7 @@ export default {
             myAnswer += this.getOrderVac(index);
           }
         });
-        myAnswer = myAnswer.split("").join(",");
+        myAnswer = myAnswer.split("").join("、");
         this.currentQuestion.myAnswer = myAnswer;
       } else {
         this.currentQuestion.options[index].isSelected = true;
@@ -184,6 +184,16 @@ export default {
   }
 };
 </script>
+<style lang="less">
+  .title-wrapper, .analysis-wrapper{
+    .content{
+      img{
+        margin-top: 15px;
+        max-width: 100% !important;
+      }
+    }
+  }
+</style>
 <style lang="less" scoped>
 .qeustion-content-wrapper {
   // img {
@@ -199,6 +209,7 @@ export default {
   }
   .title-wrapper {
     padding: 20px 15px 15px;
+    box-sizing: border-box;
     .type {
       position: relative;
       top: 2.8px;
@@ -254,8 +265,9 @@ export default {
         display: block;
         width: 20px;
         height: 20px;
-        line-height: 20px;
+        line-height: 19px;
         text-align: center;
+        vertical-align: middle;
         margin-right: 10px;
         color: #373839;
         &.border {
@@ -312,11 +324,11 @@ export default {
       &::before {
         display: inline-block;
         content: "";
-        height: 16px;
+        height: 15px;
         width: 3px;
         margin-right: 9px;
         background: #f68367;
-        border-radius: 3px;
+        border-radius: 2px;
       }
     }
     .content {
@@ -345,4 +357,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>

src/views/question-bank.vue

@@ -22,7 +22,7 @@
         <div class="course-item" v-for="(item, index) in subDirectoryModelList" :key="index">
           <div class="left-c">
             <p class="title-c">{{item.directoryName}}</p>
-            <p class="join-c" v-if="!bindStatus && (item.freeFlag == 1)">{{item.joinUserNum}}人已参与</p>
+            <p class="join-c" v-if="!bindStatus">{{item.joinUserNum}}人已参与</p>
             <div class="progress-course" v-else>
               <div class="progress-w"><van-progress :percentage="item.finishedRatio" :stroke-width="6" color="#449284" :show-pivot="false"/></div>
               <span class="mg-set">{{item.finishedRatio}}%</span><span>共{{item.sumTitle}}道</span>