From 46a7fa4e611a8e994550fa2b247a1cfb1531ab2b Mon Sep 17 00:00:00 2001
From: 77 <270260644@qq.com>
Date: Tue, 12 Nov 2024 14:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/user/address/edit.vue                   | 518 ++++++++----------
 pages/user/address/list.vue                   | 281 +++++-----
 .../s-address-item/s-address-item.vue         | 305 +++++++----
 3 files changed, 592 insertions(+), 512 deletions(-)

diff --git a/pages/user/address/edit.vue b/pages/user/address/edit.vue
index f9a3535..3ea33b1 100644
--- a/pages/user/address/edit.vue
+++ b/pages/user/address/edit.vue
@@ -1,305 +1,271 @@
 <!-- 收货地址的新增/编辑 -->
 <template>
-  <s-layout :title="state.model.id ? '编辑地址' : '新增地址'">
-    <uni-forms
-      ref="addressFormRef"
-      v-model="state.model"
-      :rules="rules"
-      validateTrigger="bind"
-      labelWidth="160"
-      labelAlign="left"
-      border
-      :labelStyle="{ fontWeight: 'bold' }"
-    >
-      <view class="bg-white form-box ss-p-x-30">
-        <uni-forms-item name="name" label="收货人" class="form-item">
-          <uni-easyinput
-            v-model="state.model.name"
-            placeholder="请填写收货人姓名"
-            :inputBorder="false"
-            placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
-          />
-        </uni-forms-item>
+	<s-layout :title="state.model.id ? '编辑地址' : '新增地址'">
+		<uni-forms ref="addressFormRef" v-model="state.model" :rules="rules" validateTrigger="bind" labelWidth="160"
+			labelAlign="left" border :labelStyle="{ fontWeight: 'bold' }">
+			<view class="bg-white form-box ss-p-x-30">
+				<uni-forms-item name="name" label="收货人" class="form-item">
+					<uni-easyinput v-model="state.model.name" placeholder="请填写收货人姓名" :inputBorder="false"
+						placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal" />
+				</uni-forms-item>
 
-        <uni-forms-item name="mobile" label="手机号" class="form-item">
-          <uni-easyinput
-            v-model="state.model.mobile"
-            type="number"
-            placeholder="请输入手机号"
-            :inputBorder="false"
-            placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
-          >
-          </uni-easyinput>
-        </uni-forms-item>
-        <uni-forms-item
-          name="areaName"
-          label="省市区"
-          @tap="state.showRegion = true"
-          class="form-item"
-        >
-          <uni-easyinput
-            v-model="state.model.areaName"
-            disabled
-            :inputBorder="false"
-            :styles="{ disableColor: '#fff', color: '#333' }"
-            placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
-            placeholder="请选择省市区"
-          >
-            <template v-slot:right>
-              <uni-icons type="right" />
-            </template>
-          </uni-easyinput>
-        </uni-forms-item>
-        <uni-forms-item
-          name="detailAddress"
-          label="详细地址"
-          :formItemStyle="{ alignItems: 'flex-start' }"
-          :labelStyle="{ lineHeight: '5em' }"
-          class="textarea-item"
-        >
-          <uni-easyinput
-            :inputBorder="false"
-            type="textarea"
-            v-model="state.model.detailAddress"
-            placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
-            placeholder="请输入详细地址"
-            clearable
-          />
-        </uni-forms-item>
-      </view>
-      <view class="ss-m-y-20 bg-white ss-p-x-30 ss-flex ss-row-between ss-col-center default-box">
-        <view class="default-box-title"> 设为默认地址 </view>
-        <su-switch style="transform: scale(0.8)" v-model="state.model.defaultStatus" />
-      </view>
-    </uni-forms>
-    <su-fixed bottom :opacity="false" bg="" placeholder :noFixed="false" :index="10">
-      <view class="footer-box ss-flex-col ss-row-between ss-p-20">
-        <view class="ss-m-b-20">
-          <button class="ss-reset-button save-btn ui-Shadow-Main" @tap="onSave">保存</button>
-        </view>
-        <button v-if="state.model.id" class="ss-reset-button cancel-btn" @tap="onDelete">
-          删除
-        </button>
-      </view>
-    </su-fixed>
+				<uni-forms-item name="mobile" label="手机号" class="form-item">
+					<uni-easyinput v-model="state.model.mobile" type="number" placeholder="请输入手机号" :inputBorder="false"
+						placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal">
+					</uni-easyinput>
+				</uni-forms-item>
+				<uni-forms-item name="areaName" label="省市区" @tap="state.showRegion = true" class="form-item">
+					<uni-easyinput v-model="state.model.areaName" disabled :inputBorder="false"
+						:styles="{ disableColor: '#fff', color: '#333' }"
+						placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
+						placeholder="请选择省市区">
+						<template v-slot:right>
+							<uni-icons type="right" />
+						</template>
+					</uni-easyinput>
+				</uni-forms-item>
+				<uni-forms-item name="detailAddress" label="详细地址" :formItemStyle="{ alignItems: 'flex-start' }"
+					:labelStyle="{ lineHeight: '5em' }" class="textarea-item">
+					<uni-easyinput :inputBorder="false" type="textarea" v-model="state.model.detailAddress"
+						placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
+						placeholder="请输入详细地址" clearable />
+				</uni-forms-item>
+			</view>
+			<view class="ss-m-y-20 bg-white ss-p-x-30 ss-flex ss-row-between ss-col-center default-box">
+				<view class="default-box-title"> 设为默认地址 </view>
+				<su-switch style="transform: scale(0.8)" v-model="state.model.defaultStatus" />
+			</view>
+		</uni-forms>
+		<su-fixed bottom :opacity="false" bg="" placeholder :noFixed="false" :index="10">
+			<view class="footer-box ss-flex-col ss-row-between ss-p-20">
+				<view class="ss-m-b-20">
+					<button class="ss-reset-button save-btn ui-Shadow-Main" @tap="onSave">保存</button>
+				</view>
+				<button v-if="state.model.id" class="ss-reset-button cancel-btn" @tap="onDelete">
+					删除
+				</button>
+			</view>
+		</su-fixed>
 
