From 86f72aa58ac2559dae6929cf4dbdfb1be366033a Mon Sep 17 00:00:00 2001
From: "yang.huaxiang" <yang.huaxiang@ebiz-fooge.com>
Date: Fri, 13 Nov 2020 11:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E9=97=A8=E7=BA=A2=E9=9C=80=E6=B1=82-?=
 =?UTF-8?q?=E7=94=B5=E6=8A=95=E6=8F=90=E7=A4=BA=EF=BC=9AUI=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4=20--=E6=8F=90=E4=BA=A4=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=9A=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/assets/sass/utils.scss                |   4 +
 src/components/ebiz/sale/IndexBar.vue     | 121 ++++++++++++++++++----
 src/views/ebiz/common/SelectedProduct.vue |  61 +++++++----
 3 files changed, 150 insertions(+), 36 deletions(-)

diff --git a/src/assets/sass/utils.scss b/src/assets/sass/utils.scss
index b7fff83d3..53961e73f 100644
--- a/src/assets/sass/utils.scss
+++ b/src/assets/sass/utils.scss
@@ -44,6 +44,10 @@
   font-size: $font-size-xll;
 }
 
+.fw400 {
+  font-weight: 400 !important;
+}
+
 .fw500 {
   font-weight: 500 !important;
 }
diff --git a/src/components/ebiz/sale/IndexBar.vue b/src/components/ebiz/sale/IndexBar.vue
index 50987068a..c377d4604 100644
--- a/src/components/ebiz/sale/IndexBar.vue
+++ b/src/components/ebiz/sale/IndexBar.vue
@@ -1,17 +1,28 @@
 <template>
-  <div class="ml6 mr6 pt5 pb5">
+  <div class="own_content">
     <ul class="index-bar">
       <li @click="changePage(Number(index) + 1)" v-for="(item, index) in pageTitle" :key="index" :class="item.tabClass" :id="item.tabClass">
-        <div :class="[{ activeline: item.tabClass }, { 'bg-gray': !item.tabClass }, 'w15', 'h2', 'mr8']" v-if="index != 0"></div>
-        <span>{{ item.pageNo }}.{{ item.pageItem }}</span>
-        <div :class="[{ activeline: item.tabClass }, { 'bg-gray': !item.tabClass }, 'w15', 'h2', 'ml8']" v-if="index != 7"></div>
-        <van-icon name="arrow" size="12" v-if="index != 7" />
+        <!-- 选中 -->
+        <div v-if="item.tabClass" class="flex justify-content-fs align-items-c">
+          <div class="flex flex-direction-colunm align-items-c">
+            <van-image :src="item.imgCheckedUrl" class="image_head" />
+            <span class="fs12 mt12">{{ item.pageItem }}</span>
+          </div>
+          <van-image :src="doneUrl" v-if="index !== 7" class="image_done" />
+        </div>
+        <div v-if="!item.tabClass" class="flex justify-content-fs align-items-c">
+          <div class="flex flex-direction-colunm align-items-c">
+            <van-image :src="item.imgNoCheckedUrl" class="image_head" />
+            <span class="fs12 mt12" style="color: #999999">{{ item.pageItem }}</span>
+          </div>
+          <van-image :src="doneNurl" v-if="index !== 7" class="image_done" />
+        </div>
       </li>
     </ul>
   </div>
 </template>
 <script>
