diff --git a/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue b/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue index e3fa633b..ee551ee0 100644 --- a/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue +++ b/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue @@ -71,8 +71,9 @@
- 积分兑换 - 京东低价商品 + + {{dict.getLabel('integralSGTypeText', row.typeText)}}

{{ row.goodsTitle }}

@@ -152,7 +153,7 @@ }, created () { - this.dict.load('integralSGType', 'integralSGOStatus').then(() => { + this.dict.load('integralSGType', 'integralSGOStatus', 'integralSGTypeText').then(() => { this.getList() }) }, @@ -165,6 +166,9 @@ } }).then((res) => { if (res.code == 0) { + res.data.records.map((item) => { + item.typeText = item.goodsType == 0 ? 0 : 1 + }) this.tableData = res.data.records this.total = res.data.total } diff --git a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue index 6cac4564..b9dbe5c8 100644 --- a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue +++ b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue @@ -77,8 +77,9 @@
- 积分兑换 - 京东低价商品 + + {{dict.getLabel('integralSGTypeText', row.typeText)}}

{{ row.goodsTitle }}

@@ -164,7 +165,7 @@ }, created () { - this.dict.load('integralSGType', 'integralSGOStatus', 'yesOrNo').then(() => { + this.dict.load('integralSGType', 'integralSGOStatus', 'yesOrNo', 'integralSGTypeText').then(() => { this.getList() }) }, @@ -178,6 +179,9 @@ } }).then((res) => { if (res.code == 0) { + res.data.records.map((item) => { + item.typeText = item.goodsType == 0 ? 0 : 1 + }) this.tableData = res.data.records this.total = res.data.total } diff --git a/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue b/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue index 76f8da8b..a57f1783 100644 --- a/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue +++ b/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue @@ -54,8 +54,9 @@ -->
- 积分兑换 - 京东低价商品 + + {{dict.getLabel('integralSGTypeText', row.typeText)}}

{{ row.title }}

@@ -116,7 +117,7 @@ }, created () { - this.dict.load('integralSGType', 'integralSGStatus').then(() => { + this.dict.load('integralSGType', 'integralSGStatus', 'integralSGTypeText').then(() => { this.getList() }) }, @@ -129,6 +130,9 @@ } }).then((res) => { if (res.code == 0) { + res.data.records.map((item) => { + item.typeText = item.type == 0 ? 0 : 1 + }) this.tableData = res.data.records this.total = res.data.total }