Merge branch 'liuxin' into develop

src/pages/help/helpList.vue

+<template>
+  <h-view id="help-list" class="public-style">
+    <h-header :proportion="[5,1,1]" class="header">
+      <div slot="left" class="h-header-btn">
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
+        <span>帮助与反馈</span>
+      </div>
+    </h-header>
+    <h-content class="my-content">
+      <div class="connect">
+        <div class="connect-top">
+          <img src="@/assets/help/call.png" >
+          <span>联系我们</span>
+        </div>
+        <p>每日8:00-18:00</p>
+      </div>
+      <p class="matter">常见问题</p>
+      <list-item :proportion="[5,1]" :item-height="44">
+        <item>
+          <div slot="name">客户绑定相关问题</div>
+        </item>
+        <item>
+          <div slot="name">如何进行客户绑定？</div>
+        </item>
+        <item>
+          <div slot="name">如何通过扫描录入进件？</div>
+        </item>
+      </list-item>
+    </h-content>
+  </h-view>
+</template>
+<script>
+export default {}
+</script>
+<style lang="less" scoped>
+#help-list {
+  .header {
+    background-color: #00469c;
+    color: #ffffff;
+    .h-header-btn {
+      img {
+        width: 16px;
+        height: 16px;
+      }
+      span {
+        font-family: PingFangSC-Semibold;
+        font-size: 17px;
+        color: #ffffff;
+        letter-spacing: 0.61px;
+        margin-left: 16px;
+      }
+    }
+  }
+  .my-content {
+    .connect {
+      background: rgba(0, 70, 156, 0.08);
+      border-radius: 4px;
+      width: 335px;
+      height: 57px;
+      margin: 0 auto;
+      margin-top: 8px;
+      text-align: center;
+      padding-top: 8px;
+      .connect-top {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+      img {
+        width: 12.4px;
+        height: 14.8px;
+      }
+      span {
+        font-family: PingFangSC-Semibold;
+        font-size: 14px;
+        color: #383f45;
+        letter-spacing: 0.43px;
+        margin-left: 8px;
+      }
+      p {
+        margin-top: 8px;
+        font-family: PingFangSC-Regular;
+        font-size: 12px;
+        color: rgba(56, 63, 69, 0.6);
+        letter-spacing: 0.37px;
+      }
+    }
+    .matter {
+      font-family: PingFangSC-Semibold;
+      font-size: 15px;
+      color: #383f45;
+      letter-spacing: 0;
+      line-height: 20px;
+      margin-top: 10px;
+      margin-left: 16px;
+      margin-bottom: 10px;
+    }
+  }
+}
+</style>

src/pages/myInfo/my-info.vue

@@ -60,7 +60,7 @@
           <img slot="left-icon" src="@/assets/myInfo/collect.png" class="left-icon" >
           <div slot="name">我的收藏</div>
         </item>
-        <item>
+        <item @click.native="changeHelp">
           <img slot="left-icon" src="@/assets/myInfo/help.png" class="left-icon" >
           <div slot="name">帮助与反馈</div>
         </item>
@@ -132,6 +132,11 @@ export default {
   },
   activated () {},
   methods: {
+    changeHelp () {
+      this.$router.push({
+        name: 'HelpList',
+      })
+    },
     changePay () {
       this.$router.push({
         name: 'FirstPay',

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

@@ -98,6 +98,7 @@ export default {
         name: 'PaymentPayEntry',
         params: {
           money,
+          bp_id: this.$route.params.bp_id,
         },
       })
     },

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

@@ -2,7 +2,7 @@
   <h-view id="payment-pay-entry" class="public-style">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
-        <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
+        <img src="@/assets/userBind/arrow.png" @click="changePage">
         <span>支付中心</span>
       </div>
     </h-header>
@@ -75,6 +75,17 @@ export default {
     isSelect (way) {
       this.select = way
     },
+    changePage () {
+      this.$router.replace(
+        {
+          name: 'PaymentFirstPay',
+          params: {
+            bp_id: this.$route.params.bp_id,
+          },
+        }
+      )
+      this.$router.go(-1)
+    },
   },
 }
 </script>

src/router/index.js

@@ -65,6 +65,9 @@ import ProDetailed from '@/pages/productQuery/product-detailed'
 // 消息中心
 import InfoCenter from '@/pages/infoCenter/infoList'
 import ProductList from '@/pages/productQuery/product-list'
+// 帮助与反馈
+import HelpList from '@/pages/help/helpList'
+
 Vue.use(Router)
 
 export default new Router({
@@ -177,6 +180,8 @@ export default new Router({
     {path: '/query-home', component: QueryHome, name: 'QueryHome', meta: {keepAlive: true}},
     {path: '/product-detailed', component: ProDetailed, name: 'ProDetailed', meta: {keepAlive: true}},
     {path: '/product-list', component: ProductList, name: 'ProductList', meta: {keepAlive: true}},
+    // 帮助与反馈
+    {path: '/help-list', component: HelpList, name: 'HelpList', meta: {keepAlive: true}},
   ],
   scrollBehavior (to, from, savedPosition) {
     if (to.hash) {