From 350119e78305af8c56278e2f49cb661cfc2d48d4 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 20 Dec 2021 10:22:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=85=9A=E5=8F=B2=E6=95=99?=
 =?UTF-8?q?=E8=82=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppPartyHistoryEducation.vue}             | 103 ++++++++++------
 .../classroomList.vue                         |   2 +-
 .../detail.vue                                |   0
 .../knowledgeList.vue                         |  28 ++---
 .../list.vue                                  | 113 +++++++++++-------
 .../select.vue                                |   0
 .../todayDetail.vue                           |   0
 .../todayList.vue                             |   2 +-
 .../videoDetail.vue                           |   0
 9 files changed, 149 insertions(+), 99 deletions(-)
 rename src/apps/party/{partyHistoryEducation/home.vue => AppPartyHistoryEducation/AppPartyHistoryEducation.vue} (85%)
 rename src/apps/party/{partyHistoryEducation => AppPartyHistoryEducation}/classroomList.vue (99%)
 rename src/apps/party/{partyHistoryEducation => AppPartyHistoryEducation}/detail.vue (100%)
 rename src/apps/party/{partyHistoryEducation => AppPartyHistoryEducation}/knowledgeList.vue (95%)
 rename src/apps/party/{partyHistoryEducation => AppPartyHistoryEducation}/list.vue (79%)
 rename src/apps/party/{partyHistoryEducation => AppPartyHistoryEducation}/select.vue (100%)
 rename src/apps/party/{partyHistoryEducation => AppPartyHistoryEducation}/todayDetail.vue (100%)
 rename src/apps/party/{partyHistoryEducation => AppPartyHistoryEducation}/todayList.vue (99%)
 rename src/apps/party/{partyHistoryEducation => AppPartyHistoryEducation}/videoDetail.vue (100%)

diff --git a/src/apps/party/partyHistoryEducation/home.vue b/src/apps/party/AppPartyHistoryEducation/AppPartyHistoryEducation.vue
similarity index 85%
rename from src/apps/party/partyHistoryEducation/home.vue
rename to src/apps/party/AppPartyHistoryEducation/AppPartyHistoryEducation.vue
index ce4ac6ab..d69e7731 100644
--- a/src/apps/party/partyHistoryEducation/home.vue
+++ b/src/apps/party/AppPartyHistoryEducation/AppPartyHistoryEducation.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="home">
+  <section class="AppPartyHistoryEducation">
     <div class="page">
       <div class="title">
         <div class="left">
@@ -10,12 +10,13 @@
           <img src="https://cdn.cunwuyun.cn/img/down.svg" class="right-icon">
         </div>
       </div>
-      <div class="header" v-for="(item, index) in todayList" :key="index" @click="handleGoto(`./todayDetail?id=${item.id}`)">
+      <div class="header" v-for="(item, index) in todayList" :key="index"
+           @click="handleGoto(`./todayDetail?id=${item.id}`)">
         <img :src="item.thumbUrl[0].url" alt="" v-if="item.thumbUrl && item.thumbUrl.length">
-        <p class="text">{{item.title}}</p>
-        <p class="time">{{item.organizationName}}  {{item.publishDate || ''}}</p>
+        <p class="text">{{ item.title }}</p>
+        <p class="time">{{ item.organizationName }} {{ item.publishDate || '' }}</p>
       </div>
-      <AiEmpty v-if="todayList.length == 0" />
+      <AiEmpty v-if="todayList.length == 0"/>
       <div class="line-bg"></div>
       <div class="title">
         <div class="left">
@@ -27,12 +28,13 @@
         </div>
       </div>
       <div class="tab-content">
-        <div class="tab-item" v-for="(item, index) in classList" :key="index" @click="handleGoto(`./videoDetail?id=${item.id}`)">
+        <div class="tab-item" v-for="(item, index) in classList" :key="index"
+             @click="handleGoto(`./videoDetail?id=${item.id}`)">
           <img :src="item.thumbUrl[0].url" alt="" v-if="item.thumbUrl && item.thumbUrl.length">
