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

src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue

@@ -51,7 +51,7 @@ export default {
       url: '',
       autioName: '',
       audio: null,
-      barStyle: {width: '98px', bottom: '-3px', left: '-38px'},
+      barStyle: {width: '96px', bottom: '-3px', left: '-38px'},
       keyword: '',
       type: '0',
       typeList: [{label: '全部', value: '0'}, {label: '我创建的', value: '1'},]
@@ -156,7 +156,7 @@ export default {
       })
     },
     toDetail(item) {
-      uni.navigateTo({url: `./detail`})
+      uni.navigateTo({url: `./detail?id=${item.id}`})
     }
   },
 
@@ -168,6 +168,11 @@ export default {
 <style lang="scss" scoped>
 .AppResourcesManage {
   padding-bottom: 128px;
+  ::v-deep .AiTopFixed{
+    .content{
+      padding: 0;
+    }
+  }
 
   .tab {
     border-bottom: 1px solid #ddd;
@@ -278,6 +283,7 @@ export default {
   .currentLeft-top {
     display: flex;
     align-items: center;
+    padding: 32px 32px 0;
 
     .left {
       width: 200px;

src/apps/AppBroadcast1/LiveBroadcast.vue

@@ -11,7 +11,8 @@
           <div class="record-item" v-for="(item, index) in 100" :key="index">
             <image :src="user.avatar" />
             <div class="right">
-              <image src="./img/voice-icon.png" />
+              <!-- <image mode="aspectFit" src="./img/voice-icon.png" /> -->
+              <image src="./img/voice.gif" />
               <span>23"</span>
             </div>
           </div>
@@ -412,8 +413,8 @@
               }
 
               image {
-                width: 20px;
+                width: 28px;
-                height: 32px;
+                height: 28px;
                 margin-right: 14px;
               }
             }

src/project/police/AppMessageNotification/SelectUser.vue

@@ -155,11 +155,11 @@ export default {
         overflow: hidden;
         margin-bottom: 32px;
         .item{
-          width: 150px;
+          padding: 0 32px;
-          line-height: 68px;
+          line-height: 56px;
           float: left;
           text-align: center;
-          border-radius: 34px;
+          border-radius: 28px;
           border: 1px solid #ddd;
           margin: 0 16px 16px 0;
           font-size: 30px;

src/project/police/AppResidentFile/AppResidentFile.vue

@@ -42,6 +42,7 @@ export default {
     ...mapState(['user', 'global']),
   },
   onLoad() {
+    this.$loading()
     document.title = '居民信息管理'
     this.getList()
     this.areaId = this.user.areaId
@@ -58,6 +59,7 @@ export default {
             this.data = [...this.data, ...res.data.records]
           } else this.data = res.data.records
           this.page1.total = res.data.total
+          uni.hideLoading()
         }
       })
     },

src/saas/AppCountryAlbum/AlbumDetail.vue

@@ -2,7 +2,11 @@
   <div class="photo" v-if="pageShow">
     <div class="photo-header">
       <h2>{{ info.albumName }}</h2>
-      <div class="right" @click="linkTo('./AddAlbum?id=' + id)" hover-class="text-hover" v-if="id !== '1' && isAdmin">
+      <div
+        class="right"
+        @click="linkTo('./AddAlbum?id=' + id)"
+        hover-class="text-hover"
+        v-if="info.albumName !== '系统相册' && info.createUserId === user.wxUserId">
         <image src="./images/setting.png" />
         <span>相册设置</span>
       </div>
@@ -95,7 +99,6 @@
 
     onLoad (query) {
       this.id = query.id
-      this.isAdmin = !!this.$store.state.user.adminAuthType
 
       this.$nextTick(() => {
         this.getTotalInfo(query.id)

src/saas/AppCountryAlbum/EditAlbum.vue

@@ -57,7 +57,6 @@
         isShow: false,
         list: [],
         currIndex: 0,
-        isAdmin: false,
         albumList: [],
         pageShow: false
       }
@@ -75,7 +74,6 @@
 
     onLoad (query) {
       this.$loading()
-      this.isAdmin = !!this.$store.state.user.adminAuthType
       this.id = query.id
       this.getAlbumList()
 
@@ -90,7 +88,7 @@
           params: {
             albumId: this.id,
             pageSize: 100000,
-            userId: this.isAdmin ? '' : this.$store.state.user.openId
+            userId: this.$store.state.user.openId
           }
         }).then(res => {
           if (res.code === 0) {

src/saas/AppCountryAlbum/components/Home.vue

@@ -62,7 +62,6 @@
       <h2>工作相册</h2>
       <div class="album-list__wrapper">
         <div class="item" v-for="(item, index) in list" :key="index" @click="linkTo('./AlbumDetail?id=' + item.id)">
-          <span v-if="item.photoHasRead === 'NO'">未查看</span>
           <image src="./../images/icon.png" :loading-img="$cdn + 'watermark/loading.png'" v-if="!item.lastPhotoUrl" />
           <u-lazy-load class="item-img" img-mode="aspectFill" :height="328" :image="item.lastPhotoUrl" v-else></u-lazy-load>
           <div class="item-bottom">
@@ -80,7 +79,7 @@
             </div>
           </div>
         </div>
-        <div class="item item-add" @click="linkTo('./AddAlbum')" v-if="user && user.adminAuthType === '1'">
+        <div class="item item-add" @click="linkTo('./AddAlbum')">
           <div class="item-add__btn"></div>
           <p>添加相册</p>
         </div>
@@ -116,7 +115,6 @@
     },
 
     mounted () {
-      console.log(this.user.adminAuthType)
       this.getCountPhotoNo()
       this.getAlbumList()
       this.getMsgList()

src/saas/AppCountryAlbum/components/Organize.vue

@@ -44,7 +44,7 @@
           </div>
         </div>
       </div>
-      <div class="info-item info-work">
+      <div class="info-item info-work" v-if="false">
         <div class="info-item__title">
           <h2>考勤统计</h2>
           <image src="../images/right.png" @click="linkTo('./Attendance?date=' + date.replace(/年|月/g, '-'))" />