From b562094cbf45e418f841b9980f7c64f34c971550 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 16 Jul 2021 16:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E9=A2=98=E6=96=87=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/scss/modules/wx-mini/voice.scss    | 75 +++++++++++++++++++
 .../src/components/wx-index/cpt-item.vue      |  3 +-
 .../src/components/wx-index/voice.vue         | 39 ++++++++++
 .../productConfig/homeCustom/index.vue        |  3 +
 .../src/views/modules/wx-mini/index-set.vue   |  1 +
 5 files changed, 120 insertions(+), 1 deletion(-)

diff --git a/epmet-oper-web/src/assets/scss/modules/wx-mini/voice.scss b/epmet-oper-web/src/assets/scss/modules/wx-mini/voice.scss
index b654f56..2934d86 100644
--- a/epmet-oper-web/src/assets/scss/modules/wx-mini/voice.scss
+++ b/epmet-oper-web/src/assets/scss/modules/wx-mini/voice.scss
@@ -59,6 +59,7 @@
   margin-top: 10px;
 
   .content {
+    position: relative;
     width: 355px;
     margin: 0 auto;
     border-radius: 5px;
@@ -145,6 +146,80 @@
   }
 }
 
+.rank_tabs{
+  margin:0px 15px 0px;
+  display: flex;
+  padding:0px 0px;
+  justify-content: space-between;
+
+  .title_focus{
+    font-size: 17px;
+    font-family: PingFang SC;
+    font-weight: 800;
+    color: #333333;
+
+    text-align: center;
+
+    .red_line{
+      height: 3px;
+      width: 30px;
+      background-color: red;
+      margin-top: 5px;
+      border-radius:4px;
+      margin-left:20px;
+    }
+  }
+
+  .title_other{
+    font-size: 17px;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #999999;
+
+  }
+
+  .rank_title_left{
+    margin-left: 25px;
+    margin-top: 10px;
+    width:30%;
+    font-size: 16px;
+    text-align: center;
+    font-family: PingFang-SC;
+    padding:0px 0px 0px 0px;
+    font-weight: 600;
+    color: rgb(0, 0, 0);
+    }
+  
+  .rank_title_right{
+      margin-left: 70px;
+      margin-top: 12px;
+      width:30%;
+      font-size: 14px;
+      text-align: center;
+      font-family: PingFang-SC;
+      padding:0px 0px 0px 0px;
+      font-weight: 500;
+      color: rgb(171, 171, 171);  
+    }
+}
+
+.more{
+  width:100%;
+  height:25px;
+  margin:10px;
+  position: relative;
+  font-size: 13px;
+  font-family: PingFang SC;
+  font-weight: 500;
+  color: #4896DE;
+  line-height: 24px;
+
+  .more_content{
+    position: absolute;
+    right:20px;
+  }
+}
+
 
 		
 
diff --git a/epmet-oper-web/src/components/wx-index/cpt-item.vue b/epmet-oper-web/src/components/wx-index/cpt-item.vue
index b0bbd8a..ea305ec 100644
--- a/epmet-oper-web/src/components/wx-index/cpt-item.vue
+++ b/epmet-oper-web/src/components/wx-index/cpt-item.vue
@@ -30,7 +30,8 @@
     <!-- 党建声音：最新发布、特色文章、轮播图新闻 -->
     <div v-else-if="item.componentFrontId==='resi-functionList-voice-newsList'
       ||item.componentFrontId==='resi-functionList-voice-newsList2'
-      ||item.componentFrontId==='resi-topList-voice-hotNewsSwiper'">
+      ||item.componentFrontId==='resi-topList-voice-hotNewsSwiper'
+      ||item.componentFrontId==='resi-functionList-voice-speciallist'">
       <voice :item=item
              :isFocused=isFocused></voice>
     </div>
diff --git a/epmet-oper-web/src/components/wx-index/voice.vue b/epmet-oper-web/src/components/wx-index/voice.vue
index b05d0bc..4e40cac 100644
--- a/epmet-oper-web/src/components/wx-index/voice.vue
+++ b/epmet-oper-web/src/components/wx-index/voice.vue
@@ -48,6 +48,45 @@
         </div>
       </div>
     </div>
+
+    <!-- 党建声音-专题文章 -->
+    <div class="voice_news"
+         v-else-if="item.componentFrontId==='resi-functionList-voice-speciallist'">
+      <div class="content">
+        <div class="rank_tabs">
+          <div class="title_focus">
+            <span>党建动态</span>
+            <div class="red_line"></div>
+          </div>
+          <div class="title_other">疫情防控</div>
+          <div class="title_other">通知公告</div>
+          <div class="title_other">生活服务</div>
+
+        </div>
+        <div class="list">
+          <div class="item"
+               :key="subindex"
+               v-for="(subitem, subindex) in item.demoData.list">
+            <div class="news_title">{{ subitem.title }}</div>
+            <img v-if="subitem.pic"
+                 :src="subitem.pic">
+            <img v-else
+                 src="@/assets/img/modules/wx-mini/index-set/page/news-pic2.png">
+            <div class="news_grid">
+              <img src="@/assets/img/modules/wx-mini/index-set/pavilion.png">
+              <span>来源：{{ subitem.author }}</span>
+              <span class="f-fr">{{ subitem.date }}</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="more">
+          <div class="more_content">查看更多</div>
+
+        </div>
+      </div>
+    </div>
+
     <!-- 党建声音-特色文章组件 -->
     <div class="voice_news"
          v-else-if="item.componentFrontId==='resi-functionList-voice-newsList2'">
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 42c6706..e0d1b1d 100644
--- a/epmet-oper-web/src/views/modules/productConfig/homeCustom/index.vue
+++ b/epmet-oper-web/src/views/modules/productConfig/homeCustom/index.vue
@@ -585,6 +585,7 @@ export default {
       loadingInstance.close()
     },
     processBackendCptData (item) {
+
       let demoData = {}
       let configuration = {}
       const tempOnlyId = getRandomString(20)
@@ -607,6 +608,7 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         } else {
+
           let list = [{
             functionId: '0',
             functionName: '通用组件',
@@ -762,6 +764,7 @@ export default {
     },
     // 添加组件到实例-前验证
     beforeAddCpt (item) {
+
       console.log('添加组件到实例-前验证')
       const regionType = this.checkCptRegion(item)
       const tempOnlyId = getRandomString(20)
diff --git a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue
index 2ca0b4f..8529da3 100644
--- a/epmet-oper-web/src/views/modules/wx-mini/index-set.vue
+++ b/epmet-oper-web/src/views/modules/wx-mini/index-set.vue
@@ -767,6 +767,7 @@ export default {
     },
     // 添加组件到实例-前验证
     beforeAddCpt (item) {
+      debugger
       console.log('添加组件到实例-前验证')
       const regionType = this.checkCptRegion(item)
       const tempOnlyId = getRandomString(20)