-          <p>{{item.title}}</p>
+          <p>{{ item.title }}</p>
         </div>
       </div>
-      <AiEmpty v-if="classList.length == 0" />
+      <AiEmpty v-if="classList.length == 0"/>
       <div class="line-bg"></div>
       <div class="title">
         <div class="left">
@@ -45,25 +47,28 @@
       </div>
       <div class="new-list">
         <div class="list-content">
-          <div class="bg-fff" v-for="(item, index) in knowledgeList" :key="index" @click="handleGoto(`./todayDetail?type=know&id=${item.id}`)">
+          <div class="bg-fff" v-for="(item, index) in knowledgeList" :key="index"
+               @click="handleGoto(`./todayDetail?type=know&id=${item.id}`)">
             <div class="item">
               <div class="info">
                 <p>{{ item.title }}</p>
                 <span>{{ item.organizationName }} {{ item.createDate }}</span>
               </div>
-              <img :src="item.thumbUrl[0].url" alt="" v-if="item.thumbUrl && item.thumbUrl.length" />
+              <img :src="item.thumbUrl[0].url" alt="" v-if="item.thumbUrl && item.thumbUrl.length"/>
             </div>
           </div>
-          <AiEmpty v-if="knowledgeList.length == 0" />
+          <AiEmpty v-if="knowledgeList.length == 0"/>
         </div>
       </div>
     </div>
   </section>
 </template>
 <script>
-import { mapState } from "vuex";
+import {mapState} from "vuex";
+
 export default {
-  name: "home",
+  name: "AppPartyHistoryEducation",
+  appName: "党史教育",
   computed: {
     ...mapState(["user", "token"]),
   },
@@ -74,7 +79,7 @@ export default {
       knowledgeList: []
     };
   },
