From c08b6d8de5e9b1fd7e2cfd3336b18518202df1ae Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Thu, 23 Apr 2020 15:20:10 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=E3=80=90=E5=8D=A1=E5=8D=95=E3=80=91?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5-=E6=8C=87=E5=AE=9A=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E6=97=A5=E6=9C=9F=E6=8E=A5=E5=8F=A3=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9B=E5=88=97=E8=A1=A8=E9=A1=B5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/CardTotreasure.vue | 66 ++++++++++++----------
 src/views/ebiz/cardList/information.vue    | 30 +++++-----
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/src/views/ebiz/cardList/CardTotreasure.vue b/src/views/ebiz/cardList/CardTotreasure.vue
index 41d3c6765..427bc7403 100644
--- a/src/views/ebiz/cardList/CardTotreasure.vue
+++ b/src/views/ebiz/cardList/CardTotreasure.vue
@@ -2,15 +2,10 @@
   <div class="card-Insurance">
     <div class="card-Insurance-box">
       <div class="card-Insurance-header">
-        <!-- <div class="Tab">
-          <div class="tab" v-for="(item, index) in arr" :key="index" @click="fnTab(index)">
-            <span :class="{ ac: iNow == index }">{{ item }}</span>
-          </div>
-        </div> -->
         <van-tabs v-model="activeName" @click="changeTab">
           <van-tab title="产品列表" name="product">
             <div class="show">
-              <ul class="card-Products" :style="this.iNow == 0 ? 'display:block' : 'display:none'">
+              <ul class="card-Products">
                 <li v-for="(itemIcon, index) in list" :key="index" class="border-gb" @click="formsD(itemIcon.productCode)">
                   <div>
                     <img :src="itemIcon.productImageUrl" class="ml10" width="118" height="70" />
@@ -27,29 +22,30 @@
                   </li>
                 </template>
               </ul>
-              <!-- <ul class="myCard" :style="this.iNow == 1 ? 'display:block' : 'display:none'">
-            <li
-              v-for="(itemiNow, index) in tAb"
-              style=" border: 1px solid #dadada;box-shadow: 0 3px 9px 1px hsla(0, 0%, 80%, 0.35);"
-              class="mb10 pl15 pt15"
-              :key="index"
-            >
-              <p>{{ itemiNow.h }}</p>
-              <span>{{ itemiNow.span1 }}</span>
-              <span>{{ itemiNow.span2 }}</span>
-              <span>{{ itemiNow.span3 }}</span>
-              <span>{{ itemiNow.span4 }}</span>
-            </li>
-            <template v-if="tAb.length === 0">
-              <li class="flex flex-direction-colunm align-items-c">
-                <img src="@/assets/images/pic_page-non.png" class="mt50" alt="" />
-                <p class="gray text-center pt20">暂无产品</p>
-              </li>
-            </template>
-          </ul> -->
             </div>
           </van-tab>
-          <van-tab title="我的订单" name="order"> </van-tab>
+          <van-tab title="我的订单" name="order">
+            <div class="order-container" v-for="(orderItem, index) in orderList" :key="index">
+              <div>
+                <span>投保单号：</span><span>{{ orderItem.text }}</span>
+              </div>
+              <div>
+                <span>投保人：</span><span>{{ orderItem.text }}</span>
+              </div>
+              <div>
+                <span>被保人：</span><span>{{ orderItem.text }}</span>
+              </div>
+              <div>
+                <span>订单状态：</span><span>{{ orderItem.text }}</span>
+              </div>
+            </div>
+            <template v-if="orderList.length === 0">
+              <li class="flex flex-direction-colunm align-items-c">
+                <img src="@/assets/images/pic_page-non.png" class="mt50" alt="" />
+                <p class="gray text-center pt20">暂无订单</p>
+              </li>
+            </template>
+          </van-tab>
         </van-tabs>
         <!--<div class="show">
           <ul class="card-Products" :style="this.iNow == 0 ? 'display:block' : 'display:none'">
@@ -120,6 +116,8 @@ export default {
         //   span: '保险费地，为孩子提供全方位的风险保障'
         // }
       ],
+      orderList: [{ text: '11111' }, { text: '11111' }], //我的订单
+      // orderList: [], //我的订单
       iNow: 0,
       tAb: [
         {
@@ -167,10 +165,6 @@ export default {
         })
       }
     },
-    // fnTab(index) {
-    //   this.iNow = index
-    //   console.log(this.iNow)
-    // },
     changeTab(name) {
       if (name == '产品列表') {
         this.getLists()
@@ -241,6 +235,16 @@ export default {
   display: flex;
   flex-direction: column;
 } */
+.order-container {
+  margin: 10px;
+  padding: 15px;
+  border-radius: 3px;
+  border: 1px solid #dadada;
+  box-shadow: 0 3px 9px 1px hsla(0, 0%, 80%, 0.35);
+}
+.order-container > div {
+  margin-bottom: 2px;
+}
 .product-list-default-bg {
   left: 50%;
   transform: translateX(-50%);
diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue
index 6e78bccb4..e6bf2a5ac 100644
--- a/src/views/ebiz/cardList/information.vue
+++ b/src/views/ebiz/cardList/information.vue
@@ -152,18 +152,6 @@
       <!-- @nameChange="nameChanges" -->
       <!-- @on-click="selectClick('1', '1')" -->
       <select-radio required :disabled="true" :radios="sexRadio" label="性别" name="性别" v-validate="'required'" :value.sync="userInfo.sex"></select-radio>
-      <FieldDatePicter
-        v-validate="'required'"
-        label="出生日期"
-        name="出生日期"
-        readonly
-        required
-        :value.sync="userInfo.birthday"
-        type="date"
-        :flag="true"
-        ref="insuredBirthday"
-        :maxDate="maxDate"
-      ></FieldDatePicter>
       <!-- @confirm="onDateConfirm($event, '5')" -->
       <van-field
         :value="userInfo.idType | idToText('insuredIdType')"
@@ -191,6 +179,18 @@
         <!-- @blur="getRelatedData(insuredInfo.idNo, '2')" -->
         <!-- <van-button v-if="userInfo.idType == 1" slot="button" size="small" type="danger" round @click="selectClick('3')">证件扫描</van-button> -->
       </van-field>
+      <FieldDatePicter
+        v-validate="'required'"
+        label="出生日期"
+        name="出生日期"
+        readonly
+        required
+        :value.sync="userInfo.birthday"
+        type="date"
+        :flag="true"
+        ref="insuredBirthday"
+        :maxDate="maxDate"
+      ></FieldDatePicter>
     </van-cell-group>
     <!-- 受益人信息 -->
     <van-cell-group class="mt10">
@@ -204,7 +204,7 @@
       name="指定生效日期"
       required
       :minDate="now"
-      :value.sync="cValiDate"
+      :value.sync="userInfo.effectiveDate"
       type="date"
       :flag="true"
       @confirm="onDateConfirm($event, '6')"
@@ -373,7 +373,6 @@ export default {
         sex: '0', //被保人性别
         birthday: '' //被保人出生日期
       },
-      cValiDate: '', //指定生效日期
       selectUser: '',
       areaList: areaList,
       currentPopupIndex: '',
@@ -918,8 +917,7 @@ export default {
       let params = {
         orderDTO: {
           orderInfoDTO: {
-            bnfFlag: '0',
-            cValiDate: this.cValiDate
+            bnfFlag: '0'
           },
           appntDTO: {},
           insuredDTOs: [