From 0c93bf2f25ab856fe271b3cf5c1467a49f07518f Mon Sep 17 00:00:00 2001
From: mengxiaolong <meng.xiaolong@ebiz-digits.com>
Date: Thu, 21 Jan 2021 10:49:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=88=97=E8=A1=A8=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E7=BC=96=E8=BE=91=E6=88=B7=E7=B1=8D=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/getAreaNameForSale.js  | 15 +++++++++++++--
 src/components/ebiz/customer/formBlock.vue |  8 ++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/assets/js/utils/getAreaNameForSale.js b/src/assets/js/utils/getAreaNameForSale.js
index 9f2d29d99..052c4413f 100644
--- a/src/assets/js/utils/getAreaNameForSale.js
+++ b/src/assets/js/utils/getAreaNameForSale.js
@@ -10,8 +10,7 @@ import areaNew from '@/assets/js/utils/areaNewForSale'
 export default function getAreaName(data, isNew) {
   let names = []
   for (let item of data) {
-    let code = item.code
-    let name = getNameByCode(code, isNew)
+    let name = getNameByCode(item.code, isNew)
     if (name) {
       names.push(name)
     }
@@ -23,6 +22,18 @@ export default function getAreaName(data, isNew) {
   }
 }
 
+export function getCensusName(data) {
+  let names = []
+  for (let item of data) {
+    let name = getNameByCode(item.code)
+    if (name) {
+      names.push(name)
+    }
+  }
+  console.log('names :>> ', names)
+  return names.join('-')
+}
+
 /**
  * 根据code获取省/市/区名称
  * @param {String} code
diff --git a/src/components/ebiz/customer/formBlock.vue b/src/components/ebiz/customer/formBlock.vue
index 89b8e2a10..cd88743a6 100644
--- a/src/components/ebiz/customer/formBlock.vue
+++ b/src/components/ebiz/customer/formBlock.vue
@@ -50,7 +50,7 @@
         placeholder="请选择"
         @click="toSelect('1')"
       />
-      <van-field :value="census" readonly label="户籍" name="户籍" right-icon="arrow" placeholder="请选择" @click="censusShow = true" />
+      <van-field v-model="census" readonly label="户籍" name="户籍" right-icon="arrow" placeholder="请选择" @click="censusShow = true" />
       <FieldDatePicter
         label="出生日期"
         :value.sync="userInfo.birthday"
@@ -208,7 +208,7 @@ import OccupationPicker from '@/components/ebiz/occipation/OccupationPicker'
 import areaList from '@/assets/js/utils/areaForSale'
 import areaLists from '@/assets/js/utils/areaNewForSale'
 import utilsAge from '@/assets/js/utils/age'
-import getAreaName from '@/assets/js/utils/getAreaNameForSale'
+import getAreaName, { getCensusName } from '@/assets/js/utils/getAreaNameForSale'
 import idNoCheck from '@/assets/js/utils/idNoCheck'
 import { idToData } from '@/views/ebiz/customer/js/verification'
 import filter from '@/filters/index'
@@ -454,7 +454,7 @@ export default {
     },
     censusInfo() {
       let area = [{ code: this.userInfo.province }, { code: this.userInfo.city }]
-      this.census = getAreaName(area)
+      this.census = getCensusName(area)
     },
     areaNameInfo() {
       let area = [{ code: this.userInfo.companyProvince }, { code: this.userInfo.companyCity }, { code: this.userInfo.companyArea }]
@@ -551,7 +551,7 @@ export default {
           this.homeShow = false
           break
         case '3': //户籍
-          this.census = getAreaName(area)
+          this.census = getCensusName(area)
           ;[this.userInfo.province, this.userInfo.city] = [area[0].code, area[1].code]
           this.censusShow = false
           break