From 853aa578b8acd02b05ba6ca18220b37277c59403 Mon Sep 17 00:00:00 2001
From: dongjian <315328220@qq.com>
Date: Wed, 26 Nov 2025 21:26:03 +0800
Subject: [PATCH] no message

---
 components/common/address-popup.vue           | 194 ++++++++++++++++++
 .../mine_address_add/mine_address_add.vue     | 153 ++++++++++----
 utils/config.js                               |   8 +-
 3 files changed, 315 insertions(+), 40 deletions(-)
 create mode 100644 components/common/address-popup.vue

diff --git a/components/common/address-popup.vue b/components/common/address-popup.vue
new file mode 100644
index 0000000..d14cd2e
--- /dev/null
+++ b/components/common/address-popup.vue
@@ -0,0 +1,194 @@
+<template>
+	<up-popup
+	  :show="show"
+	  :round="24"
+	  :closeOnClickOverlay="false"
+	  mode="bottom"
+	>
+	  <view class="address-popup-view" >
+		  <view class="head-view">
+		  	<text class="text-32 text-zu1 text-bold">{{headText}}</text>
+			<MyBtn text="确定" @ok="onOk" v-if="!dataList.length" mh="48rpx" wd="128rpx" fz="24rpx"></MyBtn>
+			<u-icon size="48rpx" name="close-circle-fill" color="#333" @click="onClose"></u-icon>
+		  </view>
+		  <scroll-view :scroll-x="true" class="address-select-view">
+			  <view class="address-select-view-scroll">
+			  	<view class="select-box" @click="onSelectItrm(item,index)" v-for="(item,index) in selectList" :key="index">
+			  		<text class="text-28 text-zu1" :style="{color:index == curSelect ? '#7934F6' : '#333',
+			  		'white-space':'nowrap',}">{{item.name}}</text>
+			  		<view class="select-line" v-if="index == curSelect"></view>
+			  	</view>
+			  </view>
+		  	
+		  </scroll-view>
+		  <scroll-view :scroll-y="true" class="address-bottom-list" :scroll-into-view="scrollId">
+		  	<view class="address-data-view" v-for="(item,index) in dataList" :key="index" :id="item.zi">
+		  		<text class="text-32 text-zu1 text-bold">{{item.zi}}</text>
+				<view class="address-data-data" @click="onItem(item,xItem)" v-for="(xItem,xIndex) in item.data" :key="xIndex">
+					<text class="text-32 text-zu1 ">{{xItem.name}}</text>
+				</view>
+		  	</view>
+		  </scroll-view>
+		  <view class="right-zi-view" v-if="dataList.length">
+		  	<view class="zi-box" v-for="(item,index) in dataList" @click="onMao(item.zi)" :key="index">
+				<text class="text-24 text-zu1">{{item.zi}}</text>
+		  	</view>
+		  </view>
+	  </view>
+	</up-popup>
+</template>
+
+<script>
+	import Func from '/utils/func'
+	import MyBtn from '@/components/common/my-btn.vue'
+	export default {
+		components:{MyBtn},
+		data() {
+		  return {
+			  scrollId:'',
+		  }
+		},
+		props:{
+			show:{
+				type:Boolean,
+				default:false
+			},
+			headText:{
+				type:String,
+				default:'请选择所在地区'
+			},
+			dataList:{
+				type:Array,
+				default:[]
+			},
+			selectList:{
+				type:Array,
+				default:[]
+			},
+			curSelect:{
+				type:Number,
+				default:0
+			}
+			
+		},
+	
+		methods: {
+			onClose(){
+				this.$emit('close')
+			},
+			onOk(){
+				this.$emit('ok');
+			},
+			onMao(item){
+				 this.scrollId = item;
+			},
+			onSelectItrm(item,index){
+				if(index != this.curSelect){
+					this.$emit('select',item,index);
+				}
+			},
+			onItem(item,xItem){
+				this.$emit('itemSelect',item,xItem);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.address-popup-view{
+		width:100vw;
+		height:1000rpx;
+		min-height:1000rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		background-color: #fff;
+		border-radius: 24rpx;
+		position: relative;
+		box-sizing: border-box;
+		.right-zi-view{
+			width:64rpx;
+			max-height:600rpx;
+			overflow-y: auto;
+			position: absolute;
+			right:32rpx;
+			border-radius: 32rpx;
+			padding: 32rpx 0;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			background-color: rgba(128,128,128,0.3);
+		}
+		.address-bottom-list{
+			width:100%;
+			height:calc(100% - 88rpx - 88rpx - 32rpx);
+			margin-top:32rpx;
+			display: flex;
+			flex-direction: column;
+			overflow-y: auto;
+			.address-data-view{
+				width:100%;
+				padding: 0 32rpx;
+				box-sizing: border-box;
+				display: flex;
+				flex-direction: column;
+				border-bottom:1rpx solid #eee;
+				.address-data-data{
+					padding-top: 24rpx;
+					box-sizing: border-box;
+					display: flex;
+					padding: 24rpx 0;
+				}
+			}
+			
+		}
+		.address-select-view{
+			width:100%;
+			height:88rpx;
+			min-height:88rpx;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			padding: 0 32rpx;
+			box-sizing: border-box;
+			.address-select-view-scroll{
+				width:100%;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				
+				.select-line{
+					width:50rpx;
+					height:8rpx;
+					min-height:8rpx;
+					background-color: #7934F6;
+					border-radius: 4rpx;
+					
+				}
+				.select-box{
+					margin-right:24rpx;
+					height:56rpx;
+					min-height:56rpx;
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+					justify-content: space-between;
+				}
+			}
+			
+		}
+		.head-view{
+			width:100vw;
+			height:88rpx;
+			min-height:88rpx;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-between;
+			
+			padding: 0 32rpx;
+			box-sizing: border-box;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/mine_package/mine_address_add/mine_address_add.vue b/pages/mine_package/mine_address_add/mine_address_add.vue
index 5d4206b..abcc9ce 100644
--- a/pages/mine_package/mine_address_add/mine_address_add.vue
+++ b/pages/mine_package/mine_address_add/mine_address_add.vue
@@ -1,9 +1,8 @@
 <template>
   <view class="address_add_warp">
     <Header
-      :leftTitle="$t('address.add.title')"
-      left-path-type="navigateTo"
-      :leftPath="leftPath"
+      :leftTitle="titleText"
+      leftPath="1"
     />
     <view class="address_form">
       <view class="add_form_item add_form_item_but">
@@ -67,7 +66,7 @@
 		</view> -->
     <view class="add_but" @click="addAddress"> 保存地址 </view>
     <up-toast ref="uToastRef"></up-toast>
-    <up-picker
+    <!-- <up-picker
       :show="regionShow"
       ref="uPickerRef"
       :columns="regionColumns"
@@ -78,19 +77,23 @@
       itemHeight="34"
       @cancel="regionShow = false"
       @close="regionShow = false"
-    ></up-picker>
+    ></up-picker> -->
+	<AddressPopup @ok="onOk"
+	:show="regionShow" @itemSelect="onItemSelect" @select="onSelect" :curSelect="curSelect" :selectList="curSelectList" :dataList="addressList" @close="onClose"></AddressPopup>
   </view>
 </template>
 
 <script>
 import { editAddress, getAddressDetail } from "@/api/address.js";
 import { getCascadeRegion } from "@/api/common.js";
+import AddressPopup from '@/components/common/address-popup.vue'
 import Header from "@/components/header.vue";
 
 export default {
-  components: { Header },
+  components: { Header,AddressPopup },
   data() {
     return {
+		titleText:'添加地址',
       form: {
         id: 0,
         name: null, // 收货人
@@ -104,6 +107,9 @@ export default {
         address: null, // 详细地址
       },
       regionShow: false,
+	  curSelect:-1,
+	  addressList:[],
+	  curSelectList:[],
       regionColumns: [],
       regionLoading: false,
       // leftPath: "/pages/mine_package/mine_address/mine_address",
@@ -115,20 +121,77 @@ export default {
     const detail = option.detail;
     if (id && id !== 0) {
       this.getById(id);
-    }
-    const ids = option.ids;
-    if (ids && ids !== 0) {
-      this.leftPath =
-        "/pages/order_package/order_submit/order_submit?ids=" +
-        ids +
-        "&addressShow=true";
-    } else if (detail) {
-      this.leftPath = "";
-    } else {
-      this.leftPath = "/pages/mine_package/mine_address/mine_address";
+	  this.titleText = '修改地址';
     }
   },
   methods: {
+	  onItemSelect(item,xItem){
+		  this.curSelectList.push(xItem);
+		  this.curSelect++; 
+		  this.getAddressList(xItem.id);
+	  },
+	  onSelect(item,index){
+		  this.curSelectList.splice(index + 1);
+		  this.curSelect = index;
+		  this.getAddressList(this.curSelectList[this.curSelectList.length - 1].id);
+	  },
+	  async getAddressList(id = 0){
+		  const params = {
+		    parentId: id,
+		  };
+		  const resp = await getCascadeRegion(params);
+		  if (resp.bizcode === 100) {
+			  
+			  this.addressList = [];
+			  resp.data.forEach(item=>{
+				  if(this.addressList.length){
+					  let index = this.addressList.findIndex(i=>i.zi == item.firstLetter);
+					  if(index != -1){
+						  this.addressList[index].data.push({id:item.id,pId:item.parentId,name:item.name});
+					  }else{
+					  this.addressList.push({zi:item.firstLetter,data:[{id:item.id,pId:item.parentId,name:item.name}]});
+					  }
+				  }else{
+					  this.addressList.push({zi:item.firstLetter,data:[{id:item.id,pId:item.parentId,name:item.name}]});
+				  }
+			  })
+			  this.addressList.sort((a,b)=>{
+				  if (a.zi < b.zi) return -1;
+				if (a.zi > b.zi) return 1;
+				return 0;
+			  });
+		  }
+	  },
+	  onOk(){
+		  this.form.regionStr = [];
+		  this.curSelectList.forEach((item,index)=>{
+			  if(index == 0){
+				  this.form.countryId = item.id;
+				  this.form.regionStr.push(item.name);
+			  }else if(index == 1){
+				  this.form.provinceId = item.id;
+				  this.form.regionStr.push(item.name);
+			  }else if(index == 2){
+				  this.form.cityId = item.id;
+				  this.form.regionStr.push(item.name);
+			  }else if(index == 3){
+				  this.form.areaId = item.id;
+				  this.form.regionStr.push(item.name);
+			  }else if(index == 4){
+				  this.form.townshipId = item.id;
+				  this.form.regionStr.push(item.name);
+			  }
+		  })
+		  
+		  			console.log('areaId',this.form)
+		  this.onClose();
+	  },
+	  onClose(){
+		  this.regionShow=false;
+		  this.curSelect=false;
+		  this.addressList=[];
+		  this.curSelectList=[];
+	  },
     /**
      * 用作编辑
      */
@@ -172,25 +235,43 @@ export default {
     },
 
     // 选择地址的弹框
-    async regionShowCheck(status) {
-      if (status) {
-        const nation = await this.getRegion(0);
-        const province =
-          nation && nation.length !== 0
-            ? await this.getRegion(nation[0].id)
-            : [];
-        const city =
-          province && province.length !== 0
-            ? await this.getRegion(province[0].id)
-            : [];
-        const area =
-          city && city.length !== 0 ? await this.getRegion(city[0].id) : [];
-        console.log("选择地址的弹框", nation, province, city, area, status);
-        this.regionColumns = [nation, province, city, area];
-      } else {
-        this.regionColumns = [[], [], [], []];
-      }
-      this.regionShow = status;
+    async regionShowCheck() {
+		this.curSelectList = [];
+		this.curSelect = -1;
+		if(this.form.townshipId){
+			this.curSelectList.push({id:this.form.countryId,name:this.form.regionStr[0]});
+			this.curSelectList.push({id:this.form.provinceId,name:this.form.regionStr[1]});
+			this.curSelectList.push({id:this.form.cityId,name:this.form.regionStr[2]});
+			this.curSelectList.push({id:this.form.areaId,name:this.form.regionStr[3]});
+			this.curSelectList.push({id:this.form.townshipId,name:this.form.regionStr[4]});
+			this.curSelect = 4;
+			await this.getAddressList(this.form.townshipId);
+		}else if(this.form.areaId){
+			this.curSelectList.push({id:this.form.countryId,name:this.form.regionStr[0]});
+			this.curSelectList.push({id:this.form.provinceId,name:this.form.regionStr[1]});
+			this.curSelectList.push({id:this.form.cityId,name:this.form.regionStr[2]});
+			this.curSelectList.push({id:this.form.areaId,name:this.form.regionStr[3]});
+			this.curSelect = 3;
+			await this.getAddressList(this.form.areaId);
+		}else if(this.form.cityId){
+			this.curSelectList.push({id:this.form.countryId,name:this.form.regionStr[0]});
+			this.curSelectList.push({id:this.form.provinceId,name:this.form.regionStr[1]});
+			this.curSelectList.push({id:this.form.cityId,name:this.form.regionStr[2]});
+			this.curSelect = 2;
+			await this.getAddressList(this.form.cityId);
+		}else if(this.form.provinceId){
+			this.curSelectList.push({id:this.form.countryId,name:this.form.regionStr[0]});
+			this.curSelectList.push({id:this.form.provinceId,name:this.form.regionStr[1]});
+			this.curSelect = 1;
+			await this.getAddressList(this.form.provinceId);
+		}else if(this.form.countryId){
+			this.curSelectList.push({id:this.form.countryId,name:this.form.regionStr[0]});
+			this.curSelect = 0;
+			await this.getAddressList(this.form.countryId);
+		}else{
+			await this.getAddressList();
+		}
+      this.regionShow = true;
     },
     // 数据交互
     async getRegion(pId) {
diff --git a/utils/config.js b/utils/config.js
index b72c9dd..d20d84b 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -2,11 +2,11 @@
 // export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
 
 
-export const BASE_URL = "https://api.tbmall.xin"; //生产
-export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产
+// export const BASE_URL = "https://api.tbmall.xin"; //生产
+// export const MILD_BASE_URL = "https://agent.tbmall.xin/"; //中台生产
 
-// export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试
-// export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试
+export const BASE_URL ='https://api.o.tbmall.xin'; // 本地测试
+export const MILD_BASE_URL = "https://agent.o.tbmall.xin/"; //中台测试
 
 
 export const SHARE_URL = 'https://h.tbmall.xin';