Merge remote-tracking branch 'origin/dev' into dev

src/saas/AppConflictMediation/Content.vue

@@ -14,6 +14,7 @@
 
         <u-form-item :label="status == 2 ? '办结意见':'办理意见'" prop="content" required :border-bottom="false" label-position="top" class="contents">
           <u-input v-model="forms.content" :placeholder="status == 2 ? '请写下你的办结意见…' : '请写下你的办理意见...'" type="textarea" auto-height height="100" maxlength="500" />
+          <span class="limit">{{ form.content.length/200 }}</span>
         </u-form-item>
 
         <div class="line"></div>
@@ -204,6 +205,11 @@ export default {
     }
   }
 
+  .limit {
+    position: fixed;
+    right: 0;
+  }
+
   .btn {
     position: fixed;
     bottom: 0;

src/saas/AppConflictMediation/List.vue

@@ -4,12 +4,8 @@
     <div class="content-box">
       <div class="content-list">
         <div class="list-item" v-for="(item, index) in statisticsList" :key="index">
-          <h3>
-            {{item.value}}
-          </h3>
-          <p>
-            {{item.label}}
-            </p>
+          <h3>{{ item.value }}</h3>
+          <p>{{ item.label }}</p>
         </div>
       </div>
     </div>
@@ -17,7 +13,7 @@
     <!-- 事件列表 -->
     <div class="title">
       <div class="title-name">事件列表</div>
-      <div class="title-type" @click="showGird = true">{{ status? status: '全部' }}<u-icon name="arrow-down"></u-icon></div>
+      <div class="title-type" @click="showGird = true">{{ status? status: '全部类型' }}<u-icon name="arrow-down"></u-icon></div>
     </div>
 
     <template>
@@ -105,8 +101,6 @@ export default {
     })
 
   },
