From e75fe4fed20179bcf69f9096697d506e5804b0d8 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Wed, 19 Feb 2025 16:06:17 +0800
Subject: [PATCH] 2

---
 admin-web-master/src/components/change/cl.vue           | 10 ++++++++--
 admin-web-master/src/views/detect/admap.vue             |  2 +-
 admin-web-master/src/views/detect/information/index.vue |  2 +-
 admin-web-master/src/views/detect/map/index.vue         |  2 +-
 admin-web-master/src/views/scheme/sam.vue               |  2 +-
 admin-web-master/src/views/serve/MarkActivity/index.vue | 17 ++++++++++++-----
 admin-web-master/src/views/serve/Merchant/index.vue     | 18 ++++++++++++------
 admin-web-master/src/views/serve/actSp.vue              | 20 +++++++++++++++-----
 8 files changed, 51 insertions(+), 22 deletions(-)

diff --git a/admin-web-master/src/components/change/cl.vue b/admin-web-master/src/components/change/cl.vue
index 46f0e19..2a3962e 100644
--- a/admin-web-master/src/components/change/cl.vue
+++ b/admin-web-master/src/components/change/cl.vue
@@ -88,7 +88,13 @@
         default: function () {
           return ''
         }
-      }
+      },
+      type: {
+        type: String,
+        default: function () {
+          return ''
+        }
+      },
     },
     methods: {
       async intdatalist() {
@@ -161,7 +167,7 @@
         this.isone =  true
       },
       async getAll() {
-        const celue = await ceGetAll(this.pageindex)
+        const celue = await ceGetAll({...this.pageindex,applicableResources:this.type})
         this.celueData = celue.data.content
         this.total = celue.data.totalElements
 
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 61aebf5..d69262b 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -274,7 +274,7 @@
     </div>
     <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false"
       :close-on-press-escape="false" :show-close="false">
-      <cl :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
+      <cl :type="ontype == '1'?'商铺':ontype == '2'?'广告位':ontype == '3'?'场地':'-'" :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
     </el-dialog>
   </div>
 
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index df85b93..4879b56 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -131,7 +131,7 @@
     </div>
     <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center
       :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
-      <cl :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
+      <cl :type="'商铺'" :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
     </el-dialog>
   </div>
 
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index d294726..3ac7e14 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -154,7 +154,7 @@
     </div>
     <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false"
       :close-on-press-escape="false" :show-close="false">
-      <cl :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
+      <cl :type="'广告位'" :resourcesId="oncetype+oninfo.id" v-if="addcl" @minSev="minSev" @mingClose="mingClose"></cl>
     </el-dialog>
   </div>
 
diff --git a/admin-web-master/src/views/scheme/sam.vue b/admin-web-master/src/views/scheme/sam.vue
index fc73961..5cfc348 100644
--- a/admin-web-master/src/views/scheme/sam.vue
+++ b/admin-web-master/src/views/scheme/sam.vue
@@ -288,7 +288,7 @@
     },
     data() {
       return {
-        onaction: '2',
+        onaction: '1',
         detailsinfo: {},
         formInline: {},
         upload: uploadUrl,
diff --git a/admin-web-master/src/views/serve/MarkActivity/index.vue b/admin-web-master/src/views/serve/MarkActivity/index.vue
index dbf9dac..741072b 100644
--- a/admin-web-master/src/views/serve/MarkActivity/index.vue
+++ b/admin-web-master/src/views/serve/MarkActivity/index.vue
@@ -157,7 +157,6 @@
                           </template>
                         </el-table-column>
 
-                        </el-table-column>
                         <el-table-column label="场地名称" prop="venueName" width="150">
 
                         </el-table-column>
@@ -179,7 +178,10 @@
                 <el-col :span="24">
                   <el-form-item label="封面图片" prop="businessScope">
                     <!-- {{idCardPhotoFront}} -->
-                    <el-image :src="$baseURL +xiangData.coverImage" style="width: 140px;height:140px;"></el-image>
+                    <!-- <el-image :src="$baseURL +xiangData.coverImage" style="width: 140px;height:140px;"></el-image> -->
+                    <div style="display: flex;">
+                      <allimg v-if="item" :src="item" fit="contain"  v-for="item in xiangData.coverImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                    </div>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -360,13 +362,16 @@
       </el-dialog>
     </div>
 
-    <el-dialog :visible.sync="showQF" custom-class='tongyong_css' style="padding: 0;" width="25%" center
+    <el-dialog :visible.sync="showQF" style="padding: 0;" width="25%" center
       :close-on-click-modal="false" :show-close="false">
       <div style="padding:20px;">
         <div style="font-size: 14px;padding-bottom: 20px;color: #000;">活动二维码</div>
         <div style="padding:20px;">
           <!-- <img :src="qfUrl" alt="" style="height:330px;width:80%"> -->
-          <el-image style="width:200px; height: 200px" :src="$baseURL+qfUrl" fit="fill"></el-image>
+          <!-- <el-image style="width:200px; height: 200px" :src="$baseURL+qfUrl" fit="fill"></el-image> -->
+          <div style="display: flex;">
+            <allimg v-if="item" :src="item" fit="contain"  v-for="item in qfUrl.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+          </div>
         </div>
         <div style="padding-top:20px;display:flex;justify-content: flex-end;">
           <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
@@ -427,6 +432,7 @@
     Registration
   } from '../../../api/MarkActivity.js'
   import upimg from "@/components/ImageUpload/index"
+  import allimg from '@/components/chakan/allimg.vue';
   import {
     changAlls
   } from '../../../api/information.js'
@@ -434,7 +440,8 @@
   export default {
     components: {
       upimg,
-      wangEditor
+      wangEditor,
+      allimg
     },
     data() {
       return {
diff --git a/admin-web-master/src/views/serve/Merchant/index.vue b/admin-web-master/src/views/serve/Merchant/index.vue
index e0f4d80..b7beec1 100644
--- a/admin-web-master/src/views/serve/Merchant/index.vue
+++ b/admin-web-master/src/views/serve/Merchant/index.vue
@@ -182,17 +182,22 @@
               <el-row :gutter="20">
                 <el-col :span="24">
                   <el-form-item label="往期活动展示" prop="previousEvents">
-                     <div style="display: flex;justify-content: space-between;" >
+                     <!-- <div style="display: flex;justify-content: space-between;" >
                        <el-image style="width:48%" fit="fill" :src="$baseURL+item" v-for="(item,index) in xiangData.previousEvents"></el-image>
-                     </div>
-
+                     </div> -->
+                     <div style="display: flex;">
+                        <allimg v-if="item" :src="item" fit="contain"  v-for="item in xiangData.previousEvents" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                      </div>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row :gutter="20">
                 <el-col :span="24">
                   <el-form-item label="封面图片" prop="coverImage">
-                    <el-image :src="$baseURL +xiangData.coverImage" style="width: 140px;height:140px;"></el-image>
+                    <!-- <el-image :src="$baseURL +xiangData.coverImage" style="width: 140px;height:140px;"></el-image> -->
+                    <div style="display: flex;">
+                      <allimg v-if="item" :src="item" fit="contain"  v-for="item in xiangData.coverImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                    </div>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -402,11 +407,12 @@
   import {
    changAlls
   } from '../../../api/information.js'
-
+  import allimg from '@/components/chakan/allimg.vue';
   export default {
     components: {
       upimg,
-      wangEditor
+      wangEditor,
+      allimg
     },
     data() {
       return {
diff --git a/admin-web-master/src/views/serve/actSp.vue b/admin-web-master/src/views/serve/actSp.vue
index a99b7ac..3b1d4b1 100644
--- a/admin-web-master/src/views/serve/actSp.vue
+++ b/admin-web-master/src/views/serve/actSp.vue
@@ -138,7 +138,10 @@
                 <el-col :span="12">
                   <el-form-item label="活动照片" prop="coverImage">
                     <!-- {{idCardPhotoFront}} -->
-                    <el-image :src="$baseURL +secondData.coverImage"></el-image>
+                    <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
+                    <div style="display: flex;">
+                      <allimg v-if="item" :src="item" fit="contain"  v-for="item in secondData.coverImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                    </div>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -217,7 +220,10 @@
                         <el-col :span="12">
                           <el-form-item label="活动照片" prop="coverImage">
                             <!-- {{idCardPhotoFront}} -->
-                            <el-image :src="$baseURL +secondData.coverImage"></el-image>
+                            <!-- <el-image :src="$baseURL +secondData.coverImage"></el-image> -->
+                            <div style="display: flex;">
+                              <allimg v-if="item" :src="item" fit="contain"  v-for="item in secondData.coverImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                            </div>
                           </el-form-item>
                         </el-col>
                       </el-row>
@@ -255,10 +261,13 @@
 
                                <div style="padding:20px;">
                                   <!-- <img :src="qfUrl" alt="" style="height:330px;width:80%"> -->
-                                  <el-image
+                                  <!-- <el-image
                                       style="width:200px; height: 200px"
                                       :src="$baseURL+qfUrl"
-                                      fit="fill"></el-image>
+                                      fit="fill"></el-image> -->
+                                      <div style="display: flex;">
+                                        <allimg v-if="item" :src="item" fit="contain"  v-for="item in qfUrl.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                                      </div>
                                </div>
                                <div style="padding-top:20px;display:flex;justify-content: flex-end;">
                                  <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
@@ -284,8 +293,9 @@
   import {
     uploadUrl
   } from '@/utils/request'
+  import allimg from '@/components/chakan/allimg.vue';
   export default {
-   components: { wangEditor ,upimg,TitleWithCircle},
+   components: { wangEditor ,upimg,TitleWithCircle,allimg},
     data() {
       return {
         upload:uploadUrl,
--
libgit2 0.21.4