|
|
@@ -5,49 +5,49 @@
|
|
|
</u-search>
|
|
|
</view>
|
|
|
<view class="content2-wrap">
|
|
|
- <view class="content2" v-for="(item,index) in dataList" :key='index' @click="configAddress(item)">
|
|
|
- <view class="row flex row1">
|
|
|
- <view class="name">
|
|
|
- {{item.contacts}}
|
|
|
- </view>
|
|
|
- <view class="phone">
|
|
|
- {{item.contactPhone1}}
|
|
|
- </view>
|
|
|
- </view>
|
|
|
- <view class="row flex row2">
|
|
|
- {{item.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}
|
|
|
- </view>
|
|
|
- <view class="row flex row3">
|
|
|
- <u-radio-group placement="row" class="select-type" v-model="item.radiovalue">
|
|
|
- <u-radio :customStyle="radioCustomStyle" v-for="(item1, index) in radiolist1" :key="index"
|
|
|
- :label="item1.name" :name="item1.name" @change="radioChange($event,item)" labelSize='12px'
|
|
|
- :iconSize='10'>
|
|
|
- </u-radio>
|
|
|
- </u-radio-group>
|
|
|
- <view class="flex">
|
|
|
- <view class="mr20 icon-img" @click.stop="toTop(item)">
|
|
|
- <!-- <u-icon name="arrow-upward" color="#999999" size="18"></u-icon> -->
|
|
|
- <image class="jt-icon" src="@/static/images/release/zhiding.png" mode='widthFix'>
|
|
|
- </image>
|
|
|
- 置顶
|
|
|
+ <view class="content2" v-for="(item,index) in dataList" @click="configAddress(item)">
|
|
|
+ <view class="row flex row1">
|
|
|
+ <view class="name">
|
|
|
+ {{item.contacts}}
|
|
|
</view>
|
|
|
- <view class="mr20 icon-img" @click.stop="edit(item)">
|
|
|
- <!-- <u-icon name="edit-pen-fill" color="#999999" size="18"></u-icon> -->
|
|
|
- <image class="jt-icon" src="@/static/images/release/bianji.png" mode='widthFix'>
|
|
|
- </image>
|
|
|
- 编辑
|
|
|
+ <view class="phone">
|
|
|
+ {{item.contactPhone1}}
|
|
|
</view>
|
|
|
- <view class="mr20 icon-img" @click.stop="del(item)">
|
|
|
- <!-- <u-icon name="trash-fill" color="#999999" size="18"></u-icon> -->
|
|
|
- <image class="jt-icon" src="@/static/images/release/shanchu.png" mode='widthFix'>
|
|
|
- </image>
|
|
|
- 删除
|
|
|
+ </view>
|
|
|
+ <view class="row flex row2">
|
|
|
+ {{item.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}
|
|
|
+ </view>
|
|
|
+ <view class="row flex row3">
|
|
|
+ <u-radio-group placement="row" class="select-type" v-model="item.radiovalue">
|
|
|
+ <u-radio :customStyle="radioCustomStyle" v-for="item1 in radiolist1"
|
|
|
+ :label="item1.name" :name="item1.name" @change="radioChange($event,item)" labelSize='12px'
|
|
|
+ :iconSize='10'>
|
|
|
+ </u-radio>
|
|
|
+ </u-radio-group>
|
|
|
+ <view class="flex">
|
|
|
+ <view class="mr20 icon-img" @click.stop="toTop(item)">
|
|
|
+ <!-- <u-icon name="arrow-upward" color="#999999" size="18"></u-icon> -->
|
|
|
+ <image class="jt-icon" src="@/static/images/release/zhiding.png" mode='widthFix'>
|
|
|
+ </image>
|
|
|
+ 置顶
|
|
|
+ </view>
|
|
|
+ <view class="mr20 icon-img" @click.stop="edit(item)">
|
|
|
+ <!-- <u-icon name="edit-pen-fill" color="#999999" size="18"></u-icon> -->
|
|
|
+ <image class="jt-icon" src="@/static/images/release/bianji.png" mode='widthFix'>
|
|
|
+ </image>
|
|
|
+ 编辑
|
|
|
+ </view>
|
|
|
+ <view class="mr20 icon-img" @click.stop="del(item)">
|
|
|
+ <!-- <u-icon name="trash-fill" color="#999999" size="18"></u-icon> -->
|
|
|
+ <image class="jt-icon" src="@/static/images/release/shanchu.png" mode='widthFix'>
|
|
|
+ </image>
|
|
|
+ 删除
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- </view>
|
|
|
-
|
|
|
+
|
|
|
<view class="bottom-btn">
|
|
|
<view class="btn-left" @click="selectAddress(0)">选择临时地址</view>
|
|
|
<view class="btn-right" @click="selectAddress(1)">新增地址</view>
|
|
|
@@ -95,10 +95,10 @@
|
|
|
},
|
|
|
|
|
|
],
|
|
|
- delId:"",
|
|
|
- isShowAlert:false,
|
|
|
- alertTitle:"",
|
|
|
- alertContent:"",
|
|
|
+ delId: "",
|
|
|
+ isShowAlert: false,
|
|
|
+ alertTitle: "",
|
|
|
+ alertContent: "",
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -114,7 +114,7 @@
|
|
|
this.getList()
|
|
|
},
|
|
|
methods: {
|
|
|
- confirmClick(){
|
|
|
+ confirmClick() {
|
|
|
this.isShowAlert = false
|
|
|
this.$request.baseRequest('post', '/cargoOwnerAddressInfo/api/deleteCargoOwnerAddress', {
|
|
|
id: this.delId,
|
|
|
@@ -137,7 +137,7 @@
|
|
|
})
|
|
|
});
|
|
|
},
|
|
|
- cancelClick(){
|
|
|
+ cancelClick() {
|
|
|
this.isShowAlert = false
|
|
|
},
|
|
|
configAddress(val) {
|
|
|
@@ -163,9 +163,10 @@
|
|
|
currentPage: 1
|
|
|
}).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
- if(res.data.records.length){
|
|
|
+ if (res.data.records.length) {
|
|
|
for (var i = 0; i < res.data.records.length; i++) {
|
|
|
- res.data.records[i].contactPhone1=res.data.records[i].contactPhone.replace(/(\d{3})(\d{4})(\d{4})/, "$1****$3")
|
|
|
+ res.data.records[i].contactPhone1 = res.data.records[i].contactPhone.replace(
|
|
|
+ /(\d{3})(\d{4})(\d{4})/, "$1****$3")
|
|
|
}
|
|
|
}
|
|
|
console.log(res.data.records)
|
|
|
@@ -196,14 +197,14 @@
|
|
|
console.log('radioChange', n);
|
|
|
console.log('radioChange', val);
|
|
|
for (var i = 0; i < this.dataList.length; i++) {
|
|
|
- if (this.dataList[i].defaultShipment == 1&&n=='默认装货') {
|
|
|
+ if (this.dataList[i].defaultShipment == 1 && n == '默认装货') {
|
|
|
this.dataList[i].radiovalue = ''
|
|
|
}
|
|
|
- if (this.dataList[i].defaultReceipt == 1&&n=='默认卸货') {
|
|
|
+ if (this.dataList[i].defaultReceipt == 1 && n == '默认卸货') {
|
|
|
this.dataList[i].radiovalue = ''
|
|
|
}
|
|
|
}
|
|
|
- this.$set(val,'radioChange',n)
|
|
|
+ this.$set(val, 'radioChange', n)
|
|
|
let _flag;
|
|
|
if (n == '默认卸货') {
|
|
|
_flag = 2
|
|
|
@@ -270,7 +271,10 @@
|
|
|
console.log(111111111)
|
|
|
let that = this
|
|
|
uni.getLocation({
|
|
|
- type: 'wgs84',
|
|
|
+ type: 'gcj02',
|
|
|
+ geocode:true,
|
|
|
+ altitude:true,
|
|
|
+ isHighAccuracy:true,
|
|
|
success: function(res) {
|
|
|
console.log('当前位置的经度：' + res.longitude);
|
|
|
console.log('当前位置的纬度：' + res.latitude);
|
|
|
@@ -285,8 +289,8 @@
|
|
|
console.log('经度：' + res.longitude);
|
|
|
let _address = that.$helper.formatLocation(res.address)
|
|
|
console.log('----------------------------')
|
|
|
- console.log(_address,that.type)
|
|
|
- var data={}
|
|
|
+ console.log(_address, that.type)
|
|
|
+ var data = {}
|
|
|
data.latitude = res.latitude
|
|
|
data.longitude = res.longitude
|
|
|
data.detailedAddress = _address.Village
|
|
|
@@ -294,14 +298,14 @@
|
|
|
data.city = _address.City
|
|
|
data.area = _address.Country
|
|
|
data.commonId = that.userInfo.id
|
|
|
- if(that.type==0){
|
|
|
- uni.setStorageSync('storage_faddress',data)
|
|
|
- }else{
|
|
|
- uni.setStorageSync('storage_saddress',data)
|
|
|
+ if (that.type == 0) {
|
|
|
+ uni.setStorageSync('storage_faddress', data)
|
|
|
+ } else {
|
|
|
+ uni.setStorageSync('storage_saddress', data)
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
uni.navigateBack({
|
|
|
- delta:1
|
|
|
+ delta: 1
|
|
|
})
|
|
|
// uni.$u.route('/pages/release/release');
|
|
|
// that.temporaryAddress.latitude = res.latitude
|
|
|
@@ -314,7 +318,7 @@
|
|
|
// that.configAddress(that.temporaryAddress)
|
|
|
// that.$forceUpdate()
|
|
|
},
|
|
|
-
|
|
|
+
|
|
|
fail(err) {
|
|
|
console.log(err)
|
|
|
},
|
|
|
@@ -340,23 +344,27 @@
|
|
|
background: white;
|
|
|
padding: 20rpx;
|
|
|
}
|
|
|
+
|
|
|
.content {
|
|
|
- height:100vh;
|
|
|
+ height: 100vh;
|
|
|
}
|
|
|
- .content2-wrap{
|
|
|
- margin-bottom:200rpx;
|
|
|
+
|
|
|
+ .content2-wrap {
|
|
|
+ margin-bottom: 200rpx;
|
|
|
}
|
|
|
+
|
|
|
.jt-icon {
|
|
|
position: relative;
|
|
|
top: 4rpx;
|
|
|
width: 24rpx;
|
|
|
margin: 0 10rpx;
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
+
|
|
|
.content2 {
|
|
|
border-radius: 20rpx;
|
|
|
background: white;
|
|
|
- margin: 20rpx ;
|
|
|
+ margin: 20rpx;
|
|
|
padding: 20rpx;
|
|
|
|
|
|
.row {
|
|
|
@@ -386,7 +394,7 @@
|
|
|
.bottom-btn {
|
|
|
position: fixed;
|
|
|
bottom: 0rpx;
|
|
|
- padding:50rpx 0;
|
|
|
+ padding: 50rpx 0;
|
|
|
width: 100%;
|
|
|
background-color: #fff;
|
|
|
display: flex;
|
