From 395d6028bc6f09d1e98dbe55e28c430989e86e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 23 Dec 2024 10:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E6=B0=91=E5=BB=BA=E8=AE=AE=E5=BE=81?=
 =?UTF-8?q?=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/peoSuggestion/15.png        | Bin 0 -> 1606 bytes
 src/views/home/index.vue                      |   4 ++-
 .../peoSuggestion/SpecialsolicitationFill.vue |  10 +++---
 src/views/peoSuggestion/goldenIdeaDetail.vue  |  31 +++++++++---------
 src/views/peoSuggestion/index.vue             |   2 +-
 src/views/peoSuggestion/solicitationDaily.vue |  12 ++++---
 src/views/peoSuggestion/topicListDetail.vue   |   8 ++---
 7 files changed, 37 insertions(+), 30 deletions(-)
 create mode 100644 src/assets/images/peoSuggestion/15.png

diff --git a/src/assets/images/peoSuggestion/15.png b/src/assets/images/peoSuggestion/15.png
new file mode 100644
index 0000000000000000000000000000000000000000..e7c476348c48ffb7712cf2759d3ed6d6149be4d6
GIT binary patch
literal 1606
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
Ef<=Jq6951J

literal 0
HcmV?d00001

diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 029f336..bc448bd 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -52,7 +52,7 @@
                     </div>
                 </div>
             </div>
-            <div class="flex flex-center1 flex-center2  " style="width: 100%;margin-top: 10px;">
+            <div class="flex flex-center1 flex-center2  " style="width: 100%;margin-top: 10px;" v-if="agencyId=='3be8c116c6536aed33fa83cbcd97ce4f'">
                 <img style="width: 100%;height: 75px;" src="../../assets/images/home/jianyi.png" @click="topeoSuggestion"></img>
             </div >
             <div class="card m-top10">
