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

src/apps/AppResidentDocument/DetailCard.vue

@@ -12,7 +12,7 @@
     </div>
 
     <div class="bottom">
-      <div class="hints">家庭成员{{ data.family.length }}</div>
+      <div class="hints">家庭成员 {{ data.family.length }}人</div>
 
       <div v-if="data.family && data.family.length > 0">
         <div class="card" v-for="(item, i) in data.family" :key="i" @click="toDetailPeople(item)">

src/apps/AppServicePublic/AppServicePublic.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="AppServicePublic">
     <AiTopFixed v-if="tabs.length">
-      <div class="tab-select" @click="tabClick(item)">
+      <div class="tab-select">
         <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index"
-             @click="tabClick(item)">{{ item.categoryName }}<span></span></div>
+             @click="tabClick(index, item)">{{ item.categoryName }}<span></span></div>
       </div>
     </AiTopFixed>
     <div class="header-top">
@@ -19,7 +19,7 @@
             <u-parse :html="item.content"></u-parse>
           </p>
           <div class="img-list" v-if="item.files.length">
-             <img :src="item.accessUrl" alt="" v-for="(item, index) in item.files" :key="index" v-if="index < 3" />
+             <img :src="items.accessUrl" alt="" v-for="(items, index) in item.files" :key="index" v-if="index < 3" @click.stop="previewImage(item.files, items.accessUrl)" />
           </div>
           <div class="flex">
             <span class="left">
