From 9bc40cd91f3af46f9d73aa91f20fc33c0d2da1ae Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 25 Apr 2022 17:51:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=99=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppInfotainment/components/files.png | Bin 0 -> 955 bytes
 src/apps/AppInfotainment/liveList.vue         | 146 ---------
 src/apps/AppInfotainment/newLIst.vue          |  23 +-
 src/apps/AppInfotainment/newsDetail.vue       | 144 ++++++---
 src/apps/AppInfotainment/newsList.vue         | 276 -----------------
 src/apps/AppInfotainment/productList.vue      | 287 ------------------
 src/apps/AppInfotainment/products.vue         | 148 ---------
 .../residentList.vue                          |   0
 8 files changed, 100 insertions(+), 924 deletions(-)
 create mode 100644 src/apps/AppInfotainment/components/files.png
 delete mode 100644 src/apps/AppInfotainment/liveList.vue
 delete mode 100644 src/apps/AppInfotainment/newsList.vue
 delete mode 100644 src/apps/AppInfotainment/productList.vue
 delete mode 100644 src/apps/AppInfotainment/products.vue
 rename src/apps/{AppInfotainment => AppMonitoringObject}/residentList.vue (100%)

diff --git a/src/apps/AppInfotainment/components/files.png b/src/apps/AppInfotainment/components/files.png
new file mode 100644
index 0000000000000000000000000000000000000000..10d53502535dad10eb33a37845dd2491f07992fe
GIT binary patch
literal 955
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|Tv8)E(|mmy
zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(;}uz(rC1}R)=9PbBIuIlOH7*fIb
zcFx9Z5l4~s`!P)~m5z8>9PtZY+IekSQ^I@ugw$O1uBBT;|1n&Sj_lkTH`$L{@l@kf
z#>=i}`mCRGCR)Bv%m4m1fA4RxpgV6*SAX7@pWb$+)%bA}1B(I!BZmV6lRyI|GvO*H
z%Xzl`V}(CHPv5&Cp**Q4+%`M3xLqLW=e_Tro-cN-mfiL?p<eyZieoF|cXN7tIDhW#
ziKIJ$=9Vkv4|#HYdvR@R!Hw>ZKJ11cq|Q7!`JVgFl@!Zq5l6xoKmKuK_4CwEyEr{g
zpEF|q^l$E=N1yrQ9~r;5+WGS?OUd46&&}pMI<?XEZ8wWKV`+m%(r=~2T-GnCYHPMO
z*m*=$GiGse%*b<CWy{DI%(!Z1LjyOHh>$>l;DxO$EN28hggc2J7vuQR-tgtylN*n+
zYYfzveAH#pagbQNS7z>!)7*!q?dxrDeQ`<i)k@nKk!^2kS)NSbF0)t9nJK~YByjgk
z@i2QX#>zA6p0r-=cXD9c{AtFaw~M1$QaC>FI5w!??YYBoqTz{T6NCRQ$(@1|7*86r
zFwQG6E>c!to|MkPWb-oZiJJqP%J~Vt=bwBonlGM~ZzpOd<!)^|Tm0s|y>E3l|4rPm
z+njCN#mVmeY6=JIe_Q@#uPhH2`nx<W@q5|tL<h63FHctMrM}HNZ^U@Dan0-OnGIXS
zAOf3g6>?i%Cg)#Oi(y?@_4b>@K6|~A?mf(BZ(nEETa)5FfqC(NBUPp&w}269$XHmJ
z#=vxh<;c^Sj7f}}?2p{C;C=h}Wm@cfBgWi0ZQnkYY+lE3Q|QXG&Xn0ZUoquK=?h;d
zd9eD^Z=m!%k8LwoXK&nOyP)^-h3?q}*B{(k^}OiNbhhJ}8S|8G3QaNJ0}Pyo8-`2*
z3Tg^^=Xo3&W;E=uF=k*)VtVxHOhc$>KwbG~^TPbKQ@_7Cn$PA^eO-#NROxu!9hR6|
zTaJg-C2pG)`}kKX|KvC+^;vTd_#U`t(6ikvM?b>i%bY`-Z)g3>lPZ>~ex>;Jl8v$?
io>U4<yAk0``x#e1zF(wvaqUe|#_@FZb6Mw<&;$UGIf-rn

literal 0
HcmV?d00001

