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

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>

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>

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;