-    <!-- 省市区弹窗 -->
-    <su-region-picker
-      :show="state.showRegion"
-      @cancel="state.showRegion = false"
-      @confirm="onRegionConfirm"
-    />
-  </s-layout>
+		<!-- 省市区弹窗 -->
+		<su-region-picker :show="state.showRegion" @cancel="state.showRegion = false" @confirm="onRegionConfirm" />
+	</s-layout>
 </template>
 
 <script setup>
-  import { ref, reactive, unref } from 'vue';
-  import sheep from '@/sheep';
-  import { onLoad } from '@dcloudio/uni-app';
-  import _ from 'lodash';
-  import { mobile } from '@/sheep/validate/form';
-  import AreaApi from '@/sheep/api/system/area';
-  import AddressApi from '@/sheep/api/member/address';
+	import {
+		ref,
+		reactive,
+		unref
+	} from 'vue';
+	import sheep from '@/sheep';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
+	import _ from 'lodash';
+	import {
+		mobile
+	} from '@/sheep/validate/form';
+	import AreaApi from '@/sheep/api/system/area';
+	import AddressApi from '@/sheep/api/member/address';
 
-  const addressFormRef = ref(null);
-  const state = reactive({
-    showRegion: false,
-    model: {
-      name: '',
-      mobile: '',
-      detailAddress: '',
-      defaultStatus: false,
-      areaName: '',
-    },
-    rules: {},
-  });
+	const addressFormRef = ref(null);
+	const state = reactive({
+		showRegion: false,
+		model: {
 
-  const rules = {
-    name: {
-      rules: [
-        {
-          required: true,
-          errorMessage: '请输入收货人姓名',
-        },
-      ],
-    },
-    mobile,
-    detailAddress: {
-      rules: [
-        {
-          required: true,
-          errorMessage: '请输入详细地址',
-        },
-      ],
-    },
-    areaName: {
-      rules: [
-        {
-          required: true,
-          errorMessage: '请选择您的位置',
-        },
-      ],
-    },
-  };
+			defaultStatus: false,
+		},
+		rules: {},
+	});
 
-  // 确认选择地区
-  const onRegionConfirm = (e) => {
-    state.model.areaName = `${e.province_name} ${e.city_name} ${e.district_name}`;
-    state.model.areaId = e.district_id;
-    state.showRegion = false;
-  };
+	const rules = {
+		name: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入收货人姓名',
+			}, ],
+		},
+		mobile,
+		detailAddress: {
+			rules: [{
+				required: true,
+				errorMessage: '请输入详细地址',
+			}, ],
+		},
+		areaName: {
+			rules: [{
+				required: true,
+				errorMessage: '请选择您的位置',
+			}, ],
+		},
+	};
 
