新闻资讯类重写

2021-12-23 15:09:25 +08:00
parent 774273d9b2
commit d32293b942
6 changed files with 220 additions and 81 deletions
--- a/src/apps/AppPageBasic/AppPageBasic.vue
+++ b/src/apps/AppPageBasic/AppPageBasic.vue
@@ -20,7 +20,7 @@ export default {
        {
          name: '三务公开',
          icon: require('./img/shgk.png'),
-          url: '../AppServicePublic/AppServicePublic?moduleId=b03d1ea68c8449ecb00685644e3f0192'
+          url: '../AppServicePublic/AppServicePublic?moduleId=b03d1ea68c8449ecb00685644e3f0192&listName=三务公开'
        }
      ]
    }
--- a/src/apps/AppPageCivilization/AppPageCivilization.vue
+++ b/src/apps/AppPageCivilization/AppPageCivilization.vue
@@ -20,12 +20,12 @@ export default {
        {
          name: '好人好事',
          icon: require('./img/hrhs.png'),
-          url: '../AppServicePublic/AppServicePublic?moduleId=5da220f3182047aba92d64ac08b93b55'
+          url: '../AppServicePublic/AppServicePublic?moduleId=5da220f3182047aba92d64ac08b93b55&listName=好人好事'
        },
        {
          name: '五好家庭',
          icon: require('./img/whjt.png'),
-          url: '../AppServicePublic/AppServicePublic?moduleId=6afadf4cd44f4b73be29390b30ca88bb'
+          url: '../AppServicePublic/AppServicePublic?moduleId=6afadf4cd44f4b73be29390b30ca88bb&listName=五好家庭'
        }
      ]
    }
