From caa394bb772ee19d5c3c425eed2a6bc6fcd57561 Mon Sep 17 00:00:00 2001
From: xiaolei <18931076385@163.com>
Date: Sat, 9 Mar 2024 08:39:22 +0800
Subject: [PATCH 1/2] axl

---
 vite-project/components.d.ts | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/vite-project/components.d.ts b/vite-project/components.d.ts
index 3af2059..4ad2596 100644
--- a/vite-project/components.d.ts
+++ b/vite-project/components.d.ts
@@ -9,29 +9,18 @@ declare module 'vue' {
   export interface GlobalComponents {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    VanAddressList: typeof import('vant/es')['AddressList']
     VanButton: typeof import('vant/es')['Button']
-    VanCheckbox: typeof import('vant/es')['Checkbox']
-    VanCheckboxGroup: typeof import('vant/es')['CheckboxGroup']
+    VanCellGroup: typeof import('vant/es')['CellGroup']
     VanField: typeof import('vant/es')['Field']
+    VanForm: typeof import('vant/es')['Form']
     VanGrid: typeof import('vant/es')['Grid']
     VanGridItem: typeof import('vant/es')['GridItem']
     VanIcon: typeof import('vant/es')['Icon']
     VanNavBar: typeof import('vant/es')['NavBar']
-    VanPicker: typeof import('vant/es')['Picker']
-    VanPopup: typeof import('vant/es')['Popup']
-    VanRadio: typeof import('vant/es')['Radio']
-    VanRadioGroup: typeof import('vant/es')['RadioGroup']
-    VanStep: typeof import('vant/es')['Step']
-    VanSteps: typeof import('vant/es')['Steps']
+    VanSearch: typeof import('vant/es')['Search']
     VanSticky: typeof import('vant/es')['Sticky']
-<<<<<<< HEAD
     VanSwipe: typeof import('vant/es')['Swipe']
     VanSwipeItem: typeof import('vant/es')['SwipeItem']
-=======
-    VanSwitch: typeof import('vant/es')['Switch']
-    VanTab: typeof import('vant/es')['Tab']
->>>>>>> 780ab2e3e24049eea300171db088ffa3386dffdb
     VanTabbar: typeof import('vant/es')['Tabbar']
     VanTabbarItem: typeof import('vant/es')['TabbarItem']
     VanUploader: typeof import('vant/es')['Uploader']
-- 
Gitee


From ceae919dd9d9b24c68f49a101d2880f330c14e3e Mon Sep 17 00:00:00 2001
From: xiaolei <18931076385@163.com>
Date: Sat, 9 Mar 2024 11:30:47 +0800
Subject: [PATCH 2/2] axl

---
 vite-project/components.d.ts                 |  6 +++
 vite-project/src/views/MyView/AddmapView.vue | 49 ++++++++++++++++----
 vite-project/src/views/MyView/MapView.vue    |  7 +--
 vite-project/src/views/MyView/MyView.vue     |  7 ++-
 4 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/vite-project/components.d.ts b/vite-project/components.d.ts
index 4ad2596..6f3c0e2 100644
--- a/vite-project/components.d.ts
+++ b/vite-project/components.d.ts
@@ -9,6 +9,7 @@ declare module 'vue' {
   export interface GlobalComponents {
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
+    VanAddressList: typeof import('vant/es')['AddressList']
     VanButton: typeof import('vant/es')['Button']
     VanCellGroup: typeof import('vant/es')['CellGroup']
     VanField: typeof import('vant/es')['Field']
@@ -17,12 +18,17 @@ declare module 'vue' {
     VanGridItem: typeof import('vant/es')['GridItem']
     VanIcon: typeof import('vant/es')['Icon']
     VanNavBar: typeof import('vant/es')['NavBar']
+    VanPicker: typeof import('vant/es')['Picker']
+    VanPopup: typeof import('vant/es')['Popup']
     VanSearch: typeof import('vant/es')['Search']
     VanSticky: typeof import('vant/es')['Sticky']
     VanSwipe: typeof import('vant/es')['Swipe']
     VanSwipeItem: typeof import('vant/es')['SwipeItem']
+    VanSwitch: typeof import('vant/es')['Switch']
+    VanTab: typeof import('vant/es')['Tab']
     VanTabbar: typeof import('vant/es')['Tabbar']
     VanTabbarItem: typeof import('vant/es')['TabbarItem']
+    VanTabs: typeof import('vant/es')['Tabs']
     VanUploader: typeof import('vant/es')['Uploader']
   }
 }
diff --git a/vite-project/src/views/MyView/AddmapView.vue b/vite-project/src/views/MyView/AddmapView.vue
index 661396d..6414099 100644
--- a/vite-project/src/views/MyView/AddmapView.vue
+++ b/vite-project/src/views/MyView/AddmapView.vue
@@ -9,31 +9,64 @@
             <div style="background-color: white;">
                 <p style="height: 10px;"></p>
                 <b style="margin-left: 10px;">智能识别地址</b>
-                <button class="btn">开始识别</button>
+                <button class="btn" @click="starttext">开始识别</button>
                 <p style="width: 90%;margin-left: 5%;font-size: 13px;margin-top: 30px;">粘贴整段地址，系统自动识别相关信息，收件人姓名，手机号、所在省市，街道门牌号等。</p>
-                <p style="height: 30px;"></p>
+                <input v-model="text" @change="copytext" style="width: 95%;margin-left: 2.5%;height: 35px;border: none;"/>
+                <hr/>
+                <p style="height: 10px;"></p>
             </div>
             <p style="height: 10px;"></p>
-            <van-field v-model="username" name="收件人" label="收件人" placeholder="收件人" :rules="[{ required: true, message: '请填写用户名' }]"/>
-            <van-field v-model="password" name="手机号码" label="手机号码" placeholder="手机号码" :rules="[{ required: true, message: '请填写手机号码' }]"/>
-            <van-field v-model="result" is-link readonly name="picker" label="所属区域" placeholder="请选择" @click="showPicker = true"/><van-popup v-model:show="showPicker" position="bottom">
-            <van-picker :columns="columns" @confirm="onConfirm" @cancel="showPicker = false"/></van-popup>
+            <van-field v-model="name" name="收件人" label="收件人" placeholder="收件人" :rules="[{ required: true, message: '请填写用户名' }]"/>
+            <van-field v-model="tel" name="手机号码" label="手机号码" placeholder="手机号码" :rules="[{ required: true, message: '请填写手机号码' }]"/>
+            <van-field v-model="city" name="所属区域" label="所属区域" placeholder="所属区域" :rules="[{ required: true, message: '请填写手机号码' }]"/>
             <van-field v-model="address" name="详细地址" label="详细地址" placeholder="详细地址" :rules="[{ required: true, message: '请填写详细地址' }]"/>
             <p style="height: 10px;"></p>
             <p style="background-color: white;padding-left: 10px;padding-top: 10px;">
                 <b>设为默认地址</b><br/><br/>
                 <span style="font-size: 14px;">使用时，优先定位至该地址</span>
-                <van-field name="switch" style="margin-left: 270px;margin-top: -40px;"><template #input><van-switch v-model="checked"/></template></van-field>
-                <button style="width: 300px;margin-left: 20px;margin-top: 20px;background-color: green;color: white;line-height: 45px;border: none;border-radius: 5px;">保存</button>
+                <van-field name="switch" style="margin-left: 270px;margin-top: -40px;width: 70px;"><template #input><van-switch v-model="isDefault" @change="vv"/></template></van-field>
+                <button style="width: 300px;margin-left: 20px;margin-top: 20px;background-color: green;color: white;line-height: 45px;border: none;border-radius: 5px;" @click="add">保存</button>
             </p>
         </div>
     </div>
 </template>
   
 <script setup lang="ts">
+import {ref} from 'vue'
+import {useRouter} from 'vue-router'
+const router = useRouter();
 const onClickLeft=()=>{
     history.back();
 }
+const name = ref('');
+const city = ref('');
+const address = ref('');
+const tel = ref('');
+const isDefault = ref(false);
+const text = ref('');
+const vv = ()=>{
+    isDefault.value===event.target.checked;
+}
+const copytext =()=>{
+    text.value === event.target.value
+}
+const starttext=()=>{
+    const regex = /([^,]+),([^,]+),([^,]+),([^,]+)/;  
+    const match = text.value.match(regex);    
+    if (match && match.length > 4) {  
+        name.value = match[1];
+        tel.value = match[2];
+        city.value = match[3];
+        address.value = match[4];
+    } 
+}
+const add = ()=>{
+    const obj = {id:Math.random(),name:name.value,city:city.value,address:address.value,tel:tel.value,isDefault:isDefault.value};
+    const arr = JSON.parse(localStorage.getItem('addlist'))
+    arr.push(obj);
+    localStorage.setItem('addlist',JSON.stringify(arr));
+    router.push('/map');
+}
 </script>
   
 <style scoped>
diff --git a/vite-project/src/views/MyView/MapView.vue b/vite-project/src/views/MyView/MapView.vue
index 6daa316..e617bcc 100644
--- a/vite-project/src/views/MyView/MapView.vue
+++ b/vite-project/src/views/MyView/MapView.vue
@@ -18,9 +18,10 @@ const chosenAddressId = ref('1');
 const onClickLeft=()=>{
     history.back();
 }
-const message = ref([
-    {name:'李四',tel:'13812345678',address:'广东省广州市天河区',isDefault:true}
-]);
+// const message = ref([
+//     {name:'李四',tel:'13812345678',address:'广东省广州市天河区',isDefault:true}
+// ]);
+const message = ref(JSON.parse(localStorage.getItem('addlist')))
 const onAdd = () => {
     router.push('/address')
 }
diff --git a/vite-project/src/views/MyView/MyView.vue b/vite-project/src/views/MyView/MyView.vue
index 426278c..7e5f5d1 100644
--- a/vite-project/src/views/MyView/MyView.vue
+++ b/vite-project/src/views/MyView/MyView.vue
@@ -29,7 +29,7 @@
     <div class="serve" style="margin-bottom: 50px;">
       <h3>常用工具</h3>
       <van-grid :column-num="4">
-        <van-grid-item @click="router.push('/map')" icon="location-o" text="地址管理" />
+        <van-grid-item @click="kk3" icon="location-o" text="地址管理" />
         <van-grid-item @click="router.push('/home')" icon="friends-o" text="服务管家" />
         <van-grid-item @click="router.push('/mesage')" icon="service-o" text="联系客服" />
         <van-grid-item @click="router.push('/help')" icon="question-o" text="帮助中心" />
@@ -51,7 +51,10 @@ const list = [
 const kk=()=>{
   router.push('/order')
   localStorage.setItem('list',JSON.stringify(list))
-
+}
+const kk3=()=>{
+  localStorage.setItem('addlist',JSON.stringify([]))
+  router.push('/map')
 }
 const list2 = [
     {id:1,name:'智能家电床头灯',img:'https://fastly.jsdelivr.net/npm/@vant/assets/ipad.jpeg',tel:'47576589768546',time:0,price:199,size:'60*90',status:'待付款',num:1},
-- 
Gitee