-import { Icon } from 'vant'
+import { Icon, Image as VanImage } from 'vant'
 export default {
   name: 'IndexBar',
   props: {
@@ -34,19 +45,78 @@ export default {
     }
   },
   components: {
-    [Icon.name]: Icon
+    [Icon.name]: Icon,
+    [VanImage.name]: VanImage
   },
   data() {
     return {
+      doneUrl: this.$assetsUrl + 'images/kmh/done.png',
+      doneNurl: this.$assetsUrl + 'images/kmh/done_n.png',
       pageTitle: [
-        { pageNo: 1, pageItem: '投保人信息', urlStr: '/sale/insuredInfo', tabClass: '' },
-        { pageNo: 2, pageItem: '被保险人信息', urlStr: '/sale/insuredPerson', tabClass: '' },
-        { pageNo: 3, pageItem: '选择产品', urlStr: '/common/selectedProduct', tabClass: '' },
-        { pageNo: 4, pageItem: '受益人信息', urlStr: '/sale/beneficiary', tabClass: '' },
-        { pageNo: 5, pageItem: '告知信息', urlStr: '/sale/notifyingMessage', tabClass: '' },
-        { pageNo: 6, pageItem: '账户信息', urlStr: '/sale/accountInformation', tabClass: '' },
-        { pageNo: 7, pageItem: '附件上传', urlStr: '/sale/attachmentManagement', tabClass: '' },
-        { pageNo: 8, pageItem: '签名确认', urlStr: '/sale/signatureConfirmation', tabClass: '' }
+        {
+          pageNo: 1,
+          pageItem: '投保人信息',
+          urlStr: '/sale/insuredInfo',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/tbrxx.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/tbrxx_n.png'
+        },
+        {
+          pageNo: 2,
+          pageItem: '被保险人信息',
+          urlStr: '/sale/insuredPerson',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/bbrxx.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/bbrxx_n.png'
+        },
+        {
+          pageNo: 3,
+          pageItem: '选择产品',
+          urlStr: '/common/selectedProduct',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/xzcp.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/xzcp_n.png'
+        },
+        {
+          pageNo: 4,
+          pageItem: '受益人信息',
+          urlStr: '/sale/beneficiary',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/syrxx.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/syrxx_n.png'
+        },
+        {
+          pageNo: 5,
+          pageItem: '告知信息',
+          urlStr: '/sale/notifyingMessage',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/gzxx.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/gzxx_n.png'
+        },
+        {
+          pageNo: 6,
+          pageItem: '账户信息',
+          urlStr: '/sale/accountInformation',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/zhxx.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/zhxx_n.png'
+        },
+        {
+          pageNo: 7,
+          pageItem: '附件上传',
+          urlStr: '/sale/attachmentManagement',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/fjsc.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/fjsc_n.png'
+        },
+        {
+          pageNo: 8,
+          pageItem: '签名确认',
+          urlStr: '/sale/signatureConfirmation',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/qmqr.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/qmqr_n.png'
+        }
       ],
       //localStorage.salePageFlag:控制导航是否可以直接跳转页面  1-投保人信息 2-被保人信息 3-选择产品 4-受益人信息 5-告知信息 6-账户信息 7-附件上传 8-签名确认
       salePageFlag: Number(localStorage.salePageFlag)
@@ -147,8 +217,7 @@ export default {
   overflow-x: auto;
   overflow-y: hidden;
   white-space: nowrap;
-  font-size: 15px;
-  margin-top: 8px;
+  font-size: 12px;
 }
 
 .index-bar li {
@@ -164,7 +233,7 @@ li {
 }
 .index-bar span,
 .index-bar van-icon {
-  align-items: flex-center;
+  align-items: center;
 }
 .active {
   color: #e9332e;
@@ -172,4 +241,20 @@ li {
 .activeline {
   background: #e9332e;
 }
+.image_head {
+  width: 16px;
+  height: 16px;
+}
+.image_done {
+  width: 8px;
+  height: 14px;
+  padding-left: 20px;
+  padding-right: 20px;
+}
+.own_content {
+  padding-top: 19px;
+  padding-bottom: 15px;
+  margin-left: 10px;
+  margin-right: 10px;
+}
 </style>
diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index bbed03c07..4af30a61f 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -33,25 +33,32 @@
       </div>
     </div>
 
-    <van-dialog v-model="active_show" :show-confirm-button="false">
-      <div class="pl20 pr20 mt20">
-        <p class="fs14 black">请选择：</p>
-        <van-radio-group v-model="active_radio">
-          <van-radio name="1" icon-size="14px" class="radio_class">
-            <div class="flex justify-content-fs align-items-c pl10 fs18">
-              <van-image round width="1.5rem" height="1.5rem" src="https://img.yzcdn.cn/vant/cat.jpeg" />
-              <div class="fs18 fwb pl10">开门红产品</div>
+    <van-dialog v-model="active_show" :show-confirm-button="false" class="dialog_class">
+      <div class="flex justify-content-fe">
+        <van-image :src="this.$assetsUrl + 'images/kmh/cancel.png'" class="fr mt15 mr15 icon_image" @click="active_show = false"></van-image>
+      </div>
+      <div class="pl20 pr20 mt30">
+        <p class="fs16 black fw400">请选择：</p>
+        <van-radio-group v-model="active_radio" style="align-items: center;">
+          <van-radio name="1" class="radio_class ml60">
+            <template #icon="props">
+              <img class="img-icon radio_icon_image" :src="props.checked ? checkedUrl : noCheckedUrl" />
+            </template>
+            <div class="flex justify-content-fs align-items-c pl5">
+              <div class="fs16 fw400">开门红产品</div>
             </div>
           </van-radio>
-          <van-radio name="2" icon-size="14px" class="radio_class">
-            <div class="flex justify-content-fs align-items-c pl10 fs18">
-              <van-image round width="1.5rem" height="1.5rem" src="https://img.yzcdn.cn/vant/cat.jpeg" />
-              <div class="fs18 fwb pl10">普通产品</div>
+          <van-radio name="2" class="radio_class ml60">
+            <template #icon="props">
+              <img class="img-icon radio_icon_image" :src="props.checked ? checkedUrl : noCheckedUrl" />
+            </template>
+            <div class="flex justify-content-fs align-items-c pl5">
+              <div class="fs16 fw400">普通产品</div>
             </div>
           </van-radio>
         </van-radio-group>
-        <div class="flex justify-content-c bg-white mt20 mb20 align-items-c">
-          <van-button type="danger" size="normal" class="dialog-comfirm-button" @click="comfirmCheckActive" v-no-more-click="1000">确认</van-button>
+        <div class="flex justify-content-c bg-white mt20 mb40 align-items-c">
+          <van-button type="danger" class="dialog-comfirm-button" @click="comfirmCheckActive" v-no-more-click="1000">确认</van-button>
         </div>
       </div>
     </van-dialog>
@@ -89,7 +96,9 @@ export default {
       isFrom: localStorage.isFrom,
       salePageFlag: '3',
       active_show: false,
-      active_radio: ''
+      active_radio: '1',
+      checkedUrl: this.$assetsUrl + 'images/kmh/kmhCheked.png',
+      noCheckedUrl: this.$assetsUrl + 'images/kmh/kmhNoCheked.png'
     }
   },
   components: {
@@ -459,6 +468,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+@import '@/assets/sass/variables.scss';
 .select-product-container {
   .border-dotted {
     border: 1px dashed #999;
@@ -477,12 +487,27 @@ export default {
     font-size: 15px;
   }
   .radio_class {
-    height: 80px;
-    border-bottom: 1px solid #8e8d8d;
+    height: 60px;
   }
   .dialog-comfirm-button {
-    width: 50%;
+    width: 167px;
+    height: 36px;
+    line-height: 36px;
     border-radius: 6px;
+    text-align: center;
+    vertical-align: center;
+  }
+  .icon_image {
+    width: 12px;
+    height: 12px;
+  }
+  .radio_icon_image {
+    width: 16px;
+    height: 16px;
+    padding-top: 3px;
+  }
+  .dialog_class {
+    width: 290px;
   }
 }
 </style>