Merge branch 'master' of…

src/pages/signUp/addPost.vue

@@ -502,6 +502,7 @@ const getEnumWorkMode = async () => {
     EnumWorkMode.value = await getEumData("EnumWorkMode");
 };
 getAreaListApi({ type: "province", code: "" }).then(res => {
+    res.data.unshift({ name: "不限", code: null });
     cityOpstion.value.push(res.data);
 });
 
@@ -545,8 +546,9 @@ const handleConfirm = (params, item) => {
 
 const columnChangeCity = ({ selectedItem, resolve, index, finish }) => {
     const type = keys[index];
-    if (type) {
+    if (type && selectedItem.code) {
         getAreaListApi({ type, code: selectedItem.code }).then(res => {
+            res.data.unshift({ name: "不限", code: null });
             resolve(res.data);
         });
     } else {
@@ -555,14 +557,38 @@ const columnChangeCity = ({ selectedItem, resolve, index, finish }) => {
 };
 const handleConfirmCity = (params, item) => {
     const { selectedItems } = params;
-    item.cityText = selectedItems.map(v => v.name || "").join("-");
-    citySelectedItems = selectedItems;
+    // item.cityText = selectedItems.map(v => v.name || "").join("-");
+    // citySelectedItems = selectedItems;
+    // const [province, city, district, street] = selectedItems;
+
+    // item.address = selectedItems.map(v => v.name || "").join("");
+    // if (!province.code) {
+    //     item.cityText = "不限";
+    //     item.address = "不限";
+    // }
+    // item.provinceCode = province.code;
+    // item.cityName = city.name;
+    // item.cityCode = city.code;
+    // item.districtCode = district.code;
+    // item.street = street ? street.name : "";
     const [province, city, district, street] = selectedItems;
-    item.address = selectedItems.map(v => v.name || "").join("");
+    item.cityText = selectedItems
+        .filter(v => v.code)
+        .map(v => v.name || "")
+        .join("-");
+    item.address = selectedItems
+        .filter(v => v.code)
+        .map(v => v.name || "")
+        .join("");
+    if (!province.code) {
+        item.cityText = "不限";
+        item.address = "不限";
+    }
+    // item.provinceCode = 520000;
     item.provinceCode = province.code;
-    item.cityName = city.name;
-    item.cityCode = city.code;
-    item.districtCode = district.code;
+    item.cityCode = city?.code;
+    item.cityName = district?.name;
+    item.districtCode = district?.code;
     item.street = street ? street.name : "";
 };
 // 地址