From a8ac7b14d4bf6e675990886b00c5379715907dd4 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 22 May 2023 16:38:42 +0800
Subject: [PATCH] bug

---
 .../components/GirdList.vue                   | 37 ++++++++++++++++---
 .../components/ResidentList.vue               | 11 ++----
 .../components/GoodsList.vue                  |  6 ++-
 .../components/GirdList.vue                   | 36 +++++++++++++++---
 .../components/ResidentList.vue               | 10 ++---
 .../components/GoodsList.vue                  |  6 ++-
 6 files changed, 76 insertions(+), 30 deletions(-)

diff --git a/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue b/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue
index 47686ce6..ebbaa0fd 100644
--- a/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue
+++ b/project/fengdu/app/AppIntegratingOrder/components/GirdList.vue
@@ -68,12 +68,12 @@
           width="350">
           <template v-slot="{ row }">
             <div class="goods">
-              <ai-uploader
-                :disabled="true"
-                :instance="instance"
-                :value="[{url: row.goodsPicUrl}]"
-                :limit="1">
-              </ai-uploader>
+              <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>
+              </div>
               <p>{{ row.goodsTitle }}</p>
             </div>
           </template>
@@ -219,5 +219,30 @@
       display: flex;
       align-items: center;
     }
+    .img-content {
+      position: relative;
+      margin-right: 8px;
+      img {
+        width: 120px;
+        height: 120px;
+        cursor: pointer;
+      }
+    }
+    .type {
+      position: absolute;
+      top: 0;
+      left: 0;
+      font-size: 12px;
+      width: 120px;
+      text-align: center;
+      color: #fff;
+      z-index: 999;
+    }
+    .type1 {
+      background-color: #E64E39;
+    }
+    .type0 {
+      background-color: #FF6900;
+    }
   }
 </style>
diff --git a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
index f275860e..a021c6f5 100644
--- a/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
+++ b/project/fengdu/app/AppIntegratingOrder/components/ResidentList.vue
@@ -68,15 +68,11 @@
           width="350">
           <template v-slot="{ row }">
             <div class="goods">
-              <!-- <ai-uploader
-                :disabled="true"
-                :instance="instance"
-                :value="[{url: row.goodsPicUrl}]"
-                :limit="1">
-              </ai-uploader> -->
               <div class="img-content">
                 <img :src="row.goodsPicUrl" alt="" v-viewer>
-                <span class="type" :class="`type`+row.goodsType">{{$dict.getLabel('integralSGType', row.goodsType)}}</span>
+
+                <span class="type type0" v-if="row.goodsType === '0'">免费兑</span>
+                <span class="type type1" v-else>京东低价商品</span>
               </div>
               <p>{{ row.goodsTitle }}</p>
             </div>
@@ -241,6 +237,7 @@
       position: absolute;
       top: 0;
       left: 0;
+      font-size: 12px;
       width: 120px;
       text-align: center;
       color: #fff;
diff --git a/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue b/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue
index 18fad76d..f31874da 100644
--- a/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue
+++ b/project/fengdu/app/AppIntegratingSupermarket/components/GoodsList.vue
@@ -54,9 +54,10 @@
               </ai-uploader> -->
               <div class="img-content">
                 <img :src="row.picUrl" alt="" v-viewer>
-                <span class="type" :class="`type`+row.type">{{$dict.getLabel('integralSGType', row.type)}}</span>
+                <span class="type type0" v-if="row.type === '0'">免费兑</span>
+                <span class="type type1" v-else>京东低价商品</span>
               </div>
-              
+
               <p>{{ row.title }}</p>
             </div>
           </template>
@@ -203,6 +204,7 @@
       text-align: center;
       color: #fff;
       z-index: 999;
+      font-size: 12px;
     }
     .type1 {
       background-color: #E64E39;
diff --git a/project/shuzipingchang/app/AppIntegratingOrder/components/GirdList.vue b/project/shuzipingchang/app/AppIntegratingOrder/components/GirdList.vue
index 47686ce6..53515816 100644
--- a/project/shuzipingchang/app/AppIntegratingOrder/components/GirdList.vue
+++ b/project/shuzipingchang/app/AppIntegratingOrder/components/GirdList.vue
@@ -68,12 +68,11 @@
           width="350">
           <template v-slot="{ row }">
             <div class="goods">
-              <ai-uploader
-                :disabled="true"
-                :instance="instance"
-                :value="[{url: row.goodsPicUrl}]"
-                :limit="1">
-              </ai-uploader>
+              <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>
+              </div>
               <p>{{ row.goodsTitle }}</p>
             </div>
           </template>
@@ -219,5 +218,30 @@
       display: flex;
       align-items: center;
     }
+    .img-content {
+      position: relative;
+      margin-right: 8px;
+      img {
+        width: 120px;
+        height: 120px;
+        cursor: pointer;
+      }
+    }
+    .type {
+      position: absolute;
+      top: 0;
+      left: 0;
+      font-size: 12px;
+      width: 120px;
+      text-align: center;
+      color: #fff;
+      z-index: 999;
+    }
+    .type1 {
+      background-color: #E64E39;
+    }
+    .type0 {
+      background-color: #FF6900;
+    }
   }
 </style>
diff --git a/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue b/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue
index f275860e..92e1b4cc 100644
--- a/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue
+++ b/project/shuzipingchang/app/AppIntegratingOrder/components/ResidentList.vue
@@ -68,15 +68,10 @@
           width="350">
           <template v-slot="{ row }">
             <div class="goods">
-              <!-- <ai-uploader
-                :disabled="true"
-                :instance="instance"
-                :value="[{url: row.goodsPicUrl}]"
-                :limit="1">
-              </ai-uploader> -->
               <div class="img-content">
                 <img :src="row.goodsPicUrl" alt="" v-viewer>
-                <span class="type" :class="`type`+row.goodsType">{{$dict.getLabel('integralSGType', row.goodsType)}}</span>
+                <span class="type type0" v-if="row.goodsType === '0'">免费兑</span>
+                <span class="type type1" v-else>京东低价商品</span>
               </div>
               <p>{{ row.goodsTitle }}</p>
             </div>
@@ -241,6 +236,7 @@
       position: absolute;
       top: 0;
       left: 0;
+      font-size: 12px;
       width: 120px;
       text-align: center;
       color: #fff;
diff --git a/project/shuzipingchang/app/AppIntegratingSupermarket/components/GoodsList.vue b/project/shuzipingchang/app/AppIntegratingSupermarket/components/GoodsList.vue
index 18fad76d..f31874da 100644
--- a/project/shuzipingchang/app/AppIntegratingSupermarket/components/GoodsList.vue
+++ b/project/shuzipingchang/app/AppIntegratingSupermarket/components/GoodsList.vue
@@ -54,9 +54,10 @@
               </ai-uploader> -->
               <div class="img-content">
                 <img :src="row.picUrl" alt="" v-viewer>
-                <span class="type" :class="`type`+row.type">{{$dict.getLabel('integralSGType', row.type)}}</span>
+                <span class="type type0" v-if="row.type === '0'">免费兑</span>
+                <span class="type type1" v-else>京东低价商品</span>
               </div>
-              
+
               <p>{{ row.title }}</p>
             </div>
           </template>
@@ -203,6 +204,7 @@
       text-align: center;
       color: #fff;
       z-index: 999;
+      font-size: 12px;
     }
     .type1 {
       background-color: #E64E39;