diff --git a/pages/usercenter/address/list/index.js b/pages/usercenter/address/list/index.js index 701d6ac..d7d0a21 100644 --- a/pages/usercenter/address/list/index.js +++ b/pages/usercenter/address/list/index.js @@ -1,7 +1,16 @@ /* eslint-disable no-param-reassign */ -import { fetchDeliveryAddressList } from '~/services/address/fetchAddress'; +import { + fetchDeliveryAddressList +} from '~/services/address/fetchAddress'; import Toast from 'tdesign-miniprogram/toast/index'; -import { resolveAddress, rejectAddress } from './util'; +import { + resolveAddress, + rejectAddress +} from './util'; +import { + deletAddress +} from '~/services/address/deletAddress' + Page({ data: { @@ -17,7 +26,9 @@ Page({ hasSelect: false, onLoad(query) { - const { selectMode = '', isOrderSure = '', id = '' } = query; + const { + selectMode = '', isOrderSure = '', id = '' + } = query; this.setData({ isOrderSure: !!isOrderSure, id, @@ -36,14 +47,18 @@ Page({ /** 获取收货地址列表 */ getAddressList() { - const { id } = this.data; + const { + id + } = this.data; fetchDeliveryAddressList().then((addressList) => { addressList.forEach((address) => { if (address.customerAddressGuid === id) { address.checked = true; } }); - this.setData({ addressList }); + this.setData({ + addressList + }); }); }, @@ -68,7 +83,9 @@ Page({ icon: '', duration: 1000, }); - const { length: len } = this.data.addressList; + const { + length: len + } = this.data.addressList; this.setData({ [`addressList[${len}]`]: { name: res.userName, @@ -84,54 +101,63 @@ Page({ }, /** 删除地址操作 */ - confirmDeleteHandle({ detail }) { - const { id } = detail || {}; - if (id !== undefined) { - this.setData({ deleteID: id, showDeleteConfirm: true }); - Toast({ - context: this, - selector: '#t-toast', - message: '地址删除成功', - theme: 'success', - duration: 1000, - }); - } else { - Toast({ - context: this, - selector: '#t-toast', - message: '需要组件库发新版才能拿到地址ID', - icon: '', - duration: 1000, - }); - } - }, - deleteAddressHandle(e) { - const { id } = e.currentTarget.dataset; - this.setData({ - addressList: this.data.addressList.filter((address) => address.id !== id), - deleteID: '', - showDeleteConfirm: false, - }); + confirmDeleteHandle({ + detail + }) { + const { + customerAddressId + } = detail || {}; + + deletAddress(customerAddressId).then((res) => { + if (res.code === 200) { + this.init() + this.setData({ + deleteID: customerAddressId, + showDeleteConfirm: true + }); + Toast({ + context: this, + selector: '#t-toast', + message: '地址删除成功', + theme: 'success', + duration: 1000, + }); + } + }) }, /** 跳转编辑 */ - editAddressHandle({ detail }) { - const { customerAddressId } = detail || {}; - wx.navigateTo({ url: `/pages/usercenter/address/edit/index?id=${customerAddressId}` }); + editAddressHandle({ + detail + }) { + const { + customerAddressId + } = detail || {}; + wx.navigateTo({ + url: `/pages/usercenter/address/edit/index?id=${customerAddressId}` + }); }, - selectHandle({ detail }) { + selectHandle({ + detail + }) { if (this.selectMode) { this.hasSelect = true; - resolveAddress(this.data.addressList,detail); - wx.navigateBack({ delta: 1 }); + resolveAddress(this.data.addressList, detail); + wx.navigateBack({ + delta: 1 + }); } else { - this.editAddressHandle({ detail }); + this.editAddressHandle({ + detail + }); } }, /** 跳转添加 */ createHandle() { - wx.navigateTo({ url: '/pages/usercenter/address/edit/index' }); + wx.navigateTo({ + url: '/pages/usercenter/address/edit/index' + }); }, -}); +}); \ No newline at end of file diff --git a/pages/usercenter/address/list/index.wxml b/pages/usercenter/address/list/index.wxml index d393db5..bb7720a 100644 --- a/pages/usercenter/address/list/index.wxml +++ b/pages/usercenter/address/list/index.wxml @@ -13,7 +13,7 @@ address="{{address}}" data-id="{{address.customerAddressGuid}}" bind:onSelect="selectHandle" - bind:onDelete="deleteAddressHandle" + bind:onDelete="confirmDeleteHandle" bind:onEdit="editAddressHandle" /> diff --git a/pages/usercenter/person-info/index.js b/pages/usercenter/person-info/index.js index ff210bb..4733064 100644 --- a/pages/usercenter/person-info/index.js +++ b/pages/usercenter/person-info/index.js @@ -150,7 +150,7 @@ Page({ let tempFilePath = tempFilePaths[0]; // 上传图片到服务器 wx.uploadFile({ - url: 'http://localhost:8888/api/Common/UploadFile', // 上传接口地址 + url: 'http://192.168.1.102:8888/api/Common/UploadFile', // 上传接口地址 filePath: tempFilePath, // 要上传的文件的临时路径 name: 'file', // 上传文件对应的字段名 success: function (uploadRes) { diff --git a/services/_utils/request.js b/services/_utils/request.js index 5d36037..e8eab5f 100644 --- a/services/_utils/request.js +++ b/services/_utils/request.js @@ -3,7 +3,7 @@ import { getStorage } from '~/utils/storage' -const ServerBasePath = 'http://localhost:8888/api/'; +const ServerBasePath = 'http://192.168.1.102:8888/api/'; // 网络请求封装 export function request(option) { diff --git a/services/address/addOrUpdateAddress.js b/services/address/addOrUpdateAddress.js index 812bb08..261e34a 100644 --- a/services/address/addOrUpdateAddress.js +++ b/services/address/addOrUpdateAddress.js @@ -2,7 +2,6 @@ import { request } from '../_utils/request'; - /** 编辑个人资料 */ export function addOrUpdateAddress(data) { return new Promise((resolve, reject) => { diff --git a/services/address/deletAddress.js b/services/address/deletAddress.js new file mode 100644 index 0000000..df018a2 --- /dev/null +++ b/services/address/deletAddress.js @@ -0,0 +1,21 @@ +import { + request +} from '../_utils/request'; + + +/** 编辑个人资料 */ +export function deletAddress(ids) { + return new Promise((resolve, reject) => { + request({ + url: `CustomerAddressApi/` + ids, + method: 'DELETE', + success: function (res) { + + resolve(res); + }, + fail: function (error) { + reject(error); + } + }); + }); +} \ No newline at end of file