From 2d9dfdff4008167aaa5d5862d890d4b562764b64 Mon Sep 17 00:00:00 2001
From: "yang.huaxiang" <yang.huaxiang@ebiz-fooge.com>
Date: Mon, 28 Dec 2020 17:44:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=90=86=E8=B5=94=E5=A4=84=E7=90=86:=20?=
 =?UTF-8?q?=E7=90=86=E8=B5=94=E6=96=B0=E5=A2=9E=E7=9C=81=E5=B8=82=E5=8C=BA?=
 =?UTF-8?q?=E4=BC=A0=E5=85=A5=20--=E6=8F=90=E4=BA=A4=E4=BA=BA=EF=BC=9A?=
 =?UTF-8?q?=E9=98=B3=E5=8D=8E=E7=A5=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/claims/ApplyInfo.vue | 45 +++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/src/views/ebiz/claims/ApplyInfo.vue b/src/views/ebiz/claims/ApplyInfo.vue
index 2fc11451c..38f6cbe28 100644
--- a/src/views/ebiz/claims/ApplyInfo.vue
+++ b/src/views/ebiz/claims/ApplyInfo.vue
@@ -173,6 +173,16 @@
         placeholder="请选择"
         @click="toSelect('5')"
       />
+      <van-field
+        v-model="areaStr"
+        label="开户银行省市"
+        placeholder="请选择"
+        required
+        @click="areaSelect"
+        readonly
+        v-validate="'required'"
+        data-vv-name="开户银行省市"
+      />
       <van-field
         v-model="userInfo.applyerBankAccountNo"
         label="银行卡号"
@@ -403,6 +413,18 @@
       <BankCardScan :scanShow="isScans" @getScanInfo="getBankCardInfo" :clear="isClear"></BankCardScan>
     </van-popup>
 
+    <van-popup position="bottom" v-model="isAreaListShow" :lazy-render="false">
+      <van-area
+        ref="areaSelect"
+        title="请选择省市"
+        :visible-item-count="4"
+        :columns-num="2"
+        :area-list="areaList"
+        @confirm="setBankArea"
+        @cancel="isAreaListShow = false"
+      />
+    </van-popup>
+
     <div class="bottom-btn bg-white">
       <van-button type="danger" size="large" @click="nextStep" v-no-more-click="1000">下一步</van-button>
     </div>
@@ -442,6 +464,7 @@ import { getIdentityInfo, onDateConfirm, effectiveDataTypeChange } from '../sale
 import occupationList from '@/components/ebiz/occipation/data/occupation'
 import getAreaName from '@/assets/js/utils/get-area-name'
 import { getWhitelist } from '@/api/ebiz/whitelist'