-  // 获得地区数据
-  const getAreaData = () => {
-    if (_.isEmpty(uni.getStorageSync('areaData'))) {
-      AreaApi.getAreaTree().then((res) => {
-        if (res.code === 0) {
-          uni.setStorageSync('areaData', res.data);
-        }
-      });
-    }
-  };
+	// 确认选择地区
+	const onRegionConfirm = (e) => {
+		state.model.areaName = `${e.province_name} ${e.city_name} ${e.district_name}`;
+		state.model.areaId = e.district_id;
+		state.showRegion = false;
+	};
 
-  // 保存收货地址
-  const onSave = async () => {
-    // 参数校验
-    const validate = await unref(addressFormRef)
-      .validate()
-      .catch((error) => {
-        console.log('error: ', error);
-      });
-    if (!validate) {
-      return;
-    }
+	// 获得地区数据
+	const getAreaData = () => {
+		if (_.isEmpty(uni.getStorageSync('areaData'))) {
+			AreaApi.getAreaTree().then((res) => {
+				if (res.code === 0) {
+					uni.setStorageSync('areaData', res.data);
+				}
+			});
+		}
+	};
 
-    // 提交请求
-    const formData = {
-      ...state.model,
-    };
-    const { code } =
-      state.model.id > 0
-        ? await AddressApi.updateAddress(formData)
-        : await AddressApi.createAddress(formData);
-    if (code === 0) {
-      sheep.$router.back();
-    }
-  };
+	// 保存收货地址
+	const onSave = async () => {
+		// 参数校验
+		const validate = await unref(addressFormRef)
+			.validate()
+			.catch((error) => {
+				console.log('error: ', error);
+			});
+		if (!validate) {
+			return;
+		}
 
-  // 删除收货地址
-  const onDelete = () => {
-    uni.showModal({
-      title: '提示',
-      content: '确认删除此收货地址吗？',
-      success: async function (res) {
-        if (!res.confirm) {
-          return;
-        }
-        const { code } = await AddressApi.deleteAddress(state.model.id);
-        if (code === 0) {
-          sheep.$router.back();
-        }
-      },
-    });
-  };
+		// 提交请求
+		const formData = {
+			...state.model,
+		};
+		const {
+			code
+		} =
+		state.model.id > 0 ?
+			await AddressApi.updateAddress(formData) :
+			await AddressApi.createAddress(formData);
+		if (code === 0) {
+			sheep.$router.back();
+		}
+	};
 
-  onLoad(async (options) => {
-    // 获得地区数据
-    getAreaData();
-    // 情况一：基于 id 获得收件地址
-    if (options.id) {
-      let { code, data } = await AddressApi.getAddress(options.id);
-      if (code !== 0) {
-        return;
-      }
-      state.model = data;
-    }
-    // 情况二：微信导入
-    if (options.data) {
-      let data = JSON.parse(options.data);
-      const areaData = uni.getStorageSync('areaData');
-      const findAreaByName = (areas, name) => areas.find((item) => item.name === name);
+	// 删除收货地址
+	const onDelete = () => {
+		uni.showModal({
+			title: '提示',
+			content: '确认删除此收货地址吗？',
+			success: async function(res) {
+				if (!res.confirm) {
+					return;
+				}
+				const {
+					code
+				} = await AddressApi.deleteAddress(state.model.id);
+				if (code === 0) {
+					sheep.$router.back();
+				}
+			},
+		});
+	};
 
-      let provinceObj = findAreaByName(areaData, data.province_name);
-      let cityObj = provinceObj ? findAreaByName(provinceObj.children, data.city_name) : undefined;
-      let districtObj = cityObj ? findAreaByName(cityObj.children, data.district_name) : undefined;
-      let areaId = (districtObj || cityObj || provinceObj).id;
+	onLoad(async (options) => {
+		// 获得地区数据
+		getAreaData();
+		// 情况一：基于 id 获得收件地址
+		if (options.id) {
+			let {
+				code,
+				data
+			} = await AddressApi.getAddress(options.id);
+			if (code !== 0) {
+				return;
+			}
+			state.model = data;
+		}
+		// 情况二：微信导入
+		if (options.data) {
+			let data = JSON.parse(options.data);
+			const areaData = uni.getStorageSync('areaData');
+			const findAreaByName = (areas, name) => areas.find((item) => item.name === name);
 
-      state.model = {
-        ...state.model,
-        areaId,
-        areaName: [data.province_name, data.city_name, data.district_name]
-          .filter(Boolean)
-          .join(' '),
-        defaultStatus: false,
-        detailAddress: data.address,
-        mobile: data.mobile,
-        name: data.consignee,
-      };
-    }
-  });
+			let provinceObj = findAreaByName(areaData, data.province_name);
+			let cityObj = provinceObj ? findAreaByName(provinceObj.children, data.city_name) : undefined;
+			let districtObj = cityObj ? findAreaByName(cityObj.children, data.district_name) : undefined;
+			let areaId = (districtObj || cityObj || provinceObj).id;
+
+			state.model = {
+				...state.model,
+				areaId,
+				areaName: [data.province_name, data.city_name, data.district_name]
+					.filter(Boolean)
+					.join(' '),
+				defaultStatus: false,
+				detailAddress: data.address,
+				mobile: data.mobile,
+				name: data.consignee,
+			};
+		}
+	});
 </script>
 
 <style lang="scss" scoped>
