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

src/apps/AppBuilding/detail.vue

@@ -164,7 +164,7 @@ export default {
     }
   },
   onShow() {
-    document.title = "以房找人"
+    document.title = "楼栋模型"
     this.$dict.load('householdRelation', 'houselivingStatus', 'houseLeaseSituation', 'houseUseStatus',
         'isFilingCertificateStatus', 'communityBuildingType', 'yesOrNo', 'BulidResidentType')
     this.getBuilding()

src/apps/AppDocumentFlow/AppDocumentFlow.vue

@@ -38,7 +38,7 @@
 <script>
 
 export default {
-  appName: "公文流转",
+  appName: "(山东)公文流转",
   data() {
     return {
       documentName: "",

src/apps/AppIntegralAudit/AppIntegralAudit.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div class="AppIntegralAudit">
     <!-- tab栏 -->
@@ -14,7 +13,7 @@
       </div>
 
       <div class="card-list">
-        <div class="card-item">
+        <div class="card-item" @click="toDetail">
           <div class="card-title">本人于12月6日在中医院接种第二针…</div>
           <div class="card-name">
             <div class="name">新冠疫苗接种</div>
@@ -47,6 +46,7 @@
 <script>
 export default {
   name: 'AppIntegralAudit',
+  appName: '积分审核',
   data () {
     return {
       tabs: ['全部', '待审核', '已审核'],
@@ -66,6 +66,10 @@ export default {
     confirmTypeSelect(e) {
       console.log(e);
     },
+
+    toDetail() {
+      uni.navigateTo({url: './detail'})
+    }
   },
   onShow() {
     document.title = '积分审核'
@@ -176,6 +180,7 @@ export default {
 
         .num {
           font-size: 34px;
+          color: #E6736E;
         }
 
         .status0 {

src/apps/AppIntegralAudit/detail.vue

@@ -1,45 +1,26 @@
 <template>
   <div class="detail">
-    <!-- tab栏 -->
+    <div class="detail-list">
-    <div class="tab-select">
+      <div>
-      <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{item}}<span></span></div>
+        <div>申请人:<div>李毅</div></div>
-    </div>
+        <div>新冠疫苗接种</div>
-
-    <!-- 全部 -->
-    <div v-if="tabIndex == 0">
-      <div class="search-box">
-        <div class="integral-types" @click="showType = true">积分类型<u-icon name="arrow-down"></u-icon></div>
-        <u-search placeholder="请输入关键字" v-model="keyword" :show-action="false"></u-search>
       </div>
-
+      <div>
-      <div class="card-list">
+        <div>2020-05-06 13:45</div>
-        <div class="card-item">
+        <div>
-          <div class="card-title">本人于12月6日在中医院接种第二针…</div>
+          <img src="" alt="">
-          <div class="card-name">
+          <div>新港镇三联村</div>
-            <div class="name">新冠疫苗接种</div>
-            <div class="time">2021-12-06</div>
-          </div>
-          <div class="card-type">
-            <div class="type">审核通过</div>
-            <div class="num">＋20</div>
-          </div>
         </div>
       </div>
-
+      <div>
-    <!-- $dict.getDict('yesOrNo') -->
+        经村两委及村篮球队青年商讨决定，我村赴黎平参加百村杯篮球赛经费分两阶段分发，第一阶段为小组循环赛，第二阶段为淘汰赛。
-      <u-select v-model="showType" :list="typeList" label-name="dictName" value-name="dictValue"
+        第一阶段费用预计一万元整，其中包括队员球服两套，住宿、饮食
-              @confirm="confirmTypeSelect"/>
+      </div>
-    </div>
+      <div>
-    
+        <img :src="item.url" alt="" v-for="(item, i) in data.files" :key="i" @click="previewImage(data.files, item.url)" />
-    <!-- 待审核 -->
+      </div>
-    <div v-if="tabIndex == 1">
-      待审核
     </div>
 
-    <!-- 已审核 -->
-    <div v-if="tabIndex == 2">
-      已审核
-    </div>
   </div>
 </template>
 
@@ -48,23 +29,13 @@ export default {
   name: 'detail',
   data () {
     return {
-      tabs: ['全部', '待审核', '已审核'],
+      data: {
-      tabIndex: 0,
+        files: []
-      showType: false,
+      }
-      keyword: '',
-      typeList: [],
-
     }
   },
   methods: {
-
+    previewImage() {}
-    tabClick(index) {
-      this.tabIndex = index
-    },
-
-    confirmTypeSelect(e) {
-      console.log(e);
-    },
   },
   onShow() {
     document.title = '积分审核'
@@ -79,117 +50,13 @@ export default {
 <style lang="scss" scoped>
 .detail {
 
-  .tab-select {
+  img {
-    width: 100%;
+      width: 220px;
-    height: 96px;
+      height: 220px;
-    line-height: 96px;
+      margin-right: 8px;
-    background: #3975C6;
-    display: flex;
-
-    .item{
-      flex: 1;
-      text-align: center;
-      font-size: 28px;
-      font-family: PingFangSC-Regular, PingFang SC;
-      color: #CDDCF0;
     }
-
+    img:nth-child(3n) {
-    .active{
+      margin-right: 0;
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      position: relative;
-      color: #fff;
-      span{
-        width: 48px;
-        height: 4px;
-        background: #FFF;
-        position: absolute;
-        bottom: 14px;
-        left: 50%;
-        margin-left: -24px;
-      }
     }
-  }
-
-  .search-box {
-    display: flex;
-    width: 100%;
-    height: 112px;
-    line-height: 112px;
-    background-color: #FFFFFF;
-    padding: 0 32px;
-    box-sizing: border-box;
-
-    .integral-types {
-      width: 30%;
-    }
-  }
-
-  .card-list {
-    width: 100%;
-    padding: 0 32px;
-    box-sizing: border-box;
-
-    .card-item {
-      margin-top: 24px;
-      background-color: #FFFFFF;
-      box-shadow: 0px 0px 8px 8px rgba(0, 0, 0, 0.02);
-      border-radius: 16px;
-      padding: 30px 32px 20px 32px;
-
-      .card-title {
-        height: 60px;
-        line-height: 60px;
-        font-size: 36px;
-        color: #333333;
-        overflow:hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        -o-text-overflow:ellipsis;
-      }
-
-      .card-name {
-        margin-top: 30px;
-        display: flex;
-        height: 50px;
-        line-height: 50px;
-        font-size: 28px;
-        color: #999999;
-
-        .name {
-          padding: 0 30px;
-          background: #EEEEEE;
-          border-radius: 24px;
-          margin-right: 40px;
-        }
-      }
-
-      .card-type {
-        margin-top: 30px;
-        display: flex;
-        justify-content: space-between;
-
-        .type {
-          font-size: 28px;
-        }
-
-        .num {
-          font-size: 34px;
-        }
-
-        .status0 {
-          color: #FF9B2B;
-        }
-
-        .status1 {
-          color: #4181FF;
-        }
-
-      }
-    }
-  }
-
-
-
 }
 </style>

src/apps/AppIntelligentSecurity/AppIntelligentSecurity.vue

@@ -66,8 +66,8 @@ import echarts from 'echarts'
 import {mapState} from 'vuex'
 
 export default {
-  name: "AppVideoSurveillance",
+  name: "AppIntelligentSecurity",
-  appName: "智慧安防",
+  appName: "(山东)视频监控",
   data() {
     return {
       nodes: [

src/apps/AppPeopleList.vue/AppPeopleList.vue

@@ -10,7 +10,7 @@
 <script>
 export default {
   name: 'AppPeopleList',
-  appName: '居民档案(山东)',
+  appName: '(山东)居民档案',
   data() {
     return {
       bannerList: [

src/apps/AppPeopleList.vue/Content.vue

@@ -0,0 +1,76 @@
+<template>
+  <div class="Content">
+    <div class="text-area">
+      <div class="title">不通过理由</div>
+      <textarea placeholder="请输入" maxlength="200"></textarea>
+    </div>
+    <div class="footer" @click="submit">
+      <div class="btn">保存</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Content",
+  data() {
+    return {
+      value: '',
+    };
+  },
+  onShow() {
+    document.title = '居民档案审核'
+  },
+  onLoad(option) {
+    // this.id = option.id
+  },
+  methods: {
+    submit() {
+
+    }
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.Content {
+  .text-area{
+    padding: 34px 32px;
+    background-color: #fff;
+    .title{
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #333;
+      line-height: 44px;
+      margin-bottom: 32px;
+    }
+    textarea{
+      width: 100%;
+      height: 500px;
+      word-break: break-all;
+    }
+  }
+  .footer {
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+  }
+  .btn {
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    background: #3975C6;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #FFF;
+  }
+  .line-bg {
+    width: 100%;
+    height: 16px;
+    background: #F5F5F5;
+  }
+}
+</style>

src/apps/AppPhoneList/AppPhoneList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="AppMailList">
+  <div class="AppPhoneList">
     <AiTopFixed>
       <!-- <div class="header-top">
         <div>区域选择</div>
@@ -53,8 +53,8 @@
 <script>
 import { mapState } from 'vuex'
 export default {
-  name: "AppMailList",
+  name: "AppPhoneList",
-  appName: "便民通讯录(山东)",
+  appName: "(山东)便民通讯录",
   inject: {
     root: {}
   },
@@ -123,7 +123,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.AppMailList {
+.AppPhoneList {
   ::v-deep .fixed{
     z-index: 9999;
   }

src/saas/AppBuilding/detail.vue

@@ -164,7 +164,7 @@ export default {
     }
   },
   onShow() {
-    document.title = "以房找人"
+    document.title = "楼栋模型"
     this.$dict.load('householdRelation', 'houselivingStatus', 'houseLeaseSituation', 'houseUseStatus',
         'isFilingCertificateStatus', 'communityBuildingType', 'yesOrNo', 'BulidResidentType')
     this.getBuilding()

src/saas/AppConflictMediation/detail.vue

@@ -55,8 +55,9 @@
           <div class="cardss">
             <div class="cardss-left">
               <div class="card-img">
-                <div v-html="transTxt(item.systemExplain)"/>
+                <!-- <div v-html="transTxt(item.systemExplain)"/> -->
                 <!-- <AiOpenData v-if="item.openId" type="userName" :openid="item.openId" style="display: inline-block; font-size:12px;"/> -->
+                <div v-html="transAvatar(item.systemExplain)"/>
                 <img src="./components/1.png" class="avatarIcon" alt="" />
               </div>
             </div>
@@ -137,6 +138,9 @@ export default {
     transTxt(str){
       return str.replace(/\$(.+)\$/g,'<AiOpenData type="userName" openid="$1"/>')
     },
+    transAvatar(str){
+      return str.replace(/\$(.+)\$.+/g,'<AiOpenData type="userName" openid="$1"/>')
+    },
     getDetail() {
       this.$http.post(`/app/appclapeventinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res?.data) {
@@ -239,6 +243,8 @@ uni-page-body {
       }
       .card-right {
         font-size: 32px;
+        width: 100%;
+        text-align: right;
         .u-icon {
           margin-left: 8px;
         }
@@ -293,7 +299,7 @@ uni-page-body {
               border: 1px solid #dddddd;
               border-radius: 50%;
               font-size: 28px;
-              z-index: 999;
+              z-index: 9;
 
               .avatarIcon {
                 position: absolute;

src/saas/AppGridManagement/AddFamily.vue

@@ -25,7 +25,7 @@
                 <img src="./components/img/user-img.png" alt="" class="userImg" v-else>
               </div>
               <div class="info">
-                 <div class="name">
+                <div class="name">
                   <span class="user-name">{{item.name}}</span>
                   <span class="user-tel">{{item.phone}}</span>
                  </div>

src/saas/AppSpecialPeople/add.vue

@@ -627,9 +627,9 @@ export default {
 
   ::v-deep .uni-input-form,
   ::v-deep .uni-textarea-textarea, 
-  .uni-input-input,
+  ::v-deep .uni-input-input,
-  .uni-input-placeholder, 
+  ::v-deep .uni-input-placeholder, 
-  .uni-input-wrapper {
+  ::v-deep .uni-input-wrapper {
     font-size: 32px;
   }
 

src/saas/AppSpecialPeople/detail.vue

@@ -361,6 +361,7 @@ export default {
       .user-item{
         padding: 24px 32px;
         display: flex;
+        
         .user-img{
           width: 112px;
           img{
@@ -370,6 +371,7 @@ export default {
         }
         .user-info{
           width: 100%;
+          border-bottom: 1px solid #ddd;
           .name{
             font-size: 32px;
             font-family: PingFangSC-Medium, PingFang SC;
@@ -387,6 +389,7 @@ export default {
               }
             }
           }
+          
           .phone{
             width: 100%;
             font-size: 26px;
@@ -398,6 +401,12 @@ export default {
           }
         }
       }
+
+      .user-item:nth-last-child(1) {
+        .user-info {
+          border-bottom: none;
+        }
+      }
     }
   }
   .text{