From 356ce8a63c43271bab3aeddab363bc72b62adde5 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 12 Jul 2023 09:36:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppIntegratingOrder/components/GirdList.vue    | 10 +++++++---
 .../AppIntegratingOrder/components/ResidentList.vue    | 10 +++++++---
 .../AppIntegratingSupermarket/components/GoodsList.vue | 10 +++++++---
 3 files changed, 21 insertions(+), 9 deletions(-)

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 @@
               <div class="img-content">
                 <img :src="row.goodsPicUrl" alt="" v-viewer>
 
-                <span class="type type0" v-if="row.goodsType === '0'">积分兑换</span>
-                <span class="type type1" v-else>京东低价商品</span>
+                <!-- <span class="type type0" v-if="row.goodsType === '0'">积分兑换</span>
+                <span class="type type1" v-else>京东低价商品</span> -->
+                <span class="type" :class="`type${row.typeText}`">{{dict.getLabel('integralSGTypeText', row.typeText)}}</span>
               </div>
               <p>{{ row.goodsTitle }}</p>
             </div>
@@ -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 @@
               <div class="img-content">
                 <img :src="row.goodsPicUrl" alt="" v-viewer>
 
-                <span class="type type0" v-if="row.goodsType === '0'">积分兑换</span>
-                <span class="type type1" v-else>京东低价商品</span>
+                <!-- <span class="type type0" v-if="row.goodsType === '0'">积分兑换</span>
+                <span class="type type1" v-else>京东低价商品</span> -->
+                <span class="type" :class="`type${row.typeText}`">{{dict.getLabel('integralSGTypeText', row.typeText)}}</span>
               </div>
               <p>{{ row.goodsTitle }}</p>
             </div>
@@ -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 @@
               </ai-uploader> -->
               <div class="img-content">
                 <img :src="row.picUrl" alt="" v-viewer>
-                <span class="type type0" v-if="row.type === '0'">积分兑换</span>
-                <span class="type type1" v-else>京东低价商品</span>
+                <!-- <span class="type type0" v-if="row.type === '0'">积分兑换</span>
+                <span class="type type1" v-else>京东低价商品</span> -->
+                <span class="type" :class="`type${row.typeText}`">{{dict.getLabel('integralSGTypeText', row.typeText)}}</span>
               </div>
 
               <p>{{ row.title }}</p>
@@ -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
           }