-  :deep() {
-    .uni-forms-item__label .label-text {
-      font-size: 28rpx !important;
-      color: #333333 !important;
-      line-height: normal !important;
-    }
+	:deep() {
+		.uni-forms-item__label .label-text {
+			font-size: 28rpx !important;
+			color: #333333 !important;
+			line-height: normal !important;
+		}
 
-    .uni-easyinput__content-input {
-      font-size: 28rpx !important;
-      color: #333333 !important;
-      line-height: normal !important;
-      padding-left: 0 !important;
-    }
+		.uni-easyinput__content-input {
+			font-size: 28rpx !important;
+			color: #333333 !important;
+			line-height: normal !important;
+			padding-left: 0 !important;
+		}
 
-    .uni-easyinput__content-textarea {
-      font-size: 28rpx !important;
-      color: #333333 !important;
-      line-height: normal !important;
-      margin-top: 8rpx !important;
-    }
+		.uni-easyinput__content-textarea {
+			font-size: 28rpx !important;
+			color: #333333 !important;
+			line-height: normal !important;
+			margin-top: 8rpx !important;
+		}
 
-    .uni-icons {
-      font-size: 40rpx !important;
-    }
+		.uni-icons {
+			font-size: 40rpx !important;
+		}
 
-    .is-textarea-icon {
-      margin-top: 22rpx;
-    }
+		.is-textarea-icon {
+			margin-top: 22rpx;
+		}
 
-    .is-disabled {
-      color: #333333;
-    }
-  }
+		.is-disabled {
+			color: #333333;
+		}
+	}
 
-  .default-box {
-    width: 100%;
-    box-sizing: border-box;
-    height: 100rpx;
+	.default-box {
+		width: 100%;
+		box-sizing: border-box;
+		height: 100rpx;
 
-    .default-box-title {
-      font-size: 28rpx;
-      color: #333333;
-      line-height: normal;
-    }
-  }
+		.default-box-title {
+			font-size: 28rpx;
+			color: #333333;
+			line-height: normal;
+		}
+	}
 
