Merge branch 'liuxin' into develop

src/pages/intoApproval/intoApproval/accessory.vue

@@ -4,25 +4,25 @@
       <item>
         <div slot="name">身份证</div>
         <span slot="content">
-          <img src="@/assets/homeImage/download.png" >下载在线查看
+          <img src="@/assets/intoApproval/download.png" >下载在线查看
         </span>
       </item>
       <item>
         <div slot="name">营业执照</div>
         <span slot="content">
-          <img src="@/assets/homeImage/download.png" >下载在线查看
+          <img src="@/assets/intoApproval/download.png" >下载在线查看
         </span>
       </item>
       <item>
         <div slot="name">银行卡</div>
         <span slot="content">
-          <img src="@/assets/homeImage/download.png" >下载在线查看
+          <img src="@/assets/intoApproval/download.png" >下载在线查看
         </span>
       </item>
       <item>
         <div slot="name">征信授权书</div>
         <span slot="content">
-          <img src="@/assets/homeImage/download.png" >下载在线查看
+          <img src="@/assets/intoApproval/download.png" >下载在线查看
         </span>
       </item>
     </list-item>

src/pages/intoApproval/intoApproval/base.vue

@@ -2,7 +2,7 @@
   <h-view id="approval" class="public-style" title="进件审批">
     <h-header :proportion="[5,1,1]" class="header">
       <div slot="left" class="h-header-btn" @click="$routeGo()">
-        <img src="@/assets/homeImage/arrow.png" >
+        <img src="@/assets/intoApproval/arrow.png" >
         <span>进件审批</span>
       </div>
     </h-header>
@@ -78,7 +78,7 @@
               <span class="card-num">证件号</span>
             </div>
             <div slot="content" class="right">
-              <img src="@/assets/homeImage/introduce.png" >
+              <img src="@/assets/intoApproval/introduce.png" >
               <span>张天</span>
               <br >
               <span>42112029870928097</span>
@@ -91,7 +91,7 @@
               <span class="card-num">证件号</span>
             </div>
             <div slot="content" class="right">
-              <img src="@/assets/homeImage/introduce.png" >
+              <img src="@/assets/intoApproval/introduce.png" >
               <span>张天</span>
               <br >
               <span>42112029870928097</span>
@@ -101,7 +101,7 @@
         <div class="alert">
           <div class="alert-content">
             <div class="title">
-              <img src="@/assets/homeImage/info.png" >
+              <img src="@/assets/intoApproval/info.png" >
               <span class="info-word">温馨提示</span>
             </div>
             <p class="top-info">绑定成功后，您即可使用APP中合同查询、还款查询等功能。</p>
@@ -118,15 +118,15 @@
     </h-content>
     <bottom-tab class="footer-button">
       <tab-button class="approve">
-        <img src="@/assets/homeImage/approve.png" >审批
+        <img src="@/assets/intoApproval/approve.png" >审批
       </tab-button>
     </bottom-tab>
   </h-view>
 </template>
 <script>
-import Tab from '@/components/tab'
-import RentInfo from '@/pages/intoApproval/rentInfo'
-import AccessoryInfo from '@/pages/intoApproval/accessory'
+import Tab from '@/pages/intoApproval/intoApproval/tab'
+import RentInfo from '@/pages/intoApproval/intoApproval/rentInfo'
+import AccessoryInfo from '@/pages/intoApproval/intoApproval/accessory'
 export default {
   components: {
     Tab,

src/pages/intoApproval/intoApproval/rentInfo.vue

@@ -69,7 +69,7 @@
     <div class="alert">
       <div class="alert-content">
         <div class="title">
-          <img src="@/assets/homeImage/info.png" >
+          <img src="@/assets/intoApproval/info.png" >
           <span class="info-word">提示</span>
         </div>
         <p class="top-info">绑定成功后，您即可使用APP中合同查询、还款查询等功能。

src/pages/intoApproval/intoApproval/tab.vue

+<template>
+  <div class="tab-style">
+    <span @click="tabNum = 0;sendTabNum()"><img :src="tabNum == 0?check1:uncheck1"></span>
+    <span @click="tabNum = 1;sendTabNum()"><img :src="tabNum == 1?check2:uncheck2" ></span>
+    <span @click="tabNum = 2;sendTabNum()"><img :src="tabNum == 2?check3:uncheck3"></span>
+  </div>
+</template>
+<script>
+import check1 from '@/assets/intoApproval/check1.png'
+import check2 from '@/assets/intoApproval/check2.png'
+import check3 from '@/assets/intoApproval/check3.png'
+import uncheck1 from '@/assets/intoApproval/uncheck1.png'
+import uncheck2 from '@/assets/intoApproval/uncheck2.png'
+import uncheck3 from '@/assets/intoApproval/uncheck3.png'
+export default {
+  data () {
+    return {
+      tabNum: 0,
+      check1: check1,
+      check2: check2,
+      check3: check3,
+      uncheck1: uncheck1,
+      uncheck2: uncheck2,
+      uncheck3: uncheck3,
+    }
+  },
+  methods: {
+    sendTabNum () {
+      this.$emit('getTabNum', this.tabNum)
+    },
+  },
+}
+</script>
+<style lang="less" scoped>
+.tab-style{
+    display:flex;
+    justify-content: center;
+    padding-top:12px;
+    padding-bottom: 8px;
+    align-items: center;
+    box-shadow:0 2px 3px 0  rgba(220,220,221,0.50);
+    span{
+        display: block;
+        width:112px;
+        height: 32px;
+        border-radius:16px;
+    }
+    img{
+        width:112px;
+        height: 32px;
+        margin-right:5.7px;
+    }
+    span:nth-of-type(2){
+        margin:0 10px;
+    }
+}
+</style>