From 66c550a7021c5685e8b7dde4a92e6efd3625689f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 29 七月 2025 12:01:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub

---
 pages/mine/address/add.vue |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/pages/mine/address/add.vue b/pages/mine/address/add.vue
index 293a39c..b57c855 100644
--- a/pages/mine/address/add.vue
+++ b/pages/mine/address/add.vue
@@ -3,9 +3,9 @@
     <div class="uForm">
       <u-form :border-bottom="false" :model="form" ref="uForm" :error-type="['toast']" :rule="rules">
 				<!-- #ifndef H5 -->
-        <view class="selectAddress" @click="clickUniMap">
+<!--        <view class="selectAddress" @click="clickUniMap">
           閫夋嫨鏀惰揣鍦板潃
-        </view>
+        </view> -->
 				<!-- #endif -->
         <u-form-item class="border" label="鏀惰揣浜�" label-width="130" prop="name">
           <u-input v-model="form.name" clearable placeholder="璇疯緭鍏ユ敹璐т汉濮撳悕" />
@@ -35,7 +35,7 @@
       <m-city :provinceData="list" headTitle="鍖哄煙閫夋嫨" ref="cityPicker" @funcValue="getpickerParentValue" pickerSize="4">
       </m-city>
 
-      <uniMap v-if="mapFlag" @close="closeMap" @callback="callBackAddress" />
+      <!-- <uniMap v-if="mapFlag" @close="closeMap" @callback="callBackAddress" /> -->
     </div>
   </view>
 </template>
@@ -43,8 +43,8 @@
 import '@/components/uview-components/uview-ui';
 
 import { addAddress, editAddress, getAddressDetail } from "@/api/address.js";
-import city from "@/pages/subComponents/m-city/m-city.vue";
-import uniMap from "@/components/uniMap";
+import city from "@/pages/mine/m-city/m-city.vue";
+import uniMap from "@/pages/mine/uniMap.vue";
 import permision from "@/js_sdk/wa-permission/permission.js";
 export default {
   components: {
@@ -125,7 +125,6 @@
 
     // 閫夋嫨鍦板潃鍚庢暟鎹殑鍥炶皟
     callBackAddress(val) {
-      console.log(val)
       uni.showLoading({
         title: "鍔犺浇涓�",
       });

--
Gitblit v1.8.0