-  .footer-box {
-    .save-btn {
-      width: 710rpx;
-      height: 80rpx;
-      border-radius: 40rpx;
-      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-      color: $white;
-    }
+	.footer-box {
+		.save-btn {
+			width: 710rpx;
+			height: 80rpx;
+			border-radius: 40rpx;
+			background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+			color: $white;
+		}
 
-    .cancel-btn {
-      width: 710rpx;
-      height: 80rpx;
-      border-radius: 40rpx;
-      background: var(--ui-BG);
-    }
-  }
-</style>
+		.cancel-btn {
+			width: 710rpx;
+			height: 80rpx;
+			border-radius: 40rpx;
+			background: var(--ui-BG);
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/address/list.vue b/pages/user/address/list.vue
index 9fd501e..932854b 100644
--- a/pages/user/address/list.vue
+++ b/pages/user/address/list.vue
@@ -1,156 +1,155 @@
 <!-- 收件地址列表 -->
 <template>
-  <s-layout title="收货地址" :bgStyle="{ color: '#FFF' }">
-    <view v-if="state.list.length">
-      <s-address-item
-        hasBorderBottom
-        v-for="item in state.list"
-        :key="item.id"
-        :item="item"
-        @tap="onSelect(item)"
-      />
-    </view>
+	<s-layout title="收货地址" :bgStyle="{ color: '#FFF' }">
+		<view v-if="state.list.length">
+			<s-address-item hasBorderBottom v-for="item in state.list" :key="item.id" :item="item" @tap="onSelect(item)"
+				@cc="getList" />
+		</view>
 
-    <su-fixed bottom placeholder>
-      <view class="footer-box ss-flex ss-row-between ss-p-20">
-        <!-- 微信小程序和微信H5 -->
-        <button
-          v-if="['WechatMiniProgram', 'WechatOfficialAccount'].includes(sheep.$platform.name)"
-          @tap="importWechatAddress"
-          class="border ss-reset-button sync-wxaddress ss-m-20 ss-flex ss-row-center ss-col-center"
-        >
-          <text class="cicon-weixin ss-p-r-10" style="color: #09bb07; font-size: 40rpx"></text>
-          导入微信地址
-        </button>
-        <button
-          class="add-btn ss-reset-button ui-Shadow-Main"
-          @tap="sheep.$router.go('/pages/user/address/edit')"
-        >
-          新增收货地址
-        </button>
-      </view>
-    </su-fixed>
-    <s-empty
-      v-if="state.list.length === 0 && !state.loading"
-      text="暂无收货地址"
-      icon="/static/data-empty.png"
-    />
-  </s-layout>
+		<su-fixed bottom placeholder>
+			<view class="footer-box ss-flex ss-row-between ss-p-20">
+				<!-- 微信小程序和微信H5 -->
+				<button v-if="['WechatMiniProgram', 'WechatOfficialAccount'].includes(sheep.$platform.name)"
+					@tap="importWechatAddress"
+					class="border ss-reset-button sync-wxaddress ss-m-20 ss-flex ss-row-center ss-col-center">
+					<text class="cicon-weixin ss-p-r-10" style="color: #09bb07; font-size: 40rpx"></text>
+					导入微信地址
+				</button>
+				<button class="add-btn ss-reset-button ui-Shadow-Main"
+					@tap="sheep.$router.go('/pages/user/address/edit')">
+					新增收货地址
+				</button>
+			</view>
+		</su-fixed>
+		<s-empty v-if="state.list.length === 0 && !state.loading" text="暂无收货地址" icon="/static/data-empty.png" />
+	</s-layout>
 </template>
 
 <script setup>
-  import { reactive, onBeforeMount } from 'vue';
-  import { onShow } from '@dcloudio/uni-app';
-  import sheep from '@/sheep';
-  import { isEmpty } from 'lodash';
-  import AreaApi from '@/sheep/api/system/area';
-  import AddressApi from '@/sheep/api/member/address';
+	import {
+		reactive,
+		onBeforeMount
+	} from 'vue';
+	import {
+		onShow
+	} from '@dcloudio/uni-app';
+	import sheep from '@/sheep';
+	import {
+		isEmpty
+	} from 'lodash';
+	import AreaApi from '@/sheep/api/system/area';
+	import AddressApi from '@/sheep/api/member/address';
 
-  const state = reactive({
-    list: [], // 地址列表
-    loading: true,
-  });
+	const state = reactive({
+		list: [], // 地址列表
+		loading: true,
+	});
 
-  // 选择收货地址
-  const onSelect = (addressInfo) => {
-    uni.$emit('SELECT_ADDRESS', {
-      addressInfo,
-    });
-    sheep.$router.back();
-  };
+	// 选择收货地址
+	const onSelect = (addressInfo) => {
+		uni.$emit('SELECT_ADDRESS', {
+			addressInfo,
+		});
+		sheep.$router.back();
+	};
 
-  // 导入微信地址
-  // TODO 芋艿：未测试
-  function importWechatAddress() {
-    let wechatAddress = {};
-    // #ifdef MP
-    uni.chooseAddress({
-      success: (res) => {
-        wechatAddress = {
-          consignee: res.userName,
-          mobile: res.telNumber,
-          province_name: res.provinceName,
-          city_name: res.cityName,
-          district_name: res.countyName,
-          address: res.detailInfo,
-          region: '',
-          is_default: false,
-        };
-        if (!isEmpty(wechatAddress)) {
-          sheep.$router.go('/pages/user/address/edit', {
-            data: JSON.stringify(wechatAddress),
-          });
-        }
-      },
-      fail: (err) => {
-        console.log('%cuni.chooseAddress,调用失败', 'color:green;background:yellow');
-      },
-    });
-    // #endif
-    // #ifdef H5
-    sheep.$platform.useProvider('wechat').jssdk.openAddress({
-      success: (res) => {
-        wechatAddress = {
-          consignee: res.userName,
-          mobile: res.telNumber,
-          province_name: res.provinceName,
-          city_name: res.cityName,
-          district_name: res.countryName,
-          address: res.detailInfo,
-          region: '',
-          is_default: false,
-        };
-        if (!isEmpty(wechatAddress)) {
-          sheep.$router.go('/pages/user/address/edit', {
-            data: JSON.stringify(wechatAddress),
-          });
-        }
-      },
-    });
-    // #endif
-  }
+	// 导入微信地址
+	// TODO 芋艿：未测试
+	function importWechatAddress() {
+		let wechatAddress = {};
+		// #ifdef MP
+		uni.chooseAddress({
+			success: (res) => {
+				wechatAddress = {
+					consignee: res.userName,
+					mobile: res.telNumber,
+					province_name: res.provinceName,
+					city_name: res.cityName,
+					district_name: res.countyName,
+					address: res.detailInfo,
+					region: '',
+					is_default: false,
+				};
+				if (!isEmpty(wechatAddress)) {
+					sheep.$router.go('/pages/user/address/edit', {
+						data: JSON.stringify(wechatAddress),
+					});
+				}
+			},
+			fail: (err) => {
+				console.log('%cuni.chooseAddress,调用失败', 'color:green;background:yellow');
+			},
+		});
+		// #endif
+		// #ifdef H5
+		sheep.$platform.useProvider('wechat').jssdk.openAddress({
+			success: (res) => {
+				wechatAddress = {
+					consignee: res.userName,
+					mobile: res.telNumber,
+					province_name: res.provinceName,
+					city_name: res.cityName,
+					district_name: res.countryName,
+					address: res.detailInfo,
+					region: '',
+					is_default: false,
+				};
+				if (!isEmpty(wechatAddress)) {
+					sheep.$router.go('/pages/user/address/edit', {
+						data: JSON.stringify(wechatAddress),
+					});
+				}
+			},
+		});
+		// #endif
+	}
 
-  onShow(async () => {
-    state.list = (await AddressApi.getAddressList()).data;
-    state.loading = false;
-  });
+	function getList(val) {
+		AddressApi.getAddressList().then((res) => {
+			state.list = res.data
+		})
+	}
+	onShow(async () => {
+		state.list = (await AddressApi.getAddressList()).data;
+		state.loading = false;
+	});
 
-  onBeforeMount(() => {
-    if (!!uni.getStorageSync('areaData')) {
-      return;
-    }
-    // 提前加载省市区数据
-    AreaApi.getAreaTree().then((res) => {
-      if (res.code === 0) {
-        uni.setStorageSync('areaData', res.data);
-      }
-    });
-  });
+	onBeforeMount(() => {
+		if (!!uni.getStorageSync('areaData')) {
+			return;
+		}
+		// 提前加载省市区数据
+		AreaApi.getAreaTree().then((res) => {
+			if (res.code === 0) {
+				uni.setStorageSync('areaData', res.data);
+			}
+		});
+	});
 </script>
 
 <style lang="scss" scoped>
-  .footer-box {
-    .add-btn {
-      flex: 1;
-      background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-      border-radius: 80rpx;
-      font-size: 30rpx;
-      font-weight: 500;
-      line-height: 80rpx;
-      color: $white;
-      position: relative;
-      z-index: 1;
-    }
+	.footer-box {
+		.add-btn {
+			flex: 1;
+			background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+			border-radius: 80rpx;
+			font-size: 30rpx;
+			font-weight: 500;
+			line-height: 80rpx;
+			color: $white;
+			position: relative;
+			z-index: 1;
+		}
 
-    .sync-wxaddress {
-      flex: 1;
-      line-height: 80rpx;
-      background: $white;
-      border-radius: 80rpx;
-      font-size: 30rpx;
-      font-weight: 500;
-      color: $dark-6;
-      margin-right: 18rpx;
-    }
-  }
-</style>
+		.sync-wxaddress {
+			flex: 1;
+			line-height: 80rpx;
+			background: $white;
+			border-radius: 80rpx;
+			font-size: 30rpx;
+			font-weight: 500;
+			color: $dark-6;
+			margin-right: 18rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-address-item/s-address-item.vue b/sheep/components/s-address-item/s-address-item.vue
index 5d99155..6c9abb5 100644
--- a/sheep/components/s-address-item/s-address-item.vue
+++ b/sheep/components/s-address-item/s-address-item.vue
@@ -1,110 +1,225 @@
 <!-- 地址卡片 -->
 <template>
-  <view
-    class="address-item ss-flex ss-row-between ss-col-center"
-    :class="[{ 'border-bottom': props.hasBorderBottom }]"
-  >
-    <view class="item-left" v-if="!isEmpty(props.item)">
-      <view class="area-text ss-flex ss-col-center">
-        <uni-tag
-          class="ss-m-r-10"
-          size="small"
-          custom-style="background-color: var(--ui-BG-Main); border-color: var(--ui-BG-Main); color: #fff;"
-          v-if="props.item.defaultStatus"
-          text="默认"
-        />
-        {{ props.item.areaName }}
-      </view>
-      <view class="address-text">
-        {{ props.item.detailAddress }}
-      </view>
-      <view class="person-text"> {{ props.item.name }} {{ props.item.mobile }} </view>
-    </view>
-    <view v-else>
-      <view class="address-text ss-m-b-10">请选择收货地址</view>
-    </view>
-    <slot>
-      <button class="ss-reset-button edit-btn" @tap.stop="onEdit">
-        <view class="edit-icon ss-flex ss-row-center ss-col-center">
-          <image :src="sheep.$url.static('/static/img/shop/user/address/edit.png')" />
-        </view>
-      </button>
-    </slot>
-  </view>
+	<view class="address-item ss-flex ss-row-between ss-col-center"
+		:class="[{ 'border-bottom': props.hasBorderBottom }]">
+		<image class="imgs"
+			src="https://zysc.fjptzykj.com:3000/shangcheng/0f01dda22fb349c40c4659d73cb346a1423fee44c9d53eb07bdae1a1e11b5299.png">
+		</image>
+		<view class="item-left" v-if="!isEmpty(props.item)">
+			<!-- <view class="area-text ss-flex ss-col-center">
+				<uni-tag
+				  class="ss-m-r-10"
+				  size="small"
+				  custom-style="background-color: var(--ui-BG-Main); border-color: var(--ui-BG-Main); color: #fff;"
+				  v-if="props.item.defaultStatus"
+				  text="默认"
+				/>
+				{{ props.item.areaName }}
+			  </view> -->
+			<view class="address-text">
+				收货人：{{ props.item.name }} {{ props.item.mobile }}
+			</view>
+			<view class="person-text">收货地址： {{ props.item.areaName }} {{ props.item.detailAddress }}</view>
+		</view>
+		<view v-else>
+			<view class="address-text ss-m-b-10">请选择收货地址</view>
+		</view>
+		<slot>
+			<!-- <button class="ss-reset-button edit-btn" @tap.stop="onEdit">
+				<view class="edit-icon ss-flex ss-row-center ss-col-center">
+					<image
+						:src="sheep.$url.static('https://zysc.fjptzykj.com:3000/shangcheng/f6c484a459e843baeb729603ae221b6d3ab384b56c2d891ae53b0ee4205477a9.png')" />
+				</view>
+			</button> -->
+		</slot>
+		<view class="bottom">
+			<view class="left" @click.stop="auto(props.item)">
+				<view class="radio">
+					<image class="img"
+						v-if="props.item.defaultStatus"
+						src="https://zysc.fjptzykj.com:3000/shangcheng/1d07aff7a6a0a3a5f09ed68407bd4bb9c589b62dba04b23d61b7027453b2894e.png">
+					</image>
+				</view>设为默认
+			</view>
+			<view class='right'>
+				<view class="edit-icon" @click.stop="onEdit">
+					<image class="img"
+						src="https://zysc.fjptzykj.com:3000/shangcheng/82a9c12d309bf1a7f11e581ac31230e3847f2aaf2f31591b4d3aed7ee506ff54.png" />
+					编辑
+				</view>
+				<view class="edit-icon" @click.stop="onDelete(props.item.id)">
+					<image class="img"
+						src="https://zysc.fjptzykj.com:3000/shangcheng/efbc57f84ba2740666f17f3cfcd1b607af5e3c520eca27814e5cda11c9715494.png" />
+					删除
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
-  /**
-   * 基础组件 - 地址卡片
-   *
-   * @param {String}  icon = _icon-edit    - icon
-   *
-   * @event {Function()} click			 - 点击
-   * @event {Function()} actionClick		 - 点击工具栏
-   *
-   * @slot 								 - 默认插槽
-   */
-  import sheep from '@/sheep';
-  import { isEmpty } from 'lodash';
-  const props = defineProps({
-    item: {
-      type: Object,
-      default() {},
-    },
-    hasBorderBottom: {
-      type: Boolean,
-      defult: true,
-    },
-  });
+	/**
+	 * 基础组件 - 地址卡片
+	 *
+	 * @param {String}  icon = _icon-edit    - icon
+	 *
+	 * @event {Function()} click			 - 点击
+	 * @event {Function()} actionClick		 - 点击工具栏
+	 *
+	 * @slot 								 - 默认插槽
+	 */
+	import sheep from '@/sheep';
+	import AddressApi from '@/sheep/api/member/address';
+	import {
+		isEmpty
+	} from 'lodash';
+	const emits = defineEmits(['cc']);
+	const props = defineProps({
+		item: {
+			type: Object,
+			default () {},
+		},
+		hasBorderBottom: {
+			type: Boolean,
+			defult: true,
+		},
+	});
 
-  const onEdit = () => {
-    sheep.$router.go('/pages/user/address/edit', {
-      id: props.item.id,
-    });
-  };
+	// 删除收货地址
+	const onDelete = (id) => {
+	  uni.showModal({
+	    title: '提示',
+	    content: '确认删除此收货地址吗？',
+	    success: async function (res) {
+	      if (!res.confirm) {
+	        return;
+	      }
+	      const { code } = await AddressApi.deleteAddress(id);
+	      if (code === 0) {
+			emits("cc", "2222")
+	      }
+	    },
+	  });
+	};
+
+	const onEdit = () => {
+		sheep.$router.go('/pages/user/address/edit', {
+			id: props.item.id,
+		});
+	};
+	
+	function auto(item){
+		item.defaultStatus = !item.defaultStatus;
+		AddressApi.updateAddress(item).then((res)=>{
+			emits("cc", "2222")
+		})
+	}
 </script>
 
 <style lang="scss" scoped>
-  .address-item {
-    padding: 24rpx 30rpx;
+	.address-item {
+		background: white;
+		padding: 24rpx 30rpx;
+		position: relative;
+		flex-wrap: wrap;
+		padding-bottom: 0;
 
-    .item-left {
-      width: 600rpx;
-    }
+		.bottom {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+			margin: 10px 0;
 
-    .area-text {
-      font-size: 26rpx;
-      font-weight: 400;
-      color: $dark-9;
-    }
+			.img {
+				width: 20px;
+				height: 20px;
+				margin-right: 10px;
+			}
 
-    .address-text {
-      font-size: 32rpx;
-      font-weight: 500;
-      color: #333333;
-      line-height: 48rpx;
-    }
+			.left {
+				display: flex;
+				align-items: center;
+				font-size: 15px;
+				font-weight: 500;
+				.radio {
+					border: 1px solid #dddddd;
+					border-radius: 50%;
+					width: 20px;
+					height: 20px;
+					margin-right: 10px;
+				}
+			}
 
-    .person-text {
-      font-size: 28rpx;
-      font-weight: 400;
-      color: $dark-9;
-    }
-  }
+			.right {
+				display: flex;
+				align-items: center;
 
-  .edit-btn {
-    width: 44rpx;
-    height: 44rpx;
-    background: $gray-f;
-    border-radius: 50%;
+				.edit-icon {
+					display: flex;
+					align-items: center;
+					font-size: 15px;
+					font-weight: 500;
+					.img {
+						margin-right: 5px;
+					}
 
-    .edit-icon {
-      width: 24rpx;
-      height: 24rpx;
-    }
-  }
-  image {
-    width: 100%;
-    height: 100%;
-  }
-</style>
+					&:first-child {
+						margin-right: 20px;
+					}
+				}
+			}
+		}
+
+		.imgs {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 2px;
+		}
+
+		.item-left {
+			width: 100%;
+			border-bottom: 1px solid #fafafa;
+			padding: 6px 0;
+			padding-bottom: 13px;
+		}
+
+		.area-text {
+			font-size: 26rpx;
+			font-weight: 400;
+			color: $dark-9;
+		}
+
+		.address-text {
+			font-size: 15px;
+			font-weight: 600;
+			color: #333333;
+			line-height: 48rpx;
+			margin-bottom: 8px;
+		}
+
+		.person-text {
+			font-size: 15px;
+			font-weight: 500;
+			color: $dark-9;
+		}
+	}
+
+	.edit-btn {
+		width: 44rpx;
+		height: 44rpx;
+		background: $gray-f;
+		border-radius: 50%;
+
+		.edit-icon {
+			width: 24rpx;
+			height: 24rpx;
+		}
+	}
+
+	image {
+		width: 100%;
+		height: 100%;
+	}
+</style>
\ No newline at end of file