-  onLoad(options) {
+  onLoad() {
     this.getTodayList()
     this.getClassList()
     this.getKnowledgeList()
@@ -85,10 +90,10 @@ export default {
         if (res.code == 0) {
           if (res.data && res.data.records) {
             res.data.records.map((item) => {
-              if(item.thumbUrl) {
+              if (item.thumbUrl) {
                 item.thumbUrl = JSON.parse(item.thumbUrl)
               }
-              if(item.publishDate) {
+              if (item.publishDate) {
                 item.publishDate = item.publishDate.substring(0, 10)
               }
             })
@@ -114,10 +119,10 @@ export default {
         if (res.code == 0) {
           if (res.data && res.data.records) {
             res.data.records.map((item) => {
-              if(item.thumbUrl) {
+              if (item.thumbUrl) {
                 item.thumbUrl = JSON.parse(item.thumbUrl)
               }
-              if(item.createDate) {
+              if (item.createDate) {
                 item.createDate = item.createDate.substring(0, 10)
               }
             })
@@ -127,7 +132,7 @@ export default {
       });
     },
     handleGoto(url) {
-      uni.navigateTo({ url });
+      uni.navigateTo({url});
     },
     toNewDetail(id) {
       this.handleGoto(`/pages/party/partyHistory/detail?id=${id}`);
@@ -137,20 +142,24 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "../../../common/common.css";
-.home {
+
+.AppPartyHistoryEducation {
   width: 100%;
   height: 100%;
 }
+
 .page {
   width: 100%;
   overflow-x: hidden;
   background-color: #fff;
-  .title{
+
+  .title {
     padding: 28px 16px 28px 28px;
     background-color: #fff;
     display: flex;
     justify-content: space-between;
-    .tips{
+
+    .tips {
       display: inline-block;
       width: 8px;
       height: 32px;
@@ -158,22 +167,25 @@ export default {
       vertical-align: middle;
       margin-right: 18px;
     }
-    .right-icon{
+
+    .right-icon {
       width: 32px;
       height: 32px;
       float: right;
       vertical-align: middle;
-      transform:rotate(270deg);
-      padding: 0px 8px 0 0;
+      transform: rotate(270deg);
+      padding: 0 8px 0 0;
     }
-    .left{
+
+    .left {
       font-size: 34px;
       font-family: PingFang-SC-Heavy, PingFang-SC;
       font-weight: 800;
       color: #333;
       line-height: 48px;
     }
-    .right{
+
+    .right {
       font-size: 28px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
@@ -181,14 +193,17 @@ export default {
       line-height: 40px;
     }
   }
-  .header{
+
+  .header {
     padding: 0 34px 40px 34px;
-    img{
+
+    img {
       width: 684px;
       height: 252px;
       margin-bottom: 32px;
     }
-    .text{
+
+    .text {
       font-size: 32px;
       font-family: PingFangSC-Medium, PingFang SC;
       font-weight: 500;
@@ -205,7 +220,8 @@ export default {
       line-clamp: 2;
       -webkit-box-orient: vertical;
     }
-    .time{
+
+    .time {
       font-size: 24px;
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
@@ -213,29 +229,34 @@ export default {
       line-height: 30px;
     }
   }
-  .line-bg{
+
+  .line-bg {
     width: 100%;
     height: 12px;
     background: #F2F2F2;
   }
-  .tab-content{
+
+  .tab-content {
     padding: 0 0 40px 30px;
     overflow-x: hidden;
     height: 236px;
     width: 800px;
-    .tab-item{
+
+    .tab-item {
       float: left;
       width: 236px;
       height: 236px;
       background: #FFF;
-      box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.12);
+      box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.12);
       border-radius: 8px;
       margin-right: 16px;
-      img{
+
+      img {
         width: 236px;
         height: 160px;
       }
-      p{
+
+      p {
         padding: 12px 8px 0;
         font-size: 26px;
         font-family: PingFangSC-Medium, PingFang SC;
@@ -243,17 +264,20 @@ export default {
         color: #333;
         line-height: 36px;
         overflow: hidden;
-        text-overflow:ellipsis;
+        text-overflow: ellipsis;
         white-space: nowrap;
       }
     }
   }
+
   .new-list {
     background-color: #fff;
+
     .list-content {
       .bg-fff {
         padding: 0 30px;
         border-top: 1px solid #ddd;
+
         .item {
           padding: 24px 0 32px 0;
           border-bottom: 2px solid #eee;
@@ -278,6 +302,7 @@ export default {
               -webkit-box-orient: vertical;
               margin-bottom: 52px;
             }
+
             span {
               font-size: 24px;
               font-family: PingFangSC-Regular, PingFang SC;
@@ -286,6 +311,7 @@ export default {
               line-height: 30px;
             }
           }
+
           img {
             width: 224px;
             height: 168px;
@@ -293,6 +319,7 @@ export default {
           }
         }
       }
+
       .view-more {
         background-color: #fff;
         font-size: 28px;
diff --git a/src/apps/party/partyHistoryEducation/classroomList.vue b/src/apps/party/AppPartyHistoryEducation/classroomList.vue
similarity index 99%
rename from src/apps/party/partyHistoryEducation/classroomList.vue
rename to src/apps/party/AppPartyHistoryEducation/classroomList.vue
index f7ee97df..59aaf4f7 100644
--- a/src/apps/party/partyHistoryEducation/classroomList.vue
+++ b/src/apps/party/AppPartyHistoryEducation/classroomList.vue
@@ -25,7 +25,7 @@ export default {
       classList: []
     };
   },
-  onLoad(options) {
+  onLoad() {
     this.getClassList()
   },
   methods: {
diff --git a/src/apps/party/partyHistoryEducation/detail.vue b/src/apps/party/AppPartyHistoryEducation/detail.vue
similarity index 100%
rename from src/apps/party/partyHistoryEducation/detail.vue
rename to src/apps/party/AppPartyHistoryEducation/detail.vue
diff --git a/src/apps/party/partyHistoryEducation/knowledgeList.vue b/src/apps/party/AppPartyHistoryEducation/knowledgeList.vue
similarity index 95%
rename from src/apps/party/partyHistoryEducation/knowledgeList.vue
rename to src/apps/party/AppPartyHistoryEducation/knowledgeList.vue
index c3a25d56..eee09ad4 100644
--- a/src/apps/party/partyHistoryEducation/knowledgeList.vue
+++ b/src/apps/party/AppPartyHistoryEducation/knowledgeList.vue
@@ -188,33 +188,33 @@ export default {
 .page {
   .search-box {
     width: 100%;
-    height: 112rpx;
+    height: 112px;
     background-color: #e60012;
-    padding: 24rpx 32rpx;
+    padding: 24px 32px;
     box-sizing: border-box;
   }
   .slect {
     width: 100%;
-    height: 96rpx;
+    height: 96px;
     background-color: #fff;
     color: #666;
     .type-slect {
       width: 50%;
-      border-right: 1rpx solid #f7f7f7;
-      margin: 30rpx 0;
+      border-right: 1px solid #f7f7f7;
+      margin: 30px 0;
       box-sizing: border-box;
       text-align: center;
-      font-size: 26rpx;
+      font-size: 26px;
       .uni-input {
         display: inline-block;
       }
       image {
-        width: 32rpx;
-        height: 32rpx;
+        width: 32px;
+        height: 32px;
         display: inline-block;
         position: relative;
-        top: 6rpx;
-        margin-left: 8srpx;
+        top: 6px;
+        margin-left: 8spx;
       }
     }
     .type-slect:nth-child(2) {
@@ -222,12 +222,12 @@ export default {
     }
   }
   .session-list {
-    padding-top: 112rpx;
+    padding-top: 112px;
     .session-item {
-      width: 686rpx;
+      width: 686px;
       padding: 32px;
       box-sizing: border-box;
-      margin: 0 auto 32rpx auto;
+      margin: 0 auto 32px auto;
       background-color: #fff;
       position: relative;
       overflow: hidden;
@@ -286,7 +286,7 @@ export default {
   }
   .no-affairs {
     width: 100%;
-    height: calc(100% - 210rpx);
+    height: calc(100% - 210px);
     display: flex;
     justify-content: center;
     align-items: center;
diff --git a/src/apps/party/partyHistoryEducation/list.vue b/src/apps/party/AppPartyHistoryEducation/list.vue
similarity index 79%
rename from src/apps/party/partyHistoryEducation/list.vue
rename to src/apps/party/AppPartyHistoryEducation/list.vue
index 660ba279..97432229 100644
--- a/src/apps/party/partyHistoryEducation/list.vue
+++ b/src/apps/party/AppPartyHistoryEducation/list.vue
@@ -9,11 +9,11 @@
             <div class="uni-list-cell">
               <div class="uni-list-cell-db">
                 <picker
-                  @change="bindPickerChange"
-                  :range="array"
-                  range-key="dictName"
+                    @change="bindPickerChange"
+                    :range="array"
+                    range-key="dictName"
                 >
-                  <div class="uni-input">{{styleText}}</div>
+                  <div class="uni-input">{{ styleText }}</div>
                   <image src="https://cdn.cunwuyun.cn/img/down.svg"></image>
                 </picker>
               </div>
@@ -24,12 +24,12 @@
             <div class="uni-list-cell">
               <div class="uni-list-cell-db">
                 <picker
-                  mode="date"
-                  :value="date"
-                  :start="startDate"
-                  :end="endDate"
-                  @change="bindDateChange"
-                  fields="month"
+                    mode="date"
+                    :value="date"
+                    :start="startDate"
+                    :end="endDate"
+                    @change="bindDateChange"
+                    fields="month"
                 >
                   <div class="uni-input">{{ day }}</div>
                   <image src="https://cdn.cunwuyun.cn/img/down.svg"></image>
@@ -42,16 +42,20 @@
       <div class="session-list">
         <div class="session-item" v-for="(item, index) in meetList" :key="index" @click="toDetail(item.id)">
           <div class="info">
-            <p v-if="fromType != 'style'"><span :class="item.style == 0 ? 'status0' : 'status1'">{{item.style == 0 ? '党史知识' : '党史图书馆'}}</span>{{item.title}}</p>
-            <p v-else><span class="status0">{{ $dict.getLabel(`partyHistoryType${optionStyle}`, item.type) }}</span>{{item.title}}</p>
-            <span class="time">{{item.organizationName}} {{item.createDate}}</span>
+            <p v-if="fromType != 'style'"><span
+                :class="item.style == 0 ? 'status0' : 'status1'">{{ item.style == 0 ? '党史知识' : '党史图书馆' }}</span>{{ item.title }}
+            </p>
+            <p v-else><span class="status0">{{
+                $dict.getLabel(`partyHistoryType${optionStyle}`, item.type)
+              }}</span>{{ item.title }}</p>
+            <span class="time">{{ item.organizationName }} {{ item.createDate }}</span>
           </div>
           <div class="img" v-if="item.thumbUrl && item.thumbUrl.length">
             <img :src="item.thumbUrl[0].url" alt="">
           </div>
         </div>
       </div>
-      <AiEmpty v-if="meetList.length == 0" />
+      <AiEmpty v-if="meetList.length == 0"/>
     </div>
   </div>
 </template>
@@ -87,10 +91,13 @@ export default {
   },
   onLoad(options) {
     console.log(options)
-    if(options.type == 'knowledge'){
-      this.array = [{dictName: "全部类型", dictValue: "0|1"}, {dictName: "党史知识 ", dictValue: 0}, {dictName: "党史图书馆", dictValue: 1}]
+    if (options.type == 'knowledge') {
+      this.array = [{dictName: "全部类型", dictValue: "0|1"}, {dictName: "党史知识 ", dictValue: 0}, {
+        dictName: "党史图书馆",
+        dictValue: 1
+      }]
     }
-    if(options.type == 'style'){
+    if (options.type == 'style') {
       this.style = ''
       this.optionStyle = options.style
       this.$dict.load("partyHistoryType0", "partyHistoryType1").then(() => {
@@ -106,9 +113,9 @@ export default {
     bindPickerChange(e) {
       console.log(e)
       this.style = this.array[e.detail.value].dictValue
-      if(this.style === ''){
+      if (this.style === '') {
         this.styleText = '类型'
-      }else {
+      } else {
         this.styleText = this.array[e.detail.value].dictName
       }
 
@@ -117,7 +124,7 @@ export default {
       this.pageSize = 10;
       this.getList();
     },
-    bindDateChange (e) {
+    bindDateChange(e) {
       this.day = e.target.value;
       this.createDate = e.target.value;
       this.pageNum = 1;
@@ -152,7 +159,7 @@ export default {
       if (this.pageNum > this.pages) return;
 
       var createDate = ''
-      if(this.createDate) {
+      if (this.createDate) {
         createDate = this.createDate + '-01 00:00:00'
       }
       this.$http.post(`/app/apppartyhistory/listWechat`, {
@@ -165,14 +172,14 @@ export default {
       }).then((res) => {
         if (res.code == 0) {
           res.data.records.map((item) => {
-            if(item.thumbUrl) {
+            if (item.thumbUrl) {
               item.thumbUrl = JSON.parse(item.thumbUrl)
             }
-            if(item.createDate) {
+            if (item.createDate) {
               item.createDate = item.createDate.substring(0, 10)
             }
           })
-          const meetList = this.pageNum > 1 ? [...this.meetList, ...res.data.records]: res.data.records
+          const meetList = this.pageNum > 1 ? [...this.meetList, ...res.data.records] : res.data.records
           this.pages = Math.ceil(res.data.total / 10)
           this.meetList = meetList
           // this.meetList.map((item) => {
@@ -195,57 +202,66 @@ export default {
 </script>
 <style lang="scss" scope>
 @import "../../../common/common.css";
+
 .page {
   .search-box {
     width: 100%;
-    height: 112rpx;
+    height: 112px;
     background-color: #e60012;
-    padding: 24rpx 32rpx;
+    padding: 24px 32px;
     box-sizing: border-box;
   }
+
   .slect {
     width: 100%;
-    height: 96rpx;
+    height: 96px;
     background-color: #fff;
     color: #666;
+
     .type-slect {
       width: 50%;
-      border-right: 1rpx solid #f7f7f7;
-      margin: 30rpx 0;
+      border-right: 1px solid #f7f7f7;
+      margin: 30px 0;
       box-sizing: border-box;
       text-align: center;
-      font-size: 26rpx;
+      font-size: 26px;
+
       .uni-input {
         display: inline-block;
       }
+
       image {
-        width: 32rpx;
-        height: 32rpx;
+        width: 32px;
+        height: 32px;
         display: inline-block;
         position: relative;
-        top: 6rpx;
-        margin-left: 8srpx;
+        top: 6px;
+        margin-left: 8 spx;
       }
     }
+
     .type-slect:nth-child(2) {
       border: none;
     }
   }
+
   .session-list {
-    padding-top: 112rpx;
+    padding-top: 112px;
+
     .session-item {
-      width: 686rpx;
+      width: 686px;
       padding: 32px;
       box-sizing: border-box;
-      margin: 0 auto 32rpx auto;
+      margin: 0 auto 32px auto;
       background-color: #fff;
       position: relative;
       overflow: hidden;
       display: flex;
       justify-content: space-between;
       border-radius: 8px;
-      .info{
-        p{
+
+      .info {
+        p {
           height: 88px;
           font-size: 32px;
           font-family: PingFangSC-Regular, PingFang SC;
@@ -259,7 +275,8 @@ export default {
           line-clamp: 2;
           -webkit-box-orient: vertical;
           margin-bottom: 24px;
-          span{
+
+          span {
             display: inline-block;
             padding: 0 8px;
             font-size: 26px;
@@ -268,15 +285,18 @@ export default {
             margin-right: 16px;
             border-radius: 8px;
           }
-          .status0{
+
+          .status0 {
             color: #2266FF;
             background-color: #E8EFFF;
           }
-          .status1{
+
+          .status1 {
             color: #FF8822;
             background-color: #FFF3E9;
           }
         }
+
         .time {
           font-size: 28px;
           font-family: PingFangSC-Regular, PingFang SC;
@@ -285,18 +305,21 @@ export default {
           line-height: 22px;
         }
       }
-      .img{
+
+      .img {
         padding-left: 24px;
-        img{
+
+        img {
           width: 192px;
           height: 144px;
         }
       }
     }
   }
+
   .no-affairs {
     width: 100%;
-    height: calc(100% - 210rpx);
+    height: calc(100% - 210px);
     display: flex;
     justify-content: center;
     align-items: center;
diff --git a/src/apps/party/partyHistoryEducation/select.vue b/src/apps/party/AppPartyHistoryEducation/select.vue
similarity index 100%
rename from src/apps/party/partyHistoryEducation/select.vue
rename to src/apps/party/AppPartyHistoryEducation/select.vue
diff --git a/src/apps/party/partyHistoryEducation/todayDetail.vue b/src/apps/party/AppPartyHistoryEducation/todayDetail.vue
similarity index 100%
rename from src/apps/party/partyHistoryEducation/todayDetail.vue
rename to src/apps/party/AppPartyHistoryEducation/todayDetail.vue
diff --git a/src/apps/party/partyHistoryEducation/todayList.vue b/src/apps/party/AppPartyHistoryEducation/todayList.vue
similarity index 99%
rename from src/apps/party/partyHistoryEducation/todayList.vue
rename to src/apps/party/AppPartyHistoryEducation/todayList.vue
index 1694ccd3..a7852fa5 100644
--- a/src/apps/party/partyHistoryEducation/todayList.vue
+++ b/src/apps/party/AppPartyHistoryEducation/todayList.vue
@@ -33,7 +33,7 @@ export default {
       pages: 2
     };
   },
-  onLoad(options) {
+  onLoad() {
     this.getTodayList();
   },
   onShow() {
diff --git a/src/apps/party/partyHistoryEducation/videoDetail.vue b/src/apps/party/AppPartyHistoryEducation/videoDetail.vue
similarity index 100%
rename from src/apps/party/partyHistoryEducation/videoDetail.vue
rename to src/apps/party/AppPartyHistoryEducation/videoDetail.vue