Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppServicePublic/Add.vue

@@ -100,14 +100,14 @@ export default {
     getType() {
       this.$http.post(`/app/appcontentmoduleinfo/listByName?names=${this.listName}`).then((res) => {
         if (res.code == 0) {
-          if(res.data && res.data[0].categoryList.length) {
+          if(res.data && res.data.length) {
             this.selectList = res.data[0].categoryList
             this.selectList.map((item, index) => {
               item.selectIndex = index
             })
-            if(this.id) {
-              this.getDetail()
-            }
+          }
+          if(this.id) {
+            this.getDetail()
           }
         }
       })
@@ -132,7 +132,6 @@ export default {
         })
       }
 
-      console.log(222)
       var categoryId = '', categoryName = ''
 
       if(this.selectList.length) {
@@ -147,7 +146,7 @@ export default {
         id: this.id,
         moduleId: this.moduleId,
         categoryId: categoryId,
-        categoryName: categoryName,
+        categoryName: categoryName, 
       })
       .then((res) => {
         console.log(333)

src/apps/AppServicePublic/AppServicePublic.vue

@@ -10,30 +10,26 @@
       <div>区域选择</div>
       <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect"></AiAreaPicker>
     </div>
-
-    <u-search class="serach_content" placeholder="请输入标题" :show-action="false" v-model="keyword" @clear="clearSearch"
-              @search="search"></u-search>
-
+    <u-search class="serach_content" placeholder="请输入标题" :show-action="false" v-model="keyword" @clear="clearSearch" @search="search"></u-search>
     <template v-if="datas.length > 0">
       <AiCard v-for="(item, i) in datas" :ref="item.id" :key="i" @click.native="toAdd(item, 1)">
         <template #custom>
           <div class="titles">{{ item.title }}</div>
-
+          <p class="item-content">{{item.content}}</p>
+          <div class="img-list" v-if="item.files.length">
+             <img :src="item.accessUrl" alt="" v-for="(item, index) in item.files" :key="index" v-if="index < 3" />
+          </div>
           <div class="flex">
             <span class="left">
-              <span class="garydiv" v-if="item.categoryName">{{ item.categoryName }}</span>
-              <span class="times">{{ item.createTime.substring(0, 10) }}</span>
+              <span class="type" v-if="item.categoryName">{{item.categoryName}}</span>
+              <span class="times">{{ item.createTime }}</span>
             </span>
 
             <span class="right">
-              <span class="font">{{ item.viewCount }}</span>
-              <span>人看过</span>
+              <img src="./img/view-icon.png" alt="">
+              <span>{{item.viewCount}}</span>
             </span>
           </div>
-
-          <div class="imgs">
-            <!-- <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i" @click.stop="previewImage(item.images, items.url)" /> -->
-          </div>
         </template>
 
         <template #menu>
@@ -99,7 +95,6 @@ export default {
       this.getList()
     })
     uni.setNavigationBarTitle({title: this.listName})
-    document.title = "三务公开"
   },
   methods: {
     getType() {
@@ -247,6 +242,7 @@ uni-page-body {
 
   ::v-deep .AiCard {
     background: #f3f6f9;
+    position: relative;
 
     .start {
       background: #fff;
@@ -254,10 +250,35 @@ uni-page-body {
       border-radius: 16px;
 
       .titles {
+        width: 600px;
         font-size: 32px;
         font-weight: 500;
         color: #333333;
         margin-bottom: 16px;
+        line-height: 50px;
+        word-break: break-all;
+      }
+
+      .item-content{
+        width: 100%;
+        word-break: break-all;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 3;
+        -webkit-box-orient: vertical;
+        font-size: 32px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        color: #999;
+        line-height: 44px;
+      }
+
+      .img-list{
+        img{
+          width: calc(33% - 16px);
+          height: 204px;
+          margin: 0 16px 8px 0;
+        }
       }
 
       .flex {
@@ -274,21 +295,44 @@ uni-page-body {
           }
 
           .times {
-            margin-left: 16px;
             font-size: 28px;
             color: #999999;
           }
+
+          .type{
+            display: inline-block;
+            padding: 0 16px;
+            line-height: 48px;
+            background: #EEE;
+            border-radius: 24px;
+            font-size: 24px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            font-weight: 400;
+            color: #999;
+            margin-right: 16px;
+          }
         }
 
         .right {
           font-size: 28px;
           color: #999;
-
+          img{
+            width: 32px;
+            height: 32px;
+            vertical-align: middle;
+            margin-right: 8px;
+          }
           .font {
             color: #4181ff;
           }
         }
       }
+
+      .iconfont-iconMore{
+        position: absolute;
+        top: 42px;
+        right: 32px;
+      }
     }
 
     .mask {

src/apps/AppServicePublic/Detail.vue

@@ -2,21 +2,27 @@
   <div class="Detail">
     <div class="header-top">
       <div class="titles">{{data.title}}</div>
+      <div class="flex">
+        <span class="left">
+          <span class="type" v-if="data.categoryName">{{data.categoryName}}</span>
+          <span class="times">{{ data.createTime }}</span>
+        </span>
 
-      <div class="titles-bottom">
-        <span v-if="selectList.length">类型：</span>
-        <span v-if="selectList.length">{{data.categoryName}}</span>
-        <span class="to-left">浏览量：</span>
-        <span>{{data.viewCount}}</span>
+        <span class="right">
+          <img src="./img/view-icon.png" alt="">
+          <span>{{data.viewCount}}</span>
+        </span>
       </div>
     </div>
 
     <div class="header-middle">
       <span class="contsnts">{{data.content}}</span>
-      <div class="img-list" v-if="data.files && data.files.length">
-        <img :src="item.accessUrl" alt="" v-for="(item, index) in data.files" :key="index" />
-      </div>
       
+      
+    </div>
+    <div class="img-list" v-if="data.files && data.files.length">
+      <div class="title">图片</div>
+      <img :src="item.accessUrl" alt="" v-for="(item, index) in data.files" :key="index" />
     </div>
   </div>
 </template>
@@ -54,7 +60,7 @@ export default {
     getType() {
       this.$http.post(`/app/appcontentmoduleinfo/listByName?names=${this.listName}`).then((res) => {
         if (res.code == 0) {
-          if(res.data && res.data[0].categoryList.length) {
+          if(res.data && res.data.length) {
             this.selectList = res.data[0].categoryList
           }
           this.getDetail()
@@ -78,6 +84,14 @@ uni-page-body {
     .titles {
       font-size: 48px;
       font-weight: 600;
+      width: 100%;
+      font-size: 48px;
+      font-family: PingFangSC-Semibold, PingFang SC;
+      font-weight: 600;
+      color: #333;
+      line-height: 66px;
+      word-break: break-all;
+      margin-bottom: 16px;
     }
 
     .titles-bottom {
@@ -91,7 +105,7 @@ uni-page-body {
   }
 
   .header-middle {
-    padding: 32px 0;
+    padding: 64px 0 48px 0;
     .contsnts {
       font-size: 36px;
       line-height: 1.5;
@@ -110,6 +124,61 @@ uni-page-body {
       height: 204px;
       margin: 0 8px 8px 0;
     }
+    .title{
+      width: 100%;
+      line-height: 112px;
+      background: #FFF;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+    }
+  }
+
+  .flex {
+    display: flex;
+    justify-content: space-between;
+
+    .left {
+      .garydiv {
+        font-size: 28px;
+        color: #999999;
+        background: #eeeeee;
+        border-radius: 24px;
+        padding: 4px 16px;
+      }
+
+      .times {
+        font-size: 28px;
+        color: #999999;
+      }
+
+      .type{
+        display: inline-block;
+        padding: 0 16px;
+        line-height: 48px;
+        background: #EEE;
+        border-radius: 24px;
+        font-size: 24px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #999;
+        margin-right: 16px;
+      }
+    }
+
+    .right {
+      font-size: 28px;
+      color: #999;
+      img{
+        width: 32px;
+        height: 32px;
+        vertical-align: middle;
+        margin-right: 8px;
+      }
+      .font {
+        color: #4181ff;
+      }
+    }
   }
 }
 </style>