@@ -99,6 +99,12 @@ export default {
     uni.setNavigationBarTitle({title: this.listName})
   },
   methods: {
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
     getType() {
       this.$http.post(`/app/appcontentmoduleinfo/listByName?names=${this.listName}`).then((res) => {
         if (res.code == 0) {
@@ -113,14 +119,20 @@ export default {
         }
       })
     },
-    tabClick(row) {
-      this.tabIndex = row.showIndex
+    tabClick(index, row) {
+      this.tabIndex = index
       this.categoryId = row.id
+      this.current = 1
+      this.getList()
+    },
+    search() {
+      this.current = 1
+      this.getList()
     },
     getList() {
       this.$http.post('/app/appcontentinfo/list', null, {
         params: {
-          size: 6,
+          size: 20,
           current: this.current,
           areaId: this.areaId,
           title: this.keyword,

src/apps/AppServicePublic/Detail.vue

@@ -24,7 +24,7 @@
     </div>
     <div class="img-list" v-if="data.files && data.files.length">
       <div class="title">图片</div>
-      <img :src="item.accessUrl" alt="" v-for="(item, index) in data.files" :key="index" />
+      <img :src="item.accessUrl" alt="" v-for="(item, index) in data.files" :key="index" @click="previewImage(data.files, item.accessUrl)" />
     </div>
   </div>
 </template>
@@ -52,6 +52,12 @@ export default {
   },
   mounted() {},
   methods: {
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
     getDetail() {
       this.$http.post(`/app/appcontentinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res?.data) {

src/apps/AppUniMsg/Add.vue

@@ -82,6 +82,10 @@ export default {
             return this.$u.toast('请输入发布组织')
           }
 
+          if (!this.forms.content) {
+            return this.$u.toast('请输入正文')
+          }
+
           const imgs = []
           if (this.forms.images) {
             this.forms.images.map((e) => {

src/apps/AppWorkonline/Detail.vue

@@ -583,12 +583,9 @@ export default {
           display: flex;
           position: relative;
           justify-content: space-between;
-          // align-items: center;
           padding-bottom: 40px;
 
           .item-left {
-            height: 100%;
-            // position: relative;
             .item-left-ava-icon {
               position: relative;
 
@@ -601,12 +598,10 @@ export default {
                 background-color: #2266ff;
                 color: #fff;
                 font-size: 28px;
-                // vertical-align: middle;
                 text-align: center;
                 z-index: 999;
 
                 img {
-                  // margin: 16px 0 0 8px;
                   width: 48px;
                   height: 48px;
                 }
@@ -618,11 +613,9 @@ export default {
                 left: 50px;
                 width: 36px;
                 height: 36px;
-                // background: #fff;
                 border-radius: 50%;
                 text-align: center;
                 vertical-align: middle;
-
                 img {
                   width: 36px;
                   height: 36px;
@@ -648,7 +641,6 @@ export default {
             }
 
             .solid {
-              // height: 100%;
               height: calc(100%);
               border-left: 4px solid #eee;
               position: absolute;
@@ -657,7 +649,6 @@ export default {
             }
 
             .dashed {
-              // height: 100%;
               height: calc(100%);
               border-left: 4px dashed #eee;
               position: absolute;
@@ -1093,12 +1084,10 @@ export default {
           display: flex;
           position: relative;
           justify-content: space-between;
-          // align-items: center;
           padding-bottom: 40px;
 
           .item-left {
             height: 100%;
-            // position: relative;
             .item-left-ava-icon {
               position: relative;
 
@@ -1111,12 +1100,10 @@ export default {
                 background-color: #2266ff;
                 color: #fff;
                 font-size: 28px;
-                // vertical-align: middle;
                 text-align: center;
                 z-index: 999;
 
                 img {
-                  // margin: 16px 0 0 8px;
                   width: 48px;
                   height: 48px;
                 }
@@ -1128,7 +1115,6 @@ export default {
                 left: 50px;
                 width: 36px;
                 height: 36px;
-                // background: #fff;
                 border-radius: 50%;
                 text-align: center;
                 vertical-align: middle;

src/apps/AppWorkonline/Opinion.vue

@@ -67,7 +67,7 @@
         <text class="img_text">(最多9张)</text>
         <div class="upload">
           <div class="info">
-            <AiUploader multiple @list="(v) => (picture = v)" :limit="9" :size="2097152" preview />
+            <AiUploader multiple @list="(v) => (picture = v)" :limit="9" action="/admin/file/add2" :size="2097152" preview />
           </div>
         </div>
       </div>

src/apps/AppWorkonline/detail.vue

@@ -583,12 +583,9 @@ export default {
           display: flex;
           position: relative;
           justify-content: space-between;
-          // align-items: center;
           padding-bottom: 40px;
 
           .item-left {
-            height: 100%;
-            // position: relative;
             .item-left-ava-icon {
               position: relative;
 
@@ -601,12 +598,10 @@ export default {
                 background-color: #2266ff;
                 color: #fff;
                 font-size: 28px;
-                // vertical-align: middle;
                 text-align: center;
                 z-index: 999;
 
                 img {
-                  // margin: 16px 0 0 8px;
                   width: 48px;
                   height: 48px;
                 }
@@ -618,11 +613,9 @@ export default {
                 left: 50px;
                 width: 36px;
                 height: 36px;
-                // background: #fff;
                 border-radius: 50%;
                 text-align: center;
                 vertical-align: middle;
-
                 img {
                   width: 36px;
                   height: 36px;
@@ -648,7 +641,6 @@ export default {
             }
 
             .solid {
-              // height: 100%;
               height: calc(100%);
               border-left: 4px solid #eee;
               position: absolute;
@@ -657,7 +649,6 @@ export default {
             }
 
             .dashed {
-              // height: 100%;
               height: calc(100%);
               border-left: 4px dashed #eee;
               position: absolute;
@@ -1093,12 +1084,10 @@ export default {
           display: flex;
           position: relative;
           justify-content: space-between;
-          // align-items: center;
           padding-bottom: 40px;
 
           .item-left {
             height: 100%;
-            // position: relative;
             .item-left-ava-icon {
               position: relative;
 
@@ -1111,12 +1100,10 @@ export default {
                 background-color: #2266ff;
                 color: #fff;
                 font-size: 28px;
-                // vertical-align: middle;
                 text-align: center;
                 z-index: 999;
 
                 img {
-                  // margin: 16px 0 0 8px;
                   width: 48px;
                   height: 48px;
                 }
@@ -1128,7 +1115,6 @@ export default {
                 left: 50px;
                 width: 36px;
                 height: 36px;
-                // background: #fff;
                 border-radius: 50%;
                 text-align: center;
                 vertical-align: middle;