--- a/src/apps/AppPageParty/AppPageParty.vue
+++ b/src/apps/AppPageParty/AppPageParty.vue
@@ -20,7 +20,7 @@ export default {
        {
          name: '党建要闻',
          icon: require('./img/djyw.png'),
-          url: '../AppServicePublic/AppServicePublic?moduleId=95f0f1c509e44d528069bc9f9dc19e53'
+          url: '../AppServicePublic/AppServicePublic?moduleId=95f0f1c509e44d528069bc9f9dc19e53&listName=党建要闻'
        },
        {
          name: '党员学习',
--- a/src/apps/AppServicePublic/Add.vue
+++ b/src/apps/AppServicePublic/Add.vue
@@ -6,18 +6,20 @@
          <u-input v-model="forms.title" placeholder="请输入标题(30字以内)" type="textarea" auto-height height="60" maxlength="30" />
        </u-form-item>

-        <u-form-item label="公开类型" prop="status" required style="position: relative">
-          <u-input v-model="forms.status" disabled placeholder="请选择公开类型" @click="showStstus = true" />
-
-          <u-select v-model="showStstus" :list="$dict.getDict('realityStatus')" value-name="dictValue" label-name="dictName" @confirm="selectStatus"></u-select>
-
-          <u-icon name="arrow-right" color="#CCCCCC" style="position: absolute; top: 25px; right: 30px"></u-icon>
+        <u-form-item label="类别" prop="status" required>
+          <div class="right" @click="showStstus=true">
+            <span v-if="forms.showIndex === ''" class="color-999">请选择类别</span>
+            <span v-else>{{selectList[forms.showIndex].categoryName}}</span>
+            <u-icon name="arrow-right" color="#CCCCCC" class="right-icon"></u-icon>
+          </div>
+          <u-select v-model="showStstus" :list="selectList" value-name="showIndex" label-name="categoryName" @confirm="selectStatus"></u-select>
        </u-form-item>

-        <u-form-item label="发布地区" prop="areaId" required style="position: relative">
-          <AiAreaPicker v-model="forms.areaId" :areaId="areaIdProps" @select="areaSelect"></AiAreaPicker>
-
-          <u-icon name="arrow-right" color="#CCCCCC" style="position: absolute; top: 25px; right: 30px"></u-icon>
+        <u-form-item label="发布地区" prop="areaId" required >
+          <div class="right">
+            <AiAreaPicker v-model="forms.areaId" :areaId="user.areaId" @select="areaSelect"></AiAreaPicker>
+            <u-icon name="arrow-right" color="#CCCCCC" class="right-icon area-right-icon"></u-icon>
+          </div>
        </u-form-item>

        <u-form-item label="正文" prop="content" required label-position="top">
@@ -48,16 +50,17 @@ export default {
      id: '',
      forms: {
        title: '',
-        status: '',
-        statusValue: '',
        content: '',
        fileIds: [],
        areaId: '',
+        showIndex: '',
      },
      showStstus: false,
      flag: false,
      areaIdProps: '',
-      moduleId: ''
+      moduleId: '',
+      listName: '',
+      selectList: []
    }
  },
  computed: { ...mapState(['user']) },
@@ -65,27 +68,42 @@ export default {
    console.log(o)
    this.id = o.id
    this.moduleId = o.moduleId
-    this.areaIdProps = this.user.areaId
-    this.$dict.load('realityStatus').then(() => {
-      this.getDetail()
-    })
+    this.forms.areaId = this.user.areaId
+    this.listName = o.listName
+    this.getType()
  },

  mounted() {},
  methods: {
-    // getDetail() {
-    //   this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.id}`).then((res) => {
-    //     if (res?.data) {
-    //       this.forms = res.data
-    //       this.forms.statusValue = res.data.status
-    //       this.forms.status = this.$dict.getLabel('realityStatus', res.data.status)
-    //       if (res.data.images) {
-    //         this.forms.images = JSON.parse(res.data.images || '[]')
-    //       }
-    //     }
-    //   })
-    // },
-
+    getDetail() {
+      this.$http.post(`/app/appcontentinfo/queryDetailById?id=${this.id}`).then((res) => {
+        if (res?.data) {
+          this.forms = {...res.data}
+          if(this.selectList.length) {
+            this.selectList.map((item, index) => {
+              if(item.id == res.data.categoryId) {
+                this.forms.showIndex = index
+              }
+            })
+          }
+          if (res.data.images) {
+            this.forms.images = JSON.parse(res.data.images || '[]')
+          }
+        }
+      })
+    },
+    getType() {
+      this.$http.post(`/app/appcontentmoduleinfo/listByName?names=${this.listName}`).then((res) => {
+        if (res.code == 0) {
+          if(res.data && res.data[0].categoryList.length) {
+            this.selectList = res.data[0].categoryList
+            if(this.id) {
+              this.getDetail()
+            }
+          }
+        }
+      })
+    },
    submit() {
      if (this.flag) return

@@ -98,6 +116,10 @@ export default {
            return this.$u.toast('请输入正文')
          }

+          if(this.selectList.length && this.forms.showIndex === '') {
+            return this.$u.toast('请选择类别')
+          }
+
          const imgs = []
          if (this.forms.fileIds) {
            this.forms.fileIds.map((e) => {
@@ -106,22 +128,21 @@ export default {
          }

          this.flag = true
-          this.$http
-            .post(`/app/appvisitvondolence/addOrUpdate`, {
+          this.$http.post(`/app/appcontentinfo/addOrUpdate`, {
              title: this.forms.title,
-              status: this.forms.statusValue ? this.forms.statusValue : this.forms.status,
              areaId: this.forms.areaId,
              content: this.forms.content,
-              // images: JSON.stringify(imgs) || [],
-              images: imgs || [],
+              files: imgs || [],
              id: this.id,
-              moduleId: this.moduleId
+              moduleId: this.moduleId,
+              categoryId: this.selectList[this.forms.showIndex].id,
+	            categoryName: this.selectList[this.forms.showIndex].categoryName,
            })
            .then((res) => {
              if (res.code == 0) {
                this.$u.toast('发布成功')
                this.flag = false
-                uni.navigateTo({ url: `./AppServicePublic` })
+                uni.navigateBack()
              }
            })
        } else {
@@ -135,8 +156,7 @@ export default {
    },

    selectStatus(e) {
-      this.forms.status = e[0].label
-      this.forms.statusValue = e[0].value
+      this.forms.showIndex = e[0].value
    },
  },
 }
@@ -185,5 +205,35 @@ export default {
    font-weight: 500;
    color: #ffffff;
  }
+
+  .right{
+    width: 100%;
+    text-align: right;
+    .right-icon{
+      vertical-align: middle;
+      margin-left: 8px;
+    }
+    .area-right-icon{
+      margin: -40px 0 0 8px;
+    }
+    ::v-deep .AiAreaPicker{
+      display: inline-block;
+      width: calc(100% - 50px);
+      .areaSelector{
+        div{
+          width: 100%;
+          padding-top: 30px;
+          box-sizing: border-box;
+          text-align: right;
+        }
+        .fixedTop{
+          text-align: left;
+        }
+      }
+    }
+  }
+  .color-999{
+    color: #999;
+  }
 }
 </style>
--- a/src/apps/AppServicePublic/AppServicePublic.vue
+++ b/src/apps/AppServicePublic/AppServicePublic.vue
@@ -1,8 +1,13 @@
 <template>
  <div class="AppServicePublic">
+    <AiTopFixed v-if="tabs.length">
+      <div class="tab-select" @click="tabClick(item)">
+        <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(item)">{{item.categoryName}}<span></span></div>
+      </div>
+    </AiTopFixed>
    <div class="header-top">
      <div>区域选择</div>
-      <AiAreaPicker v-model="areaId" :areaId="areaId" @select="areaSelect"></AiAreaPicker>
+      <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>
@@ -10,16 +15,16 @@
    <template v-if="datas.length > 0">
      <AiCard v-for="(item, i) in datas" :key="i" @click.native="toAdd(item, 1)">
        <template #custom>
-          <div class="titles">{{ item.createUserName }}</div>
+          <div class="titles">{{ item.title }}</div>

          <div class="flex">
            <span class="left">
-              <span class="garydiv">财务公开</span>
-              <span class="times">2021-12-16</span>
+              <span class="garydiv" v-if="item.categoryName">{{item.categoryName}}</span>
+              <span class="times">{{item.createTime.substring(0, 10)}}</span>
            </span>

            <span class="right">
-              <span class="font">1111</span>
+              <span class="font">{{item.viewCount}}</span>
              <span>人看过</span>
            </span>
          </div>
@@ -66,7 +71,11 @@ export default {
      pages: 0,
      deletShow: false,
      deletId: '',
-      moduleId: ''
+      moduleId: '',
+      listName: '',
+      tabs: [],
+      tabIndex: 0,
+      categoryId: ''
    }
  },
  computed: {
@@ -80,27 +89,47 @@ export default {
  onLoad(o) {
    this.areaId = this.user.areaId
    this.moduleId = o.moduleId
+    this.listName = o.listName
+    this.getType()
    this.getList()
  },
  mounted() {},
  methods: {
-    getList() {
-      this.$http
-        .post('/app/appvisitvondolence/list', null, {
-          params: {
-            size: 6,
-            current: this.current,
-            areaId: this.areaId,
-            title: this.keyword,
-            moduleId: this.moduleId
-          },
-        })
-        .then((res) => {
-          if (res.code == 0) {
-            this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
-            this.pages = res.data.pages
+    getType() {
+      this.$http.post(`/app/appcontentmoduleinfo/listByName?names=${this.listName}`).then((res) => {
+        if (res.code == 0) {
+          if(res.data && res.data[0].categoryList.length) {
+            var all = [{
+              categoryName: '全部',
+              id: '',
+              showIndex: 0,
+            }]
+            this.tabs = [...all, ... res.data[0].categoryList]
          }
-        })
+        }
+      })
+    },
+    tabClick(row) {
+      this.tabIndex = row.showIndex
+      this.categoryId = row.id
+    },
+    getList() {
+      this.$http.post('/app/appcontentinfo/list', null, {
+        params: {
+          size: 6,
+          current: this.current,
+          areaId: this.areaId,
+          title: this.keyword,
+          moduleId: this.moduleId,
+          categoryId: this.categoryId
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.datas = this.current > 1 ? [...this.datas, ...res.data.records] : res.data.records
+          this.pages = res.data.pages
+        }
+      })
    },

    areaSelect(e) {
@@ -111,15 +140,15 @@ export default {
    toAdd(item, type) {
      if (type == '1') {
        console.log('详情')
-        uni.navigateTo({ url: `./Detail?id=${item.id}` })
+        uni.navigateTo({ url: `./Detail?id=${item.id}&listName=${this.listName}` })
      }
      if (type == '2') {
        console.log('编辑')
-        uni.navigateTo({ url: `./Add?id=${item.id}` })
+        uni.navigateTo({ url: `./Add?id=${item.id}&moduleId=${this.moduleId}&listName=${this.listName}` })
      }
      if (type == null) {
        console.log('添加')
-        uni.navigateTo({ url: `./Add?moduleId=${this.moduleId}` })
+        uni.navigateTo({ url: `./Add?moduleId=${this.moduleId}&listName=${this.listName}` })
      }
    },

@@ -148,6 +177,41 @@ export default {
 uni-page-body {
  height: 100%;
 }
+::v-deep .content{
+  padding: 0!important;
+}
+.tab-select{
+  width: 100%;
+  height: 96px;
+  line-height: 96px;
+  background: #3975C6;
+  display: flex;
+  .item{
+    flex: 1;
+    text-align: center;
+    font-size: 28px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    color: #CDDCF0;
+  }
+  .active{
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    position: relative;
+    color: #fff;
+    span{
+      width: 48px;
+      height: 4px;
+      background: #FFF;
+      position: absolute;
+      bottom: 14px;
+      left: 50%;
+      margin-left: -24px;
+    }
+  }
+}
+.iconfont-iconMore{
+  margin-top: 8px;
+}
 .AppServicePublic {
  height: 100%;

--- a/src/apps/AppServicePublic/Detail.vue
+++ b/src/apps/AppServicePublic/Detail.vue
@@ -1,20 +1,22 @@
 <template>
  <div class="Detail">
    <div class="header-top">
-      <div class="titles">刘家村村规民约</div>
+      <div class="titles">{{data.title}}</div>

      <div class="titles-bottom">
        <span>类型：</span>
-        <span>财务公开</span>
+        <span>{{selectList[data.showIndex].categoryName}}</span>
        <span class="to-left">浏览量：</span>
-        <span>26</span>
+        <span>{{data.viewCount}}</span>
      </div>
    </div>

    <div class="header-middle">
-      <span class="contsnts">为了推进我村民主法治建设，维护社会稳定，促进经济发展，规范村民清洁乡村卫生行为，改善村容村貌，推进“生态乡村”建设，树立良好的民风、村风，创造安居乐业的社会环境，经全体村民代表讨论通过，制定本村规民约。</span>
-
-      <img src="" alt="" />
+      <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>
 </template>
@@ -26,26 +28,41 @@ export default {
  props: {},
  data() {
    return {
-      data: [],
+      data: {},
      id: '',
+      listName: '',
+      selectList: []
    }
  },
  computed: {},
  watch: {},
  onLoad(o) {
    this.id = o.id
-    this.$dict.load('realityStatus').then(() => {
-      // this.getDetail()
-    })
+    this.listName = o.listName
+    this.getType()
  },
  mounted() {},
  methods: {
    getDetail() {
-      this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.id}`).then((res) => {
+      this.$http.post(`/app/appcontentinfo/queryDetailById?id=${this.id}`).then((res) => {
        if (res?.data) {
          this.data = res.data
-          if (this.data.images) {
-            this.data.images = JSON.parse(this.data.images || '[]')
+          if(this.selectList.length) {
+            this.selectList.map((item, index) => {
+              if(item.id == res.data.categoryId) {
+                this.data.showIndex = index
+              }
+            })
+          }
+        }
+      })
+    },
+    getType() {
+      this.$http.post(`/app/appcontentmoduleinfo/listByName?names=${this.listName}`).then((res) => {
+        if (res.code == 0) {
+          if(res.data && res.data[0].categoryList.length) {
+            this.selectList = res.data[0].categoryList
+            this.getDetail()
          }
        }
      })
@@ -92,5 +109,13 @@ uni-page-body {
      height: 486px;
    }
  }
+
+  .img-list{
+    img{
+      width: 204px;
+      height: 204px;
+      margin: 0 8px 8px 0;
+    }
+  }
 }
 </style>