diff --git a/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue b/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue index c45d438..3baab4d 100644 --- a/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue +++ b/src/project/fengdu/AppRedemptionPoints/AppRedemptionPoints.vue @@ -28,7 +28,7 @@
-
{{ $dict.getLabel('integralSGType', item.type) }}
+
{{ $dict.getLabel('integralSGTypeText', item.type) }}

{{item.title}}

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

{{item.title}}

@@ -108,7 +108,7 @@ export default { }, onLoad() { this.getTotal() - this.$dict.load(['integralSGType']).then(() => { + this.$dict.load(['integralSGTypeText']).then(() => { this.getList() }) }, @@ -143,6 +143,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 { @@ -292,6 +293,9 @@ export default { top: 0; right: 0; } + .type2 { + background-color: #E64E39; + } .type1 { background-color: #E64E39; } diff --git a/src/project/fengdu/AppRedemptionPoints/myOrderList.vue b/src/project/fengdu/AppRedemptionPoints/myOrderList.vue index 333b64a..43151c2 100644 --- a/src/project/fengdu/AppRedemptionPoints/myOrderList.vue +++ b/src/project/fengdu/AppRedemptionPoints/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() { - 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] } }) @@ -190,6 +193,9 @@ export default { scale: 0.9; } } + .type2 { + background-color: #E64E39; + } .type1 { background-color: #E64E39; } diff --git a/src/project/fengdu/AppRedemptionPoints/placeOrder.vue b/src/project/fengdu/AppRedemptionPoints/placeOrder.vue index a671c34..325610e 100644 --- a/src/project/fengdu/AppRedemptionPoints/placeOrder.vue +++ b/src/project/fengdu/AppRedemptionPoints/placeOrder.vue @@ -3,7 +3,7 @@
-
{{ $dict.getLabel('integralSGType', goodsInfo.type) }}
+
{{ $dict.getLabel('integralSGTypeText', goodsInfo.typeText) }}

{{goodsInfo.title}}

@@ -72,7 +72,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() }) }, @@ -81,6 +81,7 @@ export default { this.$instance.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 } }) }, @@ -142,6 +143,9 @@ export default { scale: 0.9; } } + .type2 { + background-color: #E64E39; + } .type1 { background-color: #E64E39; } diff --git a/src/project/fengdu/AppRedemptionPoints/productDetails.vue b/src/project/fengdu/AppRedemptionPoints/productDetails.vue index 4ae6e6d..a0d1243 100644 --- a/src/project/fengdu/AppRedemptionPoints/productDetails.vue +++ b/src/project/fengdu/AppRedemptionPoints/productDetails.vue @@ -1,7 +1,7 @@