diff --git a/src/apps/AppInfotainment/liveList.vue b/src/apps/AppInfotainment/liveList.vue
deleted file mode 100644
index b991a2aa..00000000
--- a/src/apps/AppInfotainment/liveList.vue
+++ /dev/null
@@ -1,146 +0,0 @@
-<template>
-  <div class="item-list">
-    <div class="live-item" v-for="(op,i) in list" :key="i">
-      <video :src="op.videoFile.url" :id="`video${i+1}`">
-        <cover-view class="live-item__wrapper" v-show="currIndex != i" @ended="ended(`video${i+1}`)">
-          <cover-view class="live-item__mask"></cover-view>
-          <cover-image class="live-item__banner" :src="op.coverFile.url"/>
-          <cover-image class="play-btn" hover-class="text-hover" @click="play(`video${i+1}`, i)"
-                       src="https://cdn.cunwuyun.cn/img/bf@2x.png"/>
-          <cover-view class="live-item__text">{{ op.title }}</cover-view>
-        </cover-view>
-      </video>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      videoContext: null,
-      currIndex: -1,
-      videoId: '',
-      list: []
-    }
-  },
-  onLoad(params) {
-    this.getList(params?.areaId)
-  },
-  methods: {
-    getList(areaId) {
-      this.$instance.post(`/app/appnewscenterinfo/homepage?areaId=${areaId}`, null, {
-        withoutToken: true
-      }).then(res => {
-        if (res?.data) {
-          this.list = res.data?.videoList
-        }
-      })
-    },
-    play(videoId, index) {
-      if (this.videoContext) {
-        this.videoContext.stop()
-      }
-
-      this.currIndex = index
-      this.videoContext = wx.createVideoContext(videoId)
-
-      this.$nextTick(() => {
-        this.videoContext.play()
-      })
-    },
-    ended(id) {
-      let videoContext = uni.createVideoContext(id, this);
-      videoContext.exitFullScreen();
-    },
-  },
-}
-</script>
-
-<style lang="scss">
-.item-list {
-  min-height: 100%;
-
-  .live-item {
-    position: relative;
-    height: 396px;
-    margin-bottom: 20px;
-
-    video {
-      width: 100%;
-      height: 396px;
-    }
-
-    .live-item__wrapper {
-      position: relative;
-      width: 100%;
-      height: 396px;
-
-      .live-item__mask {
-        position: absolute;
-        left: 0;
-        top: 0;
-        z-index: 1;
-        width: 100%;
-        height: 100%;
-        background: rgba(0, 0, 0, 0.3);
-      }
-    }
-
-    .live-item__top {
-      position: absolute;
-      left: 0;
-      top: 0;
-      z-index: 11;
-      width: 128px;
-      height: 56px;
-      line-height: 56px;
-      color: #fff;
-      font-size: 24px;
-      padding-left: 44px;
-      box-sizing: border-box;
-      background: url(https://cdn.cunwuyun.cn/img/jb@2x.png) no-repeat;
-      background-size: 128px 56px;
-    }
-
-    .live-item__text {
-      position: absolute;
-      left: 0;
-      bottom: 0;
-      z-index: 11;
-      width: 100%;
-      height: 72px;
-      line-height: 72px;
-      padding: 0 40px;
-      box-sizing: border-box;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      font-size: 32px;
-      font-weight: 700;
-      color: #fff;
-      box-sizing: border-box;
-      background: rgba(0, 0, 0, 0.6);
-    }
-
-    .live-item__top {
-      position: absolute;
-    }
-
-    .live-item__banner {
-      width: 100%;
-      height: 396px;
-    }
-
-    .play-btn {
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      z-index: 11;
-      width: 80px;
-      height: 80px;
-      transform: translate(-50%, -50%);
-    }
-  }
-}
-</style>
diff --git a/src/apps/AppInfotainment/newLIst.vue b/src/apps/AppInfotainment/newLIst.vue
index 41f1da14..7ff3eec5 100644
--- a/src/apps/AppInfotainment/newLIst.vue
+++ b/src/apps/AppInfotainment/newLIst.vue
@@ -28,7 +28,7 @@
         </div>
       </div> -->
 
-      <div class="item" v-for="(item,index) in newsList" :key="index" v-if="newsList.length">
+      <div class="item" v-for="(item,index) in newsList" :key="index" v-if="newsList.length" @click="toDetail(item.id)">
         <div class="left">
           <h2>{{ item.title }}</h2>
           <p><span>通知公告</span>{{ item.createTime }}</p>
@@ -63,7 +63,6 @@
     },
 
     onLoad (params) {
-      this.areaId = params.areaId
       this.getNewsList()
       this.parentId = params.id
       this.parentName = params.parentName
@@ -75,9 +74,6 @@
         this.currIndex = uni.getStorageSync('newTypeIndex')
         this.getListInit()
       }
-      // uni.$on('update',()=>{
-      //   this.getListInit()
-      // })
       this.getListInit()
     },
 
