Merge branch 'master' of https://gitea.lihaink.cn/mkm/new_shop_app
This commit is contained in:
DESKTOP-GMUNQ1B\k
commit
3d7fe275a2
@ -1,44 +1,8 @@
|
||||
<style lang="scss">
|
||||
.sel_addr_wrap {
|
||||
height: 120rpx;
|
||||
padding: 30rpx 0;
|
||||
|
||||
.sel_addr {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin: 0 30rpx;
|
||||
border: 2rpx solid #40ae36;
|
||||
height: 60rpx;
|
||||
line-height: 60rpx;
|
||||
text-align: center;
|
||||
color: #40ae36;
|
||||
border-radius: 10rpx;
|
||||
font-weight: bold;
|
||||
|
||||
&:active {
|
||||
background: rgba(64, 174, 54, .1);
|
||||
}
|
||||
|
||||
text {
|
||||
margin-right: 10rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<template>
|
||||
<view :style="viewColor">
|
||||
<form @submit="formSubmit" report-submit='true'>
|
||||
<view class='addAddress'>
|
||||
<view class='list'>
|
||||
|
||||
<view class="sel_addr_wrap">
|
||||
<view class="sel_addr" @click="handleToChoose">
|
||||
<text>选择收货地址</text>
|
||||
<u-icon name="arrow-right" size="16" color="#40ae36"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>姓名</view>
|
||||
<input type='text' placeholder='请输入姓名' name='real_name' :value="userAddress.real_name"
|
||||
@ -52,19 +16,35 @@
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>所在地区</view>
|
||||
<view class="region">
|
||||
<view class="region_count" @click="handleToChoose">
|
||||
<text v-if="!detail.length" style="color:#cdcdcd;">请选择地区</text>
|
||||
<text v-else>{{detail}}</text>
|
||||
<view class="region_count" @click="changeRegion">
|
||||
<text v-if="!addressInfo.length" style="color:#cdcdcd;">请选择地区</text>
|
||||
<text v-else>{{addressText}}</text>
|
||||
<text class="iconfont icon-xiangyou"></text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<!-- <view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>所在村队</view>
|
||||
<view class="region">
|
||||
<view class="region_count" @click="changevillage">
|
||||
<text v-if="!villageInfo.length" style="color:#cdcdcd;">请选择村队</text>
|
||||
<text v-else>{{villageText}}</text>
|
||||
<text class="iconfont icon-xiangyou"></text>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
</view> -->
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>详细地址</view>
|
||||
<input type='text' class="location-input" placeholder='请填写具体地址' name='detail'
|
||||
placeholder-class='placeholder' v-model="userAddress.detail"></input>
|
||||
<!--<view class="location" @click="selfLocation">
|
||||
<text class="iconfont icon-chakanditu"></text>
|
||||
<br>
|
||||
定位
|
||||
</view> -->
|
||||
|
||||
</view>
|
||||
</view>
|
||||
<view class='default acea-row row-middle'>
|
||||
@ -93,36 +73,34 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
import {
|
||||
// +----------------------------------------------------------------------
|
||||
// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
|
||||
// +----------------------------------------------------------------------
|
||||
// | Copyright (c) 2016~2021 https://www.crmeb.com All rights reserved.
|
||||
// +----------------------------------------------------------------------
|
||||
// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
|
||||
// +----------------------------------------------------------------------
|
||||
// | Author: CRMEB Team <admin@crmeb.com>
|
||||
// +----------------------------------------------------------------------
|
||||
import {
|
||||
editAddress,
|
||||
getAddressDetail
|
||||
} from '@/api/user.js';
|
||||
import {
|
||||
wgsToGcj
|
||||
} from "@/utils/wgs.js";
|
||||
import {
|
||||
} from '@/api/user.js';
|
||||
import { wgsToGcj } from "@/utils/wgs.js";
|
||||
import {
|
||||
getCityV2,
|
||||
getCityList
|
||||
} from '@/api/api.js';
|
||||
import {
|
||||
} from '@/api/api.js';
|
||||
import {
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
import areaWindow from '@/components/areaWindow';
|
||||
import villageTeam from '@/components/villageTeam/villageTeam.vue';
|
||||
import {
|
||||
} from "vuex";
|
||||
import areaWindow from '@/components/areaWindow';
|
||||
import villageTeam from '@/components/villageTeam/villageTeam.vue';
|
||||
import {
|
||||
getGeocoder
|
||||
} from '@/api/store.js';
|
||||
import authorize from '@/components/Authorize';
|
||||
export default {
|
||||
} from '@/api/store.js';
|
||||
import authorize from '@/components/Authorize';
|
||||
export default {
|
||||
components: {
|
||||
areaWindow,
|
||||
authorize,
|
||||
@ -148,15 +126,10 @@
|
||||
display: false,
|
||||
display_one: false,
|
||||
addressInfo: [],
|
||||
newAddrInfo: '',
|
||||
newPCAS: '',
|
||||
villageInfo: [],
|
||||
list: [],
|
||||
latitude: '',
|
||||
longitude: '',
|
||||
detail: '', //四川省泸州市龙马潭区龙门大道15号
|
||||
location: '', // 经纬度
|
||||
|
||||
longitude: ''
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
@ -185,28 +158,14 @@
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
|
||||
// 选择地址
|
||||
handleToChoose() {
|
||||
let that = this;
|
||||
uni.navigateTo({
|
||||
url: "/pages/select_address_n/select_address_n",
|
||||
success: (res) => {
|
||||
uni.$once('changeAddress', res => {
|
||||
console.log(res)
|
||||
// this.newAddrInfo = res.addr; "name": "中国,四川省,泸州市,龙马潭区",
|
||||
that.detail = res.addr.address;
|
||||
that.location = res.addr.location;
|
||||
})
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
OnChangeAddress(address) {
|
||||
this.addressInfo = address;
|
||||
this.list = address
|
||||
},
|
||||
|
||||
OnChangevAddress(address) {
|
||||
this.villageInfo = address;
|
||||
console.log(this.villageInfo)
|
||||
},
|
||||
// 地址数据
|
||||
getCityList: function() {
|
||||
let that = this;
|
||||
@ -249,13 +208,11 @@
|
||||
let region = [res.data.province, res.data.city, res.data.district, res.data.street, res
|
||||
.data.village
|
||||
];
|
||||
console.log({
|
||||
...res.data
|
||||
});
|
||||
console.log({...res.data});
|
||||
that.$set(that, 'userAddress', res.data);
|
||||
that.$set(that, 'region', region);
|
||||
that.city_id = res.data.city_id
|
||||
if (res.data.areas) that.addressInfo = res.data.areas;
|
||||
if(res.data.areas) that.addressInfo = res.data.areas;
|
||||
else {
|
||||
|
||||
}
|
||||
@ -387,7 +344,6 @@
|
||||
formSubmit: function(e) {
|
||||
let that = this,
|
||||
value = e.detail.value;
|
||||
|
||||
if (!value.real_name) return that.$util.Tips({
|
||||
title: '请填写收货人姓名'
|
||||
});
|
||||
@ -397,7 +353,7 @@
|
||||
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
|
||||
title: '请输入正确的手机号码'
|
||||
});
|
||||
if (!that.detail.length) return that.$util.Tips({
|
||||
if (!that.addressInfo.length) return that.$util.Tips({
|
||||
title: '请选择所在地区'
|
||||
});
|
||||
// if (!that.villageInfo.length) return that.$util.Tips({
|
||||
@ -408,8 +364,8 @@
|
||||
});
|
||||
value.address_id = that.address_id;
|
||||
value.is_default = that.userAddress.is_default ? 1 : 0;
|
||||
value.area = that.detail;
|
||||
// value.brigade = that.villageInfo[0]
|
||||
value.area = that.addressInfo;
|
||||
value.brigade = that.villageInfo[0]
|
||||
|
||||
uni.showLoading({
|
||||
title: '保存中',
|
||||
@ -462,28 +418,28 @@
|
||||
this.$set(this.userAddress, 'is_default', !this.userAddress.is_default);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
|
||||
/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
|
||||
/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,
|
||||
/deep/checkbox .wx-checkbox-input.wx-checkbox-input-checked {
|
||||
border: 1px solid var(--view-theme) !important;
|
||||
background-color: var(--view-theme) !important;
|
||||
color: #fff !important;
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .list {
|
||||
.addAddress .list {
|
||||
background-color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .list .item {
|
||||
.addAddress .list .item {
|
||||
padding: 30rpx;
|
||||
border-top: 1px solid #eee;
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .list .item .location {
|
||||
.addAddress .list .item .location {
|
||||
position: absolute;
|
||||
right: 30rpx;
|
||||
top: 15rpx;
|
||||
@ -493,71 +449,68 @@
|
||||
.iconfont {
|
||||
color: var(--view-theme);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .list .item .name {
|
||||
.addAddress .list .item .name {
|
||||
width: 195rpx;
|
||||
font-size: 30rpx;
|
||||
color: #333;
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .list .item .address {
|
||||
.addAddress .list .item .address {
|
||||
flex: 1;
|
||||
margin-left: 20rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .list .item input,
|
||||
.region .region_count {
|
||||
.addAddress .list .item input,
|
||||
.region .region_count {
|
||||
width: 475rpx;
|
||||
font-size: 30rpx;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
}
|
||||
|
||||
.region .region_count {
|
||||
// height: 42rpx;
|
||||
// line-height: 42rpx;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
.region .region_count {
|
||||
height: 42rpx;
|
||||
line-height: 42rpx;
|
||||
|
||||
.icon-xiangyou {
|
||||
float: right;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .list .location-input {
|
||||
.addAddress .list .location-input {
|
||||
padding-right: 70rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .list .item .placeholder {
|
||||
.addAddress .list .item .placeholder {
|
||||
color: #ccc;
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .list .item picker {
|
||||
.addAddress .list .item picker {
|
||||
width: 475rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .list .item picker .picker {
|
||||
.addAddress .list .item picker .picker {
|
||||
width: 410rpx;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .list .item picker .iconfont {
|
||||
.addAddress .list .item picker .iconfont {
|
||||
font-size: 43rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .default {
|
||||
.addAddress .default {
|
||||
padding: 0 30rpx;
|
||||
height: 90rpx;
|
||||
background-color: #fff;
|
||||
margin-top: 23rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .default checkbox {
|
||||
.addAddress .default checkbox {
|
||||
margin-right: 15rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .keepBnt {
|
||||
.addAddress .keepBnt {
|
||||
width: 690rpx;
|
||||
height: 86rpx;
|
||||
border-radius: 50rpx;
|
||||
@ -567,9 +520,9 @@
|
||||
font-size: 32rpx;
|
||||
color: #fff;
|
||||
background-color: var(--view-theme);
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .wechatAddress {
|
||||
.addAddress .wechatAddress {
|
||||
width: 690rpx;
|
||||
height: 86rpx;
|
||||
border-radius: 50rpx;
|
||||
@ -579,5 +532,5 @@
|
||||
font-size: 32rpx;
|
||||
color: var(--view-theme);
|
||||
border: 1px solid var(--view-theme);
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Loading…
x
Reference in New Issue
Block a user