diff --git a/src/apps/AppBroadcast/AppBroadcast.vue b/src/apps/AppBroadcast/AppBroadcast.vue
index c19e48ca..c2e73752 100644
--- a/src/apps/AppBroadcast/AppBroadcast.vue
+++ b/src/apps/AppBroadcast/AppBroadcast.vue
@@ -1,15 +1,15 @@
 <template>
   <div class="AppBroadcast">
     <div class="header">
-      <img src="./img/bigHorn-bg.png" alt="">
+      <img src="img/bigHorn-bg.png" alt="">
       <div class="content">
         <div class="item" @click="linkTo('./onlineList')">
-          <img src="./img/bigHorn-icon1@2x.png" alt="">
+          <img src="img/bigHorn-icon1@2x.png" alt="">
           <div>在线设备</div>
           <!-- <h2>1</h2> -->
         </div>
         <div class="item" @click="linkTo('./playList')">
-          <img src="./img/bigHorn-icon2@2x.png" alt="">
+          <img src="img/bigHorn-icon2@2x.png" alt="">
           <div>播放记录</div>
         </div>
         <!-- <div class="item" @click="linkTo('./onlinePlayList')">
@@ -71,7 +71,7 @@ export default {
     }
   },
   onShow() {
-    document.title = '云广播' 
+    document.title = '云广播'
   },
 }
 </script>
diff --git a/src/apps/AppBroadcast/addPlay.vue b/src/apps/AppBroadcast/addPlay.vue
index aee3862e..67bb0f66 100644
--- a/src/apps/AppBroadcast/addPlay.vue
+++ b/src/apps/AppBroadcast/addPlay.vue
@@ -5,30 +5,30 @@
         <div class="label">播发内容</div>
         <div class="value" @click="nameClick">
           <span :class="formData.mediaName == '请选择' ? 'color-999' : ''">{{ formData.mediaName }}</span>
-          <img src="./img/right-icon.png" alt="">
+          <img src="img/right-icon.png" alt="">
         </div>
       </div>
       <div class="item">
         <div class="label">播放设备</div>
         <div class="value" @click="selectClick('showEquipment', equipmentList)">
           <span :class="formData.serialName == '请选择' ? 'color-999' : ''">{{ formData.serialName }}</span>
-          <img src="./img/right-icon.png" alt="">
+          <img src="img/right-icon.png" alt="">
         </div>
       </div>
       <div class="item">
         <div class="label">播发级别</div>
         <div class="value" @click="selectClick('showMessageLevel', messageLevelList)">
           <span :class="formData.messageLevelName == '请选择' ? 'color-999' : ''">{{ formData.messageLevelName }}</span>
-          <img src="./img/right-icon.png" alt="">
+          <img src="img/right-icon.png" alt="">
         </div>
       </div>
     </div>
     <div class="radio-content">
       <div class="title">播放方式</div>
       <div class="item mar-r50" :class="formData.taskType == 0 ? 'active' : ''" @click="formData.taskType = 0">立即播放<img
-          src="./img/bigHorn-xz.png" alt=""></div>
+          src="img/bigHorn-xz.png" alt=""></div>
       <div class="item" :class="formData.taskType == 1 ? 'active' : ''" @click="formData.taskType = 1"><img
-          src="./img/bigHorn-xz.png" alt="">定时播放
+          src="img/bigHorn-xz.png" alt="">定时播放
       </div>
     </div>
     <div class="content" v-if="formData.taskType != 0">
@@ -36,7 +36,7 @@
         <div class="label">定时策略</div>
         <div class="value" @click="selectClick('showCyclingType', cyclingTypeList)">
           <span :class="formData.cyclingTypeName == '请选择' ? 'color-999' : ''">{{ formData.cyclingTypeName }}</span>
-          <img src="./img/right-icon.png" alt="">
+          <img src="img/right-icon.png" alt="">
         </div>
       </div>
     </div>
@@ -60,21 +60,21 @@
         <div class="label">开始日期</div>
         <div class="value" @click="timeClick(true, 'showDate')">
           <span :class="formData.startDate ? 'color-999' : ''">{{ formData.startDate || '请选择' }}</span>
-          <img src="./img/right-icon.png" alt="">
+          <img src="img/right-icon.png" alt="">
         </div>
       </div>
       <div class="item">
         <div class="label">开始时间</div>
         <div class="value" @click="timeClick(false, 'showSatrt')">
           <span :class="formData.startTime ? 'color-999' : ''">{{ formData.startTime || '请选择' }}</span>
-          <img src="./img/right-icon.png" alt="">
+          <img src="img/right-icon.png" alt="">
         </div>
       </div>
       <div class="item">
         <div class="label">结束时间</div>
         <div class="value" @click="timeClick(false, 'showEnd')">
           <span :class="formData.endTime ? 'color-999' : ''">{{ formData.endTime || '请选择' }}</span>
-          <img src="./img/right-icon.png" alt="">
+          <img src="img/right-icon.png" alt="">
         </div>
       </div>
     </div>
@@ -176,7 +176,7 @@ export default {
     })
   },
   onShow() {
-    document.title = '音频播放' 
+    document.title = '音频播放'
   },
 
   methods: {
diff --git a/src/apps/AppBroadcast/onlineList.vue b/src/apps/AppBroadcast/onlineList.vue
index 4444e5e3..7ce1bc8c 100644
--- a/src/apps/AppBroadcast/onlineList.vue
+++ b/src/apps/AppBroadcast/onlineList.vue
@@ -2,7 +2,7 @@
   <div class="onlineList">
     <div class="record">
       <div class="item" v-for="(item, index) in list" :key="index">
-        <img src="./img/bigHorn-lb@2x.png" alt="">
+        <img src="img/bigHorn-lb@2x.png" alt="">
         <div class="info">
           <p>{{ item.deviceName }}</p>
           <span>{{ item.areaName }}</span>
@@ -47,7 +47,7 @@ export default {
     this.getList()
   },
   onShow() {
-    document.title = '在线设备' 
+    document.title = '在线设备'
   },
 }
 </script>
diff --git a/src/apps/AppBroadcast/onlinePlayList.vue b/src/apps/AppBroadcast/onlinePlayList.vue
index 501b21df..c14a3557 100644
--- a/src/apps/AppBroadcast/onlinePlayList.vue
+++ b/src/apps/AppBroadcast/onlinePlayList.vue
@@ -2,7 +2,7 @@
   <div class="onlinePlayList">
     <div class="record">
       <div class="item" v-for="(item, index) in list" :key="index">
-        <img src="./img/bigHorn-lb@2x.png" alt="">
+        <img src="img/bigHorn-lb@2x.png" alt="">
         <div class="info">
           <p>{{ item.deviceName }}</p>
           <span>{{ item.createTime }}</span><br/>
@@ -49,7 +49,7 @@ export default {
     this.getList()
   },
   onShow() {
-    document.title = '在播设备' 
+    document.title = '在播设备'
   },
 }
 </script>
diff --git a/src/apps/AppBroadcast/selectEquipment.vue b/src/apps/AppBroadcast/selectEquipment.vue
index a2ac9516..8a5ad033 100644
--- a/src/apps/AppBroadcast/selectEquipment.vue
+++ b/src/apps/AppBroadcast/selectEquipment.vue
@@ -2,14 +2,14 @@
   <div class="selectEquipment">
     <div class="search">
       <div class="search-bg">
-        <img src="./img/search-icon.png" alt="">
+        <img src="img/search-icon.png" alt="">
         <u-input v-model="value" type="text" placeholder="搜索设备名称" class="search-input" height="18"/>
       </div>
     </div>
     <div class="record">
       <div class="item">
-        <img src="./img/cir.png" alt="" class="check-img">
-        <img src="./img/lb@2x.png" alt="" class="voice-img">
+        <img src="img/cir.png" alt="" class="check-img">
+        <img src="img/lb@2x.png" alt="" class="voice-img">
         <div class="info">
           <div class="text">
             <p>村头大喇叭</p>
@@ -19,8 +19,8 @@
         </div>
       </div>
       <div class="item">
-        <img src="./img/cir.png" alt="" class="check-img">
-        <img src="./img/lb@2x.png" alt="" class="voice-img">
+        <img src="img/cir.png" alt="" class="check-img">
+        <img src="img/lb@2x.png" alt="" class="voice-img">
         <div class="info">
           <div class="text">
             <p>村头大喇叭</p>
diff --git a/src/apps/AppBroadcast/selectMp3.vue b/src/apps/AppBroadcast/selectMp3.vue
index 2dbc434f..ae0e97f4 100644
--- a/src/apps/AppBroadcast/selectMp3.vue
+++ b/src/apps/AppBroadcast/selectMp3.vue
@@ -2,7 +2,7 @@
   <div class="selectMp3">
     <div class="record">
       <div class="item">
-        <img src="./img/cir.png" alt="">
+        <img src="img/cir.png" alt="">
         <div class="info">
           <p>村头大喇叭</p>
         </div>
diff --git a/src/apps/AppBuilding/components/searchMap.vue b/src/apps/AppBuilding/components/searchMap.vue
index 1c7dc1de..155013f7 100644
--- a/src/apps/AppBuilding/components/searchMap.vue
+++ b/src/apps/AppBuilding/components/searchMap.vue
@@ -1,21 +1,21 @@
 <template>
   <div class="searchMap">
     <div class="grid-input">
-      <img src="./img/back-icon.png" alt="" class="back-icon" v-if="name && show" @click="show=false">
-      <img src="./img/search-icon.png" alt="" class="search-icon" v-else>
+      <img src="img/back-icon.png" alt="" class="back-icon" v-if="name && show" @click="show=false">
+      <img src="img/search-icon.png" alt="" class="search-icon" v-else>
       <input type="text" class="input" placeholder="请输入姓名、房屋信息" v-model="name" maxlength="10" confirm-type="search"
              @confirm="search"/>
       <div class="clear-btn">
-        <img src="./img/del-icon.png" alt="" class="del-icon" v-if="name" @click="clear">
+        <img src="img/del-icon.png" alt="" class="del-icon" v-if="name" @click="clear">
       </div>
       <span class="search-btn" @click="search">搜索</span>
     </div>
     <div class="search-list" v-if="show">
       <div class="title border">
-        <img src="./img/search-icon.png" alt="" class="search-icon">{{ name }}
+        <img src="img/search-icon.png" alt="" class="search-icon">{{ name }}
       </div>
       <div class="item border" v-for="(item, index) in buildList" :key="index" @click="getBuildingInfo(item)">
-        <img src="./img/user-icon.png" alt="" class="search-icon user-icon">
+        <img src="img/user-icon.png" alt="" class="search-icon user-icon">
         <div class="item-content">
           <h3>{{ item.residentName }}</h3>
           <p>{{ item.areaName || '' }}{{ item.createAddress }}</p>
@@ -23,7 +23,7 @@
       </div>
     </div>
     <div class="build-btn" @click="toList()">
-      <img src="./img/build-icon.png" alt=""> 楼栋<br/>列表
+      <img src="img/build-icon.png" alt=""> 楼栋<br/>列表
     </div>
     <div class="map-content">
       <AiTMap v-if="areaId" :areaId="areaId" :map.sync="map" :lib.sync="lib" :ops="ops"
diff --git a/src/apps/AppBuilding/map.vue b/src/apps/AppBuilding/map.vue
index 5cf0fd2a..ced5f393 100644
--- a/src/apps/AppBuilding/map.vue
+++ b/src/apps/AppBuilding/map.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="map">
     <div class="build-btn">
