GFRS-2618【前端】修改前端bug-- 提交人：张齐

src/api/ebiz/allowance/allowance.js

@@ -119,7 +119,7 @@ export function approveInit(data) {
 
 // <-- zhangqi 津贴申请与我的资料使用到的接口  begin -->
 
-// 津贴申请-基本信息，账户信息，影响资料等点击下一步操作时调用的保存接口
+// 津贴申请-基本信息，账户信息，影像资料等点击下一步操作时调用的保存接口
 export function saveOrUpdateAllowanceUrl(data) {
   return request({
     url: getUrl('/agent/allowance/saveOrUpdateAllowance', 1),

src/api/ebiz/allowance/myInfo.js

@@ -1,7 +1,7 @@
 import request from '@/assets/js/utils/request'
 import getUrl from '@/assets/js/utils/get-url'
 
-// 我的资料-基本信息，账户信息，影响资料等查询详细数据信息的接口
+// 我的资料-基本信息，账户信息，影像资料等查询详细数据信息的接口
 export function getAllowanceBaseDetail(data) {
   return request({
     url: getUrl('/agent/allowanceBase/getAllowanceBaseDetail', 1),
@@ -10,7 +10,7 @@ export function getAllowanceBaseDetail(data) {
   })
 }
 
-// 我的资料-基本信息，账户信息，影响资料等点击下一步操作时调用的保存接口
+// 我的资料-基本信息，账户信息，影像资料等点击下一步操作时调用的保存接口
 export function saveOrUpdateAllowanceBase(data) {
   return request({
     url: getUrl('/agent/allowanceBase/saveOrUpdateAllowanceBase', 1),

src/components/ebiz/allowance/application/IndexBar.vue

@@ -79,7 +79,7 @@ export default {
         },
         {
           pageNo: 3,
-          pageItem: '影响资料',
+          pageItem: '影像资料',
           urlStr: '/allowance/application/AttachmentManagement',
           tabClass: '',
           imgCheckedUrl: this.$assetsUrl + 'images/allowance/yxzz.png',

src/components/ebiz/allowance/myInfo/IndexBar.vue

@@ -79,7 +79,7 @@ export default {
         },
         {
           pageNo: 3,
-          pageItem: '影响资料',
+          pageItem: '影像资料',
           urlStr: '/allowance/myInfo/AttachmentManagement',
           tabClass: '',
           imgCheckedUrl: this.$assetsUrl + 'images/allowance/yxzz.png',

src/components/ebiz/parentList/Parent.vue

@@ -2,8 +2,8 @@
   <div class='parent'>
     <van-index-bar>
       <div v-if='data.length > 0'>
-        <div v-for='parent in data' :key='parent.name'
+        <div class='bg-white border-b border-t' v-for='parent in data' :key='parent.name'>
-             class='flex ml15 mt10 pb10 content border-b align-items-c' @click='choose(parent)'>
+          <div class='flex ml15 pb10 pt10 content align-items-c' @click='choose(parent)'>
             <img class='w40  mr15 ' src='../../../assets/images/bnf_avatar.png' />
             <div class='c-gray-darker fs14'>
               <div>{{ parent.name }}</div>
@@ -13,6 +13,8 @@
             </div>
           </div>
         </div>
+
+      </div>
       <div v-else class='text-center'>
         <img class='mt40 w200' src='../../../assets/images/pic_page-non.png' />
         <p class='mt15'>{{ locationHashFlag !== -1 ? '暂无数据' : '暂无数据，请在我的资料或申请流程中添加父母信息' }}</p>
@@ -57,12 +59,28 @@ export default {
     this.getList()
   },
   mounted() {
+    setTimeout(() => {
+      // eslint-disable-next-line no-undef
+      EWebBridge.webCallAppInJs('webview_left_button', {
+        img: this.$assetsUrl + 'images/del-close-btn@3x.png',
+        intercept: '1' //是否拦截原生返回事件 1是 其他否
+      })
+    }, 100)
+    // 筛选按钮的点击事件
+    window.appCallBack = this.appCallBack
     let str = location.hash
     this.locationHashFlag = str.search(/myInfo/i)
     // 调用初始化加载，判断是否弹出Dialog弹出框的方法
     this.init()
   },
   methods: {
+    appCallBack(data) {
+      if (data.trigger == 'left_button_click') {
+        this.$jump({
+          flag: 'home'
+        })
+      }
+    },
     /**
      * @Description: 初始化加载，判断是否弹出Dialog弹出框的方法
      * @author:zhangqi
@@ -190,6 +208,10 @@ export default {
     border-bottom: 1px solid #d6d6d6;
   }
 
+  .border-t:nth-of-type(1) {
+    border-top: 1px solid #d6d6d6;
+  }
+
   .content:last-child {
     border: none;
   }

src/views/ebiz/allowance/application/BaseInfo.vue

@@ -289,8 +289,6 @@ export default {
               this.allowancePageFlag = '1'
               localStorage.setItem('allowancePageFlag', this.allowancePageFlag)
             }
-          } else {
-            this.$toast(res.resultMessage)
           }
         })
       } else {

src/views/ebiz/allowance/application/SignatureConfirmation/SignatureConfirmation.vue

@@ -1,24 +1,27 @@
 <template>
-  <div class="orderDetail-container">
+  <div class='orderDetail-container'>
-    <index-bar :allowance-no="$route.query.allowanceNo"></index-bar>
+    <index-bar :allowance-no='$route.query.allowanceNo' v-if='!isWeixin'></index-bar>
-    <div v-for="(item, index) in allowanceSignDTOLst" :key="index">
+    <div v-for='(item, index) in allowanceSignDTOLst' :key='index'>
       <!-- 申请人 -->
-      <div v-if="item.type == 1 && !isWeixin">
+      <div v-if='item.type == 1 && !isWeixin'>
-        <p class="fw600 border-gb">
+        <p class='fw600 border-gb'>
-          <span>申请人</span><span class="ml60">{{ allowanceApplyDTO.name }}</span>
+          <span>申请人</span><span class='ml60'>{{ allowanceApplyDTO.name }}</span>
         </p>
         <p>点击【签名】按钮，进行申请人签名</p>
-        <p class="border-gb">
+        <p class='border-gb'>
           <span>申请人：</span>
-          <van-button type="danger" color="#2E4591" class="ml5" size="small" @click="signFunc(item.type, item.id)" :disabled="isSure" v-no-more-click="1000">{{
+          <van-button type='danger' color='#2E4591' class='ml5' size='small' @click='signFunc(item.type, item.id)'
+                      :disabled='isSure' v-no-more-click='1000'>{{
               item.signStatus == '0' ? '签名' : '已签名'
-          }}</van-button>
+            }}
-          <img class="w60 h40 v-middle ml10" v-if="item.signPath" :src="imgUrl + item.signPath.replace(/\+/g, '%2B')" alt="" /><br />
+          </van-button>
+          <img class='w60 h40 v-middle ml10' v-if='item.signPath' :src="imgUrl + item.signPath.replace(/\+/g, '%2B')"
+               alt='' /><br />
         </p>
       </div>
 
-      <div v-if="item.type == 2">
+      <div v-if='item.type == 2'>
-        <div v-if="isWeixin" class="bg-white mt10 fs14 tips">
+        <div v-if='isWeixin' class='bg-white mt10 fs14 tips'>
           <p>
             尊敬的
             <span>{{ allowanceEnjoyDTO.name }}</span
@@ -26,54 +29,83 @@
           </p>
           <p>恭喜您获得国富人寿桂冠专属父母赡养津贴，需要您点击【签字】按钮，进行签字申请：</p>
         </div>
-        <p v-if="!isWeixin" class="fw600 border-gb">
+        <p v-if='!isWeixin' class='fw600 border-gb'>
-          <span>享受人</span><span class="ml60">{{ allowanceEnjoyDTO.name }}</span>
+          <span>享受人</span><span class='ml60'>{{ allowanceEnjoyDTO.name }}</span>
         </p>
-        <p v-if="!isWeixin">点击【签名】按钮，进行享受人签名</p>
+        <p v-if='!isWeixin'>点击【签名】按钮，进行享受人签名</p>
-        <p class="border-gb">
+        <p class='border-gb'>
-          <span v-if="!isWeixin">享受人：</span>
+          <span v-if='!isWeixin'>享受人：</span>
-          <van-button type="danger" color="#2E4591" class="ml5" size="small" @click="signFunc(item.type, item.id)" :disabled="isSure" v-no-more-click="1000">{{
+          <van-button type='danger' color='#2E4591' class='ml5' size='small' @click='signFunc(item.type, item.id)'
+                      :disabled='isSure' v-no-more-click='1000'>{{
               item.signStatus == '0' ? '签名' : '已签名'
-          }}</van-button>
+            }}
-          <img class="w60 h40 v-middle ml10" v-if="item.signPath" :src="imgUrl + item.signPath.replace(/\+/g, '%2B')" alt="" /><br />
+          </van-button>
+          <img class='w60 h40 v-middle ml10' v-if='item.signPath' :src="imgUrl + item.signPath.replace(/\+/g, '%2B')"
+               alt='' /><br />
           <!-- 享受人有分享功能 -->
           <van-button
-            type="danger"
+            type='danger'
-            color="#2E4591"
+            color='#2E4591'
-            class="ml65 mt10"
+            class='ml65 mt10'
-            v-if="!isWeixin"
+            v-if='!isWeixin'
-            size="small"
+            size='small'
             @click="share('0')"
-            :disabled="isSure"
+            :disabled='isSure'
-            v-no-more-click="1000"
+            v-no-more-click='1000'
-            >分享</van-button
+          >分享
+          </van-button
           >
         </p>
       </div>
     </div>
-    <van-button v-if="!isWeixin" type="danger" color="#2E4591" class="bottom-btn ffcb6b" @click="nextStep" v-no-more-click="1000">提交审批</van-button>
+    <van-button v-if='!isWeixin' type='danger' color='#2E4591' class='bottom-btn ffcb6b' @click='nextStep'
-    <SignTure :SignShow="SignShow" :signInfo="allowanceEnjoyDTO" @close="SignClose" @SignSuccessful="SignSuccessful"></SignTure>
+                v-no-more-click='1000'>提交审批
+    </van-button>
+    <SignTure :SignShow='SignShow' :signInfo='allowanceEnjoyDTO' @close='SignClose'
+              @SignSuccessful='SignSuccessful'></SignTure>
     <!-- 短信验证 -->
-    <van-dialog v-model="show" title="提示" show-cancel-button @confirm="authConfirm(authCode)" @cancel="clearTimer">
+    <van-dialog v-model='show' title='提示' show-cancel-button @confirm='authConfirm(authCode)' @cancel='clearTimer'>
-      <p class="p10 fs14">为确保是您本人操作，短信验证码已发送至您手机号{{ encyCustomerMobile }}，请您输入验证码以完成后续投保操作。</p>
+      <p class='p10 fs14'>为确保是您本人操作，短信验证码已发送至您手机号{{ encyCustomerMobile }}，请您输入验证码以完成后续投保操作。</p>
-      <van-cell-group class="flex align-items-c pr5 mb15">
+      <van-cell-group class='flex align-items-c pr5 mb15'>
-        <van-field maxlength="6" placeholder="请输入短信验证码" v-model="authCode" clearable label-width="0" />
+        <van-field maxlength='6' placeholder='请输入短信验证码' v-model='authCode' clearable label-width='0' />
-        <van-button type="danger" color="#2E4591" plain size="small" class="w160 p0" @click="getAuthCode" :disabled="codeDisabled" v-no-more-click="2000">{{
+        <van-button type='danger' color='#2E4591' plain size='small' class='w160 p0' @click='getAuthCode'
+                    :disabled='codeDisabled' v-no-more-click='2000'>{{
             codeDisabled ? `${countDown}s后重新获取` : '获取验证码'
-        }}</van-button>
+          }}
+        </van-button>
       </van-cell-group>
     </van-dialog>
   </div>
 </template>
 <script>
-import { Toast, CellGroup, Field, Dialog, Collapse, CollapseItem, Cell, Popup, Divider, RadioGroup, Radio, Tag } from 'vant'
+import {
+  Toast,
+  CellGroup,
+  Field,
+  Dialog,
+  Collapse,
+  CollapseItem,
+  Cell,
+  Popup,
+  Divider,
+  RadioGroup,
+  Radio,
+  Tag
+} from 'vant'
 import { getAllowanceDetail, saveOrUpdateAllowanceUrl, approveInit } from '@/api/ebiz/allowance/allowance'
 import SignTure from './component/SignTure'
 import config from '@/config'
 import { getWhitelist } from '@/api/ebiz/whitelist'
 import { weixinShare } from '@/assets/js/utils/wxShare.js'
 import { checkPhone } from '@/api/ebiz/customer/customer'
-import { getSignInvalid, checkSignInvalid, getAuthCode, autchCodeCheck, getRecognitionUrl, getRecognitionResult } from '@/api/ebiz/sale/sale'
+import {
+  getSignInvalid,
+  checkSignInvalid,
+  getAuthCode,
+  autchCodeCheck,
+  getRecognitionUrl,
+  getRecognitionResult
+} from '@/api/ebiz/sale/sale'
 import { getShareParam } from '@/api/ebiz/cardList/cardList.js'
 import IndexBar from '@/components/ebiz/allowance/application/IndexBar'
 
@@ -641,10 +673,13 @@ export default {
             this.$jump({
               flag: 'h5',
               extra: {
-                url: location.origin + `/#/allowance/application/List`
+                url: location.origin + `/#/allowance/application/List?active=commit`
               },
               routerInfo: {
-                path: '/allowance/application/List'
+                path: '/allowance/application/List',
+                query: {
+                  active: 'commit'
+                }
               }
             })
           }, 1000)
@@ -656,7 +691,7 @@ export default {
   }
 }
 </script>
-<style lang="scss">
+<style lang='scss'>
 #app {
   .van-dialog__confirm,
   .van-dialog__confirm:active {
@@ -664,17 +699,20 @@ export default {
   }
 }
 </style>
-<style lang="scss" scoped>
+<style lang='scss' scoped>
 .orderDetail-container {
   background-color: #fff;
   min-height: 100vh;
+
   p {
     padding: 10px 20px;
   }
+
   /deep/ .van-popup {
     width: 100%;
     height: 100%;
   }
+
   .tips {
     line-height: 20px;
   }

src/views/ebiz/allowance/myInfo/BaseInfo.vue

@@ -343,7 +343,7 @@ export default {
         this.$jump({
           flag: 'navigation',
           extra: {
-            title: '津贴申请信息',
+            title: '填写津贴申请信息',
             hiddenRight: '1'
           }
         })
@@ -407,7 +407,7 @@ export default {
       this.$jump({
         flag: 'navigation',
         extra: {
-          title: '津贴申请信息',
+          title: '填写津贴申请信息',
           hiddenRight: '1'
         }
       })