From 20ba872f75ba74466219b76350fedb107c14d890 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 23 Feb 2024 18:20:18 +0800
Subject: [PATCH] xiaban

---
 src/view/components/areaChose.vue   |  6 +++---
 src/view/tradeScreen/index.vue      | 17 ++++++++++++++---
 src/view/tradeScreen/storeLogin.vue |  6 ++++--
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/view/components/areaChose.vue b/src/view/components/areaChose.vue
index 88c3f35..7d6215c 100644
--- a/src/view/components/areaChose.vue
+++ b/src/view/components/areaChose.vue
@@ -55,11 +55,11 @@ const handChose = (index) => {
     actIndex.value = index;
     getTownListsFn(options[index].value);
     sendFn('choserArea', { name: options[index].label, code: options[index].value })
-    emit('handArea', options[actIndex.value].value,)
+    
+    emit('handArea', options[actIndex.value].label,)
 }
 
 const handTown = (index) => {
-    console.log(townLists.value[index]);
     // townLists.value.forEach(item => {
     //   if (item.value == townLists[index].value) {
     //       sendFn('choseTown', { name: item.label, code: item.value })
@@ -68,7 +68,7 @@ const handTown = (index) => {
     townLists.value.forEach(item => {
         if (item.code == townLists.value[index].code) {
             sendFn('choseTown', { name: item.name, code: item.code })
-            emit('handTown', options[actIndex.value].value, item.code)
+            emit('handTown', item.name)
         }
     })
 }
diff --git a/src/view/tradeScreen/index.vue b/src/view/tradeScreen/index.vue
index 5ddd4c3..4827bc6 100644
--- a/src/view/tradeScreen/index.vue
+++ b/src/view/tradeScreen/index.vue
@@ -9,13 +9,13 @@
             <div class="tradmenu-li cw" @click="sendFn('header5')"></div>
         </div>
         <div v-else>
-            <areaChose channel="user-trad"></areaChose>
+            <areaChose channel="user-trad" @handTown="handTown" @handArea="handArea"></areaChose>
         </div>
     </div>
     <div class="area" @click="flag = !flag">
         <div class="area-top">
-            <div class="town">泸县</div>
-            <div class="town"></div>
+            <div class="town">{{ area }}</div>
+            <div class="town">{{ town }}</div>
         </div>
         <div class="area-bottom"></div>
     </div>
@@ -28,12 +28,23 @@ import areaChose from "@/view/components/areaChose.vue"
 import { useRouter } from "vue-router"
 const router = useRouter()
 const flag = ref(true)
+const town=ref("")
+const area=ref("泸县")
+
 
 const sendFn = (event, data = '', fn) => {
     sendMsg({ channel: 'user-trad', event, data })
     if (fn) eval(fn)
 }
 
+const handTown=(e)=>{
+    town.value=e
+}
+
+const handArea=(e)=>{
+    area.value=e
+    town.value=''
+}
 </script>
 <style lang="scss" scoped>
 .tradmenu {
diff --git a/src/view/tradeScreen/storeLogin.vue b/src/view/tradeScreen/storeLogin.vue
index f58f475..1a52064 100644
--- a/src/view/tradeScreen/storeLogin.vue
+++ b/src/view/tradeScreen/storeLogin.vue
@@ -17,8 +17,8 @@
     <areaChose v-else></areaChose>
     <div class="area" @click="flag = !flag">
         <div class="area-top">
-            <div class="town">江陽區</div>
-            <div class="town">江陽區</div>
+            <div class="town">{{ area }}</div>
+            <div class="town">{{ town }}</div>
         </div>
         <div class="area-bottom"></div>
     </div>
@@ -142,6 +142,8 @@ import { sendMsg } from "@/api.js"
 
 const router = useRouter()
 const flag = ref(true)
+const town=ref("")
+const area=ref("泸县")
 
 const merchant_list =ref([])
 const getmerchant_list = async () => {