-      <img src="./components/img/model-icon.png" alt="" @click="toDetail"> 楼栋<br/>模型
+      <img src="components/img/model-icon.png" alt="" @click="toDetail"> 楼栋<br/>模型
     </div>
     <div class="map-content">
       <AiTMap v-if="user.areaId" :areaId="user.areaId" :map.sync="map" :lib.sync="lib" :ops="ops" :libraries="['service', 'tools']"></AiTMap>
diff --git a/src/apps/AppCountryAlbum/list.vue b/src/apps/AppCountryAlbum/list.vue
index 487b62e2..ad6a5520 100644
--- a/src/apps/AppCountryAlbum/list.vue
+++ b/src/apps/AppCountryAlbum/list.vue
@@ -3,7 +3,7 @@
     <AiTopFixed>
       <div class="area-content">
         <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect">
-          <img src="./img/local-icon.png" alt="">
+          <img src="img/local-icon.png" alt="">
           <span class="label" v-if="areaName">{{ areaName }}</span>
           <span v-else>请选择</span>
           <u-icon name="arrow-down" color="#666" size="24" />
@@ -18,7 +18,7 @@
       </div>
       <AiEmpty v-if="!list.length"/>
     </div>
-    
+
   </div>
 </template>
 
@@ -53,7 +53,7 @@ export default {
       this.areaId = e.id
       this.areaName = e.name
       this.getList()
-    },  
+    },
     getList() {
       this.$http.post(`/app/appvillagepicturealbum/queryAlbumMenu`, null, {
         params: {
@@ -131,4 +131,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/apps/AppMailList/myAddList.vue b/src/apps/AppMailList/myAddList.vue
index de8c2fdf..cd8b1be3 100644
--- a/src/apps/AppMailList/myAddList.vue
+++ b/src/apps/AppMailList/myAddList.vue
@@ -9,13 +9,13 @@
           </div>
         </div>
         <div class="right">
-          <img src="./img/edit-icon.png" alt="" @click="edit(item.id)">
-          <img src="./img/del-icon.png" alt="" @click="del(item)">
+          <img src="img/edit-icon.png" alt="" @click="edit(item.id)">
+          <img src="img/del-icon.png" alt="" @click="del(item)">
         </div>
       </div>
     </div>
     <div class="empty" v-else>
-      <img src="./img/empty.png" alt="">
+      <img src="img/empty.png" alt="">
       <p>您还未添加便民通讯录<br/>点击<span>新增按钮</span>试试吧</p>
     </div>
     <div class="footer-btn" @click="edit('')">新增</div>
@@ -164,4 +164,4 @@ export default {
     z-index: 999;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/apps/AppMarryAndDie/AppMarryAndDie.vue b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
index a78f63a8..8664ddee 100644
--- a/src/apps/AppMarryAndDie/AppMarryAndDie.vue
+++ b/src/apps/AppMarryAndDie/AppMarryAndDie.vue
@@ -10,7 +10,7 @@
             <span class="titlesContent">查看全部活动和本月新增</span>
           </div>
 
-          <img src="./img/1.png" alt="" />
+          <img src="img/1.png" alt="" />
         </div>
 
         <div class="card" @click="toList(1)">
@@ -19,7 +19,7 @@
             <span class="titlesContent">查看全部参与操办信息和本月新增</span>
           </div>
 
-          <img src="./img/2.png" alt="" />
+          <img src="img/2.png" alt="" />
         </div>
 
         <div class="card" @click="toList(2)">
@@ -28,7 +28,7 @@
             <span class="titlesContent">查看全部婚礼和本月新增</span>
           </div>
 
-          <img src="./img/3.png" alt="" />
+          <img src="img/3.png" alt="" />
         </div>
 
         <div class="card" @click="toList(3)">
@@ -37,7 +37,7 @@
             <span class="titlesContent">查看全部丧礼和本月新增</span>
           </div>
 
-          <img src="./img/4.png" alt="" />
+          <img src="img/4.png" alt="" />
         </div>
       </div>
 
diff --git a/src/apps/party/AppOnlineAnswer/AppOnlineAnswer.vue b/src/apps/AppOnlineAnswer/AppOnlineAnswer.vue
similarity index 96%
rename from src/apps/party/AppOnlineAnswer/AppOnlineAnswer.vue
rename to src/apps/AppOnlineAnswer/AppOnlineAnswer.vue
index b154e5a7..d08f8f7c 100644
--- a/src/apps/party/AppOnlineAnswer/AppOnlineAnswer.vue
+++ b/src/apps/AppOnlineAnswer/AppOnlineAnswer.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="AppOnlineAnswer">
     <div class="page" v-if="list.length">
-      <img src="./static/img/answer-bg.png" alt="" class="bg-img">
+      <img src="static/img/answer-bg.png" alt="" class="bg-img">
       <div class="subject-content" v-if="!showAnwser">
         <div class="btn" v-if="showTopBtn" @click="confirm()">{{ topBtnText }}</div>
         <div class="bg-fff pad-b48">
@@ -18,8 +18,8 @@
           <div v-if="list[index].type == 1">
             <div class="item" v-for="(item, i) in list[index].items" :key="i" @click="itemClick(i)"
                  :class="{ 'item-click': clickIndex === i, 'item-success': showAnalysis && item.checked == 1, 'item-error': showAnalysis && clickIndex == i && item.checked == 0}">
-              <img src="./static/img/success-icon.png" alt="" v-if="showAnalysis && item.checked == 1">
-              <img src="./static/img/error-icon.png" alt=""
+              <img src="static/img/success-icon.png" alt="" v-if="showAnalysis && item.checked == 1">
+              <img src="static/img/error-icon.png" alt=""
                    v-if="showAnalysis && clickIndex == i && item.checked == 0">
               {{ item.sort }} &nbsp;{{ item.content }}
             </div>
@@ -28,8 +28,8 @@
           <div v-if="list[index].type == 2">
             <div class="item" v-for="(item, i) in list[index].items" :key="i" @click="itemClick(i)"
                  :class="{ 'item-click': item.isCheked, 'item-success': showAnalysis && item.checked == 1, 'item-error': showAnalysis && item.isCheked && item.checked == 0}">
-              <img src="./static/img/success-icon.png" alt="" v-if="showAnalysis && item.checked == 1">
-              <img src="./static/img/error-icon.png" alt=""
+              <img src="static/img/success-icon.png" alt="" v-if="showAnalysis && item.checked == 1">
+              <img src="static/img/error-icon.png" alt=""
                    v-if="showAnalysis && clickIndex == i && item.checked == 0">
               {{ item.sort }} &nbsp;{{ item.content }}
             </div>
@@ -54,7 +54,7 @@
       </div>
       <div class="subject-content" v-else>
         <div class="bg-fff pad-b48">
-          <img src="./static/img/answer-head.png" alt="" class="head-img">
+          <img src="static/img/answer-head.png" alt="" class="head-img">
           <div class="head-content">
             <p>本次答对题目数</p>
             <div>{{ resultInfo.right }}</div>
@@ -214,7 +214,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../../common/common.css";
+@import "../../common/common.css";
 
 .AppOnlineAnswer {
   width: 100%;
diff --git a/src/apps/party/AppOnlineAnswer/static/img/answer-bg.png b/src/apps/AppOnlineAnswer/static/img/answer-bg.png
similarity index 100%
rename from src/apps/party/AppOnlineAnswer/static/img/answer-bg.png
rename to src/apps/AppOnlineAnswer/static/img/answer-bg.png
diff --git a/src/apps/party/AppOnlineAnswer/static/img/answer-head.png b/src/apps/AppOnlineAnswer/static/img/answer-head.png
similarity index 100%
rename from src/apps/party/AppOnlineAnswer/static/img/answer-head.png
rename to src/apps/AppOnlineAnswer/static/img/answer-head.png
diff --git a/src/apps/party/AppOnlineAnswer/static/img/error-icon.png b/src/apps/AppOnlineAnswer/static/img/error-icon.png
similarity index 100%
rename from src/apps/party/AppOnlineAnswer/static/img/error-icon.png
rename to src/apps/AppOnlineAnswer/static/img/error-icon.png
diff --git a/src/apps/party/AppOnlineAnswer/static/img/success-icon.png b/src/apps/AppOnlineAnswer/static/img/success-icon.png
similarity index 100%
rename from src/apps/party/AppOnlineAnswer/static/img/success-icon.png
rename to src/apps/AppOnlineAnswer/static/img/success-icon.png
diff --git a/src/apps/AppPageParty/AppPageParty.vue b/src/apps/AppPageParty/AppPageParty.vue
index 61f975e8..7d754934 100644
--- a/src/apps/AppPageParty/AppPageParty.vue
+++ b/src/apps/AppPageParty/AppPageParty.vue
@@ -12,12 +12,12 @@ export default {
     return {
       label: '基层党建',
       appList: [
-        {
-          name: '三会一课',
-          icon: require('./img/shyk.png'),
-          url: '../party/AppThreeSessions/AppThreeSessions',
-          isBottom: true
-        },
+        // {
+        //   name: '三会一课',
+        //   icon: require('./img/shyk.png'),
+        //   url: '../party/AppThreeSessions/AppThreeSessions',
+        //   isBottom: true
+        // },
         {
           name: '党建要闻',
           icon: require('./img/djyw.png'),
@@ -55,4 +55,4 @@ uni-page-body{
 .AppPageParty{
   height: 100%;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/apps/party/AppPartyHistoryEducation/AppPartyHistoryEducation.vue b/src/apps/AppPartyHistoryEducation/AppPartyHistoryEducation.vue
similarity index 99%
rename from src/apps/party/AppPartyHistoryEducation/AppPartyHistoryEducation.vue
rename to src/apps/AppPartyHistoryEducation/AppPartyHistoryEducation.vue
index d69e7731..77a0d4a1 100644
--- a/src/apps/party/AppPartyHistoryEducation/AppPartyHistoryEducation.vue
+++ b/src/apps/AppPartyHistoryEducation/AppPartyHistoryEducation.vue
@@ -68,7 +68,7 @@ import {mapState} from "vuex";
 
 export default {
   name: "AppPartyHistoryEducation",
-  appName: "党史教育",
+  appName: "党员学习",
   computed: {
     ...mapState(["user", "token"]),
   },
@@ -141,7 +141,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../../common/common.css";
+@import "../../common/common.css";
 
 .AppPartyHistoryEducation {
   width: 100%;
diff --git a/src/apps/party/AppPartyHistoryEducation/classroomList.vue b/src/apps/AppPartyHistoryEducation/classroomList.vue
similarity index 98%
rename from src/apps/party/AppPartyHistoryEducation/classroomList.vue
rename to src/apps/AppPartyHistoryEducation/classroomList.vue
index 59aaf4f7..e2a66670 100644
--- a/src/apps/party/AppPartyHistoryEducation/classroomList.vue
+++ b/src/apps/AppPartyHistoryEducation/classroomList.vue
@@ -57,7 +57,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../../common/common.css";
+@import "../../common/common.css";
 .home {
   width: 100%;
   height: 100%;
diff --git a/src/apps/party/AppPartyHistoryEducation/detail.vue b/src/apps/AppPartyHistoryEducation/detail.vue
similarity index 98%
rename from src/apps/party/AppPartyHistoryEducation/detail.vue
rename to src/apps/AppPartyHistoryEducation/detail.vue
index ffb141a4..4cb1cc34 100644
--- a/src/apps/party/AppPartyHistoryEducation/detail.vue
+++ b/src/apps/AppPartyHistoryEducation/detail.vue
@@ -50,7 +50,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../../common/common.css";
+@import "../../common/common.css";
 .home {
   width: 100%;
   height: 100%;
diff --git a/src/apps/party/AppPartyHistoryEducation/knowledgeList.vue b/src/apps/AppPartyHistoryEducation/knowledgeList.vue
similarity index 99%
rename from src/apps/party/AppPartyHistoryEducation/knowledgeList.vue
rename to src/apps/AppPartyHistoryEducation/knowledgeList.vue
index eee09ad4..35b3a7e9 100644
--- a/src/apps/party/AppPartyHistoryEducation/knowledgeList.vue
+++ b/src/apps/AppPartyHistoryEducation/knowledgeList.vue
@@ -184,7 +184,7 @@ export default {
 };
 </script>
 <style lang="scss" scope>
-@import "../../../common/common.css";
+@import "../../common/common.css";
 .page {
   .search-box {
     width: 100%;
diff --git a/src/apps/party/AppPartyHistoryEducation/list.vue b/src/apps/AppPartyHistoryEducation/list.vue
similarity index 99%
rename from src/apps/party/AppPartyHistoryEducation/list.vue
rename to src/apps/AppPartyHistoryEducation/list.vue
index 97432229..26453b37 100644
--- a/src/apps/party/AppPartyHistoryEducation/list.vue
+++ b/src/apps/AppPartyHistoryEducation/list.vue
@@ -201,7 +201,7 @@ export default {
 };
 </script>
 <style lang="scss" scope>
-@import "../../../common/common.css";
+@import "../../common/common.css";
 
 .page {
   .search-box {
diff --git a/src/apps/party/AppPartyHistoryEducation/select.vue b/src/apps/AppPartyHistoryEducation/select.vue
similarity index 97%
rename from src/apps/party/AppPartyHistoryEducation/select.vue
rename to src/apps/AppPartyHistoryEducation/select.vue
index ff90dc3d..b5074750 100644
--- a/src/apps/party/AppPartyHistoryEducation/select.vue
+++ b/src/apps/AppPartyHistoryEducation/select.vue
@@ -34,7 +34,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../../common/common.css";
+@import "../../common/common.css";
 .home {
   width: 100%;
   height: 100%;
diff --git a/src/apps/party/AppPartyHistoryEducation/todayDetail.vue b/src/apps/AppPartyHistoryEducation/todayDetail.vue
similarity index 98%
rename from src/apps/party/AppPartyHistoryEducation/todayDetail.vue
rename to src/apps/AppPartyHistoryEducation/todayDetail.vue
index 2867b848..de282907 100644
--- a/src/apps/party/AppPartyHistoryEducation/todayDetail.vue
+++ b/src/apps/AppPartyHistoryEducation/todayDetail.vue
@@ -53,7 +53,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../../common/common.css";
+@import "../../common/common.css";
 .home {
   width: 100%;
   height: 100%;
diff --git a/src/apps/party/AppPartyHistoryEducation/todayList.vue b/src/apps/AppPartyHistoryEducation/todayList.vue
similarity index 99%
rename from src/apps/party/AppPartyHistoryEducation/todayList.vue
rename to src/apps/AppPartyHistoryEducation/todayList.vue
index a7852fa5..a70054ca 100644
--- a/src/apps/party/AppPartyHistoryEducation/todayList.vue
+++ b/src/apps/AppPartyHistoryEducation/todayList.vue
@@ -90,7 +90,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../../common/common.css";
+@import "../../common/common.css";
 .home {
   width: 100%;
   height: 100%;
diff --git a/src/apps/party/AppPartyHistoryEducation/videoDetail.vue b/src/apps/AppPartyHistoryEducation/videoDetail.vue
similarity index 99%
rename from src/apps/party/AppPartyHistoryEducation/videoDetail.vue
rename to src/apps/AppPartyHistoryEducation/videoDetail.vue
index 6f2c5cd3..1d5872f5 100644
--- a/src/apps/party/AppPartyHistoryEducation/videoDetail.vue
+++ b/src/apps/AppPartyHistoryEducation/videoDetail.vue
@@ -80,7 +80,7 @@ export default {
 };
 </script>
 <style scoped lang="scss">
-@import "../../../common/common.css";
+@import "../../common/common.css";
 .home {
   width: 100%;
   height: 100%;
diff --git a/src/apps/AppResidentDocument/AppResidentDocument.vue b/src/apps/AppResidentDocument/AppResidentDocument.vue
index effb45b8..7a599a2e 100644
--- a/src/apps/AppResidentDocument/AppResidentDocument.vue
+++ b/src/apps/AppResidentDocument/AppResidentDocument.vue
@@ -17,7 +17,7 @@
       <div class="datass" v-for="(item, iindex) in datas" :key="iindex" @click="toDetailCard(item)">
         <div class="left">
           <img :src="item.photo" alt="" v-if="item.photo" />
-          <img src="./components/img/4.png" alt="" v-else />
+          <img src="components/img/4.png" alt="" v-else />
         </div>
 
         <div class="right">
@@ -70,7 +70,7 @@ export default {
     this.getList()
   },
   onShow() {
-    document.title =  '居民列表' 
+    document.title =  '居民列表'
   },
   methods: {
     getList() {
diff --git a/src/apps/AppResidentDocument/DetailCard.vue b/src/apps/AppResidentDocument/DetailCard.vue
index ccf77dcb..3e5a7f03 100644
--- a/src/apps/AppResidentDocument/DetailCard.vue
+++ b/src/apps/AppResidentDocument/DetailCard.vue
@@ -19,7 +19,7 @@
         <div class="card" v-for="(item, i) in data.family" :key="i" @click="toDetailPeople(item)">
           <div class="photos">
             <img :src="item.photo" alt="" v-if="item.photo" />
-            <img src="./components/img/44.png" alt="" v-else />
+            <img src="components/img/44.png" alt="" v-else />
           </div>
 
           <div class="right">
diff --git a/src/apps/AppResidentDocument/DetailPeople.vue b/src/apps/AppResidentDocument/DetailPeople.vue
index 84fa8c2a..508bdea1 100644
--- a/src/apps/AppResidentDocument/DetailPeople.vue
+++ b/src/apps/AppResidentDocument/DetailPeople.vue
@@ -3,7 +3,7 @@
     <div class="top">
       <div class="photos">
         <img :src="data.resident.photo" alt="" v-if="data.resident && data.resident.photo" />
-        <img src="./components/img/44.png" alt="" v-else />
+        <img src="components/img/44.png" alt="" v-else />
       </div>
 
       <div class="right">
@@ -127,7 +127,7 @@ export default {
     })
   },
   onShow() {
-    document.title =  '家庭成员信息' 
+    document.title =  '家庭成员信息'
   },
   methods: {
     getDetail() {
diff --git a/src/apps/AppResourcesManage/AppResourcesManage.vue b/src/apps/AppResourcesManage/AppResourcesManage.vue
index c69b9822..c024b165 100644
--- a/src/apps/AppResourcesManage/AppResourcesManage.vue
+++ b/src/apps/AppResourcesManage/AppResourcesManage.vue
@@ -18,7 +18,7 @@
         <p>{{ item.content }}</p>
       </div>
     </div>
-    <img src="./img/add-icon.png" alt="" class="add-img" @click="add">
+    <img src="img/add-icon.png" alt="" class="add-img" @click="add">
     <u-popup v-model="isShow" mode="bottom">
       <div class="audio">
         <AiVideo :src="url" autoplay></AiVideo>
diff --git a/src/apps/AppResourcesManage/addPlay.vue b/src/apps/AppResourcesManage/addPlay.vue
index 5837f242..7d7dfc66 100644
--- a/src/apps/AppResourcesManage/addPlay.vue
+++ b/src/apps/AppResourcesManage/addPlay.vue
@@ -6,7 +6,7 @@
           <div class="label">音频文件</div>
           <div class="value" @click="toRecord">
             <span class="color-999" :style="{ color: file ? '#333' : '' }">{{ file ? '已选择' : '请选择' }}</span>
-            <img src="./img/right-img.png" alt="">
+            <img src="img/right-img.png" alt="">
           </div>
         </div>
       </div>
diff --git a/src/apps/AppResourcesManage/recording.vue b/src/apps/AppResourcesManage/recording.vue
index 0eaa8c65..68fb23c2 100644
--- a/src/apps/AppResourcesManage/recording.vue
+++ b/src/apps/AppResourcesManage/recording.vue
@@ -103,7 +103,7 @@
       </div>
     </div>
     <div class="content" v-else>
-      <img src="./img/body.png" alt="">
+      <img src="img/body.png" alt="">
       <p class="text">点击下方按钮开始录音</p>
       <p class="text">为了保证效果，请靠近手机讲话哦~</p>
     </div>
diff --git a/src/apps/AppServicePublic/AppServicePublic.vue b/src/apps/AppServicePublic/AppServicePublic.vue
index 288f0af6..e6dffeb6 100644
--- a/src/apps/AppServicePublic/AppServicePublic.vue
+++ b/src/apps/AppServicePublic/AppServicePublic.vue
@@ -33,7 +33,7 @@
             </span>
 
             <span class="right">
-              <img src="./img/view-icon.png" alt="">
+              <img src="img/view-icon.png" alt="">
               <span>{{ item.viewCount }}</span>
             </span>
           </div>
diff --git a/src/apps/AppServicePublic/Detail.vue b/src/apps/AppServicePublic/Detail.vue
index 02ec4db6..d88bc6e3 100644
--- a/src/apps/AppServicePublic/Detail.vue
+++ b/src/apps/AppServicePublic/Detail.vue
@@ -9,7 +9,7 @@
         </span>
 
         <span class="right">
-          <img src="./img/view-icon.png" alt="">
+          <img src="img/view-icon.png" alt="">
           <span>{{data.viewCount}}</span>
         </span>
       </div>
@@ -19,8 +19,8 @@
       <div class="contsnts">
         <u-parse :html="data.content"></u-parse>
       </div>
-      
-      
+
+
     </div>
     <div class="img-list" v-if="data.files && data.files.length && data.contentType != 1">
       <div class="title">图片</div>
diff --git a/src/apps/AppSpecialPeople/detail.vue b/src/apps/AppSpecialPeople/detail.vue
index 8cc09c11..66cd53d4 100644
--- a/src/apps/AppSpecialPeople/detail.vue
+++ b/src/apps/AppSpecialPeople/detail.vue
@@ -7,14 +7,14 @@
       <div class="select-content">
         <div class="area-content">
           <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect">
-            <img src="./img/local-icon.png" alt="">
+            <img src="img/local-icon.png" alt="">
             <span class="label" v-if="areaName">{{ areaName }}</span>
             <span v-else>请选择</span>
             <u-icon name="arrow-down" color="#666" size="24" />
           </AiAreaPicker>
         </div>
         <div class="search-input" v-if="tabIndex">
-          <img src="./img/search-icon.png" alt="">
+          <img src="img/search-icon.png" alt="">
           <u-input type="text" placeholder="请输入姓名" placeholder-style="color:#999;font-size:13px;" height="18" v-model="name" @confirm="getUserList" :clearable="false" maxlength="6" />
         </div>
       </div>
@@ -45,12 +45,12 @@
       <div class="item-content" v-for="(item, index) in userList" :key="index">
         <div class="title" @click="showUserType(index)">
           <h2>{{item.label}}</h2>
-          <img src="./img/down-icon.png" alt="" :class="item.check ? 'img-active' : ''">
+          <img src="img/down-icon.png" alt="" :class="item.check ? 'img-active' : ''">
         </div>
         <div class="user-list" v-if="item.check">
           <div class="user-item" v-for="(e, indexs) in item.value" :key="indexs" v-if="item.value && item.value.length">
             <div class="user-img">
-              <img src="./img/user-img.png" alt="">
+              <img src="img/user-img.png" alt="">
             </div>
             <div class="user-info">
               <p class="name">{{e.name}}</p>
@@ -111,7 +111,7 @@ export default {
       this.getStatistic()
       this.getStatisticMon()
       this.getUserList()
-    },  
+    },
     tabClick(index) {
       this.tabIndex = index
     },
@@ -181,7 +181,7 @@ export default {
         })
         this.userList[index].check = true
       }
-     
+
     }
   }
 }
@@ -403,4 +403,4 @@ export default {
     color: #FFF;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue b/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue
index 5972a370..b86ab1d3 100644
--- a/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue
+++ b/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue
@@ -9,7 +9,7 @@
       </div> -->
       <div class="area-content">
         <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect">
-          <img src="./img/local-icon.png" alt="">
+          <img src="img/local-icon.png" alt="">
           <span class="label" v-if="areaName">{{ areaName }}</span>
           <span v-else>请选择</span>
           <u-icon name="arrow-down" color="#666" size="24" />
@@ -21,7 +21,7 @@
       <img src="./img/off-icon.png" alt="" class="mar-l40">离线 {{count.sum - count.online || 0}} -->
       <div class="item">
         <div id="echarts" style="width:100%;height:100%;"></div>
-        <img src="./img/monitor-icon.png" alt="" class="monitor-icon">
+        <img src="img/monitor-icon.png" alt="" class="monitor-icon">
       </div>
       <div class="item">
         <h3>{{count.online || 0}}</h3>
@@ -52,10 +52,10 @@
     <div class="list-content">
       <div class="item" v-for="(item, index) in list" :key="index" @click="showMonitor(item)">
         <img class="img" :src="item.indexUrl" alt="" v-if="item.deviceStatus == 1">
-        <img class="img" src="./img/offline.png" alt="" v-else>
+        <img class="img" src="img/offline.png" alt="" v-else>
         <p>{{item.name}}</p>
-        <img class="icon" src="./img/play-icon.png" alt="" v-if="item.deviceStatus == 1">
-        <img class="icon" src="./img/not-play-icon.png" alt="" v-else>
+        <img class="icon" src="img/play-icon.png" alt="" v-if="item.deviceStatus == 1">
+        <img class="icon" src="img/not-play-icon.png" alt="" v-else>
       </div>
       <AiEmpty v-if="!list.length"/>
     </div>
@@ -173,7 +173,7 @@ export default {
     },
   },
   created() {
-    
+
     this.areaId = this.user.areaId
     this.areaName = this.user.areaName
     this.getList()
@@ -183,7 +183,7 @@ export default {
     document.title = '视频监控'
   },
   mounted() {
-    this.Echart = echarts.init(document.getElementById('echarts'))     
+    this.Echart = echarts.init(document.getElementById('echarts'))
   }
 }
 </script>
diff --git a/src/apps/AppWorkonline/AppWorkonline.vue b/src/apps/AppWorkonline/AppWorkonline.vue
index 54f83030..8d70da3b 100644
--- a/src/apps/AppWorkonline/AppWorkonline.vue
+++ b/src/apps/AppWorkonline/AppWorkonline.vue
@@ -44,11 +44,11 @@
 
           <span class="icon">
             <!-- ing -->
-            <img src="./components/ing.png" alt="" v-if="item.approvalStatus == 0" />
+            <img src="components/ing.png" alt="" v-if="item.approvalStatus == 0" />
             <!-- end -->
-            <img src="./components/end.png" alt="" v-if="item.approvalStatus == 1" />
+            <img src="components/end.png" alt="" v-if="item.approvalStatus == 1" />
             <!-- false -->
-            <img src="./components/reject.png" alt="" v-if="item.approvalStatus == 2" />
+            <img src="components/reject.png" alt="" v-if="item.approvalStatus == 2" />
           </span>
         </view>
       </u-card>
diff --git a/src/apps/AppWorkonline/Detail.vue b/src/apps/AppWorkonline/Detail.vue
index 471796b7..c73a1886 100644
--- a/src/apps/AppWorkonline/Detail.vue
+++ b/src/apps/AppWorkonline/Detail.vue
@@ -40,7 +40,7 @@
 
           <!-- 已通过 -->
           <div class="people_status_agree" v-if="list.approvalStatus == 1">
-            <img src="./components/people_status_agree.png" alt="" />
+            <img src="components/people_status_agree.png" alt="" />
           </div>
 
           <!-- 被驳回 -->
@@ -120,7 +120,7 @@
                 </div>
 
                 <div class="avatar" v-else-if="item.title == '抄送'">
-                  <img src="./components/Profile_Picture.png" alt="" />
+                  <img src="components/Profile_Picture.png" alt="" />
                 </div>
 
                 <div class="avatar" v-else>
@@ -128,13 +128,13 @@
                 </div>
 
                 <div class="icon-yes" v-if="item.stepType == 1 || item.stepType == 0 || item.stepType == 3">
-                  <img src="./components/agree.png" alt="" />
+                  <img src="components/agree.png" alt="" />
                 </div>
 
                 <div class="" v-else-if="item.stepType == 2"></div>
 
                 <div class="icon-no" v-else>
-                  <img src="./components/clearn.png" />
+                  <img src="components/clearn.png" />
                 </div>
               </div>
 
diff --git a/src/apps/AppWorkonline/detail.vue b/src/apps/AppWorkonline/detail.vue
deleted file mode 100644
index 471796b7..00000000
--- a/src/apps/AppWorkonline/detail.vue
+++ /dev/null
@@ -1,1385 +0,0 @@
-<template>
-  <div class="details" v-if="pageShow">
-    <div :class="list.approvalStatus == 1 ? 'detail_content' : 'detail_content1'">
-      <!-- 顶部文件预览和查看 -->
-      <div class="top" v-if="list.approvalStatus == 1">
-        <p>审批通过:</p>
-        <div class="save">
-          <div style="display: inline">[{{ this.list.tableInfo.tableName }}]已签署完成,</div>
-          <AiImage preview :file="list.pdfFile" style="display: inline-block; margin-left: 4px"><span class="clicksave">点击查看和保存</span> </AiImage>
-        </div>
-      </div>
-
-      <div class="form">
-        <!-- 审批表单名称 -->
-        <text class="text">{{ list.processDefName }}</text>
-
-        <div class="people">
-          <!-- 左 -->
-          <div class="people_msg">
-            <!-- 圆形头像 -->
-            <div class="avatar">
-              <span v-if="list.createUserAvatar"><img :src="list.createUserAvatar" alt="" style="width: 100%; height: 100%; border-radius: 50%" /></span>
-              <span v-else> {{ formatName(list.createUserName) }}</span>
-            </div>
-
-            <text class="name">
-              <!-- 姓名 -->
-              <p class="name_con">{{ list.createUserName }}</p>
-              <!-- 日期 -->
-              <p class="name_createtime">{{ list.createTime }}</p>
-            </text>
-          </div>
-
-          <!-- 右 -->
-          <!-- 审批状态 -->
-          <!-- 审批中 -->
-          <div class="people_status_ing" v-if="list.approvalStatus == 0">
-            {{ $dict.getLabel('listApprovalStatusHb', list.approvalStatus) }}
-          </div>
-
-          <!-- 已通过 -->
-          <div class="people_status_agree" v-if="list.approvalStatus == 1">
-            <img src="./components/people_status_agree.png" alt="" />
-          </div>
-
-          <!-- 被驳回 -->
-          <div class="people_status_reject" v-if="list.approvalStatus == 2">
-            {{ $dict.getLabel('listApprovalStatusHb', list.approvalStatus) }}
-          </div>
-        </div>
-
-        <!-- 表头内容 -->
-        <div class="content">
-          <div class="item">
-            <span class="item_info">所属类型：</span>
-            <span class="zhuf"> {{ list.classificationName }}</span>
-          </div>
-
-          <div class="item">
-            <span class="item_info">所属部门：</span>
-            <span class="liangzhu">
-              {{ $dict.getLabel('hbDepartment', list.department) }}
-            </span>
-          </div>
-
-          <div class="item">
-            <span class="item_info">审批编号：</span>
-            <span class="liangzhu">{{ list.serialNumber }}</span>
-          </div>
-
-          <div class="item">
-            <div class="item_info">
-              <span class="annexs">附件资料：</span>
-              <div class="img_text" v-for="(item, indexs) in list.annexs" :key="indexs">
-                <AiImage :src="item.annexFile.url" preview />
-                <span class="text">{{ item.annexName }}</span>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <!-- tabs栏 -->
-      <u-tabs class="tabs" :list="list_tabs" height="96" active-color="#1365dd" inactive-color="#999" bar-width="374" font-size="30" :is-scroll="false" :current="current" @change="change"></u-tabs>
-
-      <!-- 表单申请的折叠窗 -->
-      <div style="background-color: #fff" v-if="current == 0">
-        <div class="collapse">
-          <u-collapse event-type="close" :arrow="true" :accordion="true">
-            <u-collapse-item v-if="item.length > 0" v-for="(item, index) in inforlist" :title="item[0].groupName" :open="true" :key="index">
-              <div v-for="(items, indexs) in item" :key="indexs">
-                <div class="item_msg">
-                  <!-- 左 -->
-                  <span class="msg_lef">{{ items.fieldName }}</span>
-                  <!-- 右 -->
-                  <!-- 字典值 items.dictionaryCode -->
-                  <span class="msg_lright" v-if="items.fieldDataType != 5">{{ $dict.getLabel(items.dictionaryCode, items.fieldValue) }}</span>
-                  <span class="msg_lright" v-else>
-                    <span v-for="(itemL, indexL) in items.fieldValue" :key="indexL"
-                      >{{ $dict.getLabel(items.dictionaryCode, itemL) }}
-                      <!-- <span v-if="indexL < items.fieldValue.length - 1">,</span> -->
-                    </span>
-                  </span>
-                </div>
-              </div>
-            </u-collapse-item>
-          </u-collapse>
-        </div>
-      </div>
-
-      <!-- 流程信息 -->
-      <div v-if="current == 1" class="workflow">
-        <div class="step-list">
-          <div class="step-item" v-for="(item, index) in stepList" :key="index">
-            <div class="item-left">
-              <div class="item-left-ava-icon">
-                <div class="avatar" v-if="item.userName">
-                  <span v-if="item.stepAvatar"><img :src="item.stepAvatar" alt="" style="width: 100%; height: 100%; border-radius: 50%" /></span>
-                  <span v-else> {{ formatName(item.userName) }}</span>
-                </div>
-
-                <div class="avatar" v-else-if="item.title == '抄送'">
-                  <img src="./components/Profile_Picture.png" alt="" />
-                </div>
-
-                <div class="avatar" v-else>
-                  <div v-for="(item3, indexs) in item.candidates" :key="indexs">{{ formatName(item3.name) }}</div>
-                </div>
-
-                <div class="icon-yes" v-if="item.stepType == 1 || item.stepType == 0 || item.stepType == 3">
-                  <img src="./components/agree.png" alt="" />
-                </div>
-
-                <div class="" v-else-if="item.stepType == 2"></div>
-
-                <div class="icon-no" v-else>
-                  <img src="./components/clearn.png" />
-                </div>
-              </div>
-
-              <div :class="item.stepType == 1 || item.stepType == 0 || item.stepType == 3 ? 'solid' : 'dashed'"></div>
-            </div>
-
-            <div class="item-right">
-              <div class="time-info">
-                <div>{{ item.title }}</div>
-                <span>{{ item.approvalTime }}</span>
-              </div>
-              <div class="item-right-flex">
-                <span class="title2">{{ item.title2 }}<span class="color-2EA222" v-if="item.stepIndex == 1">(发起)</span></span>
-
-                <span class="title2Desc-ing" v-if="item.stepType == 9">{{ item.title2Desc }}</span>
-
-                <span class="title2Desc-false" v-else-if="item.stepType == 2">{{ item.title2Desc }}</span>
-
-                <span class="title2Desc" v-else>{{ item.title2Desc }}</span>
-
-                <div class="user-list">
-                  <div class="item-right-flex-left-name" v-for="(items, i) in item.candidates" :key="i">
-                    <span class="avatar" v-if="items.name">{{ formatName(items.name) }}</span>
-                    <span class="avatar-name" v-if="items.name">{{ items.name }}</span>
-                  </div>
-                </div>
-
-                <div v-for="(item2, inde2) in item.candidateFieldInfos" :key="inde2" v-if="item.candidateFieldInfos">
-                  <span>{{ item2.fieldName }}&nbsp;:&nbsp;</span>
-                  <span>{{ item2.fieldValue }}</span>
-                </div>
-
-                <!-- <div v-for="(item4, indexsss) in stepList" :key="indexsss">
-                  <span>{{ item4.fieldName }}&nbsp;:&nbsp;</span>
-                  <span>{{ item4.fieldValue }}</span>
-                </div> -->
-
-                <span v-if="item.stepType == 2">审批意见:{{ item.opinion }}</span>
-
-                <div class="examine" v-if="item.stepType == 2">
-                  <div class="examine_docx1">
-                    <div class="examine_img" v-if="item.pictureFiles && item.pictureFiles.length > 0" style="">
-                      <AiImage preview :src="pic.url" v-for="pic in item.pictureFiles" :key="pic.id" style="width: 65px; height: 75px; float: left; margin-left: 6px; margin-bottom: 4px; overflow: hidden" />
-                    </div>
-
-                    <div v-if="item.annexFiles && item.annexFiles.length > 0">
-                      <div v-for="annex in item.annexFiles" :key="annex.id" class="docx">
-                        <AiImage :file="annex" preview>
-                          <u-row justify="space-between">
-                            <span class="docx-name">{{ annex.name }}</span>
-                            <span>{{ annex.fileSizeStr }}</span>
-                          </u-row>
-                        </AiImage>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-
-                <div class="examine" v-if="item.stepType == 1 || item.stepType == 0 || item.stepType == 3">
-                  <div class="examine_docx1">
-                    <div class="examine_img" v-if="item.pictureFiles && item.pictureFiles.length > 0" style="">
-                      <AiImage preview :src="pic.url" v-for="pic in item.pictureFiles" :key="pic.id" style="width: 69px; height: 75px; float: left; margin-left: 4px; margin-bottom: 4px; overflow: hidden" />
-                    </div>
-
-                    <div v-if="item.annexFiles && item.annexFiles.length > 0">
-                      <div v-for="annex in item.annexFiles" :key="annex.id" class="docx">
-                        <AiImage :file="annex" preview>
-                          <u-row justify="space-between">
-                            <span class="docx-name">{{ annex.name }}</span>
-                            <span>{{ annex.fileSizeStr }}</span>
-                          </u-row>
-                        </AiImage>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="reject_agree" v-if="canApproval && list.approvalStatus == 0">
-      <div class="reject" @click="agree(0)">拒绝</div>
-      <div class="agree" @click="agree(1)">同意</div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'Detail',
-  components: {},
-  computed: {
-    canApproval() {
-      return this.listType == 0
-    },
-  },
-  onLoad(options) {
-    this.objid = options.id
-    this.listType = options.listType
-    this.getDetail()
-  },
-  onShow() {
-    document.title = '审批详情'
-  },
-  data() {
-    return {
-      objid: '',
-      list: [],
-      list_tabs: [
-        {
-          name: '申请表单',
-        },
-        {
-          name: '流程信息',
-        },
-      ],
-      current: 0,
-      inforlist: [],
-      stepList: [],
-      dictList: ['hbDepartment'],
-      pageShow: false,
-      listType: 0,
-      eventChannel: null,
-    }
-  },
-  // 方法
-  methods: {
-    formatName(name) {
-      if (name == undefined) {
-        return
-      }
-      return name.substr(name.length - 2, name.length > 2 ? name.length - 1 : name.length)
-    },
-    getDetail() {
-      this.$http.post(`/app/approv-alapply-info/info-id-table?id=${this.objid}`).then((res) => {
-        if (res.code == 0) {
-          if (res.data) {
-            this.list = res.data
-
-            // if (res.data.createUserAvatar) {
-            //   console.log(res.data.createUserAvatar)
-            // }
-
-            this.inforlist = [[], [], [], [], [], [], [], [], [], []]
-            res.data.tableInfo.tableFieldInfos.map((item) => {
-              if (item.groupIndex) {
-                this.inforlist[item.groupIndex - 1].push(item)
-              }
-
-              if (item.dictionaryCode) {
-                this.dictList.push(item.dictionaryCode)
-              }
-              if (item.fieldDataType == 5) {
-                // item.fieldValue = item.fieldValue.split(',')
-              }
-            })
-
-            this.$dict.load(this.dictList).then(() => {
-              this.pageShow = true
-            })
-          }
-        }
-      })
-
-      this.$http.post(`/app/approv-alapply-info/processinfo-id2?id=${this.objid}`).then((res) => {
-        if (res.code == 0) {
-          if (res.data) {
-            this.stepList = res.data
-            // this.getDetail()
-            // console.log(this.stepList)
-            // res.data.map((item) => {
-            //   if (item.candidateFieldInfos) {
-            //     item.candidateFieldInfos.map((items) => {
-            //       console.log(items.fieldName)
-            //       console.log(items.fieldValue)
-            //     })
-            //   }
-            // })
-          }
-        }
-      })
-    },
-
-    change(i) {
-      this.current = i
-    },
-
-    agree(type) {
-      this.$http
-        .post(`/app/approv-alapply-info/approval-popup?type=${type}&id=${this.objid}`)
-        .then((res) => {
-          if (res.code == 0) {
-            uni.navigateTo({
-              url: `./Opinion?id=${this.objid}&type=${type}`,
-            })
-          }
-        })
-        .catch((e) => {
-          uni.showToast({
-            title: e,
-            icon: 'none',
-          })
-        })
-    },
-  },
-}
-</script>
-
-<style scoped lang="scss">
-.details {
-  .color-2EA222 {
-    color: #2ea222;
-    margin-left: 8px;
-  }
-  .detail_content1 {
-    background-color: #fff;
-    padding-bottom: 348px;
-
-    .top {
-      background-color: #eff4ff;
-      height: 144px;
-      padding: 32px 0 0 32px;
-      color: #3a7ee2;
-      font-size: 28px;
-
-      .save {
-        margin-top: 8px;
-
-        .clicksave {
-          text-decoration: underline;
-        }
-      }
-    }
-
-    .form {
-      padding: 32px;
-      background-color: #fff;
-
-      .text {
-        font-size: 40px;
-        font-weight: 800;
-      }
-
-      .people {
-        display: flex;
-        // align-items: center;
-        justify-content: space-between;
-        // margin-top: 20px;
-        height: 122px;
-        line-height: 122px;
-        border-bottom: 1px solid #eee;
-        padding-bottom: 15px;
-
-        .people_msg {
-          .avatar {
-            display: inline-block;
-            width: 84px;
-            height: 84px;
-            line-height: 84px;
-            border-radius: 50%;
-            background-color: #2266ff;
-            color: #fff;
-            font-size: 28px;
-            vertical-align: middle;
-            text-align: center;
-            margin-right: 10px;
-          }
-
-          .name {
-            display: inline-block;
-            width: 145px;
-            vertical-align: middle;
-
-            .name_con {
-              font-size: 30px;
-              height: 40px;
-            }
-
-            .name_createtime {
-              color: #999;
-              font-size: 24px;
-              height: 120px;
-              width: 400px;
-            }
-          }
-        }
-
-        .people_status_ing {
-          color: #ff8822;
-          text-align: center;
-        }
-
-        .people_status_agree {
-          width: 192px;
-          height: 192px;
-
-          img {
-            width: 192px;
-            height: 192px;
-            margin-top: -60px;
-          }
-        }
-
-        .people_status_reject {
-          color: #f14242;
-          text-align: center;
-        }
-      }
-
-      .content {
-        margin-top: 16px;
-
-        .item {
-          margin-top: 16px;
-
-          .item_info {
-            display: inline;
-            font-size: 30px;
-            font-weight: 400;
-            color: #999999;
-
-            .annexs {
-              vertical-align: top;
-            }
-
-            .img_text {
-              display: inline-block;
-              position: relative;
-              width: 180px;
-              height: 175px;
-
-              img {
-                width: 180px;
-                height: 100%;
-              }
-
-              .text {
-                position: absolute;
-                bottom: 14px;
-                // text-align: center;
-                left: 0;
-                width: 160px;
-                font-size: 12px;
-                height: 40px;
-                line-height: 40px;
-                text-align: center;
-                color: #fff;
-                background-color: #000;
-                opacity: 0.4;
-              }
-            }
-          }
-
-          .zhuf {
-            font-size: 30px;
-            font-weight: 400;
-            color: #1365dd;
-          }
-
-          .liangzhu {
-            font-size: 30px;
-            font-weight: 400;
-            color: #343d65;
-          }
-        }
-      }
-    }
-
-    .tabs {
-      // margin-top: 16px;
-    }
-
-    .info {
-      height: 16px;
-      width: 100%;
-      background-color: #eee;
-    }
-
-    // 表单申请
-    .collapse {
-      // margin: 0 32px;
-      // padding: 0 32px;
-      ::v-deep .u-collapse {
-        // background-color: #fff;
-      }
-
-      ::v-deep .u-collapse-head {
-        background-color: #fff;
-        padding: 0 32px;
-        height: 96px;
-      }
-
-      ::v-deep .u-collapse-body {
-        padding: 0 32px;
-        background-color: #fafafa;
-
-        .u-collapse-content {
-          .item_msg {
-            display: flex;
-            // align-items: center;
-            justify-content: space-between;
-            padding: 10px 0;
-
-            .msg_lef {
-              width: 350px;
-              font-size: 30px;
-              font-weight: 400;
-              color: #999999;
-            }
-
-            .msg_lright {
-              max-width: 420px;
-              word-break: break-all;
-              // word-wrap: break-word;
-              margin-right: 0;
-              font-size: 30px;
-              font-weight: 400;
-              color: #333333;
-            }
-          }
-
-          .account {
-            // .account_leave {
-            // }
-            .account_house {
-              margin: 10px 0;
-              color: #333;
-              font-size: 30px;
-            }
-          }
-        }
-      }
-    }
-
-    // 流程信息
-    .workflow {
-      background-color: #fff;
-      padding: 24px 32px 40px 32px;
-
-      // 发起申请步骤
-
-      .step-list {
-        .step-item {
-          display: flex;
-          position: relative;
-          justify-content: space-between;
-          padding-bottom: 40px;
-
-          .item-left {
-            .item-left-ava-icon {
-              position: relative;
-
-              .avatar {
-                display: inline-block;
-                width: 80px;
-                height: 80px;
-                line-height: 80px;
-                border-radius: 50%;
-                background-color: #2266ff;
-                color: #fff;
-                font-size: 28px;
-                text-align: center;
-                z-index: 999;
-
-                img {
-                  width: 48px;
-                  height: 48px;
-                }
-              }
-
-              .icon-yes {
-                position: absolute;
-                top: 50px;
-                left: 50px;
-                width: 36px;
-                height: 36px;
-                border-radius: 50%;
-                text-align: center;
-                vertical-align: middle;
-                img {
-                  width: 36px;
-                  height: 36px;
-                }
-              }
-
-              .icon-no {
-                position: absolute;
-                top: 50px;
-                left: 50px;
-                width: 36px;
-                height: 36px;
-                background: #ff8822;
-                border-radius: 50%;
-                text-align: center;
-                vertical-align: middle;
-
-                img {
-                  width: 36px;
-                  height: 36px;
-                }
-              }
-            }
-
-            .solid {
-              height: calc(100%);
-              border-left: 4px solid #eee;
-              position: absolute;
-              top: 80px;
-              left: 40px;
-            }
-
-            .dashed {
-              height: calc(100%);
-              border-left: 4px dashed #eee;
-              position: absolute;
-              top: 80px;
-              left: 40px;
-            }
-          }
-
-          .item-right {
-            width: 590px;
-
-            .item-right-flex {
-              // display: flex;
-              // justify-content: space-between;
-              // align-items: center;
-              .block {
-                display: block;
-                // margin-top: 124px;
-              }
-
-              .title2 {
-                display: inline-block;
-              }
-
-              .title2Desc {
-                display: inline-block;
-                color: #2ea222;
-                margin-left: 10px;
-              }
-
-              .title2Desc-ing {
-                display: inline-block;
-                color: #ff8822;
-                margin-left: 10px;
-              }
-
-              .title2Desc-false {
-                color: #f14242;
-                display: inline-block;
-                margin-left: 10px;
-              }
-
-              .user-list {
-                overflow: hidden;
-              }
-
-              .item-right-flex-left-name {
-                margin-top: 20px;
-                float: left;
-                margin-right: 16px;
-                text-align: center;
-
-                .avatar {
-                  display: inline-block;
-                  width: 64px;
-                  height: 64px;
-                  line-height: 64px;
-                  border-radius: 50%;
-                  background-color: #2266ff;
-                  color: #fff;
-                  font-size: 28px;
-                  vertical-align: middle;
-                  text-align: center;
-                  // margin-left: 8px;
-                }
-
-                .avatar-name {
-                  display: block;
-                }
-              }
-
-              .examine {
-                p {
-                  margin: 6px 0;
-                  font-size: 12px;
-                }
-
-                .examine_img {
-                  //  float: left;
-                  // display: flex;
-                  // flex-wrap: wrap;
-                  // justify-content: space-between;
-                  // img {
-                  //   width: 134px;
-                  //   height: 136px;
-                  //   margin-right: 8px;
-                  // }
-                  // ::v-deep.AiImage {
-                  //   ::v-deep.u-image__image {
-                  //     width: 60px !important;
-                  //     height: 60px;
-                  //   }
-                  // }
-                }
-              }
-
-              .examine_docx1 {
-                .docx {
-                  display: flex;
-                  align-items: center;
-                  justify-content: space-between;
-                  width: 556px;
-                  padding: 16px;
-                  background-color: #ddd;
-                  margin: 6px 0;
-
-                  .docx-name {
-                    width: 440px;
-                    margin: 0 8px;
-                    overflow: hidden;
-                    white-space: nowrap;
-                    text-overflow: ellipsis;
-                  }
-                }
-              }
-            }
-
-            .time-info {
-              display: flex;
-              justify-content: space-between;
-
-              span {
-                color: #999;
-                font-size: 28px;
-              }
-            }
-          }
-        }
-
-        .step-item:first-child {
-          .item-right {
-            .item-right-flex {
-              .block {
-                margin-top: 0 !important;
-              }
-            }
-          }
-        }
-
-        .step-item:last-child {
-          .dashed {
-            border-left: 0 !important;
-          }
-
-          .solid {
-            border-left: 0 !important;
-          }
-        }
-      }
-    }
-
-    // 抄送人头像
-    .recipients {
-      // display: flex;
-      // justify-content: space-between;
-      // align-items: center;
-      margin: 16px 0 0 120px;
-
-      .recipients_content {
-        // display: inline-block;
-        // width: 64px;
-        // height: 150px;
-        margin-left: 32px;
-
-        .name_ava {
-          display: inline-block;
-          width: 120px;
-          // text-align: center;
-          margin-top: 5px;
-
-          .avatar {
-            display: inline-block;
-            width: 64px;
-            height: 64px;
-            line-height: 64px;
-            border-radius: 50%;
-            background-color: #2266ff;
-            color: #fff;
-            font-size: 28px;
-            vertical-align: middle;
-            text-align: center;
-            // margin-left: 8px;
-          }
-
-          .recipients_name {
-            // display: inline;
-            width: 100px;
-            height: 34px;
-            line-height: 34px;
-            // text-align: center;
-            // background-color: pink;
-            margin-top: 8px;
-          }
-        }
-      }
-
-      // .recipients_content:first-child {
-      //   margin-left: 0;
-      // }
-    }
-  }
-
-  .detail_content {
-    background-color: #fff;
-    padding-bottom: 170px;
-    // padding-bottom: 320px;
-    .top {
-      background-color: #eff4ff;
-      height: 144px;
-      padding: 32px 0 0 32px;
-      color: #3a7ee2;
-      font-size: 28px;
-
-      .save {
-        margin-top: 8px;
-
-        .clicksave {
-          text-decoration: underline;
-        }
-      }
-    }
-
-    .form {
-      padding: 32px;
-      background-color: #fff;
-
-      .text {
-        font-size: 40px;
-        font-weight: 800;
-      }
-
-      .people {
-        display: flex;
-        // align-items: center;
-        justify-content: space-between;
-        // margin-top: 20px;
-        height: 122px;
-        line-height: 122px;
-        border-bottom: 1px solid #eee;
-        padding-bottom: 15px;
-
-        .people_msg {
-          .avatar {
-            display: inline-block;
-            width: 84px;
-            height: 84px;
-            line-height: 84px;
-            border-radius: 50%;
-            background-color: #2266ff;
-            color: #fff;
-            font-size: 28px;
-            vertical-align: middle;
-            text-align: center;
-            margin-right: 10px;
-          }
-
-          .name {
-            display: inline-block;
-            width: 145px;
-            vertical-align: middle;
-
-            .name_con {
-              font-size: 30px;
-              height: 40px;
-            }
-
-            .name_createtime {
-              color: #999;
-              font-size: 24px;
-              height: 120px;
-              width: 400px;
-            }
-          }
-        }
-
-        .people_status_ing {
-          color: #ff8822;
-          text-align: center;
-        }
-
-        .people_status_agree {
-          width: 192px;
-          height: 192px;
-
-          img {
-            width: 192px;
-            height: 192px;
-            margin-top: -60px;
-          }
-        }
-
-        .people_status_reject {
-          color: #f14242;
-          text-align: center;
-        }
-      }
-
-      .content {
-        margin-top: 16px;
-
-        .item {
-          margin-top: 16px;
-
-          .item_info {
-            display: inline;
-            font-size: 30px;
-            font-weight: 400;
-            color: #999999;
-
-            .annexs {
-              // display: inline;
-              vertical-align: top;
-            }
-
-            .img_text {
-              display: inline-block;
-              position: relative;
-              width: 180px;
-              height: 175px;
-
-              img {
-                width: 180px;
-                height: 100%;
-              }
-
-              .text {
-                position: absolute;
-                bottom: 14px;
-                left: -12px;
-                font-size: 12px;
-                width: 160px;
-                height: 40px;
-                line-height: 40px;
-                text-align: center;
-                color: #fff;
-                background-color: #000;
-                opacity: 0.4;
-                margin-left: 12px;
-              }
-            }
-          }
-
-          .zhuf {
-            font-size: 30px;
-            font-weight: 400;
-            color: #1365dd;
-          }
-
-          .liangzhu {
-            font-size: 30px;
-            font-weight: 400;
-            color: #343d65;
-          }
-        }
-      }
-    }
-
-    .tabs {
-      // margin-top: 16px;
-    }
-
-    .info {
-      height: 16px;
-      width: 100%;
-      background-color: #eee;
-    }
-
-    // 表单申请
-    .collapse {
-      // margin: 0 32px;
-      // padding: 0 32px;
-      ::v-deep .u-collapse {
-        // background-color: #fff;
-      }
-
-      ::v-deep .u-collapse-head {
-        background-color: #fff;
-        padding: 0 32px;
-        height: 96px;
-      }
-
-      ::v-deep .u-collapse-body {
-        padding: 0 32px;
-        background-color: #fafafa;
-
-        .u-collapse-content {
-          .item_msg {
-            display: flex;
-            // align-items: center;
-            justify-content: space-between;
-            padding: 10px 0;
-
-            .msg_lef {
-              width: 350px;
-              font-size: 30px;
-              font-weight: 400;
-              color: #999999;
-            }
-
-            .msg_lright {
-              max-width: 420px;
-              word-break: break-all;
-              // word-wrap: break-word;
-              margin-right: 0;
-              font-size: 30px;
-              font-weight: 400;
-              color: #333333;
-            }
-          }
-
-          .account {
-            // .account_leave {
-            // }
-            .account_house {
-              margin: 10px 0;
-              color: #333;
-              font-size: 30px;
-            }
-          }
-        }
-      }
-    }
-
-    // 流程信息
-    .workflow {
-      background-color: #fff;
-      padding: 24px 32px 40px 32px;
-
-      // 发起申请步骤
-
-      .step-list {
-        .step-item {
-          display: flex;
-          position: relative;
-          justify-content: space-between;
-          padding-bottom: 40px;
-
-          .item-left {
-            height: 100%;
-            .item-left-ava-icon {
-              position: relative;
-
-              .avatar {
-                display: inline-block;
-                width: 80px;
-                height: 80px;
-                line-height: 80px;
-                border-radius: 50%;
-                background-color: #2266ff;
-                color: #fff;
-                font-size: 28px;
-                text-align: center;
-                z-index: 999;
-
-                img {
-                  width: 48px;
-                  height: 48px;
-                }
-              }
-
-              .icon-yes {
-                position: absolute;
-                top: 50px;
-                left: 50px;
-                width: 36px;
-                height: 36px;
-                border-radius: 50%;
-                text-align: center;
-                vertical-align: middle;
-
-                img {
-                  width: 36px;
-                  height: 36px;
-                }
-              }
-
-              .icon-no {
-                position: absolute;
-                top: 50px;
-                left: 50px;
-                width: 36px;
-                height: 36px;
-                background: #ff8822;
-                border-radius: 50%;
-                text-align: center;
-                vertical-align: middle;
-
-                img {
-                  width: 36px;
-                  height: 36px;
-                }
-              }
-            }
-
-            .solid {
-              // height: 100%;
-              height: calc(100%);
-              border-left: 4px solid #eee;
-              position: absolute;
-              top: 80px;
-              left: 40px;
-            }
-
-            .dashed {
-              // height: 100%;
-              height: calc(100%);
-              border-left: 4px dashed #eee;
-              position: absolute;
-              top: 80px;
-              left: 40px;
-            }
-          }
-
-          .item-right {
-            width: 590px;
-
-            .item-right-flex {
-              // display: flex;
-              // justify-content: space-between;
-              // align-items: center;
-              .block {
-                display: block;
-                // margin-top: 124px;
-              }
-
-              .title2 {
-                display: inline-block;
-              }
-
-              .title2Desc {
-                display: inline-block;
-                color: #2ea222;
-                margin-left: 10px;
-              }
-
-              .title2Desc-ing {
-                display: inline-block;
-                color: #ff8822;
-                margin-left: 10px;
-              }
-
-              .title2Desc-false {
-                color: #f14242;
-                display: inline-block;
-                margin-left: 10px;
-              }
-
-              .user-list {
-                overflow: hidden;
-              }
-
-              .item-right-flex-left-name {
-                margin-top: 20px;
-                float: left;
-                margin-right: 16px;
-                text-align: center;
-
-                .avatar {
-                  display: inline-block;
-                  width: 64px;
-                  height: 64px;
-                  line-height: 64px;
-                  border-radius: 50%;
-                  background-color: #2266ff;
-                  color: #fff;
-                  font-size: 28px;
-                  vertical-align: middle;
-                  text-align: center;
-                  // margin-left: 8px;
-                }
-
-                .avatar-name {
-                  display: block;
-                }
-              }
-
-              .examine {
-                p {
-                  margin: 6px 0;
-                  font-size: 12px;
-                }
-
-                .examine_img {
-                  // display: flex;
-                  // flex-wrap: wrap;
-                  // justify-content: space-between;
-                  // float: left;
-                  // img {
-                  //   width: 134px;
-                  //   height: 136px;
-                  //   margin-right: 8px;
-                  // }
-                  // ::v-deep.AiImage {
-                  //   ::v-deep.u-image__image {
-                  //     width: 60px !important;
-                  //     height: 60px;
-                  //   }
-                  // }
-                }
-              }
-
-              .examine_docx1 {
-                .docx {
-                  display: flex;
-                  justify-content: space-between;
-                  width: 556px;
-                  padding: 16px;
-                  background-color: #ddd;
-                  margin: 6px 0;
-
-                  .docx-name {
-                    width: 440px;
-                    overflow: hidden;
-                    white-space: nowrap;
-                    text-overflow: ellipsis;
-                  }
-                }
-              }
-            }
-
-            .time-info {
-              display: flex;
-              justify-content: space-between;
-
-              span {
-                color: #999;
-                font-size: 28px;
-              }
-            }
-          }
-        }
-
-        .step-item:first-child {
-          .item-right {
-            .item-right-flex {
-              .block {
-                margin-top: 0 !important;
-              }
-            }
-          }
-        }
-
-        .step-item:last-child {
-          .dashed {
-            border-left: 0 !important;
-          }
-
-          .solid {
-            border-left: 0 !important;
-          }
-        }
-      }
-    }
-
-    // 抄送人头像
-    .recipients {
-      // display: flex;
-      // justify-content: space-between;
-      // align-items: center;
-      margin: 16px 0 0 120px;
-
-      .recipients_content {
-        // display: inline-block;
-        // width: 64px;
-        // height: 150px;
-        margin-left: 32px;
-
-        .name_ava {
-          display: inline-block;
-          width: 120px;
-          // text-align: center;
-          margin-top: 5px;
-
-          .avatar {
-            display: inline-block;
-            width: 64px;
-            height: 64px;
-            line-height: 64px;
-            border-radius: 50%;
-            background-color: #2266ff;
-            color: #fff;
-            font-size: 28px;
-            vertical-align: middle;
-            text-align: center;
-            // margin-left: 8px;
-          }
-
-          .recipients_name {
-            // display: inline;
-            width: 100px;
-            height: 34px;
-            line-height: 34px;
-            // text-align: center;
-            // background-color: pink;
-            margin-top: 8px;
-          }
-        }
-      }
-
-      // .recipients_content:first-child {
-      //   margin-left: 0;
-      // }
-    }
-  }
-}
-
-.reject_agree {
-  position: fixed;
-  bottom: 0;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  width: 100%;
-  line-height: 112px;
-  text-align: center;
-  border-top: 1px solid #ddd;
-  z-index: 999;
-  background: #fff;
-
-  .reject {
-    background-color: #fff;
-    width: 50%;
-    color: red;
-  }
-
-  .agree {
-    height: 112px;
-    width: 50%;
-    background-color: #1365dd;
-    color: #fff;
-  }
-}
-</style>
diff --git a/src/apps/AppActive/ActiveDetail.vue b/src/pending/AppActive/ActiveDetail.vue
similarity index 100%
rename from src/apps/AppActive/ActiveDetail.vue
rename to src/pending/AppActive/ActiveDetail.vue
diff --git a/src/apps/AppActive/AddActive.vue b/src/pending/AppActive/AddActive.vue
similarity index 99%
rename from src/apps/AppActive/AddActive.vue
rename to src/pending/AppActive/AddActive.vue
index 15c85edf..e73dfd4b 100644
--- a/src/apps/AppActive/AddActive.vue
+++ b/src/pending/AppActive/AddActive.vue
@@ -176,7 +176,6 @@ export default {
         status: 0,
         createUserId: '',
         createUserName: '',
-        orgName: '',
         avatar: '',
         id: '',
         orgId: '',
@@ -216,7 +215,7 @@ export default {
     this.getEstates()
   },
   onShow() {
-    document.title = '编辑活动' 
+    document.title = '编辑活动'
   },
   methods: {
     getEstates() {
diff --git a/src/apps/AppActive/AddPosts.vue b/src/pending/AppActive/AddPosts.vue
similarity index 100%
rename from src/apps/AppActive/AddPosts.vue
rename to src/pending/AppActive/AddPosts.vue
diff --git a/src/apps/AppActive/AppActive.vue b/src/pending/AppActive/AppActive.vue
similarity index 99%
rename from src/apps/AppActive/AppActive.vue
rename to src/pending/AppActive/AppActive.vue
index bda43d76..13deb0b2 100644
--- a/src/apps/AppActive/AppActive.vue
+++ b/src/pending/AppActive/AppActive.vue
@@ -36,7 +36,7 @@
         <div class="header-title">
           <p class="text">活动列表</p>
         <div class="right-select" @click="showSelect=true">
-            {{selectText}}<img src="./components/right-icon-666.png" alt="" />
+            {{selectText}}<img src="components/right-icon-666.png" alt="" />
           </div>
         </div>
       </div>
@@ -57,7 +57,7 @@
             </div>
             <p class="conent-text">{{ item.content }}</p>
             <div class="img-list" v-if="item.images.length">
-              <image v-for="(img, i) in item.images" :key="i" :src="img.url" @click.stop="previewImage(item.images, img.url)" v-if="i<3">
+              <image v-for="(img, i) in item.images" :key="i" :src="img.url" @click.stop="previewImage(item.images, img.url)" v-if="i<3"/>
             </div>
             <div class="bottom-icon">
               <div>
@@ -134,7 +134,6 @@ export default {
   },
   data() {
     return {
-      list: [],
       isMore: false,
       current: 0,
       pageShow: false,
@@ -641,4 +640,4 @@ export default {
 .mar-t32{
   margin-top: 32px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/apps/AppActive/Detail.vue b/src/pending/AppActive/Detail.vue
similarity index 100%
rename from src/apps/AppActive/Detail.vue
rename to src/pending/AppActive/Detail.vue
diff --git a/src/apps/AppActive/SignUser.vue b/src/pending/AppActive/SignUser.vue
similarity index 94%
rename from src/apps/AppActive/SignUser.vue
rename to src/pending/AppActive/SignUser.vue
index 45aa8c1b..6f530ad8 100644
--- a/src/apps/AppActive/SignUser.vue
+++ b/src/pending/AppActive/SignUser.vue
@@ -24,8 +24,8 @@
           </div>
           <div class="right">
             <span>{{formatPhone(item.phone)}}</span>
-            <img src="./components/phone-icon.png" alt="" v-if="isAdmin" @click="callPhone(item.phone)">
-            <img src="./components/del-icon.png" alt="" v-if="isAdmin && status < 2" @click="del(item.id)">
+            <img src="components/phone-icon.png" alt="" v-if="isAdmin" @click="callPhone(item.phone)">
+            <img src="components/del-icon.png" alt="" v-if="isAdmin && status < 2" @click="del(item.id)">
           </div>
         </div>
       </div>
@@ -161,4 +161,4 @@ export default {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/apps/AppActive/components/del-icon.png b/src/pending/AppActive/components/del-icon.png
similarity index 100%
rename from src/apps/AppActive/components/del-icon.png
rename to src/pending/AppActive/components/del-icon.png
diff --git a/src/apps/AppActive/components/phone-icon.png b/src/pending/AppActive/components/phone-icon.png
similarity index 100%
rename from src/apps/AppActive/components/phone-icon.png
rename to src/pending/AppActive/components/phone-icon.png
diff --git a/src/apps/AppActive/components/right-icon-666.png b/src/pending/AppActive/components/right-icon-666.png
similarity index 100%
rename from src/apps/AppActive/components/right-icon-666.png
rename to src/pending/AppActive/components/right-icon-666.png
diff --git a/src/apps/AppHandSnapshot/AppHandSnapshot.vue b/src/pending/AppHandSnapshot/AppHandSnapshot.vue
similarity index 99%
rename from src/apps/AppHandSnapshot/AppHandSnapshot.vue
rename to src/pending/AppHandSnapshot/AppHandSnapshot.vue
index cb62a0ba..3ec6cb66 100644
--- a/src/apps/AppHandSnapshot/AppHandSnapshot.vue
+++ b/src/pending/AppHandSnapshot/AppHandSnapshot.vue
@@ -65,7 +65,6 @@ export default {
         },
       ],
       currentTabs: 0,
-      current: 0,
       current: 1,
       size: 10,
       pages: 0,
diff --git a/src/apps/AppHandSnapshot/Detail.vue b/src/pending/AppHandSnapshot/Detail.vue
similarity index 100%
rename from src/apps/AppHandSnapshot/Detail.vue
rename to src/pending/AppHandSnapshot/Detail.vue
diff --git a/src/apps/AppHandSnapshot/DoThings.vue b/src/pending/AppHandSnapshot/DoThings.vue
similarity index 100%
rename from src/apps/AppHandSnapshot/DoThings.vue
rename to src/pending/AppHandSnapshot/DoThings.vue
diff --git a/src/apps/AppHandSnapshot/Reject.vue b/src/pending/AppHandSnapshot/Reject.vue
similarity index 100%
rename from src/apps/AppHandSnapshot/Reject.vue
rename to src/pending/AppHandSnapshot/Reject.vue
diff --git a/src/apps/AppHandSnapshot/Selecter.vue b/src/pending/AppHandSnapshot/Selecter.vue
similarity index 100%
rename from src/apps/AppHandSnapshot/Selecter.vue
rename to src/pending/AppHandSnapshot/Selecter.vue
diff --git a/src/apps/AppHandSnapshot/Transfer.vue b/src/pending/AppHandSnapshot/Transfer.vue
similarity index 100%
rename from src/apps/AppHandSnapshot/Transfer.vue
rename to src/pending/AppHandSnapshot/Transfer.vue
diff --git a/src/apps/AppHandSnapshot/components/1.png b/src/pending/AppHandSnapshot/components/1.png
similarity index 100%
rename from src/apps/AppHandSnapshot/components/1.png
rename to src/pending/AppHandSnapshot/components/1.png
diff --git a/src/apps/AppHandSnapshot/components/22.png b/src/pending/AppHandSnapshot/components/22.png
similarity index 100%
rename from src/apps/AppHandSnapshot/components/22.png
rename to src/pending/AppHandSnapshot/components/22.png
diff --git a/src/apps/AppHandSnapshot/components/yan.jpg b/src/pending/AppHandSnapshot/components/yan.jpg
similarity index 100%
rename from src/apps/AppHandSnapshot/components/yan.jpg
rename to src/pending/AppHandSnapshot/components/yan.jpg
diff --git a/src/apps/AppInterview/AppInterview.vue b/src/pending/AppInterview/AppInterview.vue
similarity index 100%
rename from src/apps/AppInterview/AppInterview.vue
rename to src/pending/AppInterview/AppInterview.vue
diff --git a/src/apps/AppInterview/interviewDetail.vue b/src/pending/AppInterview/interviewDetail.vue
similarity index 100%
rename from src/apps/AppInterview/interviewDetail.vue
rename to src/pending/AppInterview/interviewDetail.vue
diff --git a/src/apps/AppPovertyAlleviation/AppPovertyAlleviation.vue b/src/pending/AppPovertyAlleviation/AppPovertyAlleviation.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/AppPovertyAlleviation.vue
rename to src/pending/AppPovertyAlleviation/AppPovertyAlleviation.vue
diff --git a/src/apps/AppPovertyAlleviation/Monitor.vue b/src/pending/AppPovertyAlleviation/Monitor.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/Monitor.vue
rename to src/pending/AppPovertyAlleviation/Monitor.vue
diff --git a/src/apps/AppPovertyAlleviation/Monitor/List.vue b/src/pending/AppPovertyAlleviation/Monitor/List.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/Monitor/List.vue
rename to src/pending/AppPovertyAlleviation/Monitor/List.vue
diff --git a/src/apps/AppPovertyAlleviation/Monitor/Statistics.vue b/src/pending/AppPovertyAlleviation/Monitor/Statistics.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/Monitor/Statistics.vue
rename to src/pending/AppPovertyAlleviation/Monitor/Statistics.vue
diff --git a/src/apps/AppPovertyAlleviation/MonitorAdd.vue b/src/pending/AppPovertyAlleviation/MonitorAdd.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/MonitorAdd.vue
rename to src/pending/AppPovertyAlleviation/MonitorAdd.vue
diff --git a/src/apps/AppPovertyAlleviation/MonitorAddFamilyMember.vue b/src/pending/AppPovertyAlleviation/MonitorAddFamilyMember.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/MonitorAddFamilyMember.vue
rename to src/pending/AppPovertyAlleviation/MonitorAddFamilyMember.vue
diff --git a/src/apps/AppPovertyAlleviation/MonitorAddLog.vue b/src/pending/AppPovertyAlleviation/MonitorAddLog.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/MonitorAddLog.vue
rename to src/pending/AppPovertyAlleviation/MonitorAddLog.vue
diff --git a/src/apps/AppPovertyAlleviation/MonitorDetail.vue b/src/pending/AppPovertyAlleviation/MonitorDetail.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/MonitorDetail.vue
rename to src/pending/AppPovertyAlleviation/MonitorDetail.vue
diff --git a/src/apps/AppPovertyAlleviation/MonitorFamilyMember.vue b/src/pending/AppPovertyAlleviation/MonitorFamilyMember.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/MonitorFamilyMember.vue
rename to src/pending/AppPovertyAlleviation/MonitorFamilyMember.vue
diff --git a/src/apps/AppPovertyAlleviation/MonitorFamilySituation.vue b/src/pending/AppPovertyAlleviation/MonitorFamilySituation.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/MonitorFamilySituation.vue
rename to src/pending/AppPovertyAlleviation/MonitorFamilySituation.vue
diff --git a/src/apps/AppPovertyAlleviation/MonitorIncome.vue b/src/pending/AppPovertyAlleviation/MonitorIncome.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/MonitorIncome.vue
rename to src/pending/AppPovertyAlleviation/MonitorIncome.vue
diff --git a/src/apps/AppPovertyAlleviation/MonitorPoorStatus.vue b/src/pending/AppPovertyAlleviation/MonitorPoorStatus.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/MonitorPoorStatus.vue
rename to src/pending/AppPovertyAlleviation/MonitorPoorStatus.vue
diff --git a/src/apps/AppPovertyAlleviation/News.vue b/src/pending/AppPovertyAlleviation/News.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/News.vue
rename to src/pending/AppPovertyAlleviation/News.vue
diff --git a/src/apps/AppPovertyAlleviation/NewsDetail.vue b/src/pending/AppPovertyAlleviation/NewsDetail.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/NewsDetail.vue
rename to src/pending/AppPovertyAlleviation/NewsDetail.vue
diff --git a/src/apps/AppPovertyAlleviation/povertyMonitor.vue b/src/pending/AppPovertyAlleviation/povertyMonitor.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/povertyMonitor.vue
rename to src/pending/AppPovertyAlleviation/povertyMonitor.vue
diff --git a/src/apps/AppPovertyAlleviation/povertyMonitor/List.vue b/src/pending/AppPovertyAlleviation/povertyMonitor/List.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/povertyMonitor/List.vue
rename to src/pending/AppPovertyAlleviation/povertyMonitor/List.vue
diff --git a/src/apps/AppPovertyAlleviation/povertyMonitor/Statistics.vue b/src/pending/AppPovertyAlleviation/povertyMonitor/Statistics.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/povertyMonitor/Statistics.vue
rename to src/pending/AppPovertyAlleviation/povertyMonitor/Statistics.vue
diff --git a/src/apps/AppPovertyAlleviation/povertyMonitorDetail.vue b/src/pending/AppPovertyAlleviation/povertyMonitorDetail.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/povertyMonitorDetail.vue
rename to src/pending/AppPovertyAlleviation/povertyMonitorDetail.vue
diff --git a/src/apps/AppPovertyAlleviation/povertyMonitorForm.vue b/src/pending/AppPovertyAlleviation/povertyMonitorForm.vue
similarity index 100%
rename from src/apps/AppPovertyAlleviation/povertyMonitorForm.vue
rename to src/pending/AppPovertyAlleviation/povertyMonitorForm.vue
diff --git a/src/apps/AppResident/AppResident.vue b/src/pending/AppResident/AppResident.vue
similarity index 98%
rename from src/apps/AppResident/AppResident.vue
rename to src/pending/AppResident/AppResident.vue
index 5b9dd03d..d7e0ce19 100644
--- a/src/apps/AppResident/AppResident.vue
+++ b/src/pending/AppResident/AppResident.vue
@@ -16,7 +16,7 @@ import GroupList from "./components/groupList";
 
 export default {
   name: "AppResident",
-  appName: "居民管理",
+  appName: "居民群管理",
   components: {GroupList, ResidentList, ResidentSta},
   data() {
     return {
diff --git a/src/apps/AppResident/components/document.vue b/src/pending/AppResident/components/document.vue
similarity index 100%
rename from src/apps/AppResident/components/document.vue
rename to src/pending/AppResident/components/document.vue
diff --git a/src/apps/AppResident/components/groupList.vue b/src/pending/AppResident/components/groupList.vue
similarity index 100%
rename from src/apps/AppResident/components/groupList.vue
rename to src/pending/AppResident/components/groupList.vue
diff --git a/src/apps/AppResident/components/info.vue b/src/pending/AppResident/components/info.vue
similarity index 100%
rename from src/apps/AppResident/components/info.vue
rename to src/pending/AppResident/components/info.vue
diff --git a/src/apps/AppResident/components/residentList.vue b/src/pending/AppResident/components/residentList.vue
similarity index 100%
rename from src/apps/AppResident/components/residentList.vue
rename to src/pending/AppResident/components/residentList.vue
diff --git a/src/apps/AppResident/components/residentSta.vue b/src/pending/AppResident/components/residentSta.vue
similarity index 100%
rename from src/apps/AppResident/components/residentSta.vue
rename to src/pending/AppResident/components/residentSta.vue
diff --git a/src/apps/AppResident/components/tagManage.vue b/src/pending/AppResident/components/tagManage.vue
similarity index 100%
rename from src/apps/AppResident/components/tagManage.vue
rename to src/pending/AppResident/components/tagManage.vue
diff --git a/src/apps/AppResident/groupResident.vue b/src/pending/AppResident/groupResident.vue
similarity index 100%
rename from src/apps/AppResident/groupResident.vue
rename to src/pending/AppResident/groupResident.vue
diff --git a/src/apps/AppResident/resident.vue b/src/pending/AppResident/resident.vue
similarity index 100%
rename from src/apps/AppResident/resident.vue
rename to src/pending/AppResident/resident.vue
diff --git a/src/apps/party/AppPartyHistory/AppPartyHistory.vue b/src/pending/party/AppPartyHistory/AppPartyHistory.vue
similarity index 100%
rename from src/apps/party/AppPartyHistory/AppPartyHistory.vue
rename to src/pending/party/AppPartyHistory/AppPartyHistory.vue
diff --git a/src/apps/party/AppPartyHistory/commentList.vue b/src/pending/party/AppPartyHistory/commentList.vue
similarity index 100%
rename from src/apps/party/AppPartyHistory/commentList.vue
rename to src/pending/party/AppPartyHistory/commentList.vue
diff --git a/src/apps/party/AppPartyHistory/detail.vue b/src/pending/party/AppPartyHistory/detail.vue
similarity index 100%
rename from src/apps/party/AppPartyHistory/detail.vue
rename to src/pending/party/AppPartyHistory/detail.vue
diff --git a/src/apps/party/AppPartyOrganization/AppPartyOrganization.vue b/src/pending/party/AppPartyOrganization/AppPartyOrganization.vue
similarity index 100%
rename from src/apps/party/AppPartyOrganization/AppPartyOrganization.vue
rename to src/pending/party/AppPartyOrganization/AppPartyOrganization.vue
diff --git a/src/apps/party/AppPartyStudy/AppPartyStudy.vue b/src/pending/party/AppPartyStudy/AppPartyStudy.vue
similarity index 99%
rename from src/apps/party/AppPartyStudy/AppPartyStudy.vue
rename to src/pending/party/AppPartyStudy/AppPartyStudy.vue
index 3584ab46..397698d2 100644
--- a/src/apps/party/AppPartyStudy/AppPartyStudy.vue
+++ b/src/pending/party/AppPartyStudy/AppPartyStudy.vue
@@ -108,7 +108,7 @@
 </template>
 <script>
 export default {
-  appName: "党员学习",
+  appName: "学习心得",
   data() {
     const currentDate = this.getDate({
       format: true,
diff --git a/src/apps/party/AppPartyStudy/partyStudyContent.vue b/src/pending/party/AppPartyStudy/partyStudyContent.vue
similarity index 100%
rename from src/apps/party/AppPartyStudy/partyStudyContent.vue
rename to src/pending/party/AppPartyStudy/partyStudyContent.vue
diff --git a/src/apps/party/AppPartyStudy/partyStudyDetail.vue b/src/pending/party/AppPartyStudy/partyStudyDetail.vue
similarity index 100%
rename from src/apps/party/AppPartyStudy/partyStudyDetail.vue
rename to src/pending/party/AppPartyStudy/partyStudyDetail.vue
diff --git a/src/apps/party/AppThreeSessions/AppThreeSessions.vue b/src/pending/party/AppThreeSessions/AppThreeSessions.vue
similarity index 100%
rename from src/apps/party/AppThreeSessions/AppThreeSessions.vue
rename to src/pending/party/AppThreeSessions/AppThreeSessions.vue
diff --git a/src/apps/party/AppThreeSessions/qrcode.vue b/src/pending/party/AppThreeSessions/qrcode.vue
similarity index 100%
rename from src/apps/party/AppThreeSessions/qrcode.vue
rename to src/pending/party/AppThreeSessions/qrcode.vue
diff --git a/src/apps/party/AppThreeSessions/threeSessionsContent.vue b/src/pending/party/AppThreeSessions/threeSessionsContent.vue
similarity index 100%
rename from src/apps/party/AppThreeSessions/threeSessionsContent.vue
rename to src/pending/party/AppThreeSessions/threeSessionsContent.vue
diff --git a/src/apps/party/AppThreeSessions/threeSessionsDetail.vue b/src/pending/party/AppThreeSessions/threeSessionsDetail.vue
similarity index 100%
rename from src/apps/party/AppThreeSessions/threeSessionsDetail.vue
rename to src/pending/party/AppThreeSessions/threeSessionsDetail.vue
diff --git a/src/apps/party/AppThreeSessions/threeSessionsUser.vue b/src/pending/party/AppThreeSessions/threeSessionsUser.vue
similarity index 100%
rename from src/apps/party/AppThreeSessions/threeSessionsUser.vue
rename to src/pending/party/AppThreeSessions/threeSessionsUser.vue
diff --git a/src/apps/party/AppThreeSessions/vote.vue b/src/pending/party/AppThreeSessions/vote.vue
similarity index 100%
rename from src/apps/party/AppThreeSessions/vote.vue
rename to src/pending/party/AppThreeSessions/vote.vue