@@ -110,7 +106,6 @@
             categoryType: '2',
           }
         }).then((res)=>{
-          // console.log(res,'新闻分类');
           var array = []
           res.data.records.map(item=>{
            array.push({ 
@@ -120,7 +115,7 @@
             })
           })
           this.tabList = array
-          console.log(this.tabList[this.currIndex].parentId,'parentId');
+          // console.log(this.tabList[this.currIndex].parentId,'parentId');
         })
       },
 
@@ -138,24 +133,16 @@
             moduleId: this.tabList[this.currIndex].parentId,
             categoryId: this.tabList[this.currIndex].id,
           }
-        }).then(res => {
-          console.log(res);
-          
+        }).then(res => {  
           if (res.code === 0) {
             const data = res.data.records
             this.newsList.push(...data)
             this.current = this.current 
           }
-        }).catch((err) => {
-          console.log(err);
         })
       },
-      toDetail(item) {
-        if(item.detailType == 6 || item.detailType == 5) { //特色农产品  旅游故事
-          uni.navigateTo(`/subPages/live/products?id=${item.id}&detailType=${item.detailType}`)
-        }else {
-         uni.navigateTo(`/subPages/live/newsDetail?id=${item.id}&areaId=${this.areaId}&type=${this.currIndex}`)
-        }
+      toDetail(id) {
+        uni.navigateTo({url: `./newsDetail?id=${id}`})
       },
     },
 
diff --git a/src/apps/AppInfotainment/newsDetail.vue b/src/apps/AppInfotainment/newsDetail.vue
index 1fff8f65..7363a675 100644
--- a/src/apps/AppInfotainment/newsDetail.vue
+++ b/src/apps/AppInfotainment/newsDetail.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="news-detail" v-if="pageShow">
-    <div class="video" v-if="info.videoFile">
+    <!-- <div class="video" v-if="info.videoFile">
       <video :src="info.videoFile.url" :poster="info.coverFile.url"></video>
-    </div>
+    </div> -->
     <div class="detail-top" :class="[info.videoFile ? 'detail-top__active' : '']">
       <h2>{{ info.title }}</h2>
-      <div class="detail-info">
+      <!-- <div class="detail-info">
         <div class="left">{{ info.areaName }} {{ info.createTime ? info.createTime.split(' ')[0] : '' }} </div>
         <div class="right">
           <div class="right-item">
@@ -17,13 +17,15 @@
             <span :style="{color: info.nowUserStatus === '0' ? '#C41C19' : '#666'}">{{ info.upCount }}</span>
           </div>
         </div>
-      </div>
-      <div class="detail-content" v-if="!info.videoFile">
-        <!-- <div v-html="info.content" class="articalContent"></div> -->
-        <!-- <image :src="info.coverFile.url" mode="widthFix" /> -->
-        <!-- <AiWxparse :imageProp="imageProp" className="articalContent" :content="info.content"/> -->
-        <!-- <u-parse className="articalContent" :html="info.content"/> -->
-      </div>
+      </div> -->
+      <!-- <div class="detail-content" v-if="!info.videoFile">
+        <div v-html="info.content" class="articalContent"></div>
+        <image :src="info.coverFile.url" mode="widthFix" />
+        <AiWxparse :imageProp="imageProp" className="articalContent" :content="info.content"/>
+        <u-parse className="articalContent" :html="info.content"/>
+      </div> -->
+      <p><span>通知公告</span>{{ info.createTime.substring(0,10) }}</p>
+      <u-parse :html="info.content" style="margin-top: 20px;"/>
     </div>
     <!-- <div class="detail-comments">
       <h2>全部评论({{ commentsTotal }})</h2>
@@ -119,10 +121,13 @@
 		</div> -->
     <!-- <ai-login ref="login"></ai-login> -->
 
-    <div class="accessory-list">
+    <div class="accessory-list" v-if="info.files.length">
       <p><u-icon name="attach" color="#2979ff" size="28"></u-icon>附件</p>
       <div class="card-list">
-        <div class=""></div>
+        <div class="item" v-for="(item,index) in info.files" :key="index" @click="previewFile(item)">
+          <img src="./components/files.png" alt="">
+          <div>{{ item.fileName }}</div>
+        </div>
       </div>
     </div>
   </div>
@@ -130,15 +135,11 @@
 
 <script>
   import {mapState} from 'vuex'
