继续完善

pages/mall/consumer/address-edit.uvue

@@ -53,6 +53,7 @@
 <script setup lang="uts">
 import { ref, reactive, computed } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
+import { supabaseService } from '@/utils/supabaseService.uts'
 
 type Address = {
   id: string
@@ -94,18 +95,52 @@ onLoad((options) => {
   }
 })
 
-const loadAddress = (id: string) => {
-  const storedAddresses = uni.getStorageSync('addresses')
-  if (storedAddresses) {
-    const addresses = JSON.parse(storedAddresses as string) as Address[]
-    const address = addresses.find(item => item.id === id)
+const loadAddress = async (id: string) => {
+  try {
+    // 从Supabase加载地址详情
+    const address = await supabaseService.getAddressById(id)
     if (address) {
-      formData.name = address.name
+      formData.name = address.recipient_name
       formData.phone = address.phone
-      formData.detail = address.detail
-      formData.isDefault = address.isDefault
+      formData.detail = address.detail_address
+      formData.isDefault = address.is_default
       formData.label = address.label || ''
       regionString.value = `${address.province} ${address.city} ${address.district}`.trim()
+    } else {
+      // 如果Supabase没有找到，尝试从本地存储加载
+      const storedAddresses = uni.getStorageSync('addresses')
+      if (storedAddresses) {
+        const addresses = JSON.parse(storedAddresses as string) as Address[]
+        const localAddress = addresses.find(item => item.id === id)
+        if (localAddress) {
+          formData.name = localAddress.name
+          formData.phone = localAddress.phone
+          formData.detail = localAddress.detail
+          formData.isDefault = localAddress.isDefault
+          formData.label = localAddress.label || ''
+          regionString.value = `${localAddress.province} ${localAddress.city} ${localAddress.district}`.trim()
+        }
+      }
+    }
+  } catch (error) {
+    console.error('加载地址详情失败:', error)
+    // 失败时从本地存储加载
+    const storedAddresses = uni.getStorageSync('addresses')
+    if (storedAddresses) {
+      try {
+        const addresses = JSON.parse(storedAddresses as string) as Address[]
+        const address = addresses.find(item => item.id === id)
+        if (address) {
+          formData.name = address.name
+          formData.phone = address.phone
+          formData.detail = address.detail
+          formData.isDefault = address.isDefault
+          formData.label = address.label || ''
+          regionString.value = `${address.province} ${address.city} ${address.district}`.trim()
+        }
+      } catch (e) {
+        console.error('解析本地地址数据失败', e)
+      }
     }
   }
 }
@@ -122,7 +157,7 @@ const onSwitchChange = (e: UniSwitchChangeEvent) => {
   formData.isDefault = e.detail.value
 }
 
-const saveAddress = () => {
+const saveAddress = async () => {
   if (!formData.name) {
     uni.showToast({ title: '请填写收货人', icon: 'none' })
     return
@@ -146,28 +181,66 @@ const saveAddress = () => {
   const city = regions[1] || ''
   const district = regions.slice(2).join(' ') || ''
 
-  const storedAddresses = uni.getStorageSync('addresses')
-  let addresses: Address[] = []
-  if (storedAddresses) {
-    try {
-      addresses = JSON.parse(storedAddresses as string) as Address[]
-    } catch (e) {
-      addresses = []
-    }
-  }
-  
-  // 如果设为默认，取消其他默认
-  if (formData.isDefault) {
-    addresses.forEach(item => {
-      item.isDefault = false
-    })
+  // 构建地址对象
+  const addressData = {
+    recipient_name: formData.name,
+    phone: formData.phone,
+    province: province,
+    city: city,
+    district: district,
+    detail_address: formData.detail,
+    postal_code: '', // 如果需要可以添加邮政编码字段
+    is_default: formData.isDefault,
+    label: formData.label || ''
   }
+
+  let success = false
   
   if (isEdit.value) {
-    const index = addresses.findIndex(item => item.id === addressId.value)
-    if (index !== -1) {
-      addresses[index] = {
-        ...addresses[index],
+    // 更新地址
+    success = await supabaseService.updateAddress(addressId.value, addressData)
+  } else {
+    // 添加新地址
+    success = await supabaseService.addAddress(addressData)
+  }
+
+  if (success) {
+    // 同时更新本地存储作为缓存
+    const storedAddresses = uni.getStorageSync('addresses')
+    let addresses: Address[] = []
+    if (storedAddresses) {
+      try {
+        addresses = JSON.parse(storedAddresses as string) as Address[]
+      } catch (e) {
+        addresses = []
+      }
+    }
+    
+    // 如果设为默认，取消其他默认
+    if (formData.isDefault) {
+      addresses.forEach(item => {
+        item.isDefault = false
+      })
+    }
+    
+    if (isEdit.value) {
+      const index = addresses.findIndex(item => item.id === addressId.value)
+      if (index !== -1) {
+        addresses[index] = {
+          ...addresses[index],
+          name: formData.name,
+          phone: formData.phone,
+          province: province,
+          city: city,
+          district: district,
+          detail: formData.detail,
+          isDefault: formData.isDefault,
+          label: formData.label
+        }
+      }
+    } else {
+      const newAddress: Address = {
+        id: `addr_${Date.now()}`, // 临时ID，实际由Supabase生成
         name: formData.name,
         phone: formData.phone,
         province: province,
@@ -177,36 +250,26 @@ const saveAddress = () => {
         isDefault: formData.isDefault,
         label: formData.label
       }
+      addresses.push(newAddress)
     }
+    
+    uni.setStorageSync('addresses', JSON.stringify(addresses))
+    
+    uni.showToast({
+      title: '保存成功',
+      icon: 'success'
+    })
+    
+    setTimeout(() => {
+      uni.navigateBack()
+    }, 1500)
   } else {
-    const newAddress: Address = {
-      id: `addr_${Date.now()}`,
-      name: formData.name,
-      phone: formData.phone,
-      province: province,
-      city: city,
-      district: district,
-      detail: formData.detail,
-      isDefault: formData.isDefault,
-      label: formData.label
-    }
-    // 如果是第一个地址，自动设为默认
-    if (addresses.length === 0) {
-      newAddress.isDefault = true
-    }
-    addresses.push(newAddress)
+    console.error('保存地址失败')
+    uni.showToast({
+      title: '保存失败',
+      icon: 'none'
+    })
   }
-  
-  uni.setStorageSync('addresses', JSON.stringify(addresses))
-  
-  uni.showToast({
-    title: '保存成功',
-    icon: 'success'
-  })
-  
-  setTimeout(() => {
-    uni.navigateBack()
-  }, 1500)
 }
 
 const parseSmartInput = () => {
@@ -244,17 +307,23 @@ const parseSmartInput = () => {
     formData.detail = addrText
   }
 }
-const deleteAddress = () => {
+const deleteAddress = async () => {
   uni.showModal({
     title: '提示',
     content: '确定要删除该地址吗？',
-    success: (res) => {
+    success: async (res) => {
       if (res.confirm) {
-        const storedAddresses = uni.getStorageSync('addresses')
-        if (storedAddresses) {
-          let addresses = JSON.parse(storedAddresses as string) as Address[]
-          addresses = addresses.filter(item => item.id !== addressId.value)
-          uni.setStorageSync('addresses', JSON.stringify(addresses))
+        // 调用Supabase服务删除地址
+        const success = await supabaseService.deleteAddress(addressId.value)
+        
+        if (success) {
+          // 同时从本地存储中移除
+          const storedAddresses = uni.getStorageSync('addresses')
+          if (storedAddresses) {
+            let addresses = JSON.parse(storedAddresses as string) as Address[]
+            addresses = addresses.filter(item => item.id !== addressId.value)
+            uni.setStorageSync('addresses', JSON.stringify(addresses))
+          }
           
           uni.showToast({
             title: '删除成功',
@@ -264,6 +333,12 @@ const deleteAddress = () => {
           setTimeout(() => {
             uni.navigateBack()
           }, 1500)
+        } else {
+          console.error('删除地址失败')
+          uni.showToast({
+            title: '删除失败',
+            icon: 'none'
+          })
         }
       }
     }