diff --git a/src/project/pingchang/AppSuperMarket/AppSuperMarket.vue b/src/project/pingchang/AppSuperMarket/AppSuperMarket.vue index d5a9bf70..7410bb2a 100644 --- a/src/project/pingchang/AppSuperMarket/AppSuperMarket.vue +++ b/src/project/pingchang/AppSuperMarket/AppSuperMarket.vue @@ -28,7 +28,7 @@
-
{{ $dict.getLabel('integralSGType', item.type) }}
+
{{ $dict.getLabel('integralSGTypeText', item.typeText) }}

{{item.title}}

@@ -51,7 +51,7 @@
-
{{ $dict.getLabel('integralSGType', item.type) }}
+
{{ $dict.getLabel('integralSGTypeText', item.typeText) }}

{{item.title}}

@@ -110,7 +110,7 @@ export default { ...mapState(['user']), }, onLoad() { - this.$dict.load(['integralSGType']) + this.$dict.load(['integralSGTypeText']) }, onShow() { document.title = '积分商城' @@ -145,6 +145,7 @@ export default { if (res.code === 0) { this.goodsList = this.current == 1 ? res.data.records : [...this.goodsList, ...res.data.records] res.data.records.map((item, index) => { + item.typeText = item.type == 0 ? 0 : 1 if(index%2 ==0) { this.leftList.push(item) }else { diff --git a/src/project/pingchang/AppSuperMarket/myOrderList.vue b/src/project/pingchang/AppSuperMarket/myOrderList.vue index a1834bd6..e3ec43b4 100644 --- a/src/project/pingchang/AppSuperMarket/myOrderList.vue +++ b/src/project/pingchang/AppSuperMarket/myOrderList.vue @@ -12,7 +12,7 @@
-
{{ $dict.getLabel('integralSGType', item.goodsType) }}
+
{{ $dict.getLabel('integralSGTypeText', item.goodsTypeText) }}

{{item.goodsTitle}}

@@ -63,7 +63,7 @@ export default { ...mapState(['user']), }, onLoad(option) { - this.$dict.load(['integralSGOStatus', 'integralSGType']).then(() => { + this.$dict.load(['integralSGOStatus', 'integralSGTypeText']).then(() => { this.getList() }) }, @@ -85,6 +85,9 @@ export default { } }).then(res => { if (res.code === 0) { + res.data.records.map((item) => { + item.goodsTypeText = item.goodsType == 0 ? 0 : 1 + }) this.list = this.current == 1 ? res.data.records : [...this.list, ...res.data.records] } }) diff --git a/src/project/pingchang/AppSuperMarket/placeOrder.vue b/src/project/pingchang/AppSuperMarket/placeOrder.vue index a00c0966..f16d95a4 100644 --- a/src/project/pingchang/AppSuperMarket/placeOrder.vue +++ b/src/project/pingchang/AppSuperMarket/placeOrder.vue @@ -3,7 +3,7 @@
-
{{ $dict.getLabel('integralSGType', goodsInfo.type) }}
+
{{ $dict.getLabel('integralSGTypeText', goodsInfo.typeText) }}

{{goodsInfo.title}}

@@ -74,7 +74,7 @@ export default { this.shopGoodsId = option.shopGoodsId this.total = option.total this.backLevel = option.backLevel - this.$dict.load(['integralSGType']).then(() => { + this.$dict.load(['integralSGTypeText']).then(() => { this.getDetail() }) }, @@ -86,6 +86,7 @@ export default { this.$http.post(`/app/appintegralsupermarketshop/queryGoodsInfoXCX?shopGoodsId=${this.shopGoodsId}`).then(res => { if (res.code === 0) { this.goodsInfo = res.data + this.goodsInfo.typeText = this.goodsInfo.type == 0 ? 0 : 1 } }) }, diff --git a/src/project/pingchang/AppSuperMarket/productDetails.vue b/src/project/pingchang/AppSuperMarket/productDetails.vue index f5bf297f..4a7b0e46 100644 --- a/src/project/pingchang/AppSuperMarket/productDetails.vue +++ b/src/project/pingchang/AppSuperMarket/productDetails.vue @@ -1,7 +1,7 @@