diff --git a/jsowell-ui/src/views/financial/merchant.vue b/jsowell-ui/src/views/financial/merchant.vue index f929a581b..66c9ef23a 100644 --- a/jsowell-ui/src/views/financial/merchant.vue +++ b/jsowell-ui/src/views/financial/merchant.vue @@ -205,8 +205,9 @@ export default { }, getMerchantList() { getMerchantList().then((response) => { - this.merchantList = response.rows; - console.log("merchantList", this.merchantList) + console.log("getMerchantList response.rows:", response.data); + this.merchantList = response.data; + console.log("getMerchantList merchantList", this.merchantList) }); }, /** 搜索按钮操作 */ diff --git a/jsowell-ui/src/views/member/memberGroup/index.vue b/jsowell-ui/src/views/member/memberGroup/index.vue index 08db32df1..5a342cf39 100644 --- a/jsowell-ui/src/views/member/memberGroup/index.vue +++ b/jsowell-ui/src/views/member/memberGroup/index.vue @@ -135,7 +135,7 @@ export default { getMerchantList() { getMerchantList().then((response) => { console.log("response", response) - this.merchantList = response.obj; + this.merchantList = response.data; this.createMerchantVip.targetMerchantId = this.merchantList[0].merchantId }) }, diff --git a/jsowell-ui/src/views/member/merchantVIP/index.vue b/jsowell-ui/src/views/member/merchantVIP/index.vue index bd7af07a6..1ac3e4098 100644 --- a/jsowell-ui/src/views/member/merchantVIP/index.vue +++ b/jsowell-ui/src/views/member/merchantVIP/index.vue @@ -323,7 +323,7 @@ export default { getMerchantList() { getMerchantList().then((response) => { console.log("response", response) - this.merchantList = response.obj; + this.merchantList = response.data; this.createMerchantVip.targetMerchantId = this.merchantList[0].merchantId }) }, diff --git a/jsowell-ui/src/views/order/invoice/index.vue b/jsowell-ui/src/views/order/invoice/index.vue index 4ec03b83b..efdb52528 100644 --- a/jsowell-ui/src/views/order/invoice/index.vue +++ b/jsowell-ui/src/views/order/invoice/index.vue @@ -222,7 +222,7 @@ export default { }, getMerchantList() { getMerchantList().then((response) => { - this.merchantList = response.rows; + this.merchantList = response.data; console.log("merchantList", this.merchantList) }); }, diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue index 7e9371554..a13192454 100644 --- a/jsowell-ui/src/views/order/order/index.vue +++ b/jsowell-ui/src/views/order/order/index.vue @@ -277,7 +277,7 @@ export default { }, getMerchantList() { getMerchantList().then((response) => { - this.merchantList = response.rows; + this.merchantList = response.data; console.log("merchantList", this.merchantList) }); }, diff --git a/jsowell-ui/src/views/pile/basic/index.vue b/jsowell-ui/src/views/pile/basic/index.vue index 6f88ccd00..ddef06709 100644 --- a/jsowell-ui/src/views/pile/basic/index.vue +++ b/jsowell-ui/src/views/pile/basic/index.vue @@ -479,7 +479,7 @@ export default { }, getMerchantList() { getMerchantList().then((response) => { - this.merchantList = response.rows; + this.merchantList = response.data; }); }, getModelList() { diff --git a/jsowell-ui/src/views/pile/card/index.vue b/jsowell-ui/src/views/pile/card/index.vue index b127514d2..f022ea86b 100644 --- a/jsowell-ui/src/views/pile/card/index.vue +++ b/jsowell-ui/src/views/pile/card/index.vue @@ -266,7 +266,7 @@ export default { getMerchantList() { getMerchantList().then((response) => { // console.log("getMerchantList response", response); - this.merchantList = response.obj; + this.merchantList = response.data; this.form.merchantId = this.merchantList[0].merchantId }) }, diff --git a/jsowell-ui/src/views/pile/station/index.vue b/jsowell-ui/src/views/pile/station/index.vue index 89606dd1f..ec230c9f4 100644 --- a/jsowell-ui/src/views/pile/station/index.vue +++ b/jsowell-ui/src/views/pile/station/index.vue @@ -400,7 +400,7 @@ export default { }, getMerchantList() { getMerchantList().then((response) => { - this.merchantList = response.rows; + this.merchantList = response.data; console.log("merchantList", this.merchantList) }); }, diff --git a/jsowell-ui/src/views/pile/station/pileList.vue b/jsowell-ui/src/views/pile/station/pileList.vue index 164c57680..0bd775193 100644 --- a/jsowell-ui/src/views/pile/station/pileList.vue +++ b/jsowell-ui/src/views/pile/station/pileList.vue @@ -372,7 +372,7 @@ export default { }, getMerchantList() { getMerchantList().then((response) => { - this.merchantList = response.rows; + this.merchantList = response.data; }); }, // 查询站点信息