@@ -148,6 +148,7 @@ import { inspRecord } from '@/api/satisfaction';
 export default {
     data() {
         return {
+            agencyId:"",
             searchKey: null,//搜索栏
             tabList: [
                 {
@@ -200,6 +201,7 @@ export default {
         };
     },
     created() {
+        console.log(this.$store.state.app.agencyId,"sdjflsjklfds");
         this.agencyId = this.$store.state.app.agencyId;
         this.userId = this.$store.state.app.userInfo.id;
         this.customerId = this.$store.state.app.userInfo.customerId;
diff --git a/src/views/peoSuggestion/SpecialsolicitationFill.vue b/src/views/peoSuggestion/SpecialsolicitationFill.vue
index 3c9b877..7459103 100644
--- a/src/views/peoSuggestion/SpecialsolicitationFill.vue
+++ b/src/views/peoSuggestion/SpecialsolicitationFill.vue
@@ -100,6 +100,7 @@ export default {
             showPopup:false,
             ideaIdentityList:[],
             formData:{
+                attachmentList:[],
                 openId:"",
                 fileList:[],
                 identityTypeCode:[],
@@ -211,13 +212,14 @@ export default {
                     file.message = '上传成功'
                     file.url = res.data.url
                     let fileInfo = {
-                        type: type,
-                        format: format,
+                        // type: type,
+                        // format: format,
                         name: name,
                         url: url
                     };
-                    this.formData.imageList.push(res.data.url)
-                    console.log(fileInfo,"sdlkjdslgfjdgls");
+                    // this.formData.imageList.push(res.data.url)
+                    // console.log(fileInfo,"sdlkjdslgfjdgls");
+                    this.formData.attachmentList.push(fileInfo)
                     // this.attrs.push(fileInfo)
                 })
                 .catch(() => {
diff --git a/src/views/peoSuggestion/goldenIdeaDetail.vue b/src/views/peoSuggestion/goldenIdeaDetail.vue
index 1431979..9ca2044 100644
--- a/src/views/peoSuggestion/goldenIdeaDetail.vue
+++ b/src/views/peoSuggestion/goldenIdeaDetail.vue
@@ -1,16 +1,17 @@
 <template>
     <div>
-           <div class='container' style="height: 85vh; overflow: auto;">
-        <div class="card flex flex-y ">
-            <h2>{{ ProblemDescription.subjectTitle }}</h2>
-            <div class="m-bottom5">{{ ProblemDescription.eventContent }}</div>
-            <div class="font-size13 gray">{{ ProblemDescription.createdTime }}</div>
-            <div class="image-grid" v-for="item in ProblemDescription.imageList" >
-                <div class="grid-item ">
-                    <img :src="item" style="width: 105px; height: 75px;">
+        <div class='container' style="height: 85vh; overflow: auto;">
+            <div class="card flex flex-y ">
+                <h2>{{ ProblemDescription.subjectTitle }}</h2>
+                <div class="m-bottom5">{{ ProblemDescription.eventContent }}</div>
+                <div class="font-size13 gray">{{ ProblemDescription.createdTime }}</div>
+
+                <div class="" v-for="item in ProblemDescription.imageList">
+                    <div class=" flex flex-center1 flex-center2">
+                        <img :src="item" style="width: 100%; height: 100%;">
+                    </div>
                 </div>
-            </div>
-            <!-- <div class="flex flex-y flex-center1 flex-center2 gray back_color  m-top15">
+                <!-- <div class="flex flex-y flex-center1 flex-center2 gray back_color  m-top15">
                 <div class="flex m-top16 flex-center1 flex-center2 vote white">
                     <div :style="{ width:support1Width}">
                         <span class="van-ellipsis" style="width: 100px;">支持 {{ ProblemDescription.supportNum }}</span>
@@ -23,8 +24,8 @@
                 <div class="gray  font-size13 p-12">{{dataValue}}人参与</div>
 
             </div> -->
-        </div>
-        <!-- <div class="bot_btn flex flex-x flex-mean m-bot50 back_color back_color">
+            </div>
+            <!-- <div class="bot_btn flex flex-x flex-mean m-bot50 back_color back_color">
             <van-button :disabled="disableAllButtons" round class="support"
                 :icon="require('@/assets/images/icons/support.png')" type="info" @click="handelClicsupport">
                 支持
@@ -35,10 +36,10 @@
                 反对
             </van-button>
         </div> -->
+        </div>
+        <Android />
     </div>
-    <Android/>
-    </div>
- 
+
 </template>
 
 <script>
diff --git a/src/views/peoSuggestion/index.vue b/src/views/peoSuggestion/index.vue
index f02fd50..6a472f8 100644
--- a/src/views/peoSuggestion/index.vue
+++ b/src/views/peoSuggestion/index.vue
@@ -72,7 +72,7 @@
 
                             </div>
                             <span class="van-multi-ellipsis--l2" style="flex: 1; line-height: 1.5;">
-                                <van-tag size="medium" style="margin-right: 5px; width: 40px;"
+                                <van-tag size="medium" style="margin-right: 5px; "
                                     :color="item.status == '1' ? '#07c160' : '#b6b6b6'">
                                     {{ item.status == '1' ? "征集中" : "已结束" }}
                                 </van-tag>
diff --git a/src/views/peoSuggestion/solicitationDaily.vue b/src/views/peoSuggestion/solicitationDaily.vue
index 2465253..cb2ed47 100644
--- a/src/views/peoSuggestion/solicitationDaily.vue
+++ b/src/views/peoSuggestion/solicitationDaily.vue
@@ -2,7 +2,7 @@
     <div class="container">
         <div class="block">
             <div class="">
-                <van-cell required is-link title="建议主题" @click="onShowPicker()"  label="描述信息" :value="ideaTitleName">
+                <van-cell required is-link title="建议主题" @click="onShowPicker()"  :value="ideaTitleName">
                     <!-- <div>{{ cascaderValue }}</div> -->
                 </van-cell>
 
@@ -22,7 +22,7 @@
                             <van-uploader max-size="10 * 1024 * 1024" v-model="fileList1" show-upload
                                 :after-read="afterReadFile" accept=".doc,.docx,.pdf" />
                             <span
-                                style="color:#C1C1C1; font-size: 15px;line-height: 18px">您也可以将建议内容整理成文档上传，支持word、pdf格式，文件大小不超过5Mb.</span>
+                                style="color:#C1C1C1; font-size: 15px;line-height: 18px">您也可以将建议内容整理成文档上传，支持word、pdf格式，文件大小不超过5Mb。</span>
                         </div>
                     </template>
                 </van-field>
@@ -117,6 +117,7 @@ export default {
             ideaTitleTypeList:[],
             adviceType:false,
             formData:{
+                attachmentList:[],
                 age:"",
                 ideaTitleType:"",
                 operationType:"4",
@@ -208,13 +209,14 @@ export default {
                     file.message = '上传成功'
                     file.url = res.data.url
                     let fileInfo = {
-                        type: type,
-                        format: format,
+                        // type: type,
+                        // format: format,
                         name: name,
                         url: url
                     };
-                    this.formData.imageList.push(res.data.url)
+                    this.formData.attachmentList.push(fileInfo)
       
+                 
                 })
                 .catch(() => {
                     file.status = 'failed'
diff --git a/src/views/peoSuggestion/topicListDetail.vue b/src/views/peoSuggestion/topicListDetail.vue
index 678559b..fbd4b1b 100644
--- a/src/views/peoSuggestion/topicListDetail.vue
+++ b/src/views/peoSuggestion/topicListDetail.vue
@@ -7,12 +7,12 @@
                 <div class="font-size15 gray">{{ ProblemDescription.agencyName }}</div>
                 <div class="font-size15 gray">{{ ProblemDescription.updatedTime }}</div>
             </div>
-            <div class="m-bottom5 font-size18">{{ ProblemDescription.subjectContent }}</div>
-            <div class="image-grid" v-for="item in ProblemDescription.attachmentList" >
+            <div class="m-bottom5 font-size18" ><div v-html="ProblemDescription.subjectContent"></div></div>
+            <!-- <div class="image-grid" v-for="item in ProblemDescription.attachmentList" >
                 <div class="grid-item ">
                     <img :src="item" style="width: 105px; height: 75px;">
                 </div>
-            </div>
+            </div> -->
           
         </div>
         <div class="flex flex-center1 " style="position: fixed; bottom:60px; left: 0px; right:0px;">
@@ -117,7 +117,7 @@ export default {
             }
             await getDetailSpecial(parm).then(res => {
                 this.ProblemDescription = res.data;
-                this.ProblemDescription.subjectContent=  this.ProblemDescription.subjectContent.replace(/<[^>]*>/g, '')
+                this.ProblemDescription.subjectContent=  this.ProblemDescription.subjectContent.replace(/<img/gi,'<img style="max-width:100%;height:auto;margin:0 auto;display:block"')
                 this.dataValue = res.data.opposeNum + res.data.supportNum
             })
         },