Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev

src/assets/js/utils/request.js

@@ -11,7 +11,27 @@ let proposal = [
   '/proposal/proposal/deleteProposal'
 ] //建议书
 let sale = ['/sale/order/orderList', '/sale/order/saveOrUpdateOrderInfo'] //在线投保
-let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale]
+let agentEnter = [
+  '/agent/enter/share',
+  '/agent/enter/query',
+  '/agent/enter/saveOrUpdateInfo',
+  '/agent/enter/queryAll',
+  '/agent/enter/getImpart',
+  '/agent/agreement/query',
+  '/agent/agreement/signAgreement',
+  '/agent/enter/query'
+] //入司
+let claims = [
+  `/claim/claimApply/progress`,
+  `/claim/claimApply/progressDetail`,
+  `/claim/claimReport/history`,
+  `/claim/claimApply/apply`,
+  `/edor/customer/customerList`,
+  `/edor/customer/customerInfo`,
+  `/claim/claimApply/query`,
+  `/claim/claimApply/delete`
+]
+let whiteList = ['/customer/agent/getCustomersList', ...proposal, ...sale, ...agentEnter, ...claims]
 
 // 创建axios实例
 const service = axios.create({

src/components/ebiz/agentEenter/RsTop.vue

@@ -10,7 +10,7 @@
       </van-notice-bar>
     </div>
 
-    <div class="steps_w w325 mh20 mv8 h20 relative ">
+    <div class="steps_w w260 mh50 mv8 h20 relative ">
       <div class="step flex justify-content-s align-items-c h20 absolute top0 left0">
         <div class="circle radius50 w12 h12 bg-gray "></div>
         <div class="wire w50 h2 bg-gray"></div>
@@ -78,12 +78,12 @@ export default {
   }
   .lh20 {
     text-align: center;
-    // line-height: 20px;
+    line-height: 20px;
   }
   .wire {
-    // width: 54px;
-    // height: 2px;
-    // background: red;
+    width: 54px;
+    height: 2px;
+    background: red;
   }
 }
 </style>

src/views/ebiz/agentEenter/AgentEenterBasicImage.vue

@@ -188,13 +188,13 @@ export default {
                   this.fileListBank05 = [{ url: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${item.rgssUrl}` }]
                   break
               }
-              switch (item.subBusinessType) {
-                case '3': // 申请人
-                  this.fileListBank01.push({ url: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${item.rgssUrl}` })
-                  break
-                case '4': //  担保人
-                  this.fileListBank06.push({ url: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${item.rgssUrl}` })
-                  break
+              if(item.imageInfoType == '1' && item.subBusinessType == '3'){
+                 // 申请人身份证
+                 this.fileListBank01.push({ url: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${item.rgssUrl}` })
+              }
+              if(item.imageInfoType == '1' && item.subBusinessType == '4'){
+                 // 担保人身份证
+                this.fileListBank06.push({ url: config.imgDomain + `/returnImageStream?a=b.jpg&imgPath=${item.rgssUrl}` })
               }
             })
             this.list = result

src/views/ebiz/agentEenter/EntryProcess.vue

@@ -1,7 +1,8 @@
 <template>
   <div class="entry-container pt60 bg-white" v-if="proces">
-    <div class="ml80 w200 text-center">
-      入司申请<br /><span class="grey">{{ proces.applyDate }}</span>
+    <div class="ml80 w200 text-center pv5">
+       入司申请<br />
+       <span class="grey">{{ proces.applyDate }}</span>
     </div>
     <div class="ml80 w100 flex path relative" style="flex-wrap: wrap">
       <div class="left-path flex" style="flex-direction: column">
@@ -14,14 +15,14 @@
           <div class="flex align-items-c text-center">
             <div>
               <div>自助入司资料上传</div>
-              <span v-if="proces.approvalStatus == '03'" class="grey">{{ proces.approvalDate }}{{ proces.approvalTime }}</span>
+              <span class="grey">{{ proces.approvalDate }}</span>
             </div>
             <van-button v-if="proces.approvalStatus == '01'" @click="goBaseInfo" class="ml15 ph10" plain type="primary"
               >立即上传</van-button
             >
           </div>
         </div>
