From 06e560e929fb76d1a8a163040f6e795bb9f62a4e Mon Sep 17 00:00:00 2001
From: pangxingyue <120277894@qq.com>
Date: Fri, 5 Mar 2021 16:16:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=20=E6=8A=95=E4=BF=9D=E4=BA=BA=E4=BF=A1=E6=81=AF=E9=A1=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/index.js                           |  4 +-
 src/router/ebiz/insureAgain.js                | 20 ++++--
 src/views/ebiz/insureAgain/DropdownBox.vue    | 57 ---------------
 src/views/ebiz/insureAgain/InfoCell.vue       | 63 ----------------
 .../ebiz/insureAgain/InsureAgainDetail.vue    | 71 -------------------
 .../ebiz/insureAgain/InsureInformation.vue    | 64 ++++++++---------
 .../insureAgain/NotificationInformation.vue   |  2 +-
 .../ebiz/insureAgain/NotificationItem.vue     |  2 +-
 .../ebiz/insureAgain/ProductInformation.vue   |  4 +-
 .../ebiz/insureAgain/SignConfirmation.vue     |  4 +-
 src/views/ebiz/insureAgain/StateRadio.vue     | 33 ---------
 src/views/ebiz/insureAgain/index.vue          | 44 +++++++++---
 12 files changed, 91 insertions(+), 277 deletions(-)
 delete mode 100644 src/views/ebiz/insureAgain/DropdownBox.vue
 delete mode 100644 src/views/ebiz/insureAgain/InfoCell.vue
 delete mode 100644 src/views/ebiz/insureAgain/InsureAgainDetail.vue
 delete mode 100644 src/views/ebiz/insureAgain/StateRadio.vue

