feat:抖音支付
This commit is contained in:
@@ -1,32 +1,18 @@
|
||||
<template>
|
||||
<view class="address_add_warp">
|
||||
<Header
|
||||
:leftTitle="titleText"
|
||||
leftPath="1"
|
||||
/>
|
||||
<Header :leftTitle="titleText" leftPath="1" />
|
||||
<view class="address_form">
|
||||
<view class="add_form_item add_form_item_but">
|
||||
<view class="add_form_title">收货人</view>
|
||||
<up-input
|
||||
placeholder="收货人"
|
||||
border="surround"
|
||||
v-model="form.name"
|
||||
:customStyle="{
|
||||
border: '0rpx',
|
||||
}"
|
||||
></up-input>
|
||||
<up-input placeholder="收货人" border="surround" v-model="form.name" :customStyle="{
|
||||
border: '0rpx',
|
||||
}"></up-input>
|
||||
</view>
|
||||
<view class="add_form_item add_form_item_but">
|
||||
<view class="add_form_title">手机号码</view>
|
||||
<up-input
|
||||
placeholder="请填写收货人手机号"
|
||||
border="surround"
|
||||
v-model="form.mobile"
|
||||
:customStyle="{
|
||||
border: '0rpx',
|
||||
}"
|
||||
type="number"
|
||||
></up-input>
|
||||
<up-input placeholder="请填写收货人手机号" border="surround" v-model="form.mobile" :customStyle="{
|
||||
border: '0rpx',
|
||||
}" type="number" maxlength="11"></up-input>
|
||||
</view>
|
||||
<view class="add_form_item add_form_item_but">
|
||||
<view class="add_form_title">所在地区</view>
|
||||
@@ -34,25 +20,15 @@
|
||||
<view style="color: #808080; margin-left: 22rpx; font-size: 28rpx">{{
|
||||
(form.regionStr && form.regionStr.join("/")) || "所在地区"
|
||||
}}</view>
|
||||
<up-image
|
||||
src="/static/common/right_soild.png"
|
||||
width="14"
|
||||
height="14"
|
||||
bgColor="#f1f6ff00"
|
||||
></up-image>
|
||||
<up-image src="/static/common/right_soild.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
|
||||
</view>
|
||||
</view>
|
||||
<view class="add_form_item">
|
||||
<view class="add_form_title">详细地址</view>
|
||||
<up-input
|
||||
placeholder="门牌号、小区、楼栋号、单元室等"
|
||||
border="surround"
|
||||
v-model="form.address"
|
||||
:customStyle="{
|
||||
border: '0rpx',
|
||||
height: '100rpx',
|
||||
}"
|
||||
></up-input>
|
||||
<up-input placeholder="门牌号、小区、楼栋号、单元室等" border="surround" v-model="form.address" :customStyle="{
|
||||
border: '0rpx',
|
||||
height: '100rpx',
|
||||
}"></up-input>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="address_default">
|
||||
@@ -78,10 +54,10 @@
|
||||
@cancel="regionShow = false"
|
||||
@close="regionShow = false"
|
||||
></up-picker> -->
|
||||
<AddressPopup @ok="onOk"
|
||||
:show="regionShow" @itemSelect="onItemSelect" @select="onSelect" :curSelect="curSelect" :selectList="curSelectList" :dataList="addressList" @close="onClose"></AddressPopup>
|
||||
<qiaobao-assistant page-key="pages/mine_package/mine_address_add/mine_address_add" title="编辑收货地址" />
|
||||
</view>
|
||||
<AddressPopup @ok="onOk" :show="regionShow" @itemSelect="onItemSelect" @select="onSelect" :curSelect="curSelect"
|
||||
:selectList="curSelectList" :dataList="addressList" @close="onClose"></AddressPopup>
|
||||
<qiaobao-assistant page-key="pages/mine_package/mine_address_add/mine_address_add" title="编辑收货地址" />
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@@ -91,10 +67,10 @@ import AddressPopup from '@/components/common/address-popup.vue'
|
||||
import Header from "@/components/header.vue";
|
||||
|
||||
export default {
|
||||
components: { Header,AddressPopup },
|
||||
components: { Header, AddressPopup },
|
||||
data() {
|
||||
return {
|
||||
titleText:'添加地址',
|
||||
titleText: '添加地址',
|
||||
form: {
|
||||
id: 0,
|
||||
name: null, // 收货人
|
||||
@@ -108,9 +84,9 @@ export default {
|
||||
address: null, // 详细地址
|
||||
},
|
||||
regionShow: false,
|
||||
curSelect:-1,
|
||||
addressList:[],
|
||||
curSelectList:[],
|
||||
curSelect: -1,
|
||||
addressList: [],
|
||||
curSelectList: [],
|
||||
regionColumns: [],
|
||||
regionLoading: false,
|
||||
// leftPath: "/pages/mine_package/mine_address/mine_address",
|
||||
@@ -122,81 +98,81 @@ export default {
|
||||
const detail = option.detail;
|
||||
if (id && id !== 0) {
|
||||
this.getById(id);
|
||||
this.titleText = '修改地址';
|
||||
this.titleText = '修改地址';
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
onItemSelect(item,xItem){
|
||||
this.curSelectList.push(xItem);
|
||||
this.curSelect++;
|
||||
this.getAddressList(xItem.id).then(() => {
|
||||
if (!this.addressList.length) {
|
||||
this.onOk();
|
||||
}
|
||||
});
|
||||
},
|
||||
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=[];
|
||||
},
|
||||
onItemSelect(item, xItem) {
|
||||
this.curSelectList.push(xItem);
|
||||
this.curSelect++;
|
||||
this.getAddressList(xItem.id).then(() => {
|
||||
if (!this.addressList.length) {
|
||||
this.onOk();
|
||||
}
|
||||
});
|
||||
},
|
||||
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 = [];
|
||||
},
|
||||
/**
|
||||
* 用作编辑
|
||||
*/
|
||||
@@ -241,41 +217,41 @@ export default {
|
||||
|
||||
// 选择地址的弹框
|
||||
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.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;
|
||||
},
|
||||
// 数据交互
|
||||
@@ -332,8 +308,8 @@ export default {
|
||||
this.form.areaId = regionId[3] ? regionId[3] : null;
|
||||
this.form.townshipId = regionId[4] ? regionId[4] : null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
this.regionShowCheck(false);
|
||||
},
|
||||
|
||||
@@ -356,6 +332,13 @@ export default {
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!/^1[3-9]\d{9}$/.test(params.mobile)) {
|
||||
this.$refs.uToastRef.show({
|
||||
type: "error",
|
||||
message: "请输入正确的手机号码",
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!params.regionStr) {
|
||||
this.$refs.uToastRef.show({
|
||||
type: "error",
|
||||
@@ -388,15 +371,15 @@ export default {
|
||||
if (!params.countryId || params.countryId === 0) {
|
||||
delete params.countryId;
|
||||
}
|
||||
|
||||
|
||||
delete params.regionStr;
|
||||
if(params.countryId != 47021){
|
||||
this.$refs.uToastRef.show({
|
||||
type: "error",
|
||||
message: '选择地址错误'
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (params.countryId != 47021) {
|
||||
this.$refs.uToastRef.show({
|
||||
type: "error",
|
||||
message: '选择地址错误'
|
||||
});
|
||||
return;
|
||||
}
|
||||
const res = await editAddress(params);
|
||||
if (res && res.bizcode === 100) {
|
||||
uni.$emit("refreshAddressList");
|
||||
|
||||
Reference in New Issue
Block a user