-
-
   onShow() {
     document.title = '矛盾调解'
     this.getList()
@@ -142,7 +136,6 @@ export default {
     },
     getStaticList() {
       this.$http.post('/app/appclapeventinfo/clapEventStatisticByGirdMember').then((res) => {
-        // console.log(res);
         if (res.code == 0){
           for (let i in res.data) {
             var obj = {

src/saas/AppGridManagement/AddFamily.vue

@@ -63,7 +63,7 @@ export default {
   computed: { ...mapState(['user']) },
   methods: {
     getList(){
-      this.$http.post(`/app/appresident/list?areaId=${this.areaId}&householdName=1&current=${this.current}&con=${this.value}`).then((res) => {
+      this.$http.post(`/app/appresident/list?householdName=1&current=${this.current}&con=${this.value}`).then((res) => {
         if (res.code == 0) {
           res.data.records.map((item) => {
             item.checked = false

src/saas/AppGridManagement/Organization.vue

@@ -41,7 +41,7 @@ export default {
   props: ['params'],
   onShow() {
     document.title = '网格管理'
-     
+    this.getGirdUserList()
   },
   mounted() {
     this.userGird = this.params

src/saas/AppInterview/AppInterview.vue

@@ -25,9 +25,14 @@
       <u-loadmore :status="loadmore" color="#999" font-size="24"
                   margin-top="32" margin-bottom="80"/>
     </template>
-    <div class="no-message" v-else>
+    <!-- <div class="no-message" v-else>
       <image src="https://cdn.cunwuyun.cn/wxAdmin/img/message.png"/>
       <p>您还未添加过事务记录<br>点击<b @click="gotoAdd()">新增按钮</b>试试吧~</p>
+    </div> -->
+
+    <div class="empty" v-else>
+      <img src="https://cdn.cunwuyun.cn/dvcp/h5/no-data.png" alt="">
+      <p>您还未添加过事务记录<br/>点击<span @click="gotoAdd()">新增按钮</span>试试吧</p>
     </div>
     <AiFixedBtn>
       <div class="addBtn iconfont iconfont-iconfangda" @tap="gotoAdd()"/>
@@ -125,12 +130,13 @@ export default {
     margin-top: 140px;
     text-align: center;
     color: #888;
-    font-size: 30px;
+    font-size: 28px;
 
-    b {
-      font-size: 32px;
+    b{
+      font-size: 28px;
       color: $uni-color-primary;
       padding: 0 8px;
+      font-weight: 400;
     }
 
     image {
@@ -221,5 +227,23 @@ export default {
       box-sizing: border-box;
     }
   }
+  .empty{
+    height: 100%;
+    img{
+      width: 282px;
+      height: 306px;
+      margin: 168px 0 0 234px;
+    }
+    p{
+      text-align: center;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 44px;
+      span{
+        color: #467DFE;
+      }
+    }
+  }
 }
 </style>

src/saas/AppMailList/AppMailList.vue

@@ -63,7 +63,8 @@ export default {
         params: {
           isPublic: 1,
           resource: "portal",
-          size: 999
+          size: 999,
+          name: this.keyword
         }
       }).then(res => {
         if (res.code == 0) {

src/saas/AppMailList/myAddList.vue

@@ -46,7 +46,6 @@ export default {
     getList() {
       this.$http.post(`/app/appconvenientaddressbook/list`, null, {
         params: {
-          areaId: this.user.areaId,
           createUserId: this.user.id
         }
       }).then(res => {

src/saas/AppSpecialPeople/detail.vue

@@ -101,13 +101,11 @@ export default {
       this.areaId = this.user.areaId
       this.areaName = this.user.areaName
       this.getStatistic()
-      this.getStatisticMon()
       this.getUserList()
     })
     
     uni.$on('specialPeopleList', () => {
       this.getStatistic()
-      this.getStatisticMon()
       this.getUserList()
     })
   },
@@ -119,7 +117,6 @@ export default {
     areaSelect(e) {
       this.areaId = e
       this.getStatistic()
-      this.getStatisticMon()
       this.getUserList()
     },
     tabClick(index) {
@@ -127,8 +124,9 @@ export default {
     },
     getStatistic() {
       this.statisticsList = []
+      this.statisticsListMon = []
       this.$http.post(`app/appspecialadjustment/statistic?type=0&range=0`).then((res) => {
-        if (res.code == 0) {
+        if (res?.data) {
           for (let i in res.data.map) {
             var obj = {
               label: i,
@@ -136,19 +134,12 @@ export default {
             }
             this.statisticsList.push(obj)
           }
-        }
-      })
-    },
-    getStatisticMon() {
-      this.statisticsListMon = []
-      this.$http.post(`app/appspecialadjustment/statistic?type=0&range=0`).then((res) => {
-        if (res.code == 0) {
-          for(let i in res.data.monthMap){
-            var obj = {
-              label: i,
-              value: res.data.monthMap[i]
+          for(let n in res.data.monthMap){
+            var objmon = {
+              label: n,
+              value: res.data.monthMap[n]
             }
-            this.statisticsListMon.push(obj)
+            this.statisticsListMon.push(objmon)
           }
         }
       })
@@ -156,7 +147,7 @@ export default {
     getUserList() {
       this.userList = []
       this.$http.post(`app/appspecialadjustment/allList?size=20&current=${this.current}`,{type: this.type, name: this.name}).then((res) => {
-        if (res.code == 0) {
+        if (res?.data) {
           if(this.current > res.data.total) {
             return
           }

src/saas/AppWalkask/AppWalkask.vue

@@ -39,7 +39,7 @@
             </AiCard>
           </template>
 
-          <div v-else>
+          <!-- <div v-else>
             <AiEmpty description="您还未添加过入户走访慰问" class="emptyWrap"></AiEmpty>
 
             <div class="addBtns">
@@ -47,6 +47,10 @@
               <span class="toAdds" @click="toAdd()">新增按钮</span>
               <span> 试试试吧~</span>
             </div>
+          </div> -->
+          <div class="empty" v-else>
+            <img src="https://cdn.cunwuyun.cn/dvcp/h5/no-data.png" alt="">
+            <p>您还未添加过走访慰问<br/>点击<span @click="toAdd()">新增按钮</span>试试吧</p>
           </div>
         </div>
       </div>
@@ -320,7 +324,7 @@ uni-page-body {
         text-align: center;
         color: #b7b7b7;
         margin-top: 10px;
-        font-weight: 800;
+        font-size: 28px;
 
         .toAdds {
           color: #467dfe;
@@ -346,5 +350,23 @@ uni-page-body {
     bottom: 106px;
     z-index: 9;
   }
+  .empty{
+    height: 100%;
+    img{
+      width: 282px;
+      height: 306px;
+      margin: 168px 0 0 234px;
+    }
+    p{
+      text-align: center;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #999;
+      line-height: 44px;
+      span{
+        color: #467DFE;
+      }
+    }
+  }
 }
 </style>