|
@@ -478,8 +478,9 @@ export default {
|
|
|
async onLoad(params = {}) {
|
|
|
this.loading = true
|
|
|
try {
|
|
|
- // const customerId = params['customerId'] || this.query['customerId']
|
|
|
- const res = await getAddressList()
|
|
|
+ // 合并查询参数
|
|
|
+ const queryParams = { ...this.query, ...params }
|
|
|
+ const res = await getAddressList(queryParams)
|
|
|
this.data = res.data.data || []
|
|
|
this.loading = false
|
|
|
this.selectionClear()
|
|
@@ -638,14 +639,14 @@ export default {
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
|
})
|
|
|
-
|
|
|
+
|
|
|
const loading = this.$loading({
|
|
|
lock: true,
|
|
|
text: '设置中...',
|
|
|
spinner: 'el-icon-loading',
|
|
|
background: 'rgba(0, 0, 0, 0.7)'
|
|
|
})
|
|
|
-
|
|
|
+
|
|
|
try {
|
|
|
await setDefaultAddress(row.id)
|
|
|
this.$message.success('设置默认地址成功')
|