|
@@ -143,11 +143,7 @@ Page({
|
|
|
},
|
|
|
commmitAddress() {
|
|
|
let self = this
|
|
|
- let name = this.trim(this.data.name)
|
|
|
- let phone = this.trim(this.data.mob_phone)
|
|
|
- let address = this.trim(this.data.address)
|
|
|
- let area_info = this.data.area_info
|
|
|
-
|
|
|
+ let name = this.trim(this.data.name)
|
|
|
if (!name) {
|
|
|
wx.showToast({
|
|
|
icon: 'none',
|
|
@@ -156,6 +152,8 @@ Page({
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ let phone = this.trim(this.data.mob_phone)
|
|
|
if (!(/^1(3|4|5|7|8)\d{9}$/.test(phone))) {
|
|
|
wx.showToast({
|
|
|
icon: 'none',
|
|
@@ -164,7 +162,8 @@ Page({
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ let area_info = this.data.area_info
|
|
|
if (!area_info) {
|
|
|
wx.showToast({
|
|
|
icon: 'none',
|
|
@@ -173,6 +172,8 @@ Page({
|
|
|
})
|
|
|
return
|
|
|
}
|
|
|
+
|
|
|
+ let address = this.trim(this.data.address)
|
|
|
if (!address) {
|
|
|
wx.showToast({
|
|
|
icon: 'none',
|
|
@@ -182,14 +183,17 @@ Page({
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ wx.showLoading({
|
|
|
+ title: '加载中',
|
|
|
+ })
|
|
|
if (this.data.isEdit) {
|
|
|
this.editAddress(name, this.data.address_id, this.data.city_id, this.data.area_id, this.data.area_info, address, phone)
|
|
|
- return;
|
|
|
-
|
|
|
}
|
|
|
- this.addArress(name, address, phone, area_info);
|
|
|
+ else {
|
|
|
+ this.addArress(name, address, phone, area_info);
|
|
|
+ }
|
|
|
},
|
|
|
- addArress(name, address, phone, area_info) {
|
|
|
+ addArress(name, address, phone, area_info) {
|
|
|
let self = this;
|
|
|
getReq({
|
|
|
act: 'member_address',
|
|
@@ -202,6 +206,7 @@ Page({
|
|
|
}, function (res) {
|
|
|
wx.hideLoading()
|
|
|
if (res.code == 200) {
|
|
|
+ console.log(res);
|
|
|
let address_id = res.datas.address_id
|
|
|
self.setDefault(res, name, phone, area_info, address, address_id)
|
|
|
}
|
|
@@ -250,14 +255,15 @@ Page({
|
|
|
let params = {
|
|
|
act: 'member_address',
|
|
|
op: 'set_default',
|
|
|
- is_default
|
|
|
- }
|
|
|
- if (this.data.isEdit) {
|
|
|
- params = Object.assign({}, params, { address_id })
|
|
|
+ is_default,
|
|
|
+ address_id
|
|
|
}
|
|
|
getReq(params, function (response) {
|
|
|
wx.hideLoading()
|
|
|
+ console.log(response);
|
|
|
+
|
|
|
if (response.code == 200) {
|
|
|
+
|
|
|
wx.navigateBack()
|
|
|
}
|
|
|
else {
|