-  // import AiLogin from '@/components/AiLogin/AiLogin'
   export default {
     name: 'newsDetail',
     computed: {
       ...mapState(['token'])
     },
-    components: {
-      // AiLogin
-    },
     data () {
       return {
         isShowComment: false,
@@ -159,16 +160,13 @@
         focus: false,
         current: 0,
         isMore: false,
-        commentsTotal: 0
+        commentsTotal: 0,
+        fileList: []
       }
     },
 
     onLoad (params) {
-      this.$loading()
       this.id = params.id
-      this.areaId = params.areaId
-      this.type = params.type
-
       this.$nextTick(() => {
         this.getDetail()
         this.getComments()
@@ -214,26 +212,21 @@
         this.$set(this.commentList[index], 'isShow', '1')
       },
 
-      suport() {
-        this.$loading()
-
-        this.$instance.post('/app/appnewscenterinfo/suportFree?id=' + this.id).then(res => {
-          this.$hideLoading()
-          if (res.code === 0) {
-            this.$set(this.info, 'upCount', this.info.upCount + 1)
-            this.$set(this.info, 'nowUserStatus', '0')
-            this.$toast('点赞成功')
-          }
-        })
-      },
+      // suport() {
+      //   this.$instance.post('/app/appnewscenterinfo/suportFree?id=' + this.id).then(res => {
+      //     if (res.code === 0) {
+      //       this.$set(this.info, 'upCount', this.info.upCount + 1)
+      //       this.$set(this.info, 'nowUserStatus', '0')
+      //       this.$toast('点赞成功')
+      //     }
+      //   })
+      // },
 
       replySuport (id, index) {
-        this.$loading()
         this.$instance.post('/app/appnewscentercommenthot/suportFree', {
           commentId: id,
           status: this.commentList[index].status === '0' ? '1' : '0'
         }).then(res => {
-          this.$hideLoading()
           if (res.code === 0) {
             this.$set(this.commentList[index], 'supportedQuantity', this.commentList[index].supportedQuantity + 1)
             this.$set(this.commentList[index], 'status', '0')
@@ -243,16 +236,14 @@
       },
 
       getDetail() {
-        var url = '/app/appnewscenterinfo/queryDetailByIdForWx?id=' + this.id
-        if(this.type == 5) { //旅游故事
-          url = '/app/appcountrysidetourism/queryDetailByIdForWX?id=' + this.id
-        }
-        this.$instance.post(url).then(res => {
-          this.$hideLoading()
+        this.$http.post('/app/apppublicityinfo/queryDetailById',null,{
+          params: {
+            id: this.id
+          }
+        }).then(res => {
+          console.log(res);
           if (res.code === 0) {
             this.info = res.data
-            this.$hideLoading()
-
             this.$nextTick(() => {
               this.pageShow = true
             })
@@ -260,12 +251,36 @@
         })
       },
 
+      previewFile(file) {
+      let fileList = [{
+        index: 0,
+        url: file.accessUrl
+      }]
+      if(file.postfix == ".png" || file.postfix == "jpg") {
+        uni.previewImage({
+          urls: fileList.map(v => v.url),
+          current: file.accessUrl
+        })
+      } else {
+        wx.downloadFile({
+          url: file.accessUrl,
+          success: function (res) {
+            const filePath = res.tempFilePath
+            wx.openDocument({
+              filePath: filePath,
+              success: function (res) {
+                console.log('打开文档成功')
+              }
+            })
+          }
+        })
+      }
+    },
+
       onConfirm () {
         if (!this.commnet) {
           return this.$toast('评论不能为空')
         }
-
-        this.$loading()
         this.$instance.post('/app/appnewscentercomment/addOrUpdateForWX', {
           circleId: this.id,
           content: this.commnet,
@@ -274,7 +289,6 @@
           name: uni.getStorageSync('userInfo').nickName,
           areaId: this.areaId
         }).then(res => {
-          this.$hideLoading()
           if (res.code === 0) {
             this.commnet = ''
             this.$toast(this.commentId ? '回复成功' : '评论成功')
@@ -292,7 +306,6 @@
         }).catch(() => {
             this.commentId = ''
             this.placeholder = ''
-          this.$hideLoading()
         })
       },
 
@@ -441,7 +454,6 @@
         padding-right: 4rpx;
       }
     }
-
     .detail-top__active {
       padding-top: 30rpx;
 
@@ -485,7 +497,14 @@
     & > h2 {
       margin-bottom: 40rpx;
       color: #333333;
-      font-size: 40rpx;
+      font-size: 40px;
+    }
+
+    p {
+      font-size: 24px;
+      span {
+        margin-right: 15px;
+      }
     }
 
     .detail-info {
@@ -701,4 +720,31 @@
       }
     }
   }
+
+  .accessory-list {
+    margin-top: 16px;
+    background: #FFF;
+    padding: 0 32px 30px 32px;
+    box-sizing: border-box;
+    p {
+      font-size: 32px;
+      height: 112px;
+      line-height: 112px;
+    }
+    .card-list {
+      .item{
+        padding: 16px;
+        border: 1px solid #CCCCCC;
+        border-radius: 8px;
+        display: flex;
+        margin-bottom: 32px;
+        img {
+          width: 96px;
+          height: 96px;
+        }
+
+      }
+    }
+    
+  }
 </style>
diff --git a/src/apps/AppInfotainment/newsList.vue b/src/apps/AppInfotainment/newsList.vue
deleted file mode 100644
index af942f6c..00000000
--- a/src/apps/AppInfotainment/newsList.vue
+++ /dev/null
@@ -1,276 +0,0 @@
-<template>
-  <div class="news">
-    <div class="fixed-top">
-      <div class="header-search">
-        <div class="search-input-content">
-          <img src="https://cdn.cunwuyun.cn/img/search-blue.svg" alt="" class="search-icon">
-          <input type="text" placeholder="请输入标题" class="search-input" placeholder-style="color:#E2E8F1;" v-model="title" @confirm="onConfirm" confirm-type="search" />
-        </div>
-      </div>
-      <div class="header-tab">
-        <div class="tab-item" v-for="(item, index) in tabList" :key="index" @click="changeTab(index)">{{item}}<span class="active-line" v-if="currIndex == index"></span></div>
-      </div>
-    </div>
-    <div class="news-list">
-      <div class="item" hover-class="bg-hover" v-for="(item, index) in newsList" :key="index" @click="toDetail(item.id)">
-        <div class="item-wrapper solid" :style="{display: type === '1' ? 'block' : 'flex'}">
-          <div class="item-left flex1">
-            <h2 :style="{marginBottom: item.type === '1' ? '16rpx' : '30rpx'}">{{ item.title }}</h2>
-            <div class="item-video" v-if="item.type === '1'">
-              <image class="play-btn" src="https://cdn.cunwuyun.cn/img/bf@2x.png" />
-              <div class="mask"></div>
-              <image class="cover" :src="item.coverFile.url" mode="aspectFill" />
-            </div>
-            <div class="item-left__bottom item-active" :class="[item.photo ? 'item-active' : '']">
-              <span class="top-text">置顶</span>
-              <span>浏览{{ item.viewCount }}</span>
-              <span>点赞{{ item.upCount }}</span>
-              <span>{{ item.createTime ? item.createTime.split(' ')[0] : '-' }}</span>
-            </div>
-          </div>
-          <image v-if="item.type === '0'" :src="item.coverFile.url" mode="aspectFill" />
-        </div>
-      </div>
-      <div class="noMore" v-if="isMore && current !== 0">没有更多了噢！</div>
-      <div class="no-more" v-if="!newsList.length && isShowEmpty">
-        <image src="https://cdn.cunwuyun.cn/img/Empty.png" />
-        <p>暂无相关信息</p>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: 'newsList',
-
-    data () {
-      return {
-        currIndex: 0,
-        title: '',
-        isLoading: false,
-        newsList: [],
-        isShowEmpty: false,
-        isMore: false,
-        current: 0,
-        areaId: '',
-        tabList: ['全部', '视频', '文章']
-      }
-    },
-
-    onLoad (params) {
-      this.areaId = params.areaId
-      this.$loading()
-      this.getNewsList(params.areaId)
-    },
-
-    methods: {
-      changeTab(index) {
-        this.currIndex = index
-        this.isMore = false
-        this.current = 0
-        this.$loading()
-
-        this.$nextTick(() => {
-          this.getNewsList(this.areaId)
-        })
-      },
-
-      onConfirm () {
-        this.isMore = false
-        this.current = 0
-        this.$loading()
-
-        this.$nextTick(() => {
-          this.getNewsList(this.areaId)
-        })
-      },
-
-      getNewsList(areaId) {
-        if (this.isMore || this.isLoading) return
-        let type = ''
-
-        if (this.currIndex === 1) {
-          type = 1
-        } else if (this.currIndex === 2) {
-          type = 0
-        }
-
-        this.isLoading = true
-        this.$instance.post(`/app/appnewscenterinfo/listForWx?current=${this.current + 1}&type=${type}&size=10&areaId=&title=${this.title}`, null, {
-          withoutToken: 1
-        }).then(res => {
-          if (res.code === 0) {
-            this.isShowEmpty = true
-            this.$hideLoading()
-
-              if (this.current === 0) {
-                this.newsList = []
-              }
-            if (!res.data.records.length) {
-              this.isMore = true
-              this.isLoading = false
-
-              this.$nextTick(() => {
-                this.pageShow = true
-              })
-
-              return false
-            }
-
-            const data = res.data.records
-            this.newsList.push(...data)
-            this.current = this.current + 1
-            this.isLoading = false
-
-            this.$nextTick(() => {
-              this.pageShow = true
-            })
-          } else {
-            this.$hideLoading()
-          }
-        }).catch(() => {
-          this.$hideLoading()
-          this.isShowEmpty = true
-          this.isLoading = false
-        })
-      },
-
-      toDetail (id) {
-        this.$linkTo(`/subPages/live/newsDetail?id=${id}&areaId=${this.areaId}`)
-      }
-    },
-
-    onReachBottom () {
-      this.getNewsList(this.areaId)
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .news-list{
-    padding-top: 120rpx;
-  }
-  .news {
-    min-height: 100vh;
-    padding-top: 96rpx;
-    background: #fff;
-  }
-
-  .item-video {
-    position: relative;
-    height: 388rpx;
-    margin-bottom: 24rpx;
-
-    .mask {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-      z-index: 11;
-      background: rgba(0, 0, 0, 0.16);
-    }
-
-    .play-btn {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      z-index: 121;
-      width: 80rpx;
-      height: 80rpx;
-      margin: 0;
-      transform: translate(-50%, -50%);
-    }
-
-    .cover {
-      display: block;
-      width: 100%!important;
-      height: 388rpx!important;
-      margin-left: 0!important;
-    }
-  }
-
-  div {
-    box-sizing: border-box;
-  }
-
-  .noMore {
-    line-height: 90rpx;
-    text-align: center;
-    color: #999;
-    font-size: 26rpx;
-  }
-
-  .news {
-    background: #fff;
-  }
-
-  .item {
-    padding: 0 30rpx;
-
-    &:first-child {
-      .item-wrapper {
-        padding-top: 0!important;
-      }
-    }
-
-    .item-wrapper {
-      padding: 30rpx 0 20rpx;
-      display: flex;
-      align-items: center;
-    }
-
-    .item-left {
-      flex: 1;
-
-      h2 {
-        margin-bottom: 32rpx;
-        color: #333333;
-        font-size: 30rpx;
-        font-weight: 700;
-      }
-
-      .item-left__bottom {
-        display: flex;
-
-        span {
-          margin-right: 10rpx;
-          color: #999999;
-          font-size: 22rpx;
-
-          &:last-child {
-            margin-right: 0;
-          }
-        }
-        .top-text{
-          font-size: 22rpx;
-          color: #EF4645;
-          margin-right: 16rpx;
-        }
-      }
-    }
-
-    image {
-      flex-shrink: 0;
-      width: 224rpx;
-      height: 140rpx;
-      margin-left: 46rpx;
-    }
-  }
-
-  .no-more {
-    margin-top: 20rpx;
-    text-align: center;
-    color: #999;
-
-    image {
-      width: 400rpx;
-      height: 240rpx;
-    }
-
-    p {
-      text-align: center;
-      color: #999;
-      font-size: 28rpx;
-    }
-  }
-</style>
diff --git a/src/apps/AppInfotainment/productList.vue b/src/apps/AppInfotainment/productList.vue
deleted file mode 100644
index de2029f3..00000000
--- a/src/apps/AppInfotainment/productList.vue
+++ /dev/null
@@ -1,287 +0,0 @@
-<template>
-  <div class="news">
-    <div class="news-list">
-      <div class="item" hover-class="bg-hover" v-for="(item, index) in newsList" :key="index" @click="toDetail(item)">
-        <div class="item-wrapper solid" :style="{display: type === '1' ? 'block' : 'flex'}">
-          <div class="item-left flex1">
-            <h2 :style="{marginBottom: item.type === '1' ? '16rpx' : '30rpx'}">{{ item.title }}</h2>
-            <div class="item-video" v-if="item.type === '1'">
-              <image class="play-btn" src="https://cdn.cunwuyun.cn/img/bf@2x.png" />
-              <div class="mask"></div>
-              <image class="cover" :src="item.coverFile" mode="aspectFill" />
-            </div>
-            <div class="item-left__bottom item-active" :class="[item.photo ? 'item-active' : '']">
-              <span class="top-text" v-if="item.top == 1">置顶</span>
-              <span>{{tabList[item.detailType].name || ''}}</span>
-              <span>{{ item.createTime ? item.createTime.split(' ')[0] : '' }}</span>
-            </div>
-          </div>
-          <image v-if="item.type === '0'" :src="item.coverFile" mode="aspectFill" />
-        </div>
-      </div>
-      <AiEmpty v-if="!newsList.length && isShowEmpty"/>
-      <div class="noMore" v-if="isMore && current !== 0">没有更多了噢！</div>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: 'productList',
-    data () {
-      return {
-        currIndex: 0,
-        title: '',
-        isLoading: false,
-        newsList: [],
-        isShowEmpty: false,
-        isMore: false,
-        current: 0,
-        areaId: '',
-      }
-    },
-
-    onLoad (params) {
-      this.areaId = params.areaId
-      this.$loading()
-      this.getNewsList()
-    },
-    onShow() {
-      this.getListInit()
-    },
-
-    methods: {
-      toSelect() {
-        this.$linkTo(`/subPages/live/select?index=6`)
-      },
-
-      onConfirm () {
-        this.isMore = false
-        this.current = 0
-        this.$loading()
-
-        this.$nextTick(() => {
-          this.getNewsList(this.areaId)
-        })
-      },
-
-      getListInit() {
-        this.isMore = false
-        this.current = 0
-        this.newsList = []
-        this.$loading()
-        this.getNewsList()
-      },
-      getNewsList() {
-        if (this.isMore || this.isLoading) return
-        this.isLoading = true
-        this.$instance.post(`/app/appnewscenterinfo/listForWxNew?current=${this.current + 1}&type=6&size=10&title=${this.title}&areaId=${this.areaId}`, null, {
-          withoutToken: 1
-        }).then(res => {
-          if (res.code === 0) {
-            this.isShowEmpty = true
-            this.$hideLoading()
-
-            if (this.current === 0) {
-              this.newsList = []
-            }
-            if (!res.data.records.length) {
-              this.isMore = true
-              this.isLoading = false
-
-              this.$nextTick(() => {
-                this.pageShow = true
-              })
-
-              return false
-            }
-
-            const data = res.data.records
-            this.newsList.push(...data)
-            this.current = this.current + 1
-            this.isLoading = false
-
-            this.$nextTick(() => {
-              this.pageShow = true
-            })
-          } else {
-            this.$hideLoading()
-          }
-        }).catch(() => {
-          this.$hideLoading()
-          this.isShowEmpty = true
-          this.isLoading = false
-        })
-      },
-      toDetail(item) {
-        this.$linkTo(`/subPages/live/products?id=${item.id}&detailType=${item.detailType}`)
-      },
-    },
-
-    onReachBottom () {
-      this.getNewsList(this.areaId)
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .news-list{
-    padding-top: 20rpx;
-  }
-  .news {
-    min-height: 100vh;
-    background: #fff;
-  }
-
-  .item-video {
-    position: relative;
-    height: 388rpx;
-    margin-bottom: 24rpx;
-
-    .mask {
-      position: absolute;
-      width: 100%;
-      height: 100%;
-      z-index: 11;
-      background: rgba(0, 0, 0, 0.16);
-    }
-
-    .play-btn {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      z-index: 121;
-      width: 80rpx;
-      height: 80rpx;
-      margin: 0;
-      transform: translate(-50%, -50%);
-    }
-
-    .cover {
-      display: block;
-      width: 100%!important;
-      height: 388rpx!important;
-      margin-left: 0!important;
-    }
-  }
-
-  div {
-    box-sizing: border-box;
-  }
-
-  .noMore {
-    line-height: 90rpx;
-    text-align: center;
-    color: #999;
-    font-size: 26rpx;
-  }
-
-  .news {
-    background: #fff;
-  }
-
-  .header {
-    position: fixed;
-    left: 0;
-    top: 0;
-    z-index: 10000;
-    width: 100%;
-    padding: 8rpx 0;
-    background: #fff;
-
-    .header-search {
-      display: flex;
-      align-items: center;
-      width: 690rpx;
-      height: 60rpx;
-      margin: 0 auto 8rpx;
-      padding: 0 32rpx;
-      background: #0D6DDC;
-      border-radius: 30rpx;
-      
-      image {
-        flex-shrink: 1;
-        width: 32rpx;
-        height: 32px;
-        margin-right: 12rpx;
-      }
-
-      input {
-        flex: 1;
-        height: 100%;
-        font-size: 28rpx;
-        color: #fff;
-      }
-    }
-  }
-
-  .item {
-    padding: 0 30rpx;
-
-    &:first-child {
-      .item-wrapper {
-        padding-top: 0!important;
-      }
-    }
-
-    .item-wrapper {
-      padding: 30rpx 0 20rpx;
-      display: flex;
-      align-items: center;
-    }
-
-    .item-left {
-      flex: 1;
-
-      h2 {
-        margin-bottom: 32rpx;
-        color: #333333;
-        font-size: 30rpx;
-        font-weight: 700;
-      }
-
-      .item-left__bottom {
-        display: flex;
-
-        span {
-          margin-right: 10rpx;
-          color: #999999;
-          font-size: 22rpx;
-
-          &:last-child {
-            margin-right: 0;
-          }
-        }
-        .top-text{
-          font-size: 22rpx;
-          color: #EF4645;
-          margin-right: 16rpx;
-        }
-      }
-    }
-
-    image {
-      flex-shrink: 0;
-      width: 224rpx;
-      height: 140rpx;
-      margin-left: 46rpx;
-    }
-  }
-
-  .no-more {
-    margin-top: 20rpx;
-    text-align: center;
-    color: #999;
-
-    image {
-      width: 400rpx;
-      height: 240rpx;
-    }
-
-    p {
-      text-align: center;
-      color: #999;
-      font-size: 28rpx;
-    }
-  }
-</style>
diff --git a/src/apps/AppInfotainment/products.vue b/src/apps/AppInfotainment/products.vue
deleted file mode 100644
index c4c2a5eb..00000000
--- a/src/apps/AppInfotainment/products.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <div class="page">
-    <div class="swiper-content" v-if="list.length">
-      <u-swiper :list="list" mode="number" height="720" bg-color="none"></u-swiper>
-    </div>
-    <div class="name-info">
-      <h2>{{info.title}}</h2>
-      <p v-if="detailType == 6">{{info.businessUnit}}</p>
-    </div>
-    <div class="products-info" v-if="detailType == 6">
-      <div class="flex-info">
-        <div class="label">联系人</div>
-        <div class="value">{{info.contactPerson}}</div>
-      </div>
-      <div class="flex-info">
-        <div class="label">电话</div>
-        <div class="value">{{info.contactPhone}}
-          <img src="https://cdn.cunwuyun.cn/dvcp/recruitWorkers/phone-icon.png" alt="" @click="callPhone()">
-        </div>
-      </div>
-      <div class="flex-info">
-        <div class="label">地址</div>
-        <div class="value">{{ info.address }}</div>
-      </div>
-    </div>
-    <!-- <p class="content" v-html="info.content"></p> -->
-    <u-parse className="articalContent" :html="info.content" class="content"></u-parse>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: 'page',
-    data () {
-      return {
-        pageShow: false,
-        info: {},
-        id: '',
-        list: [],
-        detailType: 5, //5旅游故事 6特色农产品
-      }
-    },
-    onLoad (option) {
-      this.id = option.id
-      this.detailType = option.detailType
-      this.getDetail()
-    },
-
-    methods: {
-      getDetail() {
-        this.$instance.post('/app/appcountrysidetourism/queryDetailByIdForWX?id=' + this.id).then(res => {
-          this.$hideLoading()
-          if (res.code === 0) {
-            res.data.photo = JSON.parse(res.data.photo)
-            if(res.data.photo.length) {
-              res.data.photo.map((item) => {
-                this.list.push(item.url)
-              })
-            }
-            this.info = res.data
-            this.$hideLoading()
-
-            this.$nextTick(() => {
-              this.pageShow = true
-            })
-          }
-        })
-      },
-      callPhone() {
-        wx.makePhoneCall({
-          phoneNumber: this.info.contactPhone,
-        })
-      }
-    },
-    onShareAppMessage () {
-      return {
-        title: this.info.title,
-        path: `/subPages/live/products?id=${this.id}&detailType=${this.detailType}`
-      }
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-.page{
-  padding-bottom: 80rpx;
-  background-color: #f3f6f9;
-  .name-info{
-    padding: 16rpx 32rpx 14rpx;
-    background-color: #fff;
-    margin-bottom: 16rpx;
-    h2{
-      width: 100%;
-      height: 50rpx;
-      font-size: 36rpx;
-      font-weight: 500;
-      color: #333;
-      line-height: 50rpx;
-      margin-bottom: 8rpx;
-    }
-    p{
-      width: 100%;
-      height: 40rpx;
-      font-size: 28rpx;
-      font-weight: 400;
-      color: #666;
-      line-height: 40rpx;
-    }
-  }
-  .products-info{
-    background-color: #fff;
-    margin-bottom: 16rpx;
-    .flex-info{
-      display: flex;
-      line-height: 40rpx;
-      font-size: 28rpx;
-      color: #333;
-      .label{
-        padding: 24rpx 0;
-        width: 176rpx;
-        padding-left: 32rpx;
-        box-sizing: border-box;
-        font-weight: 500;
-      }
-      .value{
-        padding: 24rpx 32rpx 24rpx 0;
-        width: calc(100% - 176rpx);
-        border-bottom: 2rpx solid #eee;
-        box-sizing: border-box;
-        word-break: break-all;
-        img{
-          width: 48rpx;
-          height: 48rpx;
-          float: right;
-        }
-      }
-    }
-  }
-  .content{
-    padding: 32rpx;
-    background-color: #fff;
-    word-break: break-all;
-    font-size: 32rpx;
-    color: #666;
-    line-height: 56rpx;
-  }
-}
-</style>
diff --git a/src/apps/AppInfotainment/residentList.vue b/src/apps/AppMonitoringObject/residentList.vue
similarity index 100%
rename from src/apps/AppInfotainment/residentList.vue
rename to src/apps/AppMonitoringObject/residentList.vue