From 097f212329d6233736bd5aadaece83f569f51a95 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 18 Jul 2024 11:19:02 +0800
Subject: [PATCH] 代码优化
---
subPackage/house/member/index.vue | 4 +-
subPackage/house/components/userInfo.vue | 98 +++++++++++++++++++++++++++++++-----------------
2 files changed, 65 insertions(+), 37 deletions(-)
diff --git a/subPackage/house/components/userInfo.vue b/subPackage/house/components/userInfo.vue
index 9671de6..f49d287 100644
--- a/subPackage/house/components/userInfo.vue
+++ b/subPackage/house/components/userInfo.vue
@@ -39,11 +39,11 @@
<u-form-item class="form-item" labelWidth="110" label="户籍地区" prop="residentAdcode">
<view class="region">
- <uni-data-picker :border="false" v-model="residentadDefault"
+ <!-- <uni-data-picker :border="false" v-model="residentadDefault"
:map="{text:'name',value:'id'}" :localdata="cityList" popup-title="请选择户籍地区"
- @change="onchange" @nodeclick="onnodeclick"></uni-data-picker>
+ @change="onchange" @nodeclick="onnodeclick"></uni-data-picker> -->
- <!-- <picker mode="region" custom-item="children" :range="cityList" range-key="name"
+ <picker mode="region" :custom-item="children" :range="cityList" :range-key="name"
:value="residentadDefault" @change="changeHouseholdRegion">
<view class="region-picker c-c0" v-if="!residentad">
请选择户籍地区
@@ -51,7 +51,7 @@
<view class="region-picker c-30" v-if="residentad">
{{residentad}}
</view>
- </picker> -->
+ </picker>
</view>
<!-- <u-icon slot="right" name="arrow-right"></u-icon> -->
</u-form-item>
@@ -189,18 +189,18 @@
</u-form-item> -->
<u-form-item class="form-item" labelWidth="110" label="籍贯地区" prop="nativePlaceAdcode">
<view class="region">
- <uni-data-picker :border="false" v-model="navtivePlaceDefault"
+ <!-- <uni-data-picker :border="false" v-model="navtivePlaceDefault"
:map="{text:'name',value:'id'}" :localdata="cityList" popup-title="请选择户籍地区"
- @change="changeNativeRegion" @nodeclick="onnodeclick"></uni-data-picker>
- <!-- <picker :range="cityList" range-key="name" :value="navtivePlaceDefault"
- @change="changeNativeRegion">
+ @change="changeNativeRegion" @nodeclick="onnodeclick"></uni-data-picker> -->
+ <picker mode="region" :custom-item="children" :range="cityList" :range-key="name"
+ :value="navtivePlaceDefault" @change="changeNativeRegion">
<view class="region-picker c-c0" v-if="!nativePlace">
请选择籍贯地区
</view>
<view class="region-picker c-30" v-if="nativePlace">
{{nativePlace}}
</view>
- </picker> -->
+ </picker>
</view>
<!-- <u-icon slot="right" name="arrow-right"></u-icon> -->
</u-form-item>
@@ -519,8 +519,8 @@
homeRegion: "", //居住地
homeIndex: 0,
showRegion: false,
- navtivePlaceDefault: [],
- residentadDefault: [],
+ navtivePlaceDefault: [13, 0, 0],
+ residentadDefault: [13, 0, 0],
isEdit: false,
from: "",
type: "",
@@ -670,7 +670,7 @@
value
} = e.detail;
this.nativePlace = `${value[0]}-${value[1]}-${value[2]}`
- this.form.nativePlaceAdcode = value[2].value;
+ this.form.nativePlaceAdcode = code[2];
},
@@ -688,15 +688,16 @@
// console.log("****2***" + JSON.stringify(node))
},
+
//选择户籍
- // changeHouseholdRegion(e) {
- // let {
- // code,
- // value
- // } = e.detail;
- // this.residentad = `${value[0]}-${value[1]}-${value[2]}`
- // this.form.residentAdcode = code[2];
- // },
+ changeHouseholdRegion(e) {
+ let {
+ code,
+ value
+ } = e.detail;
+ this.residentad = `${value[0]}-${value[1]}-${value[2]}`
+ this.form.residentAdcode = code[2];
+ },
getRegionList() {
@@ -1142,24 +1143,24 @@
city,
district
} = this.extractAddressComponents(address.text);
- // this.residentadDefault = [province, city, district]; //户籍地区
- // this.residentad = `${province}-${city}-${district}`;
+ this.residentadDefault = [province, city, district]; //户籍地区
+ this.residentad = `${province}-${city}-${district}`;
this.$set(this.form, "hukouRegistration", address.text);
// this.getRegionTree(data => {
- // for (let i = 0, ii = data.length; i < ii; i++) {
- // if (data[i].name == province) {
- // for (let j = 0, jj = data[i].children.length; j < jj; j++) {
- // for (let k = 0, kk = data[i].children[j].children.length; k < kk; k++) {
- // if (data[i].children[j].children[k].name == district) {
- // this.$set(this.form, "residentAdcode", data[i].children[j].children[k].id);
- // break;
- // }
- // }
- // }
- // }
- // }
+ let data = this.cityList
+ for (let i = 0, ii = data.length; i < ii; i++) {
+ if (data[i].name == province) {
+ for (let j = 0, jj = data[i].children.length; j < jj; j++) {
+ for (let k = 0, kk = data[i].children[j].children.length; k < kk; k++) {
+ if (data[i].children[j].children[k].name == district) {
+ this.$set(this.form, "residentAdcode", data[i].children[j].children[k].id);
+ break;
+ }
+ }
+ }
+ }
+ }
// })
-
},
@@ -1382,4 +1383,31 @@
border-radius: 8rpx;
box-sizing: border-box;
}
+
+ .title {
+ font-size: 14px;
+ font-weight: bold;
+ margin: 20px 0 5px 0;
+ }
+
+ .data-pickerview {
+ height: 400px;
+ border: 1px #e5e5e5 solid;
+ }
+
+ .popper__arrow {
+ top: -6px;
+ left: 50%;
+ margin-right: 3px;
+ border-top-width: 0;
+ border-bottom-color: #EBEEF5;
+ }
+
+ .popper__arrow {
+ top: -6px;
+ left: 50%;
+ margin-right: 3px;
+ border-top-width: 0;
+ border-bottom-color: #EBEEF5;
+ }
</style>
\ No newline at end of file
diff --git a/subPackage/house/member/index.vue b/subPackage/house/member/index.vue
index 5dbeee7..8816c98 100644
--- a/subPackage/house/member/index.vue
+++ b/subPackage/house/member/index.vue
@@ -110,7 +110,7 @@
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
- <u-form-item v-if="form.currentAddress" @click="navToHouseTag" class="form-item"
+ <!-- <u-form-item v-if="form.currentAddress" @click="navToHouseTag" class="form-item"
labelWidth="110" label="房屋标签" prop="gender">
<view class="">
@@ -120,7 +120,7 @@
</view>
<u-icon slot="right" name="arrow-right"></u-icon>
- </u-form-item>
+ </u-form-item> -->
<u-form-item class="form-item" @click="showVolunteerOrg = true" labelWidth="120" label="志愿者组织"
--
Gitblit v1.9.3