Merge branch 'master' of https://gitlab.ezijing.com/ezijing/x-learn

src/components/MyQuestionList.vue

@@ -105,7 +105,7 @@ export default {
       api
         .getMyQuestions(params)
         .then(response => {
-          const { list, total } = this.requestCallback ? this.requestCallback(response) : response
+          const { list, current_total: total } = this.requestCallback ? this.requestCallback(response) : response
           this.total = total
           this.list = list.map(item => {
             item.checked = false

src/pages/contact/index.vue

@@ -6,11 +6,11 @@
     <div class="footer">
       <div class="item">
         <p>客服微信二维码：</p>
-        <div class="pic"></div>
+        <div class="pic"><img src="../../assets/images/wechat_mp_qrcode.png" /></div>
       </div>
       <div class="item">
         <p>想了解更多，请关注官方公众号：</p>
-        <div class="pic"></div>
+        <div class="pic"><img src="../../assets/images/wechat_mp_qrcode.png" /></div>
       </div>
     </div>
   </app-container>
@@ -43,6 +43,11 @@ export default {
       height: 120px;
       margin-right: 84px;
       background-color: #d8d8d8;
+      img {
+        width: 100%;
+        height: 100%;
+        object-fit: contain;
+      }
     }
   }
 }