From 85e6be4c207ea202c9926c43b033891349059f8c Mon Sep 17 00:00:00 2001
From: jlw <ji.liangwei@ebiz-fooge.com>
Date: Sat, 9 May 2020 09:40:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=93=B6=E4=BF=9D=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                             |  1 +
 package-lock.json                      | 44 +++++++++++++++++++-------
 src/views/ebiz/report/reportDetail.vue |  4 +++
 src/views/ebiz/report/reportList.vue   | 36 +++++++++++++++++----
 4 files changed, 66 insertions(+), 19 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..3c3629e64
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/package-lock.json b/package-lock.json
index 44d9b6fc6..bc73d1468 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6387,7 +6387,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -6408,12 +6409,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -6428,17 +6431,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -6555,7 +6561,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -6567,6 +6574,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -6581,6 +6589,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -6588,12 +6597,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -6612,6 +6623,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -6692,7 +6704,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -6704,6 +6717,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -6789,7 +6803,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -6825,6 +6840,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -6844,6 +6860,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -6887,12 +6904,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -12770,7 +12789,8 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
       "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "rx-lite-aggregates": {
       "version": "4.0.8",
diff --git a/src/views/ebiz/report/reportDetail.vue b/src/views/ebiz/report/reportDetail.vue
index f572b2dcc..f12fe99e9 100644
--- a/src/views/ebiz/report/reportDetail.vue
+++ b/src/views/ebiz/report/reportDetail.vue
@@ -68,7 +68,11 @@ export default {
     if (localStorage.title == '团险') {
       this.title = '健康险'
     } else if (localStorage.title == '银代') {
+      if(localStorage.name){
+        this.title=localStorage.name
+      }else{
       this.title = '银保'
+      }
     } else if (localStorage.title == '个险') {
       if (localStorage.name) {
         this.title = localStorage.name
diff --git a/src/views/ebiz/report/reportList.vue b/src/views/ebiz/report/reportList.vue
index 64cebefa1..21eb07322 100644
--- a/src/views/ebiz/report/reportList.vue
+++ b/src/views/ebiz/report/reportList.vue
@@ -60,13 +60,29 @@
       >机构明细</van-button>
     </div>
     <van-button
-      v-show="this.active != '0' "
+      v-show="this.active != '0'&&this.active!='4' "
       type="danger"
       class="bottom-btn"
       @click="goDetail('1')"
       v-no-more-click="1000"
       size="large"
     >查看明细</van-button>
+    <div class="flex justify-content-s bottom-btn bg-white" v-show="this.active == '4'">
+      <van-button
+        class="bottom0 left0"
+        type="danger"
+        @click="goDetail('1')"
+        v-no-more-click="1000"
+        size="large"
+      >银行明细</van-button>
+      <van-button
+        class="bottom0 left0"
+        type="danger"
+        size="large"
+        v-no-more-click="1000"
+        @click="goDetail('3')"
+      >机构明细</van-button>
+    </div>
   </div>
 </template>
 
@@ -145,16 +161,22 @@ export default {
     },
     goDetail(val) {
       let name = ''
-      if (val == '2') {
-        name = '机构名称'
-        localStorage.name = name
-      } else {
-        localStorage.removeItem('name')
-      }
       let data = {
         resultsName: this.title,
         resultsType: val
       }
+      if (val == '2') {
+        name = '机构名称'
+        localStorage.name = name
+      } else if (val == '3'){
+        name = '机构名称'
+        localStorage.name = name
+        data.resultsName='银代'
+        data.resultsType='2'
+
+      }else {
+        localStorage.removeItem('name')
+      }
       this.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true, // 禁用背景点击