Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_cp/dv_cp_wechat_app into dev

src/apps/AppAskForm/AppAskForm.vue

@@ -36,7 +36,8 @@ export default {
     }
   },
   onShow() {
-    document.title = "问卷表单"
+    // document.title = "问卷表单"
+    uni.setNavigationBarTitle({title:"问卷表单"})
     this.$refs?.TabPage?.show()
     this.$nextTick(() => {
       this.injectJWeixin(['sendChatMessage', 'selectEnterpriseContact', 'shareAppMessage', 'shareWechatMessage']).then(() => {

src/apps/AppAskForm/AppForm.vue

@@ -69,7 +69,7 @@ export default {
     this.checkAccess()
   },
   onShow() {
-    document.title = '问卷调查'
+    uni.setNavigationBarTitle({title:"问卷调查"})
     wx.hideOptionMenu()
   },
 }

src/apps/AppGridManagement/AddFamily.vue

@@ -21,7 +21,7 @@
             </div>
             <div class="userInfo">
               <div>
-               <img src="item.photo" alt="" class="userImg"  v-if="item.photo">
+               <img :src="item.photo" alt="" class="userImg"  v-if="item.photo">
                <img src="./components/img/user-img.png" alt="" class="userImg" v-else>
               </div>
               <div class="info">

src/apps/AppGridManagement/AppGridManagement.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="AppGridManagement">
-    <div class="header" v-if="component != 'Map' && isAdmin">
-      <div class="pad-t32"></div>
-      <div class="select-gird">
+    <!-- <div class="header" v-if="component != 'Map' && isAdmin"> -->
+      <div class="pad-t32"  v-if="component != 'Map' && isAdmin"></div>
+      <div class="select-gird"  v-if="component != 'Map' && isAdmin">
         <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
         <div @click="linkTo('./SelectGird')">
           {{params.girdName}}
@@ -10,7 +10,7 @@
         </div>
         <span @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</span>
       </div>
-    </div>
+    <!-- </div> -->
     
     <component v-if="refresh && isAdmin" :is="component" @change="onChange" :params="params"> </component>
     <div class="tabs" v-if="isTab && isAdmin">

src/apps/AppGridManagement/Map.vue

@@ -1,10 +1,10 @@
 <template>
-  <div class="detail">
+  <div class="map">
     <div class="grid-select">
       <span class="label">网格选择</span>
       <div class="grid-select__right" @click="toChoose">
         <span>{{ form.girdName || '请选择' }}</span>
-        <u-icon name="arrow-right" color="#cccccc" size="14"></u-icon>
+        <u-icon name="arrow-right" color="#cccccc" size="30" style="margin-left:8px;"></u-icon>
       </div>
     </div>
     <div class="map-content">
@@ -270,8 +270,9 @@ ai-tree-picker {
   display: inline-block;
 }
 
-.detail {
+.map {
   height: 100%;
+  height: calc(100% - 98px);
   .grid-select {
     width: 100%;
     padding: 34px 32px;
@@ -281,6 +282,10 @@ ai-tree-picker {
     justify-content: space-between;
     line-height: 44px;
     color: #333;
+    // position: fixed;
+    // top: 0;
+    // left: 0;
+    // z-index: 999;
 
     .grid-select__right {
       display: flex;
@@ -304,7 +309,7 @@ ai-tree-picker {
 
   .map-content {
     width: 100%;
-    height: calc(100% - 210px);
+    height: calc(100% - 115px);
   }
 
   .popup {

src/apps/AppGridManagement/Organization.vue

@@ -2,8 +2,11 @@
   <div class="Organization">
     <div class="title">网格人员</div>
     <div class="user-content" v-for="(item, index) in dataInfo.parentGirdMembers" :key="index">
-      <image :src="item.photo" alt="" mode="aspectFill" v-if="item.photo" />
-      <img src="./components/img/big-user.png" alt="" v-else>
+      <div>
+        <!-- <image :src="item.photo" alt="" mode="aspectFill" v-if="item.photo" /> -->
+        <img :src="item.photo" alt="" v-if="item.photo">
+        <img src="./components/img/big-user.png" alt="" v-else>
+      </div>
       <div class="right">
         <div class="name">{{item.name}}</div>
         <div class="gird">{{item.checkType == 2 ? '网格长' : '网格员'}}</div>
@@ -11,8 +14,11 @@
       </div>
     </div>
     <div class="user-content user-item" v-for="(item, index) in dataInfo.girdMembers" :key="index">
-      <image :src="item.photo" alt="" mode="aspectFill" v-if="item.photo" />
-      <img src="./components/img/user-img.png" alt="" v-else />
+      <div>
+        <!-- <image :src="item.photo" alt="" mode="aspectFill" v-if="item.photo" /> -->
+        <img :src="item.photo" alt="" v-if="item.photo">
+        <img src="./components/img/big-user.png" alt="" v-else>
+      </div>
       <div class="right">
         <div class="name">{{item.name}} 
           <span class="gird">{{item.checkType == 2 ? '网格长' : '网格员'}}</span>
@@ -65,7 +71,6 @@ export default {
 <style lang="scss" scoped>
 .Organization {
   background-color: #f5f5f5;
-  padding-top: 160px;
   .title{
     font-size: 38px;
     font-family: PingFangSC-Semibold, PingFang SC;
@@ -83,6 +88,7 @@ export default {
     box-sizing: border-box;
     display: flex;
     img{
+      display: inline-block;
       width: 200px;
       height: 200px;
       margin-right: 32px;

src/apps/AppGridManagement/SelectGird.vue

@@ -217,7 +217,7 @@ export default {
           margin-left: 32px;
           border-bottom: 1px solid #e4e5e6;
           .applicationNames {
-            width: calc(100% - 56px);
+            width: calc(100% - 100px);
             font-size: 36px;
             font-weight: 500;
             color: #333333;
@@ -226,9 +226,10 @@ export default {
             white-space:nowrap;
           }
           .imgs {
-            width: 40px;
-            height: 40px;
+            width: 60px;
+            height: 60px;
             vertical-align: middle;
+            margin-right: 32px;
           }
         }
       }

src/apps/AppGridManagement/SetGird.vue

@@ -307,12 +307,13 @@ export default {
             padding-right: 32px;
             box-sizing: border-box;
             text-align: right;
+             .imgs {
+              width: 60px;
+              height: 60px;
+              vertical-align: middle;
+            }
           }
-          .imgs {
-            width: 40px;
-            height: 40px;
-            margin-right: 20px;
-          }
+         
         }
       }
     }

src/apps/AppGridManagement/Statistics.vue

@@ -113,7 +113,7 @@ uni-page-body {
   height: 100%;
 }
 .Statistics {
-  padding: 130px 30px 0;
+  padding: 0 30px 0;
   box-sizing: border-box;
 
   .middle {

src/apps/AppServicePublic/Add.vue

@@ -1,9 +1,10 @@
 <template>
-  <div class="add" v-if="isShow">
+  <div class="add">
     <div class="header-description">
       <u-form :model="forms" ref="uForm" label-width="auto">
         <u-form-item label="标题" prop="title" required label-position="top">
-          <u-input v-model="forms.title" :focus="true" placeholder="请输入标题(30字以内)" type="textarea" auto-height height="60"
+          <u-input v-model="forms.title" :focus="true" placeholder="请输入标题(30字以内)" type="textarea" auto-height
+                   height="60"
                    maxlength="30"/>
         </u-form-item>
 
@@ -54,7 +55,6 @@ export default {
       id: '',
       forms: {
         title: '',
-        content: '',
         areaId: '',
         selectIndex: '',
         files: []
@@ -66,7 +66,6 @@ export default {
       listName: '',
       selectList: [],
       isHideCoverimg: false,
-      isShow: false
     }
   },
   computed: {...mapState(['user'])},
@@ -78,7 +77,6 @@ export default {
     }
     if (!o.id) {
       this.forms.areaId = this.user.areaId
-      this.isShow = true
     }
     this.listName = o.listName
     this.getType()
@@ -86,11 +84,8 @@ export default {
   onShow() {
     document.title = this.listName
   },
-
-  mounted() {
-  },
   methods: {
-    getModuleInfo () {
+    getModuleInfo() {
       this.$http.post(`/app/appcontentmoduleinfo/queryDetailById?id=${this.moduleId}`).then(res => {
         if (res.code === 0) {
           this.isHideCoverimg = res.data.styleType === '0'
@@ -100,7 +95,7 @@ export default {
     getDetail() {
       this.$http.post(`/app/appcontentinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res?.data) {
-          this.forms = {...res.data}
+          this.forms = res.data
           if (this.selectList.length) {
             this.selectList.map((item, index) => {
               if (item.id == res.data.categoryId) {
@@ -111,13 +106,12 @@ export default {
           if (res.data.images) {
             this.forms.images = JSON.parse(res.data.images || '[]')
           }
-          this.isShow = true
         }
       })
     },
     getType() {
       this.$http.post(`/app/appcontentmoduleinfo/listByName?names=${this.listName}`).then((res) => {
-        if (res.code == 0) {
+        if (res?.code == 0) {
           if (res.data && res.data.length) {
             this.selectList = res.data[0].categoryList
             this.selectList.map((item, index) => {