Merge branch 'feature/【20210204】vip商城调整' into dev

# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/assets/js/utils/request.js

src/assets/js/utils/data-dictionary.js

@@ -1809,6 +1809,16 @@ export default {
       shortName: '寿险',
       name: '国富人寿国富稳赢两全保险',
       code: 'GFRS_M0033'
+    },
+    {
+      shortName: '重疾险',
+      name: '国富人寿国富民安重大疾病保险（2021版）',
+      code: 'GFRS_M0034'
+    },
+    {
+      shortName: '重疾险',
+      name: '国富人寿八桂无忧重大疾病保险（C款）',
+      code: 'GFRS_M0035'
     }
   ],
   // 职级

src/views/ebiz/claims/ApplyInfo.vue

@@ -465,6 +465,7 @@ import occupationList from '@/components/ebiz/occipation/data/occupation'
 import getAreaName from '@/assets/js/utils/get-area-name'
 import areaList from '@/assets/js/utils/area'
 import { getWhitelist } from '@/api/ebiz/whitelist'
+import areaList from '@/assets/js/utils/area'
 
 export default {
   name: 'applyInfo',

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>