From 523775edf9f72ec9a2f23fba4d0da8c3f9e74540 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Thu, 22 Jul 2021 14:48:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/wx-mini/index-set.scss       |  2 +-
 .../src/components/wx-index/heart.vue         | 16 +++++++++-----
 .../src/components/wx-index/issue.vue         | 10 +++++++--
 .../src/components/wx-index/score.vue         | 19 ++++++++++------
 .../src/components/wx-index/voice.vue         | 22 ++++++++++++++-----
 .../productConfig/homeCustom/index.vue        | 13 ++++++-----
 .../{index-set.vue => index-set11.vue}        |  2 +-
 7 files changed, 56 insertions(+), 28 deletions(-)
 rename epmet-oper-web/src/views/modules/wx-mini/{index-set.vue => index-set11.vue} (99%)

diff --git a/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss b/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss
index 095363c..f073c57 100644
--- a/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss
+++ b/epmet-oper-web/src/assets/scss/modules/wx-mini/index-set.scss
@@ -450,7 +450,7 @@
 
 		textarea {
 			background-color: rgba(247, 247, 247, 1);
-			min-height: 100px !important;
+			min-height: 400px !important;
 			font-size: 13px;
 			&:focus {
 				background-color: #ffffff;
diff --git a/epmet-oper-web/src/components/wx-index/heart.vue b/epmet-oper-web/src/components/wx-index/heart.vue
index 919d198..8d8cfc9 100644
--- a/epmet-oper-web/src/components/wx-index/heart.vue
+++ b/epmet-oper-web/src/components/wx-index/heart.vue
@@ -9,14 +9,14 @@
     <div v-if="item.componentFrontId==='resi-functionList-heart-banner'"
          class="heart_banner">
       <div class="subbanner">
-        <img v-if="item.demoData.pic"
-             :src="item.demoData.pic">
+        <img v-if="item.configuration.pic"
+             :src="item.configuration.pic">
         <img v-else
              src="@/assets/img/modules/wx-mini/index-set/page/heart-banner.png">
         <div class="d-title">
           <img class="left-log"
                src="@/assets/img/modules/wx-mini/index-set/heart-logo.png">
-          <span class="s-title">{{ item.demoData.title }}</span>
+          <span class="s-title">{{ item.configuration.title }}</span>
 
           <div class="d-group-no">
 
@@ -30,7 +30,10 @@
     <!-- 爱心互助最新活动组件 -->
     <div class="heart_news"
          v-if="item.componentFrontId==='resi-functionList-heart-new'">
-      <div class="d-cpt-title">{{item.demoData.title}}
+      <div v-if="item.configuration.title"
+           class="d-cpt-title">{{item.configuration.title}}</div>
+      <div v-else
+           class="d-cpt-title">{{item.configuration.title}}
         <!-- <div class="more">查看更多</div> -->
       </div>
       <div class="list">
@@ -71,7 +74,10 @@
     <!-- 爱心互助历史回顾组件 -->
     <div class="heart_news"
          v-if="item.componentFrontId==='resi-functionList-heart-history'">
-      <div class="d-cpt-title">{{item.demoData.title}}
+      <div v-if="item.configuration.title"
+           class="d-cpt-title">{{item.configuration.title}}</div>
+      <div v-else
+           class="d-cpt-title">{{item.configuration.title}}
         <!-- <div class="more">查看更多</div> -->
       </div>
       <div class="list">
diff --git a/epmet-oper-web/src/components/wx-index/issue.vue b/epmet-oper-web/src/components/wx-index/issue.vue
index a09fae2..76d02cc 100644
--- a/epmet-oper-web/src/components/wx-index/issue.vue
+++ b/epmet-oper-web/src/components/wx-index/issue.vue
@@ -8,7 +8,10 @@
     <div class="issue_news"
          v-if="item.componentFrontId==='resi-functionList-hall-latestIssueList'">
       <div class="d-cpt-wrap">
-        <div class="d-cpt-title">{{item.demoData.title}}</div>
+        <div v-if="item.configuration.title"
+             class="d-cpt-title">{{item.configuration.title}}</div>
+        <div v-else
+             class="d-cpt-title">{{item.configuration.title}}</div>
         <div class="list">
           <div class="item2"
                :key="subindex"
@@ -31,7 +34,10 @@
     <div class="issue_news"
          v-else-if="item.componentFrontId==='resi-functionList-hall-closedProjectList'">
       <div class="d-cpt-wrap">
-        <div class="d-cpt-title">{{item.demoData.title}}</div>
+        <div v-if="item.configuration.title"
+             class="d-cpt-title">{{item.configuration.title}}</div>
+        <div v-else
+             class="d-cpt-title">{{item.configuration.title}}</div>
         <div class="list">
           <div class="item3"
                :key="subindex"
diff --git a/epmet-oper-web/src/components/wx-index/score.vue b/epmet-oper-web/src/components/wx-index/score.vue
index 5d1c2d6..451b27f 100644
--- a/epmet-oper-web/src/components/wx-index/score.vue
+++ b/epmet-oper-web/src/components/wx-index/score.vue
@@ -8,9 +8,10 @@
     <div class="score_rank"
          v-if="item.componentFrontId==='resi-functionList-score-rank'">
       <div class="score_rank_content">
-        <div class="title">{{item.demoData.title}}
-          <div class="score_more">查看更多</div>
-        </div>
+        <div v-if="item.configuration.title"
+             class="title">{{item.configuration.title}}</div>
+        <div v-else
+             class="title">积分排行</div>
 
         <div class="rank_tabs">
           <span class="tabs_1">总排名</span>
@@ -73,9 +74,10 @@
     <div class="score_rank"
          v-if="item.componentFrontId==='resi-functionList-score-rank-2'">
       <div class="score_rank_content">
-        <div class="title">{{item.demoData.title}}
-          <div class="score_more">查看更多</div>
-        </div>
+        <div v-if="item.configuration.title"
+             class="title">{{item.configuration.title}}</div>
+        <div v-else
+             class="title">积分排行</div>
 
         <div class="single">
           <div class="single_bc">
@@ -188,7 +190,10 @@
     <div class="score_party"
          v-else-if="item.componentFrontId==='resi-functionList-top-party'">
       <div class="score_party_content">
-        <div class="title">{{item.demoData.title}}</div>
+        <div v-if="item.configuration.title"
+             class="title">{{item.configuration.title}}</div>
+        <div v-else
+             class="title">党员积分排行</div>
         <div class="m-box">
           <div class="rank_tabs">
             <p class="rank_title_left">身边党员</p>
diff --git a/epmet-oper-web/src/components/wx-index/voice.vue b/epmet-oper-web/src/components/wx-index/voice.vue
index e4142e1..8c13ec7 100644
--- a/epmet-oper-web/src/components/wx-index/voice.vue
+++ b/epmet-oper-web/src/components/wx-index/voice.vue
@@ -10,8 +10,8 @@
          v-if="item.componentFrontId==='resi-topList-voice-hotNewsSwiper'">
       <div class="d-cpt-wrap">
         <div class="d-cpt-subwrap">
-          <img v-if="item.demoData.pic"
-               :src="item.demoData.pic">
+          <img v-if="item.configuration.pic"
+               :src="item.configuration.pic">
           <img v-else
                src="@/assets/img/modules/wx-mini/index-set/page/swiper-bg.png">
           <!-- <div>
@@ -29,7 +29,10 @@
     <div class="voice_news"
          v-else-if="item.componentFrontId==='resi-functionList-voice-newsList'">
       <div class="content">
-        <div class="d-cpt-title">{{item.demoData.title}}</div>
+        <div v-if="item.configuration.title"
+             class="d-cpt-title">{{item.configuration.title}}</div>
+        <div v-else
+             class="d-cpt-title">党建声音</div>
         <div class="list">
           <div class="item"
                :key="subindex"
@@ -54,7 +57,11 @@
          v-else-if="item.componentFrontId==='resi-functionList-voice-listwithtag'">
 
       <div class="content">
-        <div class="d-cpt-title">{{item.demoData.title}}</div>
+        <div v-if="item.configuration.title"
+             class="d-cpt-title">{{item.configuration.title}}</div>
+        <div v-else
+             class="d-cpt-title">党建声音</div>
+
         <div class="tag">
           <div class="tab_item"
                :key="subindex"
@@ -88,7 +95,7 @@
         <div class="rank_tabs">
           <div :class="[{'title_focus':subindex===0},{'title_other':subindex>0}]"
                :key="subindex"
-               v-for="(subitem, subindex) in item.demoData.tagList">
+               v-for="(subitem, subindex) in item.configuration.tagList">
             <span>{{subitem}}</span>
             <div v-if="subindex===0"
                  class="red_line"></div>
@@ -130,7 +137,10 @@
     <div class="voice_news"
          v-else-if="item.componentFrontId==='resi-functionList-voice-newsList2'">
       <div class="content">
-        <div class="d-cpt-title">{{item.demoData.title}}</div>
+        <div v-if="item.configuration.title"
+             class="d-cpt-title">{{item.configuration.title}}</div>
+        <div v-else
+             class="d-cpt-title">特色文章</div>
         <div class="list">
           <div class="item"
                :key="subindex"
diff --git a/epmet-oper-web/src/views/modules/productConfig/homeCustom/index.vue b/epmet-oper-web/src/views/modules/productConfig/homeCustom/index.vue
index e0d1b1d..f4f6c3d 100644
--- a/epmet-oper-web/src/views/modules/productConfig/homeCustom/index.vue
+++ b/epmet-oper-web/src/views/modules/productConfig/homeCustom/index.vue
@@ -155,7 +155,7 @@
                       name="el-zoom-in-top">
             <div class="mw-set el-zoom-in-top"
                  v-if="focusedCpt.tempOnlyId">
-              <div class="d-set-head"
+              <!-- <div class="d-set-head"
                    @click="focusedCpt.demoIsUnfold = !focusedCpt.demoIsUnfold">
                 <span class="d-title">演示数据</span>
                 <img class="d-arrow"
@@ -168,17 +168,18 @@
                   <el-input type="textarea"
                             v-model="focusedCpt.demoData"></el-input>
                 </el-form-item>
-              </el-form>
+              </el-form> -->
 
               <div class="d-set-head"
                    @click="focusedCpt.confIsUnfold = !focusedCpt.confIsUnfold">
                 <span class="d-title">高级选项</span>
-                <img class="d-arrow"
+                <!-- <img class="d-arrow"
                      :class="{'z-unfold': focusedCpt.confIsUnfold}"
-                     src="@/assets/img/modules/wx-mini/index-set/arrow-down.png">
+                     src="@/assets/img/modules/wx-mini/index-set/arrow-down.png"> -->
               </div>
-              <el-form v-show="focusedCpt.confIsUnfold"
-                       ref="form">
+              <!-- <el-form v-show="focusedCpt.confIsUnfold"
+                       ref="form"> -->
+              <el-form ref="form">
                 <el-form-item>
                   <el-input type="textarea"
                             v-model="focusedCpt.configuration"></el-input>
diff --git a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue b/epmet-oper-web/src/views/modules/wx-mini/index-set11.vue
similarity index 99%
rename from epmet-oper-web/src/views/modules/wx-mini/index-set.vue
rename to epmet-oper-web/src/views/modules/wx-mini/index-set11.vue
index a0255c0..c4c67c9 100644
--- a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue
+++ b/epmet-oper-web/src/views/modules/wx-mini/index-set11.vue
@@ -176,7 +176,7 @@
                  v-if="focusedCpt.tempOnlyId">
               <div class="d-set-head"
                    @click="focusedCpt.demoIsUnfold = !focusedCpt.demoIsUnfold">
-                <span class="d-title">演示数据</span>
+                <span class="d-title">演示数据1</span>
                 <img class="d-arrow"
                      :class="{'z-unfold': focusedCpt.demoIsUnfold}"
                      src="@/assets/img/modules/wx-mini/index-set/arrow-down.png">