Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/help/helpList.vue

@@ -15,7 +15,27 @@
         <p>每日8:00-18:00</p>
       </div>
       <p class="matter">常见问题</p>
-      <list-item :proportion="[5,1]" :item-height="44">
+      <div class="question">
+        <div class="question-top" @click="show(0)">
+          <span>客户绑定相关问题</span>
+          <img class="img0" src="@/assets/help/down.png" >
+        </div>
+        <ul class="list0">
+          <li>如何进行客户绑定？</li>
+          <li>如何通过扫描录入进件？</li>
+        </ul>
+      </div>
+      <div class="question">
+        <div class="question-top" @click="show(1)">
+          <span>客户绑定相关问题</span>
+          <img class="img1" src="@/assets/help/down.png" >
+        </div>
+        <ul class="list1">
+          <li>如何进行客户绑定？</li>
+          <li>如何通过扫描录入进件？</li>
+        </ul>
+      </div>
+      <!-- <list-item :proportion="[5,1]" :item-height="44">
         <item>
           <div slot="name">客户绑定相关问题</div>
         </item>
@@ -25,12 +45,33 @@
         <item>
           <div slot="name">如何通过扫描录入进件？</div>
         </item>
-      </list-item>
+      </list-item>-->
     </h-content>
   </h-view>
 </template>
 <script>
-export default {}
+export default {
+  data () {
+    return {
+      isShow: true,
+    }
+  },
+  methods: {
+    show (e) {
+      let ul = document.querySelector(`.list${e}`)
+      let li = ul.querySelectorAll('li')
+      let img = document.querySelector(`.list${e}`)
+      if (this.isShow) {
+        ul.style.height = li.length * 35 + 'px'
+        img.style.transform =
+        this.isShow = false
+      } else {
+        ul.style.height = 0
+        this.isShow = true
+      }
+    },
+  },
+}
 </script>
 <style lang="less" scoped>
 #help-list {
@@ -95,6 +136,60 @@ export default {}
       margin-left: 16px;
       margin-bottom: 10px;
     }
+    .question {
+      background-color: #ffffff;
+      .question-top {
+        height: 44px;
+        line-height: 44px;
+        background-color: #ffffff;
+        padding-left: 24px;
+        display: flex;
+        align-items: center;
+        span {
+          display:inline-block;
+          position: relative;
+          font-family: PingFangSC-Regular;
+          font-size: 13px;
+          color: #00469c;
+          letter-spacing: 0;
+          line-height: 20px;
+          text-indent: 8px;
+          flex:12;
+        }
+        span::before{
+        content:'';
+        display: block;
+        position: absolute;
+        top:4px;
+        left: 0px;
+        width:4px;
+        height:12px;
+        background-color:#00469C;
+      }
+        img{
+          width: 20px;
+          height: 20px;
+          margin-right: 20px;
+          flex:1;
+        }
+      }
+      .list0,.list1 {
+        overflow: hidden;
+        transition: 0.2s linear;
+        height:0px;
+        li {
+          font-family: PingFangSC-Regular;
+          font-size: 12px;
+          color: #656464;
+          height: 35px;
+          width:343px;
+          margin:0 auto;
+          line-height: 35px;
+          border-bottom: 1px solid #F1F0F5;
+          text-indent: 15px;
+        }
+      }
+    }
   }
 }
 </style>

src/pages/intoApproval/intoApproval/refund.vue

@@ -136,6 +136,7 @@ export default {
         params: {
           isConfirm: true,
           hasButtom: confirmStatus,
+          confirm_status: this.$route.params.confirm_status,
         },
       })
       this.$router.go(-1)

src/pages/pay/payment/first-pay.vue

@@ -25,7 +25,7 @@
         <div class="pay-icon"><img src="@/assets/payment/first-pay.png" alt="">违约金支付</div>
         <div class="pay-input">
           <span>应还违约金</span>
-          <input v-model="liquidated_damages" type="text" placeholder="请输入支付金额">
+          <input v-model="liquidated_damages" readonly type="text" placeholder="请输入支付金额">
         </div>
       </div>
     </h-content>