From ae03041e34233cd03c1697529bb055518516f288 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Thu, 30 Dec 2021 17:03:26 +0800
Subject: [PATCH 1/4] 26142

---
 src/apps/AppResidentActivitie/Add.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/apps/AppResidentActivitie/Add.vue b/src/apps/AppResidentActivitie/Add.vue
index 26100355..ab897732 100644
--- a/src/apps/AppResidentActivitie/Add.vue
+++ b/src/apps/AppResidentActivitie/Add.vue
@@ -7,7 +7,9 @@
         </u-form-item>
 
         <u-form-item label="活动详情" prop="content" required :border-bottom="false" label-position="top" class="contents">
-          <u-input v-model="forms.content" placeholder="请输入活动详情(500字以内)" type="textarea" auto-height height="100" maxlength="500" />
+          <!-- <u-input v-model="forms.content" placeholder="请输入活动详情(500字以内)" type="textarea" auto-height height="100" maxlength="500" /> -->
+          <AiEditor v-model="forms.content" placeholder="请输入活动详情(500字以内)" :maxlength="500" />
+
         </u-form-item>
 
         <div class="line"></div>

From d79479f5169ce3800bc11048759253c5312c31bf Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 30 Dec 2021 17:26:15 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B5=B0=E8=AE=BF=E6=85=B0=E9=97=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppWalkask/AppWalkask.vue | 18 +++++++++---------
 src/apps/AppWalkask/add.vue        | 18 ++++++++++--------
 src/apps/AppWalkask/walkObject.vue |  6 ++++--
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/apps/AppWalkask/AppWalkask.vue b/src/apps/AppWalkask/AppWalkask.vue
index 21dbf608..6b09fb9c 100644
--- a/src/apps/AppWalkask/AppWalkask.vue
+++ b/src/apps/AppWalkask/AppWalkask.vue
@@ -9,7 +9,7 @@
         <div class="currentLeft">
           <div class="currentLeft-top">
             <div class="left">
-              <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" style="color:#fff;">
+              <AiAreaPicker v-model="areaId" all :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color:#fff;">
                 <img :src="$cdn+'location.svg'" alt="" style="width:18px;height:18px;margin-right:4px;vertical-align: middle;">
                 <span class="label" v-if="areaName">{{ areaName }}</span>
                 <span v-else>请选择</span>
@@ -29,10 +29,10 @@
                   <span class="tags">{{ $dict.getLabel('realityStatus', item.reality) }}</span>
                 </div>
 
-                <div class="cards-hint">{{ item.description }}</div>
+                <div class="cards-hint">{{ item.title }}</div>
 
                 <div class="imgs">
-                  <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i" @click.stop="previewImage(item.images, items.url)" />
+                  <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i" @click.stop="previewImage(item.images, items.url)" v-if="i < 3" />
                 </div>
 
                 <div class="cards-bottom">
@@ -62,9 +62,7 @@
 
       <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" :show-title="false" @confirm="delet"></u-modal>
 
-      <AiFixedBtn>
-        <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="goDetail()" />
-      </AiFixedBtn>
+      <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="goDetail()" />
     </template>
   </div>
 </template>
@@ -154,9 +152,7 @@ export default {
     },
 
     areaSelect(e) {
-      console.log(e)
-      this.areaId = e.id
-      this.areaName = e.name
+      this.areaId = e
       this.getList()
     },
 
@@ -348,6 +344,10 @@ uni-page-body {
     justify-content: center;
     align-items: center;
     display: flex;
+    position: fixed;
+    right: 6px;
+    bottom: 106px;
+    z-index: 9;
   }
 }
 </style>
diff --git a/src/apps/AppWalkask/add.vue b/src/apps/AppWalkask/add.vue
index e3992734..5866c6d6 100644
--- a/src/apps/AppWalkask/add.vue
+++ b/src/apps/AppWalkask/add.vue
@@ -4,7 +4,11 @@
       <div class="header-description">
         <u-form :model="forms" ref="uForm" label-width="auto">
           <u-form-item label="区域选择" prop="areaId" class="areaIds" style="position: relative">