+import areaList from '@/assets/js/utils/area'
 
 export default {
   name: 'applyInfo',
@@ -473,6 +496,11 @@ export default {
       countDownNum: 0,
       countDownTimer: null,
       isPassedCardCheck: false,
+      isAreaListShow: false, //开户行
+      areaList,
+      areaStr: '',
+      // change: '', //待修改！！
+      // OtherFeesList: [], //暂定其他费用的数组
       customerNo: '', //客户编号
       DataIndex: '', //点击客户的index，用来获取对应客户信息
       currentDate: new Date(), //当前时间
@@ -517,6 +545,8 @@ export default {
         applyerNationatlity: 'CHN', // 国家/地区
         applyerBankAccountName: '', // 账户户名
         applyerBankName: '', // 开户银行
+        applyAccBankProvince: '', //开户省
+        applyAccBankCity: '', //开户市
         applyerBankCode: '', //银行编码
         applyerBankAccountNo: '', // 银行卡号
         certiIsLong: '', //是否长期
@@ -656,6 +686,18 @@ export default {
       this.sid = ''
       this.code = ''
     },
+    areaSelect() {
+      this.isAreaListShow = true
+      this.$refs['areaSelect'].reset('450000')
+    },
+    setBankArea(areaInfo) {
+      let province = areaInfo[0]
+      let city = areaInfo[1]
+      this.userInfo.applyAccBankProvince = province.code
+      this.userInfo.applyAccBankCity = city.code
+      this.isAreaListShow = false
+      this.areaStr = `${province.name}-${city.name}`
+    },
     init() {
       let data = {
         slaveStatus: this.slaveStatus,
@@ -1206,6 +1248,9 @@ export default {
       //     that.userInfo.isPettyCase = '1'
       //     break
       // }
+      if (!this.userInfo.applyAccBankProvince || this.userInfo.applyAccBankProvince == '' || !this.userInfo.applyAccBankCity || this.userInfo.applyAccBankCity == '') {
+        return this.$toast('请选择开户行所在地')
+      }
       that.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true, // 禁用背景点击

From 4d65c82327a32c94266b9fa704c68dcf55212857 Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Fri, 29 Jan 2021 10:40:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E4=B9=A6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0M0034/M0035=E4=BA=A7=E5=93=81=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/data-dictionary.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index a1db9e8cd..ac2842605 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -1793,6 +1793,16 @@ export default {
       shortName: '寿险',
       name: '国富人寿附加一年期定期寿险',
       code: 'GFRS_A0006'
+    },
+    {
+      shortName: '重疾险',
+      name: '国富人寿国富民安重大疾病保险（2021版）',
+      code: 'GFRS_M0034'
+    },
+    {
+      shortName: '重疾险',
+      name: '国富人寿八桂无忧重大疾病保险（C款）',
+      code: 'GFRS_M0035'
     }
   ],
   // 职级

From 9c2bd15b163f27abd85f2c29db5635b87879b809 Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Thu, 4 Feb 2021 11:34:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/product-store/StoreDetail.vue | 37 +++++++++++++++++---
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/views/ebiz/product-store/StoreDetail.vue b/src/views/ebiz/product-store/StoreDetail.vue
index 143fe3483..82b3e84ca 100644
--- a/src/views/ebiz/product-store/StoreDetail.vue
+++ b/src/views/ebiz/product-store/StoreDetail.vue
@@ -50,9 +50,16 @@
       <template v-if="redirectUrl">
         <iframe v-show="thirdUrlReady" style="width: 100vw; min-height: 100vh;" :src="redirectUrl" frameborder="0"></iframe>
       </template>
-      <template v-else>
+      <template v-if="detailImg">
         <img id="detailImg" v-if="detailImg" :src="$assetsUrl + detailImg" />
       </template>
+      <template v-if="imgList">
+        <van-grid :column-num="3">
+          <van-grid-item v-for="(img, i) in imgList" :key="i" @click="prevImg(i)">
+            <van-image fit="cover" :src="$assetsUrl + img" />
+          </van-grid-item>
+        </van-grid>
+      </template>
     </div>
     <van-button class="bottom-btn" :disabled="!isCanCheck1 || !isCanCheck2" v-if="isWeixin && bottomBtnShow" type="danger" @click="check" v-no-more-click="1000"
       >查看</van-button
@@ -67,7 +74,7 @@
 </template>
 
 <script>
-import { NoticeBar, Field, Radio, Popup, RadioGroup, Toast } from 'vant'
+import { NoticeBar, Field, Radio, Popup, RadioGroup, Toast, Grid, GridItem, Image as VanImage, ImagePreview } from 'vant'
 import icon from '@/assets/images/jilu@3x.png'
 import { getShopList, saveShareTrack } from '@/api/ebiz/product-store/product-store'
 
@@ -78,7 +85,11 @@ export default {
     [Radio.name]: Radio,
     [RadioGroup.name]: RadioGroup,
     [Popup.name]: Popup,
-    [Field.name]: Field
+    [Field.name]: Field,
+    [Grid.name]: Grid,
+    [GridItem.name]: GridItem,
+    [VanImage.name]: VanImage,
+    [ImagePreview.name]: ImagePreview
   },
   props: {
     mallId: {
@@ -122,6 +133,7 @@ export default {
       },
       loaded: false,
       detailImg: '',
+      imgList: [],
       bottomBtnShow: false,
       redirectUrl: '',
       thirdUrlReady: false
@@ -149,6 +161,12 @@ export default {
     this.getShopList({ id: this.mallId })
   },
   methods: {
+    prevImg(i) {
+      let imgs = this.imgList.map(img => {
+        return this.$assetsUrl + img
+      })
+      ImagePreview(imgs, i)
+    },
     //获取商城详情
     enterProtocol() {
       this.$jump({
@@ -203,7 +221,12 @@ export default {
               })
               window['appCallBack'] = this.appCallBack
             }
-            this.detailImg = res.content.detailImgUrl
+            let imgs = res.content.detailImgUrl.split(',')
+            if (imgs.length > 1) {
+              this.imgList = res.content.detailImgUrl.split(',')
+            } else {
+              this.detailImg = res.content.detailImgUrl
+            }
             this.bottomBtnShow = res.content.bottomBtnShow
             this.detail = res.content
             this.pdfUrl = this.$assetsUrl + res.content.pdfUrl
@@ -309,5 +332,11 @@ export default {
     width: 100%;
     z-index: 1;
   }
+  /deep/ .van-grid-item {
+    height: 200px;
+  }
+  /deep/ .van-image {
+    height: 100%;
+  }
 }
 </style>