-        <div v-if="(proces.trajectory_list == null && proces.approvalStatus == '02') || (proces.trajectory_list == null && proces.approvalStatus == '21')">
+        <div v-if="(proces.trajectoryList == null && proces.approvalStatus == '02') || (proces.trajectory_list == null && proces.approvalStatus == '21')">
           <div class="h50 flex relative border-right active">
             <i class="w10 h10 radius50 right-circle absolute bottom0"></i>
           </div>
@@ -52,7 +53,7 @@
                 >
               </div>
               <span v-if="item.approvalStatus == '03' || item.approvalStatus == '04'" class="grey">{{ item.approvalDate }}</span>
-              <van-button @click="goSeeCause" v-if="item.approvalStatus == '04'" class="absolute approval-button ph10" plain type="primary"
+              <van-button @click="goSeeCause" v-if="proces.approvalStatus == '04' && item.approvalStatus == '04' && item.approvalStatus != '02' && item.approvalStatus != '03' && index == proces.trajectory_list.length - 1" class="absolute approval-button ph10" plain type="primary"
                 >查看原因</van-button
               >
             </div>

src/views/ebiz/agentEenter/SeeCause.vue

@@ -1,36 +1,42 @@
 <template>
   <div>
     <div class="p15 text-center fs14 ">
-      <img :src="srcSuccess" class=" mb15 pt15" width="100" />
+      <img src="@/assets/images/cause.png" class=" mb15 pt15" />
       <h4 class="text-left ph50">入司资料审核不通过，可能是以下问题，请修改相应资料，确认无误后再次提交审核！</h4>
-      <div class="text-left mt60 c-gray-base">未通过原因</div>
-      <ul class="text-left c-gray-base">
-        <li v-for="(causeText, index) in cause" :key="index">{{ index }}.{{ causeText.text }}</li>
-      </ul>
-      <van-button @click="goBaseInfo" plain type="danger" v-no-more-click="1000" class="w200 mt50" round>去修改</van-button>
+      <div class="text-left mt60 c-gray-base">未通过原因：</div>
+      <div class="text-left c-gray-base" v-if="proces.trajectoryList.length>0">
+        <div v-for="(causeText, index) in proces.trajectoryList" v-if="index == proces.trajectoryList.length - 1" :key="index">{{ causeText.approvalOpinion }}</div>
+      </div>
+      <van-button @click="goBaseInfo" v-no-more-click="1000" plain type="danger" class="w200 mt50" round>去修改</van-button>
     </div>
   </div>
 </template>
 
 <script>
 import { Field, Icon, Button, Checkbox, CheckboxGroup } from 'vant'
+import { processCheck } from '@/api/ebiz/agentEenter/agentEenter'
 export default {
   data() {
     return {
-      srcSuccess: this.$assetsUrl + 'images/success.png',
+      // srcSuccess: this.$assetsUrl + 'images/fail.png',
       pdfUrl: '',
       checked: false,
-      cause: [
-        {
-          text: '入司基本信息中家庭地址不够详细'
-        },
-        {
-          text: '入司影像信息中银行卡影像模糊不清'
-        }
-      ]
+      proces: {
+        trajectoryList:[]
+      },
+      granting: [],
+      failArr: [],
+      successArr: []
     }
   },
-  created() {},
+  mounted() {
+    ;(document.body.style.backgroundColor = '#fff'), 
+    this.processCheck()
+  },
+  beforeRouteLeave(to, from, next) {
+    document.body.style.backgroundColor = ''
+    next()
+  },
   methods: {
     goBaseInfo() {
       this.$jump({
@@ -43,6 +49,27 @@ export default {
           path: `/agentEenter/AgentEenterBasicInfor`
         }
       })
+    },
+    processCheck() {
+      let that = this
+      that.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
+      let data = {
+      }
+      processCheck(data).then(res => {
+        // console.log(res)
+        // console.log('res.result', res.result)
+        if (res.result == '0') {
+          that.$toast.clear()
+          that.proces = res.content
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
     }
   },
   components: {