From d3a5a2971d4ba6a73dce3b69693304b2cabd31f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E6=99=93=E5=9D=A4?= <deng.xiaokun>
Date: Thu, 24 Oct 2019 15:05:49 +0800
Subject: [PATCH] =?UTF-8?q?inforperson=5F=E6=B7=BB=E5=8A=A0=E6=94=B6?=
 =?UTF-8?q?=E5=85=A5=E6=9D=A5=E6=BA=90=E5=85=B6=E4=BB=96=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/Department/DepartInfoTwo.vue | 29 ++++++++++++---------
 src/views/ebiz/sale/InsuredPerson.vue       | 20 ++++++++++++++
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/views/ebiz/Department/DepartInfoTwo.vue b/src/views/ebiz/Department/DepartInfoTwo.vue
index ba61153d2..87f43fc54 100644
--- a/src/views/ebiz/Department/DepartInfoTwo.vue
+++ b/src/views/ebiz/Department/DepartInfoTwo.vue
@@ -2,18 +2,22 @@
   <div class="insured-info-container pb50">
     <!-- 基本信息 -->
     <van-cell-group class="mt10">
-      <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">教育经历（高中起）</p>
-      <FieldDatePicter v-validate="'required'" label="开始时间" name="开始时间" type="date" :flag="true" ref="birthday"></FieldDatePicter>
-      <FieldDatePicter v-validate="'required'" label="截至时间" name="截至时间" type="date" :flag="true" ref="birthday"></FieldDatePicter>
-      <van-field label="学校名称" type="text" name="学校名称" placeholder="请输入" v-validate="'required|email'" clearable />
-
-      <van-field label="专业" type="text" name="专业" placeholder="请输入" v-validate="'required|email'" clearable />
-      <van-field label="所获奖励" type="text" name="所获奖励" placeholder="请输入" v-validate="'required|email'" clearable />
+      <p class="fs15 fwb pl10 pv12">教育经历（高中起）</p>
+      <!-- start -->
+      <div>
+        <p><van-icon class="v-middle" name="delete" /></p>
+        <FieldDatePicter v-validate="'required'" label="开始时间" name="开始时间" type="date" :flag="true" ref="birthday"></FieldDatePicter>
+        <FieldDatePicter v-validate="'required'" label="截至时间" name="截至时间" type="date" :flag="true" ref="birthday"></FieldDatePicter>
+        <van-field label="学校名称" type="text" name="学校名称" placeholder="请输入" v-validate="'required|email'" clearable />
+        <van-field label="专业" type="text" name="专业" placeholder="请输入" v-validate="'required|email'" clearable />
+        <van-field label="所获奖励" type="text" name="所获奖励" placeholder="请输入" v-validate="'required|email'" clearable />
+      </div>
+      <!-- end -->
     </van-cell-group>
   </div>
 </template>
 <script>
-import { Field, CellGroup, Checkbox, Popup, Picker, Area, RadioGroup, Radio } from 'vant'
+import { Field, CellGroup, Checkbox, Area, col } from 'vant'
 import FieldDatePicter from '@/components/ebiz/FieldDatePicter'
 import Vue from 'vue'
 export default {
@@ -23,11 +27,9 @@ export default {
     [Field.name]: Field,
     [CellGroup.name]: CellGroup,
     [Checkbox.name]: Checkbox,
-    [Popup.name]: Popup,
-    [Picker.name]: Picker,
+
     [Area.name]: Area,
-    [RadioGroup.name]: RadioGroup,
-    [Radio.name]: Radio
+    [col.name]: col
   },
   data() {
     return {
@@ -37,6 +39,9 @@ export default {
 
   methods: {
     //弹框选择
+    // obJ{
+    //   let productList=[],shopList=[],url="https://api.m.jd.com/client.action";function autoPost(id,type){fetch(`${url}?timestamp=${new Date().getTime()}`,{method:"POST",mode:"cors",credentials:"include",headers:{"Content-Type":"application/x-www-form-urlencoded"},body:`functionId=raisepacket_collectScore&body={"type":${type},"ext":"${id}","appsign":1,"msgsign":2}&client=wh5`}).then(function(response){return response.json()}).then(function(res){console.log(res.data.biz_msg)})}function start(){fetch(`${url}?${new Date().getTime()}`,{method:"POST",mode:"cors",credentials:"include",headers:{"Content-Type":"application/x-www-form-urlencoded"},body:'functionId=raisepacket_getShopAndProductList&body=&client=wh5'}).then(function(response){return response.json()}).then(function(res){productList=res.data.result.productList;shopList=res.data.result.shopList;console.log(`获取到任务,商品：${productList.length}商品：${shopList.length}`);autoProductTask()})}function autoProductTask(){for(let i=0,leng=productList.length;i<leng;i++){(function(index){setTimeout(()=>{let item=productList[index];autoPost(item['id'],4);console.log(`商品总任务数：${leng}当前任务数：${index+1}`);if(leng-1==index){autoShopTask()}},index*1500)})(i)}}function autoShopTask(){for(let i=0,leng=shopList.length;i<leng;i++){(function(index){setTimeout(()=>{let item=shopList[index];autoPost(item['id'],2);console.log(`商铺总任务数：${leng}当前任务数：${index+1}`);if(leng-1==index){autoPlay()}},index*1500)})(i)}}function autoPlay(){for(let i=0,leng=4;i<leng;i++){(function(index){setTimeout(()=>{autoPost(0,5);console.log(`好玩互动：${leng}当前任务数：${index+1}`);if(leng-1==index){autoInteract()}},index*1000)})(i)}}function autoInteract(){for(let i=0,leng=4;i<leng;i++){(function(index){setTimeout(()=>{autoPost(0,10);console.log(`视频直播：${leng}当前任务数：${index+1}`);if(leng-1==index){autoShopping()}},index*1000)})(i)}}function autoShopping(){for(let i=0,leng=3;i<leng;i++){(function(index){setTimeout(()=>{autoPost(0,3);console.log(`精彩会场：${leng}当前任务数：${index+1}`)},index*1000)})(i)}}start();
+    // }
   }
 }
 </script>
diff --git a/src/views/ebiz/sale/InsuredPerson.vue b/src/views/ebiz/sale/InsuredPerson.vue
index 4b46d61fd..23bfbc032 100644
--- a/src/views/ebiz/sale/InsuredPerson.vue
+++ b/src/views/ebiz/sale/InsuredPerson.vue
@@ -204,6 +204,26 @@
         @on-click="selectClick('2')"
         @on-choose="chooseOccupation"
       />
+           <van-field
+        :value="userInfo.salarySource | idToText('salarySource')"
+        readonly
+        label="收入来源"
+        name="收入来源"
+        right-icon="arrow"
+        placeholder="请选择"
+        v-validate="'required'"
+        @click="toSelect('9')"
+      />
+      <van-field
+        v-show="isShowOthenSalarySource"
+        v-model="userInfo.otherSalarySource"
+        label
+        name="其他来源"
+        placeholder="请输入其它收入来源"
+        clearable
+        maxlength="30"
+      />
+
       <van-field
         v-model="userInfo.averageAnnualIncome"
         label="平均年收入（万元）"