From 7123f2dc617877a7778d764a0338156e59113fbb Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Tue, 23 May 2023 10:00:34 +0800
Subject: [PATCH 1/2] address-5/23
---
Utils/physicalObject.js | 2 +-
.../components/uni-combox/uni-combox.vue | 55 +++++---
.../address/addNewAddress/addNewAddress.vue | 125 +++++++++++-------
.../classify/order/wuliuPupup/wuliuPupup.vue | 2 +-
4 files changed, 117 insertions(+), 67 deletions(-)
diff --git a/Utils/physicalObject.js b/Utils/physicalObject.js
index 37c2d9a..0f24b50 100644
--- a/Utils/physicalObject.js
+++ b/Utils/physicalObject.js
@@ -73,7 +73,7 @@ export const insertDeliveryAddress = params => {
export const baiduApiMapSearch = params => {
- return POST('GET', `${base}/common/baiduApiMapSearch`, params).then(res => res.data);
+ return POST('GET', `${base}/common/gaoDeApiMapSearch`, params).then(res => res.data);
}
// 更新收货地址
export const updateDeliveryAddress = params => {
diff --git a/components/uni-combox/components/uni-combox/uni-combox.vue b/components/uni-combox/components/uni-combox/uni-combox.vue
index 3fae44f..949546a 100644
--- a/components/uni-combox/components/uni-combox/uni-combox.vue
+++ b/components/uni-combox/components/uni-combox/uni-combox.vue
@@ -4,11 +4,13 @@
{{label}}
-
+
-
-
+
+
{{emptyTips}}
@@ -20,11 +22,11 @@
-
+
{{emptyTips}}
-
+
@@ -86,6 +88,10 @@
type: String,
default: ''
},
+ height:{
+ type:Number,
+ default:0,
+ }
},
data() {
return {
@@ -138,11 +144,17 @@
}
},
- onBlur() {
+
+ async onBlur() {
this.$emit("blur")
if(this.isAddress){
- this.showSelector = false;
+ if(this.inputVal==""){
+ this.showSelector = false;
+ }else{
+ this.showSelector = true;
+ }
+
return
}
@@ -169,7 +181,7 @@
/* #ifndef APP-NVUE */
display: flex;
/* #endif */
- height: 40px;
+ // height: 40px;
flex-direction: row;
align-items: center;
// border-bottom: solid 1px #DDDDDD;
@@ -198,7 +210,17 @@
height: 22px;
line-height: 22px;
}
-
+ .uni-combox__input2 {
+ flex: 1;
+ font-size: 16px;
+ line-height: 22px;
+ width: 100%;
+ background-color: #f6f6f6;
+ border-radius: 8px;
+ box-sizing: border-box;
+ padding: 10px;
+ height: 100px;
+ }
.uni-combox__input-arrow {
padding: 10px;
}
@@ -213,19 +235,18 @@
border-radius: 6px;
box-shadow: #DDDDDD 4px 4px 8px, #DDDDDD -4px -4px 8px;
z-index: 100;
- .topmore{
- top:52px;
- }
+
}
-
+ .uni-combox__selector.topmore{
+ top:110px;
+ // bottom: 75px;
+ }
+
.uni-combox__selector-scroll {
max-height: 200px;
box-sizing: border-box;
}
- .uni-combox__selector-scroll2 {
- max-height:300px;
- box-sizing: border-box;
- }
+
.uni-combox__selector::before {
content: '';
diff --git a/physical-merchants/address/addNewAddress/addNewAddress.vue b/physical-merchants/address/addNewAddress/addNewAddress.vue
index 5667c79..902f084 100644
--- a/physical-merchants/address/addNewAddress/addNewAddress.vue
+++ b/physical-merchants/address/addNewAddress/addNewAddress.vue
@@ -1,13 +1,13 @@
-
+
@@ -108,6 +108,7 @@
region: '',
address: "",
is_default: false,
+
},
dataParams: null,
//
@@ -122,6 +123,9 @@
// {"name": "重庆国贸中心-东北门","address": "重庆市渝中区中华路189号",},
// {"name": "重庆国贸中心-东北门","address": "重庆市渝中区中华路189号",}
],
+ top:0,
+ top1:0,
+ height:0,
};
@@ -134,7 +138,7 @@
},
onLoad(params) {
- console.log(params)
+ // console.log(params)
this.dataParams = params
},
watch: {
@@ -173,9 +177,50 @@
},
-
+
+ async mounted() {
+ await this.getRect('.scrol-t').then(res => {
+
+ this.top = res.top;
+
+ })
+ await this.getRect('.bottom-fixed').then(res => {
+
+ this.top1 = res.top;
+
+ })
+
+ this.height = this.top1 - this.top - 120;
+
+ // console.log(this.top1,this.top,this.height)
+ },
methods: {
+
+ focusMethod(){
+
+
+ },
+ blurMethod(){
+
+ this.baiduApiMap(this.userAddress.address)
+ },
+ getRect(selector, all) {
+ return new Promise(resolve => {
+ uni.createSelectorQuery()
+ .in(this)
+ [all ? 'selectAll' : 'select'](selector)
+ .boundingClientRect(rect => {
+ if (all && Array.isArray(rect) && rect.length) {
+ resolve(rect);
+ }
+ if (!all && rect) {
+ resolve(rect);
+ }
+ })
+ .exec();
+ });
+ },
findAddressById(id) {
let params = {
id: id
@@ -217,46 +262,25 @@
this.userAddress.region = this.region.map(item => item.name).join(',');
}
- console.log(this.userAddress.region, "获取选择的地区", this.regionId, this.region)
+ // console.log(this.userAddress.region, "获取选择的地区", this.regionId, this.region)
},
// 获取数据
init() {
},
- //点击了定位图标
- location(){
- this.userAddress.address = this.userAddress.address.replace(/\s+/g, "")
-
- if(app.globalData.latitude&&app.globalData.longitude){
- this.baiduApiMap(app.globalData.longitude,app.globalData.latitude,this.userAddress.address)
- }else{
- uni.getLocation({
- type: 'wgs84',
- success: function(res) {
- app.globalData.latitude = res.latitude;
- app.globalData.longitude = res.longitude;
- this.baiduApiMap(app.globalData.longitude,app.globalData.latitude,this.userAddress.address)
- }
- })
- }
-
+ //监听详细地址的onInput事件
+ location(n){
+ // this.userAddress.address = this.userAddress.address.replace(/\s+/g, "")
},
- baiduApiMap(lng,lat,query){
- let params;
- if(query==""){
- params={
- lng,lat
- }
- }else{
- params={
- lng,lat,query
- }
+
+
+ baiduApiMap(query){
+ query = query.replace(/\s+/g, "")
+ let params={
+ query:query
}
-
-
-
-
+ // console.log(params,"params")
baiduApiMapSearch(params).then(res=>{
console.log(res)
@@ -280,12 +304,16 @@
})
},
+ // 点击获取的详细地址
getSelect(desc){
- console.log(desc)
+ // console.log(desc)
this.defaultRegionCode = desc.adcode ;
this.userAddress.address = desc.address;
-
+ uni.showToast({
+ icon:'none',
+ title:"所在地区同步修改"
+ })
},
// 默认地址设置改变
@@ -468,7 +496,8 @@
/*表单*/
.form-container {
height: 100%;
-
+ /* display: flex;
+ flex-direction: column; */
.form-gorup {
padding: 20rpx;
margin-bottom: 20rpx;
diff --git a/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue b/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
index a8476e1..0d5fffd 100644
--- a/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
+++ b/physical-merchants/classify/order/wuliuPupup/wuliuPupup.vue
@@ -1,6 +1,6 @@
-
+
物流信息
From 0562d99e7ae8adc8d0807c3963d7654b46bff556 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Tue, 23 May 2023 10:19:42 +0800
Subject: [PATCH 2/2] address2
---
.../address/addNewAddress/addNewAddress.vue | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/physical-merchants/address/addNewAddress/addNewAddress.vue b/physical-merchants/address/addNewAddress/addNewAddress.vue
index 902f084..918f80a 100644
--- a/physical-merchants/address/addNewAddress/addNewAddress.vue
+++ b/physical-merchants/address/addNewAddress/addNewAddress.vue
@@ -202,7 +202,6 @@
},
blurMethod(){
-
this.baiduApiMap(this.userAddress.address)
},
getRect(selector, all) {
@@ -269,10 +268,10 @@
},
- //监听详细地址的onInput事件
- location(n){
- // this.userAddress.address = this.userAddress.address.replace(/\s+/g, "")
- },
+ // //监听详细地址的onInput事件
+ // location(n){
+ // // this.userAddress.address = this.userAddress.address.replace(/\s+/g, "")
+ // },
baiduApiMap(query){
@@ -280,9 +279,14 @@
let params={
query:query
}
+ uni.showLoading({
+ title: '加载中',
+ mask:true,
+ });
+
// console.log(params,"params")
baiduApiMapSearch(params).then(res=>{
-
+ uni.hideLoading();
console.log(res)
if (res.return_code == '000000') {