feat(fsgx): 完成全部24项开发任务 Phase1-7
Phase1 后端核心：
- 新增 fsgx_v1.sql 迁移脚本（is_queue_goods/frozen_points/available_points/no_assess）
- SystemConfigServices 返佣设置扩展（周期人数/分档比例/范围/时机）
- StoreOrderCreateServices 周期循环佣金计算
- StoreOrderTakeServices 佣金发放后同步冻结积分
- StoreProductServices/StoreProduct 保存 is_queue_goods
Phase2 后端接口：
- GET /api/hjf/brokerage/progress 佣金周期进度
- GET /api/hjf/assets/overview 资产总览
- HjfPointsServices 每日 frozen_points 0.4‰ 释放定时任务
- PUT /adminapi/hjf/member/{uid}/no_assess 不考核接口
- GET /adminapi/hjf/points/release_log 积分日志接口
Phase3 前端清理：
- hjfCustom.js 路由精简（仅保留 points/log）
- hjfQueue.js/hjfMember.js API 清理/重定向至 CRMEB 原生接口
- pages.json 公排→推荐佣金/佣金记录/佣金规则
Phase4-5 前端改造：
- queue/status.vue 推荐佣金进度页整体重写
- 商品详情/订单确认/支付结果页文案与逻辑改造
- 个人中心/资产页/引导页/规则页文案改造
- HjfQueueProgress/HjfRefundNotice/HjfAssetCard 组件改造
- 推广中心嵌入佣金进度摘要
- hjfMockData.js 全量更新（公排字段→佣金字段）
Phase6 Admin 增强：
- 用户列表新增 frozen_points/available_points 列及不考核操作按钮
- hjfPoints.js USE_MOCK=false 对接真实积分日志接口
Phase7 配置文档：
- docs/fsgx-phase7-config-checklist.md 后台配置与全链路验收清单
Made-with: Cursor
This commit is contained in:
apple
301
pro_v3.5.1_副本/view/uniapp/pages/users/user_address/addClient.vue
Normal file
301
pro_v3.5.1_副本/view/uniapp/pages/users/user_address/addClient.vue
Normal file
@@ -0,0 +1,301 @@
|
||||
<template>
|
||||
<!-- 添加新地址 -->
|
||||
<view :style="colorStyle">
|
||||
<form @submit="formSubmit">
|
||||
<view class='addAddress'>
|
||||
<view class="rd-16rpx bg--w111-fff p-24 mb-20">
|
||||
<textarea class="w-full fs-30 h-140"
|
||||
v-model="addressValue"
|
||||
placeholder="粘贴地址信息，自动拆分姓名、电话和地址"
|
||||
wrap-style="wrap"
|
||||
:always-embed="true"
|
||||
:adjust-position="true"
|
||||
cursor-spacing="85rpx"
|
||||
:maxlength="200"
|
||||
name="desc"
|
||||
@blur="identify()"/>
|
||||
</view>
|
||||
<view class="input-wrapper">
|
||||
<view class='list'>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>姓名</view>
|
||||
<input type='text' placeholder='请输入姓名' name='real_name' :value="userAddress.real_name" placeholder-class='placeholder'></input>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>联系电话</view>
|
||||
<input type='number' maxlength="11" placeholder='请输入联系电话' name="phone" :value='userAddress.phone' placeholder-class='placeholder' pattern="\d*"></input>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>所在地区</view>
|
||||
<view class="address acea-row row-between-wrapper">
|
||||
<view class="addressCon acea-row" @click="changeRegion">
|
||||
<text class="picker color-add" v-if="!addressInfo.length">请选择地址</text>
|
||||
<view v-else>
|
||||
<text class="picker">{{addressText}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="location1" @click="chooseLocation">
|
||||
<text class="iconfont icon-ic_location1 text-primary"></text>定位
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>详细地址</view>
|
||||
<view class="address">
|
||||
<input type='text' placeholder='请填写具体地址' name='detail' placeholder-class='placeholder' :value='userAddress.detail' class="detail"></input>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<button class='keepBnt' form-type="submit">立即保存</button>
|
||||
</view>
|
||||
</form>
|
||||
<areaWindow ref="areaWindow" :display="display" :address="addressInfo" @submit="OnChangeAddress" @changeClose="changeClose"></areaWindow>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {getGeocoder,getCityList} from '@/api/user.js';
|
||||
import {mapGetters} from "vuex";
|
||||
import colors from '@/mixins/color.js';
|
||||
import areaWindow from '@/components/areaWindow';
|
||||
import AddressParse from '../components/zh-address-parse.min.js'
|
||||
export default {
|
||||
components: {
|
||||
areaWindow,
|
||||
},
|
||||
mixins: [colors],
|
||||
data() {
|
||||
return {
|
||||
id: 0, //地址id
|
||||
userAddress: {}, //地址详情
|
||||
district: [],
|
||||
display: false,
|
||||
addressInfo: [],
|
||||
addressVal: '',
|
||||
latitude: '',
|
||||
longitude: '',
|
||||
city_id: 0,
|
||||
addressValue: "",
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['isLogin']),
|
||||
addressText() {
|
||||
return this.addressInfo.map(v => v.label).join('/');
|
||||
}
|
||||
},
|
||||
onLoad(options) {
|
||||
|
||||
},
|
||||
methods: {
|
||||
changeRegion() {
|
||||
this.display = true;
|
||||
},
|
||||
OnChangeAddress(address) {
|
||||
this.latitude = ''
|
||||
this.longitude = ''
|
||||
this.addressInfo = address;
|
||||
},
|
||||
// 关闭地址弹窗；
|
||||
changeClose: function() {
|
||||
this.display = false;
|
||||
},
|
||||
// 获取选中位置
|
||||
chooseLocation: function() {
|
||||
let self = this;
|
||||
uni.chooseLocation({
|
||||
success: (res) => {
|
||||
let latitude, longitude;
|
||||
latitude = res.latitude.toString();
|
||||
longitude = res.longitude.toString();
|
||||
this.latitude = res.latitude
|
||||
this.longitude = res.longitude
|
||||
getGeocoder({
|
||||
lat: latitude,
|
||||
long: longitude
|
||||
}).then(res => {
|
||||
const data = res.data;
|
||||
getCityList(data.address_component.province + '/' + data.address_component.city + '/' + data.address_component.district + '/' + (!data
|
||||
.address_reference.town ? '' : data.address_reference.town.title)).then(res => {
|
||||
self.addressInfo = res.data;
|
||||
self.userAddress.detail = data.formatted_addresses.recommend;
|
||||
}).catch(err => {
|
||||
self.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
});
|
||||
})
|
||||
},
|
||||
fail: (err) => {
|
||||
console.log(err)
|
||||
}
|
||||
})
|
||||
},
|
||||
/**
|
||||
* 提交用户添加地址
|
||||
*
|
||||
*/
|
||||
formSubmit: function(e) {
|
||||
let that = this,
|
||||
value = e.detail.value;
|
||||
if (!value.real_name) return that.$util.Tips({
|
||||
title: '请填写收货人姓名'
|
||||
});
|
||||
if (!value.phone) return that.$util.Tips({
|
||||
title: '请填写联系电话'
|
||||
});
|
||||
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
|
||||
title: '请输入正确的手机号码'
|
||||
});
|
||||
if (!that.addressInfo.length) return that.$util.Tips({
|
||||
title: '请选择所在地区'
|
||||
});
|
||||
if (that.addressInfo.length < 3) return that.$util.Tips({
|
||||
title: '请补全所在地区信息'
|
||||
});
|
||||
if (!value.detail) return that.$util.Tips({
|
||||
title: '请填写详细地址'
|
||||
});
|
||||
value.id = 0;
|
||||
let regionArray = that.addressInfo;
|
||||
value.address = {
|
||||
province: regionArray[0].label,
|
||||
city: regionArray[1].label,
|
||||
district: regionArray[2].label,
|
||||
street: regionArray[3] ? regionArray[3].label : '',
|
||||
city_id: regionArray[regionArray.length - 1].id ? regionArray[regionArray.length - 1].id : that.city_id,
|
||||
};
|
||||
uni.$emit("refresh", value)
|
||||
uni.navigateBack()
|
||||
},
|
||||
identify() {
|
||||
const options = {
|
||||
type: 0, // 哪种方式解析，0：正则，1：树查找
|
||||
textFilter: [], // 预清洗的字段
|
||||
nameMaxLength: 4, // 查找最大的中文名字长度
|
||||
}
|
||||
const parseResult = AddressParse(this.addressValue.trim(), options)
|
||||
// type参数0表示使用正则解析，1表示采用树查找, textFilter地址预清洗过滤字段。
|
||||
if (this.addressValue.trim()) {
|
||||
getCityList(parseResult.province + '/' + parseResult.city + '/' + parseResult.area).then(res => {
|
||||
this.addressInfo = res.data;
|
||||
this.userAddress.phone = parseResult.phone;
|
||||
this.userAddress.real_name = parseResult.name;
|
||||
this.userAddress.detail = parseResult.detail;
|
||||
}).catch(err => {
|
||||
return this.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.color-add {
|
||||
color: #cdcdcd;
|
||||
}
|
||||
|
||||
.location1 {
|
||||
.iconfont {
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.text-primary {
|
||||
color: $primary-admin;
|
||||
}
|
||||
|
||||
.addAddress {
|
||||
padding: 24rpx 20rpx;
|
||||
}
|
||||
|
||||
.addAddress .input-wrapper {
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.addAddress .list {
|
||||
padding: 8rpx 0;
|
||||
border-radius: 16rpx;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.addAddress .list .item {
|
||||
padding: 32rpx 24rpx;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.addAddress .list .item .detail {
|
||||
width: 368rpx;
|
||||
}
|
||||
|
||||
.addAddress .list .item .location {
|
||||
position: absolute;
|
||||
right: 46rpx;
|
||||
top: 50%;
|
||||
margin-top: -40rpx !important;
|
||||
font-size: 24rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.addAddress .list .item .icon-dizhi {
|
||||
font-size: 36rpx !important;
|
||||
}
|
||||
|
||||
.addAddress .list .item .name {
|
||||
width: 195rpx;
|
||||
font-size: 30rpx;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.addAddress .list .item .address {
|
||||
// width: 412rpx;
|
||||
flex: 1;
|
||||
// margin-left: 20rpx;
|
||||
}
|
||||
|
||||
.addAddress .list .item .address .addressCon {
|
||||
width: 360rpx;
|
||||
}
|
||||
|
||||
.addAddress .list .item .address .addressCon .tip {
|
||||
font-size: 21rpx;
|
||||
margin-top: 4rpx;
|
||||
}
|
||||
|
||||
.addAddress .list .item input {
|
||||
flex: 1;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
|
||||
.placeholder {
|
||||
color: #ccc;
|
||||
}
|
||||
|
||||
.addAddress .list .item .picker {
|
||||
width: 430rpx;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
|
||||
.addAddress .list .item .iconfont {
|
||||
font-size: 30rpx;
|
||||
margin-top: 4rpx;
|
||||
}
|
||||
|
||||
.addAddress .keepBnt {
|
||||
position: fixed;
|
||||
right: 20rpx;
|
||||
bottom: 40rpx;
|
||||
left: 20rpx;
|
||||
height: 80rpx;
|
||||
border-radius: 40rpx;
|
||||
text-align: center;
|
||||
line-height: 80rpx;
|
||||
font-size: 28rpx;
|
||||
color: #fff;
|
||||
background-color: $primary-admin;
|
||||
}
|
||||
</style>
|
||||
669
pro_v3.5.1_副本/view/uniapp/pages/users/user_address/index.vue
Normal file
669
pro_v3.5.1_副本/view/uniapp/pages/users/user_address/index.vue
Normal file
@@ -0,0 +1,669 @@
|
||||
<template>
|
||||
<!-- 添加新地址 -->
|
||||
<view :style="colorStyle">
|
||||
<form @submit="formSubmit">
|
||||
<view class='addAddress'>
|
||||
<!-- #ifdef MP -->
|
||||
<view v-if="!id" class="wechatAddress acea-row row-between-wrapper" @click="getWxAddress">
|
||||
<view class="acea-row row-middle"><text class="iconfont icon-ic_wechat"></text>获取微信收货地址</view>
|
||||
<text class="iconfont icon-ic_rightarrow"></text>
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
<!-- #ifdef H5 -->
|
||||
<view v-if="this.$wechat.isWeixin() && !id" class="wechatAddress acea-row row-between-wrapper" @click="getAddress">
|
||||
<view class="acea-row row-middle"><text class="iconfont icon-ic_wechat"></text>获取微信收货地址</view>
|
||||
<text class="iconfont icon-ic_rightarrow"></text>
|
||||
</view>
|
||||
<!-- #endif -->
|
||||
<view class="rd-16rpx bg--w111-fff p-24 mb-20">
|
||||
<textarea class="w-full fs-30 h-140"
|
||||
v-model="addressValue"
|
||||
placeholder="粘贴地址信息，自动拆分姓名、电话和地址"
|
||||
wrap-style="wrap"
|
||||
:always-embed="true"
|
||||
:adjust-position="true"
|
||||
cursor-spacing="85rpx"
|
||||
:maxlength="200"
|
||||
name="desc"
|
||||
@blur="identify()"/>
|
||||
</view>
|
||||
<view class="input-wrapper">
|
||||
<view class='list'>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>姓名</view>
|
||||
<input type='text' placeholder='请输入姓名' name='real_name' :value="userAddress.real_name" placeholder-class='placeholder' />
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>联系电话</view>
|
||||
<input type='number' maxlength="11" placeholder='请输入联系电话' name="phone" :value='userAddress.phone' placeholder-class='placeholder' pattern="\d*" />
|
||||
</view>
|
||||
<view class='item acea-row row-between-wrapper'>
|
||||
<view class='name'>所在地区</view>
|
||||
<view class="address acea-row row-between-wrapper">
|
||||
<view class="addressCon acea-row" @click="changeRegion">
|
||||
<text class="picker color-add" v-if="!addressInfo.length">请选择地址</text>
|
||||
<view v-else>
|
||||
<text class="picker">{{addressText}}</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="location1" @click="chooseLocation">
|
||||
<text class="iconfont icon-ic_location1 fontcolor"></text>定位
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class='item acea-row row-between'>
|
||||
<view class='name'>详细地址</view>
|
||||
<view class="address">
|
||||
<textarea :value="userAddress.detail" name="detail" auto-height placeholder="请填写具体地址" placeholder-class="placeholder" class="lh-42rpx w-full" />
|
||||
<!-- <input type='text' placeholder='请填写具体地址' name='detail' placeholder-class='placeholder' :value='userAddress.detail' class="w-full"></input> -->
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="default acea-row row-between-wrapper">
|
||||
<view>设置为默认地址</view>
|
||||
<view :class="{ on: userAddress.is_default }" class="switch" @click="ChangeIsDefault">
|
||||
<view class="inner"></view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="fixed-btn">
|
||||
<button class='keepBnt btn bg-color' form-type="submit">立即保存</button>
|
||||
<view v-if="id" class='delbtn btn mt-12' @click="delAddress">删除</view>
|
||||
</view>
|
||||
</view>
|
||||
</form>
|
||||
<areaWindow ref="areaWindow" :display="display" :address="addressInfo" @submit="OnChangeAddress" @changeClose="changeClose"></areaWindow>
|
||||
<home></home>
|
||||
<tuiModal :show="showModal" title="提示" content="确认删除地址?" :maskClosable="false" @click="handleClick"></tuiModal>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
editAddress,
|
||||
getAddressDetail,
|
||||
getGeocoder,
|
||||
getCityList,
|
||||
delAddress
|
||||
} from '@/api/user.js';
|
||||
import {
|
||||
getCityData
|
||||
} from '@/api/api.js';
|
||||
import {
|
||||
toLogin
|
||||
} from '@/libs/login.js';
|
||||
import {
|
||||
mapGetters
|
||||
} from "vuex";
|
||||
import colors from '@/mixins/color.js';
|
||||
import areaWindow from '@/components/areaWindow';
|
||||
import AddressParse from '../components/zh-address-parse.min.js'
|
||||
import tuiModal from '@/components/tui-modal/index.vue';
|
||||
export default {
|
||||
components: {
|
||||
areaWindow,
|
||||
tuiModal
|
||||
},
|
||||
mixins: [colors],
|
||||
data() {
|
||||
return {
|
||||
cartId: '', //购物车id
|
||||
pinkId: 0, //拼团id
|
||||
couponId: 0, //优惠券id
|
||||
id: 0, //地址id
|
||||
userAddress: {
|
||||
is_default: false
|
||||
}, //地址详情
|
||||
isAuto: false, //没有授权的不会自动授权
|
||||
isShowAuth: false, //是否隐藏授权
|
||||
district: [],
|
||||
news: '',
|
||||
noCoupon: 0,
|
||||
display: false,
|
||||
showModal: false,
|
||||
addressInfo: [],
|
||||
addressVal: '',
|
||||
latitude: '',
|
||||
longitude: '',
|
||||
city_id: 0,
|
||||
addressValue: "",
|
||||
deliveryType: 1, //配送方式
|
||||
store_name: '', //门店名称
|
||||
storeId: 0, //门店id
|
||||
product_id: 0 //商品id
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['isLogin']),
|
||||
addressText() {
|
||||
return this.addressInfo.map(v => v.label).join('/');
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
isLogin: {
|
||||
handler: function(newV, oldV) {
|
||||
if (newV) {
|
||||
//#ifndef MP
|
||||
this.getUserAddress();
|
||||
//#endif
|
||||
}
|
||||
},
|
||||
deep: true
|
||||
}
|
||||
},
|
||||
onLoad(options) {
|
||||
this.cartId = options.cartId || '';
|
||||
this.pinkId = options.pinkId || 0;
|
||||
this.couponId = options.couponId || 0;
|
||||
this.id = options.id || 0;
|
||||
this.noCoupon = options.noCoupon || 0;
|
||||
this.news = options.new || '';
|
||||
this.deliveryType = options.delivery_type || 1;
|
||||
this.store_name = options.store_name;
|
||||
this.storeId = options.store_id;
|
||||
this.product_id = options.product_id;
|
||||
uni.setNavigationBarTitle({
|
||||
title: options.id ? '修改地址' : '添加地址'
|
||||
})
|
||||
if (this.isLogin) {
|
||||
this.getUserAddress();
|
||||
// this.getCityList();
|
||||
} else {
|
||||
toLogin()
|
||||
}
|
||||
},
|
||||
onShow() {
|
||||
uni.removeStorageSync('form_type_cart');
|
||||
},
|
||||
methods: {
|
||||
onLoadFun() {
|
||||
this.getUserAddress();
|
||||
this.isShowAuth = false;
|
||||
},
|
||||
/**
|
||||
* 删除地址
|
||||
*/
|
||||
handleClick(e){
|
||||
let index = e.index;
|
||||
if (index == 1) {
|
||||
delAddress(this.id).then(res => {
|
||||
this.$util.Tips({
|
||||
title: '删除成功',
|
||||
icon: 'success'
|
||||
}, function() {
|
||||
uni.navigateBack()
|
||||
});
|
||||
}).catch(err => {
|
||||
return this.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
});
|
||||
} else {
|
||||
this.showModal = false;
|
||||
}
|
||||
},
|
||||
delAddress() {
|
||||
this.showModal = true
|
||||
},
|
||||
// 授权关闭
|
||||
authColse: function(e) {
|
||||
this.isShowAuth = e
|
||||
},
|
||||
changeRegion() {
|
||||
this.display = true;
|
||||
},
|
||||
OnChangeAddress(address) {
|
||||
this.latitude = ''
|
||||
this.longitude = ''
|
||||
this.addressInfo = address;
|
||||
},
|
||||
// 地址数据
|
||||
// getCityList: function() {
|
||||
// let that = this;
|
||||
// getCityData(0).then(res => {
|
||||
// this.district = res.data
|
||||
// })
|
||||
// },
|
||||
// 关闭地址弹窗；
|
||||
changeClose: function() {
|
||||
this.display = false;
|
||||
},
|
||||
getUserAddress: function() {
|
||||
if (!this.id) return false;
|
||||
let that = this;
|
||||
getAddressDetail(this.id).then(res => {
|
||||
let region = [{
|
||||
label: res.data.province
|
||||
}, {
|
||||
label: res.data.city
|
||||
}, {
|
||||
label: res.data.district
|
||||
}, {
|
||||
label: res.data.street
|
||||
}];
|
||||
that.$set(that, 'userAddress', res.data);
|
||||
that.addressInfo = res.data.city_list;
|
||||
that.latitude = res.data.latitude;
|
||||
that.longitude = res.data.longitude;
|
||||
that.city_id = res.data.city_id;
|
||||
});
|
||||
},
|
||||
// 获取选中位置
|
||||
chooseLocation: function() {
|
||||
let self = this;
|
||||
uni.chooseLocation({
|
||||
success: (res) => {
|
||||
let latitude, longitude;
|
||||
latitude = res.latitude.toString();
|
||||
longitude = res.longitude.toString();
|
||||
this.latitude = res.latitude
|
||||
this.longitude = res.longitude
|
||||
getGeocoder({
|
||||
lat: latitude,
|
||||
long: longitude
|
||||
}).then(res => {
|
||||
const data = res.data;
|
||||
getCityList(data.address_component.province + '/' + data.address_component.city + '/' + data.address_component.district + '/' + (!data
|
||||
.address_reference.town ? '' : data.address_reference.town.title)).then(res => {
|
||||
self.addressInfo = res.data;
|
||||
self.userAddress.detail = data.formatted_addresses.recommend;
|
||||
}).catch(err => {
|
||||
return self.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
});
|
||||
}).catch(err=>{
|
||||
return self.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
})
|
||||
},
|
||||
fail: (err) => {
|
||||
console.log(err)
|
||||
}
|
||||
})
|
||||
},
|
||||
// 自动定位
|
||||
selfLocation() {
|
||||
let self = this
|
||||
uni.showLoading({
|
||||
title: '定位中',
|
||||
mask: true,
|
||||
});
|
||||
uni.getLocation({
|
||||
type: 'gcj02',
|
||||
success: (res) => {
|
||||
let latitude, longitude;
|
||||
latitude = res.latitude.toString();
|
||||
longitude = res.longitude.toString();
|
||||
this.latitude = res.latitude
|
||||
this.longitude = res.longitude
|
||||
getGeocoder({
|
||||
lat: latitude,
|
||||
long: longitude
|
||||
}).then(res => {
|
||||
const data = res.data;
|
||||
getCityList(data.address_component.province + '/' + data.address_component.city + '/' + data.address_component.district + '/' + (!data.address_reference
|
||||
.town ? '' : data.address_reference.town.title)).then(res => {
|
||||
self.addressInfo = res.data;
|
||||
self.userAddress.detail = data.formatted_addresses.recommend;
|
||||
uni.hideLoading();
|
||||
})
|
||||
})
|
||||
},
|
||||
fail: (res) => {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: res,
|
||||
icon: 'none',
|
||||
duration: 1000
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
// 导入共享地址（小程序）
|
||||
getWxAddress: function() {
|
||||
let that = this;
|
||||
uni.authorize({
|
||||
scope: 'scope.address',
|
||||
success: function(res) {
|
||||
uni.chooseAddress({
|
||||
success: function(res) {
|
||||
getCityList(res.provinceName + '/' + res.cityName + '/' + res.countyName + '/' + res.streetName).then(res => {
|
||||
that.addressInfo = res.data;
|
||||
}).catch(err=>{
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
})
|
||||
that.userAddress.real_name = res.userName;
|
||||
that.userAddress.phone = res.telNumber;
|
||||
that.userAddress.detail = res.detailInfo;
|
||||
},
|
||||
fail: function(res) {
|
||||
if (res.errMsg == 'chooseAddress:cancel') return that.$util
|
||||
.Tips({
|
||||
title: '取消选择'
|
||||
});
|
||||
},
|
||||
})
|
||||
},
|
||||
fail: function(res) {
|
||||
uni.showModal({
|
||||
title: '您已拒绝导入微信地址权限',
|
||||
content: '是否进入权限管理，调整授权？',
|
||||
success(res) {
|
||||
if (res.confirm) {
|
||||
uni.openSetting({
|
||||
success: function(res) {}
|
||||
});
|
||||
} else if (res.cancel) {
|
||||
return that.$util.Tips({
|
||||
title: '已取消！'
|
||||
});
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
})
|
||||
},
|
||||
// 导入共享地址（微信）；
|
||||
getAddress() {
|
||||
let that = this;
|
||||
that.$wechat.openAddress().then(res => {
|
||||
getCityList(res.provinceName + '/' + res.cityName + '/' + res.countryName + '/' + res.streetName).then(res => {
|
||||
that.addressInfo = res.data;
|
||||
})
|
||||
that.userAddress.real_name = res.userName;
|
||||
that.userAddress.phone = res.telNumber;
|
||||
that.userAddress.detail = res.detailInfo;
|
||||
}).catch(err => {
|
||||
that.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
});
|
||||
},
|
||||
/**
|
||||
* 提交用户添加地址
|
||||
*
|
||||
*/
|
||||
formSubmit: function(e) {
|
||||
let that = this,
|
||||
value = e.detail.value;
|
||||
if (!value.real_name) return that.$util.Tips({
|
||||
title: '请填写收货人姓名'
|
||||
});
|
||||
if (!value.phone) return that.$util.Tips({
|
||||
title: '请填写联系电话'
|
||||
});
|
||||
if (!/^1(3|4|5|7|8|9|6)\d{9}$/i.test(value.phone)) return that.$util.Tips({
|
||||
title: '请输入正确的手机号码'
|
||||
});
|
||||
if (!that.addressInfo.length) return that.$util.Tips({
|
||||
title: '请选择所在地区'
|
||||
});
|
||||
if (that.addressInfo.length < 3) return that.$util.Tips({
|
||||
title: '请补全所在地区信息'
|
||||
});
|
||||
// if (that.region[0] == '省') return that.$util.Tips({
|
||||
// title: '请选择所在地区'
|
||||
// });
|
||||
if (!value.detail) return that.$util.Tips({
|
||||
title: '请填写详细地址'
|
||||
});
|
||||
// if(!that.longitude && !that.latitude) return that.$util.Tips({title:'请定位你的经纬度'})
|
||||
value.id = that.id;
|
||||
let regionArray = that.addressInfo;
|
||||
value.address = {
|
||||
province: regionArray[0].label,
|
||||
city: regionArray[1].label,
|
||||
district: regionArray[2].label,
|
||||
street: regionArray[3] ? regionArray[3].label : '',
|
||||
city_id: regionArray[regionArray.length - 1].id ? regionArray[regionArray.length - 1].id : that.city_id,
|
||||
};
|
||||
value.is_default = that.userAddress.is_default ? 1 : 0;
|
||||
// 经度
|
||||
value.longitude = that.longitude;
|
||||
// 纬度
|
||||
value.latitude = that.latitude;
|
||||
uni.showLoading({
|
||||
title: '保存中',
|
||||
mask: true
|
||||
})
|
||||
editAddress(value).then(res => {
|
||||
if (that.id)
|
||||
that.$util.Tips({
|
||||
title: '修改成功',
|
||||
icon: 'success'
|
||||
});
|
||||
else
|
||||
that.$util.Tips({
|
||||
title: '添加成功',
|
||||
icon: 'success'
|
||||
});
|
||||
setTimeout(function() {
|
||||
if (that.cartId) {
|
||||
uni.$emit("handClick", {addressId: that.id ? that.id : res.data.id})
|
||||
|
||||
}
|
||||
uni.navigateBack()
|
||||
}, 500);
|
||||
}).catch(err => {
|
||||
return that.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
})
|
||||
},
|
||||
ChangeIsDefault: function(e) {
|
||||
this.$set(this.userAddress, 'is_default', !this.userAddress.is_default);
|
||||
},
|
||||
identify() {
|
||||
const options = {
|
||||
type: 0, // 哪种方式解析，0：正则，1：树查找
|
||||
textFilter: [], // 预清洗的字段
|
||||
nameMaxLength: 4, // 查找最大的中文名字长度
|
||||
}
|
||||
const parseResult = AddressParse(this.addressValue.trim(), options)
|
||||
// type参数0表示使用正则解析，1表示采用树查找, textFilter地址预清洗过滤字段。
|
||||
if (this.addressValue.trim()) {
|
||||
getCityList(parseResult.province + '/' + parseResult.city + '/' + parseResult.area).then(res => {
|
||||
this.addressInfo = res.data;
|
||||
this.userAddress.phone = parseResult.phone;
|
||||
this.userAddress.real_name = parseResult.name;
|
||||
this.userAddress.detail = parseResult.detail;
|
||||
}).catch(err => {
|
||||
return this.$util.Tips({
|
||||
title: err
|
||||
});
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.color-add {
|
||||
color: #cdcdcd;
|
||||
}
|
||||
|
||||
.location1 {
|
||||
.iconfont {
|
||||
margin-right: 8rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.fontcolor {
|
||||
color: var(--view-theme);
|
||||
}
|
||||
|
||||
.addAddress {
|
||||
padding: 24rpx 20rpx;
|
||||
}
|
||||
|
||||
.addAddress .input-wrapper {
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.addAddress .list {
|
||||
padding: 8rpx 0;
|
||||
border-radius: 16rpx;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.addAddress .list .item {
|
||||
padding: 32rpx 24rpx;
|
||||
// border-top: 1rpx solid #eee;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.addAddress .list .item .detail {
|
||||
width: 368rpx;
|
||||
}
|
||||
|
||||
.addAddress .list .item .location {
|
||||
position: absolute;
|
||||
right: 46rpx;
|
||||
top: 50%;
|
||||
margin-top: -40rpx !important;
|
||||
font-size: 24rpx;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.addAddress .list .item .icon-dizhi {
|
||||
font-size: 36rpx !important;
|
||||
}
|
||||
|
||||
.addAddress .list .item .name {
|
||||
width: 182rpx;
|
||||
font-size: 30rpx;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.addAddress .list .item .address {
|
||||
// width: 412rpx;
|
||||
flex: 1;
|
||||
// margin-left: 20rpx;
|
||||
}
|
||||
|
||||
.addAddress .list .item .address .addressCon {
|
||||
width: 360rpx;
|
||||
}
|
||||
|
||||
.addAddress .list .item .address .addressCon .tip {
|
||||
font-size: 21rpx;
|
||||
margin-top: 4rpx;
|
||||
}
|
||||
|
||||
.addAddress .list .item input {
|
||||
// width: 475rpx;
|
||||
flex: 1;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
|
||||
.placeholder {
|
||||
color: #ccc;
|
||||
}
|
||||
|
||||
// .addAddress .list .item {
|
||||
// width: 475rpx;
|
||||
// }
|
||||
|
||||
.addAddress .list .item .picker {
|
||||
width: 430rpx;
|
||||
font-size: 30rpx;
|
||||
}
|
||||
|
||||
.addAddress .list .item .iconfont {
|
||||
font-size: 30rpx;
|
||||
margin-top: 4rpx;
|
||||
}
|
||||
|
||||
.addAddress .default {
|
||||
padding: 0 25rpx;
|
||||
height: 128rpx;
|
||||
border-radius: 16rpx;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
.addAddress .default .switch {
|
||||
position: relative;
|
||||
width: 79rpx;
|
||||
height: 46rpx;
|
||||
border: 2rpx solid #DDDDDD;
|
||||
border-radius: 46rpx;
|
||||
background-color: #DDDDDD;
|
||||
transition: background-color 0.3s;
|
||||
box-sizing: content-box;
|
||||
|
||||
&.on {
|
||||
border-color: var(--view-theme);
|
||||
background-color: var(--view-theme);
|
||||
|
||||
.inner {
|
||||
transform: translateX(33rpx);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.addAddress .default .switch .inner {
|
||||
position: absolute;
|
||||
top: 2rpx;
|
||||
left: 2rpx;
|
||||
width: 42rpx;
|
||||
height: 42rpx;
|
||||
border-radius: 100%;
|
||||
background-color: #FFFFFF;
|
||||
box-shadow: 0rpx 3rpx 6rpx 0rpx rgba(0, 0, 0, 0.08);
|
||||
transition: transform 0.3s cubic-bezier(0.3, 1.05, 0.4, 1.05);
|
||||
}
|
||||
|
||||
.addAddress .default checkbox {
|
||||
margin-right: 15rpx;
|
||||
}
|
||||
|
||||
.addAddress .keepBnt {
|
||||
color: #fff;
|
||||
}
|
||||
.fixed-btn{
|
||||
position: fixed;
|
||||
right: 20rpx;
|
||||
bottom: 40rpx;
|
||||
left: 20rpx;
|
||||
.btn{
|
||||
height: 80rpx;
|
||||
border-radius: 40rpx;
|
||||
text-align: center;
|
||||
line-height: 80rpx;
|
||||
font-size: 28rpx;
|
||||
}
|
||||
}
|
||||
.addAddress .delbtn{
|
||||
color: var(--view-theme);
|
||||
border: 1px solid var(--view-theme);
|
||||
}
|
||||
|
||||
.addAddress .wechatAddress {
|
||||
// width: 690rpx;
|
||||
height: 100rpx;
|
||||
padding: 0 24rpx;
|
||||
border-radius: 24rpx;
|
||||
background-color: #FFFFFF;
|
||||
text-align: center;
|
||||
line-height: 100rpx;
|
||||
margin: 0 0 20rpx;
|
||||
font-size: 30rpx;
|
||||
color: #3D3D3D;
|
||||
|
||||
// border: 1px solid var(--view-theme);
|
||||
.icon-ic_wechat {
|
||||
margin-right: 20rpx;
|
||||
font-size: 48rpx;
|
||||
color: #00C800;
|
||||
}
|
||||
}
|
||||
|
||||
.mt-22 {
|
||||
margin-top: 22rpx;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user