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

src/apps/AppVillagersCircle/AppVillagersCircle.vue

@@ -0,0 +1,220 @@
+<template>
+  <div class="AppVillagersCircle">
+    <!-- tab栏 -->
+    <div class="tab-select">
+      <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{item}}<span></span></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 class="card-list">
+        <div class="card-item" @click="toDetail">
+          <div class="card-title">阳光美丽，空气格外清新</div>
+          <div class="card-name">
+            <div class="name">发布信息</div>
+            <div class="name">美丽庭院</div>
+            <div class="time">2021-12-06</div>
+          </div>
+          <div class="card-type">
+            <div class="type">审核通过</div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty description="暂无数据" class="emptyWrap"></AiEmpty>
+
+      <!-- $dict.getDict('yesOrNo') -->
+      <u-select v-model="showType" :list="typeList" label-name="dictName" value-name="dictValue"
+              @confirm="confirmTypeSelect"/>
+    </div>
+    
+    <!-- 待审核 -->
+    <div v-if="tabIndex == 1">
+      <div class="card-list">
+        <div class="card-item" @click="toDetail">
+          <div class="card-title">阳光美丽，空气格外清新</div>
+          <div class="card-name">
+            <div class="name">发布信息</div>
+            <div class="name">美丽庭院</div>
+            <div class="time">2021-12-06</div>
+          </div>
+          <div class="card-type">
+            <div class="type">审核通过</div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty description="暂无数据" class="emptyWrap"></AiEmpty>
+    </div>
+
+    <!-- 已审核 -->
+    <div v-if="tabIndex == 2">
+      <div class="card-list">
+        <div class="card-item" @click="toDetail">
+          <div class="card-title">阳光美丽，空气格外清新</div>
+          <div class="card-name">
+            <div class="name">发布信息</div>
+            <div class="name">美丽庭院</div>
+            <div class="time">2021-12-06</div>
+          </div>
+          <div class="card-type">
+            <div>审核通过</div>
+          </div>
+        </div>
+      </div>
+      <AiEmpty description="暂无数据" class="emptyWrap"></AiEmpty>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'AppVillagersCircle',
+  appName: '村民圈',
+  data () {
+    return {
+      tabs: ['全部', '待处理', '已处理'],
+      tabIndex: 0,
+      showType: false,
+      keyword: '',
+      typeList: [],
+
+    }
+  },
+  methods: {
+
+    tabClick(index) {
+      this.tabIndex = index
+    },
+
+    confirmTypeSelect(e) {
+      console.log(e);
+    },
+
+    toDetail() {
+      uni.navigateTo({url: './detail'})
+    }
+  },
+  onShow() {
+    document.title = '村民圈'
+  },
+  onLoad() {
+    // this.$dict.load('yesOrNo')
+  },
+
+}
+</script>
+
+<style lang="scss" scoped>
+.AppVillagersCircle {
+
+  .tab-select {
+    width: 100%;
+    height: 96px;
+    line-height: 96px;
+    background: #3975C6;
+    display: flex;
+
+    .item{
+      flex: 1;
+      text-align: center;
+      font-size: 28px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #CDDCF0;
+    }
+
+    .active{
+      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: 20px;
+        }
+      }
+
+      .card-type {
+        margin-top: 30px;
+        font-size: 28px;
+
+        .num {
+          font-size: 34px;
+          color: #E6736E;
+        }
+
+        .status0 {
+          color: #FF9B2B;
+        }
+
+        .status1 {
+          color: #4181FF;
+        }
+
+      }
+    }
+  }
+}
+</style>

src/apps/AppVillagersCircle/detail.vue

@@ -0,0 +1,72 @@
+<template>
+  <div class="detail">
+    <div class="avatar-info">
+      <div class="avatar-img">
+        <img src="./img/tx@2x.png" alt="">
+        <!-- <img src="./img/tx@2x.png" alt=""> -->
+      </div>
+      <div class="avatar-title">
+        <div class="name">雷洋</div>
+        <div class="time">
+          <span>美丽庭院</span>
+          <span>2020-10-28 12:30</span>
+        </div>
+      </div>
+    </div>
+    <div class="textarea">⾦秋穿上⽑⾐，漫步森林，在阳光下呼吸伸展，⾃在安逸的天⼈。也许是兰天名字的由来吧。</div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'detail',
+  data() {
+    return {
+
+    }
+  },
+  methods: {},
+  onShow() {},
+  onLoad() {},
+
+
+}
+</script>
+
+<style lang="scss" scoped>
+.detail {
+  background: #FFFFFF;
+  padding: 30px 32px;
+  box-sizing: border-box;
+
+  .avatar-info {
+    display: flex;
+    margin-bottom: 30px;
+    .avatar-img {
+      margin-right: 20px;
+      img {
+        width: 88px;
+        height: 88px;
+        border-radius: 50%;
+      }
+    }
+    .avatar-title {
+      .name {
+        font-size: 32px;
+        color: #333333;
+        font-weight: 600;
+        margin-bottom: 12px;
+      }
+      .time {
+        font-size: 26px;
+        color: #999999;
+      }
+    }
+  }
+  .textarea {
+    font-style: 32px;
+  }
+
+
+}
+</style>