diff --git a/src/config/index.js b/src/config/index.js
index 21b75b18e..7139e3589 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -11,7 +11,7 @@ let apiDomain, imgDomain, assetsUrl, mainUrl, payUrl, zssqUrl ,REQ_PWD, CACHE_EN
 console.log('环境：', process.env.VUE_APP_FLAG)
 switch (process.env.VUE_APP_FLAG) {
   case 'dev':
-    apiDomain = 'http://139.199.50.151:7000/api/v2' // 国富api ///api/v1
+    apiDomain = 'http://139.199.50.151:7000/api/v1' // 国富api ///api/v1
     imgDomain = 'http://211.159.248.123:7012/updown' // dev
     // 静态服务资源
     assetsUrl = 'http://139.199.50.151:8000/app/'
@@ -22,7 +22,7 @@ switch (process.env.VUE_APP_FLAG) {
     zssqUrl = 'http://139.199.50.151/html/test/index.html#/'
       REQ_PWD = '41424344454631323334353637383930'
     CACHE_ENCRYP = '41424344454631323334353637383930'
-    API_VERSION = 'v2'
+    API_VERSION = 'v1'
     break
   case 'uat':
     apiDomain = 'http://115.159.235.59:7000/api/v1' // 国富api
diff --git a/src/router/ebiz/insureAgain.js b/src/router/ebiz/insureAgain.js
index 726dd6ae3..46dd21d1d 100644
--- a/src/router/ebiz/insureAgain.js
+++ b/src/router/ebiz/insureAgain.js
@@ -1,5 +1,6 @@
 const InsureAgain = () => import('@/views/ebiz/insureAgain')
-const InsureAgainDetail = () => import('@/views/ebiz/insureAgain/InsureAgainDetail')
+const uncommitInsureDetail = () => import('@/views/ebiz/insureAgain/uncommitInsureDetail')
+const commitInsureDetail = () => import('@/views/ebiz/insureAgain/commitInsureDetail')
 const InsureAgainProgress = () => import('@/views/ebiz/insureAgain/InsureAgainProgress')
 const InsureAgainPayment = () => import('@/views/ebiz/insureAgain/Payment')
 const PaymentResult = () => import('@/views/ebiz/insureAgain/PaymentResult')
@@ -15,14 +16,23 @@ export default [
     }
   },
   {
-    // 重新投保首页
-    path: '/insureAgain/insureAgainDetail',
-    name: 'InsureAgainDetail',
-    component: InsureAgainDetail,
+    // 重新投保详情页
+    path: '/insureAgain/uncommitInsureDetail',
+    name: 'uncommitInsureDetail',
+    component: uncommitInsureDetail,
     meta: {
       title: '可申请重新投保保单详情'
     }
   },
+  {
+    // 重新投保详情页
+    path: '/insureAgain/commitInsureDetail',
+    name: 'commitInsureDetail',
+    component: commitInsureDetail,
+    meta: {
+      title: '重新投保保单详情'
+    }
+  },
   {
     // 投保流程首页
     path: '/insureAgain/progress',
diff --git a/src/views/ebiz/insureAgain/DropdownBox.vue b/src/views/ebiz/insureAgain/DropdownBox.vue
deleted file mode 100644
index 52c4aa118..000000000
--- a/src/views/ebiz/insureAgain/DropdownBox.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-  <div :class="gutter ? 'mb10' : ''">
-    <van-cell is-link>
-      <template #title>
-        <slot name="boxTitle">
-          <span class="title">{{ title }}</span>
-        </slot>
-      </template>
-      <template #right-icon>
-        <slot name="right-title"></slot>
-        <van-icon v-show="!isOpened" name="arrow-down" @click.native="isOpened = !isOpened" />
-        <van-icon v-show="isOpened" name="arrow-up" @click.native="isOpened = !isOpened" />
-      </template>
-    </van-cell>
-
-    <div class="content bg-white" v-show="isOpened">
-      <slot>
-        <p style="text-align: center;" class="p10">暂无内容</p>
-      </slot>
-    </div>
-
-    <slot name="footer"></slot>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'DropdownBox',
-  props: {
-    gutter: {
-      type: Boolean,
-      default: true
-    },
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  data() {
-    return {
-      isOpened: true
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.title {
-  color: #ff0000;
-  font-weight: bold;
-}
-
-/deep/ .van-cell {
-  display: flex;
-  align-items: center;
-}
-</style>
diff --git a/src/views/ebiz/insureAgain/InfoCell.vue b/src/views/ebiz/insureAgain/InfoCell.vue
deleted file mode 100644
index 7cb673b14..000000000
--- a/src/views/ebiz/insureAgain/InfoCell.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<!--
- * @Author: PangXingYue
- * @Date: 2021-03-03 09:07:22
- * @LastEditTime: 2021-03-03 17:22:23
- * @LastEditors: PangXingYue
- * @Description: 
- * @FilePath: \ebiz-h5\src\views\ebiz\insureAgain\InfoCell.vue
--->
-<template>
-  <van-field label-width="12.2em">
-    <template #label>
-      <slot name="cellLabel">
-        <span :style="styleObj">{{ label }}</span>
-      </slot>
-    </template>
-    <template #input>
-      <slot>
-        <span :style="styleObj">{{ value }}</span>
-      </slot>
-    </template>
-  </van-field>
-</template>
-
-<script>
-import { Field } from 'vant'
-export default {
-  name: 'InfoCell',
-  components: {
-    [Field.name]: Field
-  },
-  props: {
-    value: {
-      type: [String, Number],
-      default: '暂无数据',
-      required: false
-    },
-    label: {
-      type: String
-    },
-    color: {
-      type: String,
-      default: '#000'
-    }
-  },
-  computed: {
-    styleObj() {
-      return {
-        color: this.color
-      }
-    }
-  },
-  data() {
-    return {}
-  },
-  created() {}
-}
-</script>
-
-<style lang="scss" scoped>
-/deep/ .van-field__control {
-  text-align: center;
-}
-</style>
diff --git a/src/views/ebiz/insureAgain/InsureAgainDetail.vue b/src/views/ebiz/insureAgain/InsureAgainDetail.vue
deleted file mode 100644
index 3905ad3d3..000000000
--- a/src/views/ebiz/insureAgain/InsureAgainDetail.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-  <div>
-    <DropdownBox>
-      <template #boxTitle>
-        <span>投保人信息</span>
-      </template>
-      <InfoCell label="保单号" />
-      <InfoCell label="生效日期" />
-      <InfoCell label="保单状态" />
-      <InfoCell label="签收状态" />
-    </DropdownBox>
-    <DropdownBox>
-      <template #boxTitle>
-        <span>投保人信息</span>
-      </template>
-      <InfoCell label="投保人" />
-      <InfoCell label="性别" />
-      <InfoCell label="证件类型" />
-      <InfoCell label="证件号码" />
-      <InfoCell label="联系电话" />
-    </DropdownBox>
-    <DropdownBox>
-      <template #boxTitle>
-        <span>被保险人信息</span>
-      </template>
-      <InfoCell label="姓名" />
-      <InfoCell label="性别" />
-      <InfoCell label="证件类型" />
-      <InfoCell label="证件号码" />
-      <InfoCell label="联系电话" />
-    </DropdownBox>
-    <DropdownBox>
-      <template #boxTitle>
-        <span>受益人信息</span>
-      </template>
-      <InfoCell label="受益人" />
-      <InfoCell label="姓名" />
-      <InfoCell label="性别" />
-      <InfoCell label="受益比例" />
-      <InfoCell label="证件类型" />
-      <InfoCell label="证件号码" />
-    </DropdownBox>
-    <DropdownBox>
-      <template #boxTitle>
-        <span>险种类型</span>
-      </template>
-      <InfoCell label="险种名称" />
-      <InfoCell label="保险期间" />
-      <InfoCell label="交费期间" />
-      <InfoCell label="险种保额(元)" />
-      <InfoCell label="险种保费(元)" />
-    </DropdownBox>
-  </div>
-</template>
-
-<script>
-import DropdownBox from './DropdownBox'
-import InfoCell from './InfoCell'
-
-export default {
-  components: {
-    DropdownBox,
-    InfoCell
-  },
-  data() {
-    return {}
-  }
-}
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/ebiz/insureAgain/InsureInformation.vue b/src/views/ebiz/insureAgain/InsureInformation.vue
index 0e3bcec7a..54cea3d1b 100644
--- a/src/views/ebiz/insureAgain/InsureInformation.vue
+++ b/src/views/ebiz/insureAgain/InsureInformation.vue
@@ -4,61 +4,61 @@
       <template #boxTitle>
         <span class="title">投保人信息</span>
       </template>
-      <InfoCell label="姓名" value="zjp" />
-      <InfoCell label="证件类型" />
-      <InfoCell label="出生日期" />
-      <InfoCell label="证件截止日期" />
+      <InfoCell label="姓名">zjp</InfoCell>
+      <InfoCell label="证件类型"></InfoCell>
+      <InfoCell label="出生日期"></InfoCell>
+      <InfoCell label="证件截止日期"></InfoCell>
       <InfoCell label="性别">
         <van-button class="mr10" size="small" type="danger" round>男</van-button>
         <van-button plain size="small" type="danger" round>女</van-button>
       </InfoCell>
-      <InfoCell label="国籍" />
+      <InfoCell label="国籍"></InfoCell>
       <InfoCell label="婚姻状况">
         <input class="input" type="text" value="" placeholder="请输入" />
       </InfoCell>
-      <InfoCell label="职业类别" />
-      <InfoCell label="移动电话" />
-      <InfoCell label="电子邮箱" />
+      <InfoCell label="职业类别"></InfoCell>
+      <InfoCell label="移动电话"></InfoCell>
+      <InfoCell label="电子邮箱"></InfoCell>
       <InfoCell label="有无社保">
         <van-button class="mr10" size="small" type="danger" round>有</van-button>
         <van-button plain size="small" type="danger" round>无</van-button>
       </InfoCell>
-      <InfoCell label="税收居民身份" />
-      <InfoCell label="联系地址" />
+      <InfoCell label="税收居民身份"></InfoCell>
+      <InfoCell label="联系地址"></InfoCell>
     </DropdownBox>
     <DropdownBox>
       <template #boxTitle>
         <span class="title">被保险人信息</span>
       </template>
-      <InfoCell label="姓名" />
-      <InfoCell label="证件类型" />
-      <InfoCell label="证件号码" />
-      <InfoCell label="出生日期" />
+      <InfoCell label="姓名"></InfoCell>
+      <InfoCell label="证件类型"></InfoCell>
+      <InfoCell label="证件号码"></InfoCell>
+      <InfoCell label="出生日期"></InfoCell>
       <InfoCell label="性别">
         <van-button class="mr10" size="small" type="danger" round>男</van-button>
         <van-button plain size="small" type="danger" round>女</van-button>
       </InfoCell>
-      <InfoCell label="国籍" />
+      <InfoCell label="国籍"></InfoCell>
       <InfoCell label="婚姻状况">
         <input class="input" type="text" value="" placeholder="请输入" />
       </InfoCell>
-      <InfoCell label="职业类别" />
+      <InfoCell label="职业类别"></InfoCell>
       <InfoCell label="有无社保">
         <van-button class="mr10" size="small" type="danger" round>有</van-button>
         <van-button plain size="small" type="danger" round>无</van-button>
       </InfoCell>
-      <InfoCell label="税收居民身份" />
-      <InfoCell label="联系地址" />
+      <InfoCell label="税收居民身份"></InfoCell>
+      <InfoCell label="联系地址"></InfoCell>
     </DropdownBox>
     <DropdownBox>
       <template #boxTitle>
         <span class="title">受益人信息</span>
       </template>
-      <InfoCell label="受益类型" />
-      <InfoCell label="是被保险人的" />
-      <InfoCell label="姓名" />
-      <InfoCell label="证件类型" />
-      <InfoCell label="证件截止日期" />
+      <InfoCell label="受益类型"></InfoCell>
+      <InfoCell label="是被保险人的"></InfoCell>
+      <InfoCell label="姓名"></InfoCell>
+      <InfoCell label="证件类型"></InfoCell>
+      <InfoCell label="证件截止日期"></InfoCell>
       <InfoCell label="性别">
         <van-button class="mr10" size="small" type="danger" round>男</van-button>
         <van-button plain size="small" type="danger" round>女</van-button>
@@ -72,10 +72,10 @@
       <InfoCell label="移动电话">
         <input class="input" type="text" value="" placeholder="请输入" />
       </InfoCell>  
-      <InfoCell label="联系地址" />
-      <InfoCell label="职业类别" />
-      <InfoCell label="受益顺序" />
-      <InfoCell label="受益比例" />
+      <InfoCell label="联系地址"></InfoCell>
+      <InfoCell label="职业类别"></InfoCell>
+      <InfoCell label="受益顺序"></InfoCell>
+      <InfoCell label="受益比例"></InfoCell>
     </DropdownBox>
     <DropdownBox>
       <template #boxTitle>
@@ -85,9 +85,9 @@
         <van-button class="mr10" size="small" type="danger" round>男</van-button>
         <van-button plain size="small" type="danger" round>女</van-button>
       </InfoCell>
-      <InfoCell label="账户名称" />
-      <InfoCell label="开户银行" />
-      <InfoCell label="银行账号" />
+      <InfoCell label="账户名称"></InfoCell>
+      <InfoCell label="开户银行"></InfoCell>
+      <InfoCell label="银行账号"></InfoCell>
     </DropdownBox>
 
     <van-button type="danger" class="bottom-btn" v-no-more-click="1000" @click="nextStep">下一步</van-button>
@@ -96,8 +96,8 @@
 
 <script>
 import { bus } from './bus'
-import InfoCell from './InfoCell'
-import DropdownBox from './DropdownBox'
+import InfoCell from '@/components/ebiz/insureAgain/InfoCell'
+import DropdownBox from '@/components/ebiz/insureAgain/DropdownBox'
 export default {
   name: 'InsureInformation',
   components: {
diff --git a/src/views/ebiz/insureAgain/NotificationInformation.vue b/src/views/ebiz/insureAgain/NotificationInformation.vue
index bf4a8b18e..1c70642ec 100644
--- a/src/views/ebiz/insureAgain/NotificationInformation.vue
+++ b/src/views/ebiz/insureAgain/NotificationInformation.vue
@@ -34,7 +34,7 @@
 <script>
 import { bus } from './bus'
 import NotificationItem from './NotificationItem'
-import DropdownBox from './DropdownBox'
+import DropdownBox from '@/components/ebiz/insureAgain/DropdownBox'
 export default {
   components: {
     NotificationItem,
diff --git a/src/views/ebiz/insureAgain/NotificationItem.vue b/src/views/ebiz/insureAgain/NotificationItem.vue
index 89f405295..234ed7ce1 100644
--- a/src/views/ebiz/insureAgain/NotificationItem.vue
+++ b/src/views/ebiz/insureAgain/NotificationItem.vue
@@ -15,7 +15,7 @@
 
 <script>
 import { RadioGroup, Radio } from 'vant'
-import InfoCell from './InfoCell'
+import InfoCell from '@/components/ebiz/insureAgain/InfoCell'
 export default {
   name: 'NotificationItem',
   components: {
diff --git a/src/views/ebiz/insureAgain/ProductInformation.vue b/src/views/ebiz/insureAgain/ProductInformation.vue
index 9d6cf6dda..211e718fe 100644
--- a/src/views/ebiz/insureAgain/ProductInformation.vue
+++ b/src/views/ebiz/insureAgain/ProductInformation.vue
@@ -84,8 +84,8 @@
 
 <script>
 import { bus } from './bus'
-import InfoCell from './InfoCell'
-import DropdownBox from './DropdownBox'
+import InfoCell from '@/components/ebiz/insureAgain/InfoCell'
+import DropdownBox from '@/components/ebiz/insureAgain/DropdownBox'
 import ReadingAgreement from '@/components/ebiz/insureAgain/ReadingAgreement'
 import { Checkbox, RadioGroup, Radio, Dialog } from 'vant'
 export default {
diff --git a/src/views/ebiz/insureAgain/SignConfirmation.vue b/src/views/ebiz/insureAgain/SignConfirmation.vue
index 7acabb512..206c6d3a2 100644
--- a/src/views/ebiz/insureAgain/SignConfirmation.vue
+++ b/src/views/ebiz/insureAgain/SignConfirmation.vue
@@ -41,8 +41,8 @@
 </template>
 
 <script>
-import DropdownBox from './DropdownBox'
-import StateRadio from './StateRadio'
+import DropdownBox from '@/components/ebiz/insureAgain/DropdownBox'
+import StateRadio from '@/components/ebiz/insureAgain/StateRadio'
 export default {
   name: 'SignConfirmation',
   components: {
diff --git a/src/views/ebiz/insureAgain/StateRadio.vue b/src/views/ebiz/insureAgain/StateRadio.vue
deleted file mode 100644
index a551326c1..000000000
--- a/src/views/ebiz/insureAgain/StateRadio.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
-  <van-radio-group v-model="result">
-    <van-radio :disabled="disabled" :name="1" />
-    <van-radio checked-color="#19970e" v-show="false" :name="2" />
-  </van-radio-group>
-</template>
-
-<script>
-import { Radio, RadioGroup } from 'vant'
-export default {
-  name: 'StateRadio',
-  components: {
-    [Radio.name]: Radio,
-    [RadioGroup.name]: RadioGroup
-  },
-  props: {
-    result: {
-      type: Number,
-      default: 2
-    }
-  },
-  computed: {
-    disabled() {
-      return this.result !== 1
-    }
-  },
-  data() {
-    return {}
-  }
-}
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/views/ebiz/insureAgain/index.vue b/src/views/ebiz/insureAgain/index.vue
index df8789ccd..e52d29ab2 100644
--- a/src/views/ebiz/insureAgain/index.vue
+++ b/src/views/ebiz/insureAgain/index.vue
@@ -9,7 +9,7 @@
     </van-sticky>
     <div class="container">
       <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
-        <van-list ref="uncommitted" v-model="loading" :finished="finished" :finished-text="finishedText" @load="loadMore">
+        <van-list ref="uncommitted" v-model="loading" :finished="finished" :finished-text="finishedText" :immediate-check="false" @load="loadMore">
           <div v-if="insureList.length>0">
             <Order v-for="(order,index) in insureList" :key="index" :order="order">
               <p v-if="active === 'uncommit'" class="name mb8">
@@ -26,9 +26,15 @@
                   <span class="ml5 span">{{ order.stateName }}</span>
                 </p>
               </div>
+
               <template #btns>
-                <van-button size="small" round type="danger" @click="insureAgainDetail" plain>查看详情</van-button>
-                <van-button class="ml10" size="small" round type="danger" @click="insureAgain">重新投保</van-button>
+                <div v-if="active === 'uncommit'">
+                  <van-button size="small" round type="danger" @click="uncommitInsureDetail" plain>查看详情</van-button>
+                  <van-button class="ml10" size="small" round type="danger" @click="insureAgain">重新投保</van-button>
+                </div>
+                <div v-if="active === 'commit'">
+                  <van-button class="ml10" size="small" round type="danger" @click="commitInsureDetail">查看投保单</van-button>
+                </div>
               </template>
             </Order>
           </div>
@@ -72,7 +78,7 @@ import Order from '@/components/ebiz/insureAgain/Order'
 import ReadingAgreement from '@/components/ebiz/insureAgain/ReadingAgreement'
 export default {
   name: 'InsureAgain',
-  components: {    
+  components: {
     Order,
     ReadingAgreement,
     [Search.name]: Search,
@@ -99,6 +105,16 @@ export default {
       radio: ''
     }
   },
+  created() {
+     let pageInfo = {
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        orderType: this.active,
+        name: this.searchName,
+        desensitizType: this.active === 'uncommit' ? 1 : 0
+      }
+    this.getOrderList(pageInfo)
+  },
   mounted() {
     setTimeout(() => {
       // eslint-disable-next-line no-undef
@@ -197,15 +213,27 @@ export default {
       }, 100)
       this.isAgreementShow = true
     },
-    insureAgainDetail(order) {
-      localStorage.orderNo = order.orderInfoDTO.orderNo
+    uncommitInsureDetail(order) {
+      // localStorage.orderNo = order.orderInfoDTO.orderNo
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + '/#/insureAgain/insureAgainDetail'
+          url: location.origin + '/#/insureAgain/uncommitInsureDetail'
         },
         routerInfo: {
-          path: '/insureAgain/insureAgainDetail'
+          path: '/insureAgain/uncommitInsureDetail'
+        }
+      })
+    },
+     commitInsureDetail(order) {
+      // localStorage.orderNo = order.orderInfoDTO.orderNo
+      this.$jump({
+        flag: 'h5',
+        extra: {
+          url: location.origin + '/#/insureAgain/commitInsureDetail'
+        },
+        routerInfo: {
+          path: '/insureAgain/commitInsureDetail'
         }
       })
     },