From fc0ced09274e24ef3f19ad817a2f35414212fbe8 Mon Sep 17 00:00:00 2001
From: D <3066417822@qq.com>
Date: Sun, 3 Dec 2023 15:22:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9F=8E=E5=B8=82=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8(=E5=AE=9E=E9=AA=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common => components/u-city-select}/area.js          | 0
 .../common => components/u-city-select}/city.js          | 0
 .../common => components/u-city-select}/province.js      | 0
 .../u-city-select}/u-city-select.vue                     | 7 ++++---
 src/pages.json                                           | 7 ++++---
 src/pages_template/pages/citySelect/index.vue            | 9 +++++----
 6 files changed, 13 insertions(+), 10 deletions(-)
 rename src/{pages_template/common => components/u-city-select}/area.js (100%)
 rename src/{pages_template/common => components/u-city-select}/city.js (100%)
 rename src/{pages_template/common => components/u-city-select}/province.js (100%)
 rename src/{pages_template/pages/citySelect => components/u-city-select}/u-city-select.vue (96%)

diff --git a/src/pages_template/common/area.js b/src/components/u-city-select/area.js
similarity index 100%
rename from src/pages_template/common/area.js
rename to src/components/u-city-select/area.js
diff --git a/src/pages_template/common/city.js b/src/components/u-city-select/city.js
similarity index 100%
rename from src/pages_template/common/city.js
rename to src/components/u-city-select/city.js
diff --git a/src/pages_template/common/province.js b/src/components/u-city-select/province.js
similarity index 100%
rename from src/pages_template/common/province.js
rename to src/components/u-city-select/province.js
diff --git a/src/pages_template/pages/citySelect/u-city-select.vue b/src/components/u-city-select/u-city-select.vue
similarity index 96%
rename from src/pages_template/pages/citySelect/u-city-select.vue
rename to src/components/u-city-select/u-city-select.vue
index 382276f..348b3a4 100644
--- a/src/pages_template/pages/citySelect/u-city-select.vue
+++ b/src/components/u-city-select/u-city-select.vue
@@ -64,9 +64,9 @@
 </template>
 
 <script>
-	import provinces from "@/pages_template/common/province.js";
-	import citys from "@/pages_template/common/city.js";
-	import areas from "@/pages_template/common/area.js";
+	import provinces from "./province.js";
+	import citys from "./city.js";
+	import areas from "./area.js";
 	/**
 	 * city-select 省市区级联选择器
 	 * @property {String Number} z-index 弹出时的z-index值（默认1075）
@@ -248,3 +248,4 @@
 		}
 	}
 </style>
+@/components/u-city-select/province.js@/components/u-city-select/city.js@/components/u-city-select/area.js
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 0d133a8..b405171 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,12 +1,13 @@
 {
   "easycom": {
     "custom": {
+      "u-city-select": "@/components/u-city-select/u-city-select.vue",
+      "geek-(.*)": "@/components/geek-xd/components/geek-$1/geek-$1.vue",
+      "gx-(.*)": "@/components/geek-xd/components/geek-$1/geek-$1.vue",
       "^u--(.*)": "uview-plus/components/u-$1/u-$1.vue",
       "^up-(.*)": "uview-plus/components/u-$1/u-$1.vue",
       "^u-([^-].*)": "uview-plus/components/u-$1/u-$1.vue",
-      "qiun-(.*)": "@/components/qiun-data-charts/components/qiun-$1/qiun-$1.vue",
-      "geek-(.*)": "@/components/geek-xd/components/geek-$1/geek-$1.vue",
-      "gx-(.*)": "@/components/geek-xd/components/geek-$1/geek-$1.vue"
+      "qiun-(.*)": "@/components/qiun-data-charts/components/qiun-$1/qiun-$1.vue"
     }
   },
   "pages": [
diff --git a/src/pages_template/pages/citySelect/index.vue b/src/pages_template/pages/citySelect/index.vue
index 9577dd2..c2d4989 100644
--- a/src/pages_template/pages/citySelect/index.vue
+++ b/src/pages_template/pages/citySelect/index.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import citySelect from './u-city-select.vue';
+import citySelect from '@/components/u-city-select/u-city-select.vue';
 export default {
 	components: {
 		citySelect
@@ -36,13 +36,14 @@ export default {
 	methods: {
 		cityChange(e) {
 			this.input = e.province.label + '-' + e.city.label + '-' + e.area.label;
+			this.input += e.province.value + '-' + e.city.value + '-' + e.area.value;
 		}
 	}
 };
 </script>
 
 <style scoped>
-	.btn-wrap {
-		margin: 100rpx 30rpx;
-	}
+.btn-wrap {
+	margin: 100rpx 30rpx;
+}
 </style>