src/saas/AppAskForm/PreviewForm.vue

@@ -46,7 +46,7 @@
             <image style="display: block; max-width: 100%;margin: 0 auto" v-if="formInfo[`field_${index}`]" :src="formInfo[`field_${index}`]" />
             <div v-else class="components-item__select components-item__textarea components-item__upload">
               <image :src="`${$cdn}askform/upload.png`"/>
-              <span>选择图片（2M以内）</span>
+              <span>选择图片（10M以内）</span>
             </div>
           </template>
           <template v-if="(item.type === 'input')">

src/saas/AppAskForm/components/List.vue

@@ -113,7 +113,7 @@ export default {
     }
   },
   created() {
-    this.$loading()
+    // this.$loading()
     this.$dict.load(['questionnaireStatus', 'questionnaireType', 'questionnaireFieldType']).then(() => {
       this.getList()
     })

src/saas/AppConflictMediation/detail.vue

@@ -55,9 +55,7 @@
           <div class="cardss">
             <div class="cardss-left">
               <div class="card-img">
-                <!-- <div v-html="transTxt(item.systemExplain)"/> -->
+                <AiOpenData v-if="transTxt(item.systemExplain)[1]" type="userName" :openid="transTxt(item.systemExplain)[1]" style="display: inline-block; font-size:12px;"/>
-                <!-- <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>
@@ -65,8 +63,8 @@
             <div class="cardss-right">
               <div class="cardsss-right-left">
                 <div class="cardssss-right-left-top">
-                  <!-- <span>{{ item.systemExplain }}</span> -->
+                  <AiOpenData type="userName" :openid="transTxt(item.systemExplain)[1]" style="display: inline-block;"/>
-                  <div v-html="transTxt(item.systemExplain)"/>
+                  <div v-html="transTxt(item.systemExplain)[2]"/>
                   <div style="color: #2ea222; font-size: 16px; margin-top: 5px">
                     {{ $dict.getLabel('clapDoStatus', item.doStatus) }}
                   </div>
@@ -136,16 +134,14 @@ export default {
   },
   methods: {
     transTxt(str){
-      return str.replace(/\$(.+)\$/g,'<AiOpenData type="userName" openid="$1"/>')
+      console.log(str.split("$"));
-    },
+      return str.split("$")
-    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) {
           this.data = res.data
-          console.log(this.data);
           this.showPage = true
         }
       })

src/saas/AppGridManagement/Map.vue

@@ -36,7 +36,7 @@
           </div>
           <div v-if="form.girdMemberList && form.girdMemberList.length">
             <div class="info-flex" v-for="(item, index) in  form.girdMemberList" :key="index">
-              <span class="label">网格管理员</span>
+              <span class="label">网格员</span>
               <span class="value">
                 <AiOpenData v-if="item.name" type="userName" :openid="item.name" />
                 <!-- &nbsp;&nbsp;{{ item.phone }}

src/saas/AppGridManagement/Organization.vue

@@ -39,6 +39,7 @@
 </template>
 
 <script>
+import { mapActions } from 'vuex'
 export default {
   data() {
     return {
@@ -49,7 +50,10 @@ export default {
   props: ['params'],
   onShow() {
     document.title = '网格管理'
+    uni.$on('updateList', () => {
+      this.current = 1
       this.getGirdUserList()
+    })
   },
   mounted() {
     this.userGird = this.params
@@ -60,6 +64,7 @@ export default {
     }) 
   },
   methods: {
+    ...mapActions(['injectJWeixin', 'wxInvoke']),
     getGirdUserList() {
       this.$http.post(`/app/appgirdmemberinfo/listGirdMemberByGirdId?girdId=${this.userGird.id}`).then((res) => {
         if (res.code == 0) {
@@ -71,14 +76,16 @@ export default {
       uni.navigateTo({url})
     },
     viewUser(userId) {
-      wx.invoke('openUserProfile', {
+      this.injectJWeixin('openUserProfile').then(() => {
-        "type": 1, //1表示该userid是企业成员，2表示该userid是外部联系人
+        this.wxInvoke([
-        "userid": userId //可以是企业成员，也可以是外部联系人
+          'openUserProfile',
-          }, function(res) {
+          {
-          if(res.err_msg != "openUserProfile:ok") {
+            type: 1,
-              //错误处理
+            userid: userId,
-          }
+          },
-      });
+          () => 0,
+        ])
+      })
     },
     toFamily(item) {
       uni.navigateTo({url: `./FamilyList?id=${item.id}&girdId=${this.userGird.id}`})