-            <AiAreaPicker v-model="forms.areaId" :areaId="areaIdProps" @select="areaSelect" style="color: #333"></AiAreaPicker>
+            <AiAreaPicker v-model="forms.areaId" :areaId="areaIdProps" @select="areaSelect" style="color: #333" :name.sync="forms.areaName">
+              <span class="label" v-if="forms.areaName">{{ forms.areaName }}</span>
+              <span v-else style="color:rgb(192, 196, 204);font-size:14px;">请选择</span>
+              <u-icon name="arrow-right" color="rgb(192, 196, 204)" size="30" style="margin-left:4px;" />
+            </AiAreaPicker>
           </u-form-item>
 
           <div class="line"></div>
@@ -38,7 +42,7 @@
           <div class="line"></div>
 
           <u-form-item label="图片(最多9张)" prop="images" class="avatars" label-position="top" :border-bottom="false">
-            <AiUploader :def.sync="forms.images" multiple placeholder="上传图片" :limit="9"></AiUploader>
+            <AiUploader :def.sync="forms.images" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
           </u-form-item>
         </u-form>
       </div>
@@ -65,6 +69,7 @@ export default {
       show: false,
       forms: {
         areaId: '',
+        areaName: '',
         optionId: '',
         create_user_name: '',
         reality: '',
@@ -88,6 +93,7 @@ export default {
     this.id = o.id
     this.areaIdProps = this.user.areaId
     this.forms.areaId = this.user.areaId
+    this.forms.areaName = this.user.areaName
     this.$dict.load('realityStatus').then(() => {
       this.getDetail()
     })
@@ -165,12 +171,7 @@ export default {
     },
 
     areaSelect(e) {
-      if (e.type == 5) {
-        this.forms.areaId = e.id
-      }
-      if (e.type == 4) {
-        this.forms.areaId = e.id
-      }
+      this.forms.areaId = e
     },
 
     backlist(e) {
@@ -280,6 +281,7 @@ export default {
     font-size: 32px;
     font-weight: 500;
     color: #ffffff;
+    z-index: 999;
   }
 }
 </style>
diff --git a/src/apps/AppWalkask/walkObject.vue b/src/apps/AppWalkask/walkObject.vue
index 8cb40603..96e55e38 100644
--- a/src/apps/AppWalkask/walkObject.vue
+++ b/src/apps/AppWalkask/walkObject.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="walkObject">
     <div class="header-top">
-      <u-search v-model="keyword" placeholder="搜索" :show-action="false" bg-color="#F5F5F5" search-icon-color="#CCCCCC" placeholder-color="#999999" @search="handerSearch" @clear="handerClear"></u-search>
+      <u-search v-model="keyword" placeholder="请输入姓名" :show-action="false" bg-color="#F5F5F5" search-icon-color="#CCCCCC" placeholder-color="#999999" @search="handerSearch" @clear="handerClear"></u-search>
     </div>
 
     <div class="header-middle">
@@ -170,12 +170,14 @@ export default {
     }
 
     .Checkbox {
-      padding: 0 20px 0 30px;
+      padding: 0 0px 0 30px;
 
       ::v-deep .u-collapse {
         .u-collapse-item {
           .u-collapse-body {
             // display: inline;
+              padding-bottom: 4px;
+              box-sizing: content-box;
             .u-radio-group {
               .u-radio {
                 line-height: 0;

From 585f6f5a838e858f357c9c673c4a05aed1160c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Thu, 30 Dec 2021 17:29:39 +0800
Subject: [PATCH 3/4] 26025

---
 src/apps/AppMarryAndDie/CadreList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/apps/AppMarryAndDie/CadreList.vue b/src/apps/AppMarryAndDie/CadreList.vue
index 4a357c79..c920f913 100644
--- a/src/apps/AppMarryAndDie/CadreList.vue
+++ b/src/apps/AppMarryAndDie/CadreList.vue
@@ -122,7 +122,6 @@ export default {
           params: {
             size: 6,
             current: this.current,
-            modeType: 0,
             personType: 1,
           },
         })

From 91bdafa9769042e2db2cf7a8114a85848f91f05c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Thu, 30 Dec 2021 17:33:45 +0800
Subject: [PATCH 4/4] 25895

---
 src/apps/AppWorkonline/Opinion.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppWorkonline/Opinion.vue b/src/apps/AppWorkonline/Opinion.vue
index 0f1b4c41..2a35034e 100644
--- a/src/apps/AppWorkonline/Opinion.vue
+++ b/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" action="/admin/file/add2" :size="2097152" preview />
+            <AiUploader multiple @list="(v) => (picture = v)" :limit="9" action="/admin/file/add2" preview />
           </div>
         </div>
       </div>