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

src/apps/AppServicePublic/Add.vue

@@ -9,13 +9,13 @@
         <u-form-item label="公开类型" prop="status" required style="position: relative">
           <u-input v-model="forms.status" disabled placeholder="请选择公开类型" @click="showStstus = true" />
 
-          <u-select v-model="showStstus" :list="$dict.getDict('realityStatus')" value-name="dictValue" label-name="dictName" @confirm="realityStstus"></u-select>
+          <u-select v-model="showStstus" :list="$dict.getDict('realityStatus')" value-name="dictValue" label-name="dictName" @confirm="selectStatus"></u-select>
 
           <u-icon name="arrow-right" color="#CCCCCC" style="position: absolute; top: 25px; right: 30px"></u-icon>
         </u-form-item>
 
         <u-form-item label="发布地区" prop="areaId" required style="position: relative">
-          <AiAreaPicker v-model="areaId" :areaId="areaIdProps" @select="areaSelect"></AiAreaPicker>
+          <AiAreaPicker v-model="forms.areaId" :areaId="areaIdProps" @select="areaSelect"></AiAreaPicker>
 
           <u-icon name="arrow-right" color="#CCCCCC" style="position: absolute; top: 25px; right: 30px"></u-icon>
         </u-form-item>
@@ -45,10 +45,11 @@ export default {
   props: {},
   data() {
     return {
-      show: false,
+      id: '',
       forms: {
         title: '',
         status: '',
+        statusValue: '',
         content: '',
         fileIds: [],
         areaId: '',
@@ -59,43 +60,45 @@ export default {
     }
   },
   computed: { ...mapState(['user']) },
-  created() {
+  onLoad(o) {
+    console.log(o)
+    this.id = o.id
     this.areaIdProps = this.user.areaId
     this.$dict.load('realityStatus').then(() => {
       this.getDetail()
     })
   },
+
   mounted() {},
   methods: {
-    getDetail() {
-      this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.params.id}`).then((res) => {
-        if (res?.data) {
-          this.forms = res.data
-          this.forms.realityValue = res.data.reality
-          this.forms.reality = this.$dict.getLabel('realityStatus', res.data.reality)
-          if (res.data.images) {
-            this.forms.images = JSON.parse(res.data.images || '[]')
-          }
-        }
-      })
-    },
+    // getDetail() {
+    //   this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.id}`).then((res) => {
+    //     if (res?.data) {
+    //       this.forms = res.data
+    //       this.forms.statusValue = res.data.status
+    //       this.forms.status = this.$dict.getLabel('realityStatus', res.data.status)
+    //       if (res.data.images) {
+    //         this.forms.images = JSON.parse(res.data.images || '[]')
+    //       }
+    //     }
+    //   })
+    // },
 
     submit() {
       if (this.flag) return
 
       this.$refs.uForm.validate((valid) => {
         if (valid) {
-          if (!this.forms.create_user_name) {
-            return this.$u.toast('请选择走访慰问对象')
-          }
           if (!this.forms.title) {
-            return this.$u.toast('请输入入户走访事项')
+            return this.$u.toast('请输入标题')
+          }
+          if (!this.forms.content) {
+            return this.$u.toast('请输入正文')
           }
 
           const imgs = []
-          if (this.forms.images) {
-            this.forms.images.map((e) => {
-              console.log(e)
+          if (this.forms.fileIds) {
+            this.forms.fileIds.map((e) => {
               imgs.push({ url: e.url, id: e.id })
             })
           }
@@ -103,26 +106,19 @@ export default {
           this.flag = true
           this.$http
             .post(`/app/appvisitvondolence/addOrUpdate`, {
-              areaId: this.forms.areaId,
-              applicationId: this.forms.applicationId,
-              name: this.forms.create_user_name,
-              optionId: this.forms.applicationId,
-              reality: this.forms.realityValue ? this.forms.realityValue : this.forms.reality,
               title: this.forms.title,
-              description: this.forms.description,
-              createUserId: this.user.id,
-              createUserName: this.user.name,
-              images: JSON.stringify(imgs) || [],
+              status: this.forms.statusValue ? this.forms.statusValue : this.forms.status,
+              areaId: this.forms.areaId,
+              content: this.forms.content,
+              // images: JSON.stringify(imgs) || [],
+              images: imgs || [],
               id: this.id,
             })
             .then((res) => {
-              console.log(4)
               if (res.code == 0) {
-                console.log(5)
                 this.$u.toast('发布成功')
                 this.flag = false
-                uni.navigateTo({ url: `./AppWalkask` })
-                console.log(6)
+                uni.navigateTo({ url: `./AppServicePublic` })
               }
             })
         } else {
@@ -132,24 +128,12 @@ export default {
     },
 
     areaSelect(e) {
-      if (e.type == 5) {
       this.forms.areaId = e.id
-      } else {
-        return this.$u.toast('请选择到村')
-      }
     },
 
-    backlist(e) {
-      console.log(e.item)
-      this.forms.create_user_name = e.item.create_user_name
-      this.forms.applicationId = e.appId
-      this.forms.optionId = e.item.id
-      // this.addList = true
-    },
-
-    realityStstus(e) {
-      this.forms.reality = e[0].label
-      this.forms.realityValue = e[0].value
+    selectStatus(e) {
+      this.forms.status = e[0].label
+      this.forms.statusValue = e[0].value
     },
   },
 }

src/apps/AppServicePublic/AppServicePublic.vue

@@ -8,13 +8,10 @@
     <u-search class="serach_content" placeholder="请输入公开标题" :show-action="false" v-model="keyword" @clear="clearSearch" @search="search"></u-search>
 
     <template v-if="datas.length > 0">
-      <u-card v-for="(item, index) in datas" :key="index" :foot-border-top="false" :head-border-bottom="false" :show-head="false" :border-radius="32" @click="goDetail(item, 1)">
-        <view class="body" slot="body">
-          <view class="u-body-item">
+      <AiCard v-for="(item, i) in datas" :key="i" @click.native="toAdd(item, 1)">
+        <template #custom>
           <div class="title">{{ item.createUserName }}</div>
-          </view>
 
-          <view class="u-body-item">
           <div class="flex">
             <span class="left">
               <span class="garydiv">财务公开</span>
@@ -26,9 +23,17 @@
               <span>人看过</span>
             </span>
           </div>
-          </view>
-        </view>
-      </u-card>
+
+          <div class="imgs">
+            <!-- <img :src="items.url" alt="" v-for="(items, i) in item.images" :key="i" @click.stop="previewImage(item.images, items.url)" /> -->
+          </div>
+        </template>
+
+        <template #menu>
+          <div class="menu" @tap.stop="toAdd(item, 2)">编辑</div>
+          <div class="menu" @tap.stop="toDetele(item)">删除</div>
+        </template>
+      </AiCard>
 
       <u-loadmore :status="loadmore" color="#999" font-size="24" margin-top="32" margin-bottom="80" />
     </template>
@@ -38,6 +43,8 @@
     <AiFixedBtn>
       <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="toAdd()" />
     </AiFixedBtn>
+
+    <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" :show-title="false" @confirm="delet"></u-modal>
   </div>
 </template>
 
@@ -57,6 +64,8 @@ export default {
       current: 1,
       size: 10,
       pages: 0,
+      deletShow: false,
+      deletId: '',
     }
   },
   computed: {
@@ -92,20 +101,37 @@ export default {
     },
 
     areaSelect(e) {
-      if (e.type == 5) {
       this.areaId = e.id
-      } else {
-        return this.$u.toast('请选择到村')
-      }
       this.getList()
     },
 
-    goDetail(item) {
+    toAdd(item, type) {
+      if (type == '1') {
+        console.log('详情')
         uni.navigateTo({ url: `./Detail?id=${item.id}` })
+      }
+      if (type == '2') {
+        console.log('编辑')
+        uni.navigateTo({ url: `./Add?id=${item.id}` })
+      }
+      if (type == null) {
+        console.log('添加')
+        uni.navigateTo({ url: `./Add` })
+      }
     },
 
-    toAdd() {
-      uni.navigateTo({ url: `./Add` })
+    toDetele(item) {
+      this.deletShow = true
+      this.deletId = item.id
+    },
+
+    delet() {
+      this.$http.post(`/app/appvisitvondolence/delete?ids=${this.deletId}`).then((res) => {
+        if (res.code == 0) {
+          this.$u.toast('删除成功！')
+          this.getList()
+        }
+      })
     },
   },
   onReachBottom() {
@@ -135,14 +161,16 @@ uni-page-body {
     padding: 20px 30px;
   }
 
-  .u-card {
-    ::v-deep .u-card__body {
-      .body {
-        position: relative;
-        .u-body-item {
+  ::v-deep .AiCard {
+    background: #f3f6f9;
+    .start {
+      background: #fff;
+      padding: 32px;
+      border-radius: 16px;
       .title {
-            font-size: 36px;
+        font-size: 32px;
         font-weight: 500;
+        color: #333333;
         margin-bottom: 16px;
       }
       .flex {
@@ -172,6 +200,17 @@ uni-page-body {
         }
       }
     }
+    .mask {
+      .moreMenu {
+        .menu {
+          text-align: center;
+          line-height: 80px;
+          width: 192px;
+          height: 80px;
+          font-size: 28px;
+          font-weight: 400;
+          color: #333333;
+        }
       }
     }
   }

src/apps/AppServicePublic/Detail.vue

@@ -25,13 +25,32 @@ export default {
   components: {},
   props: {},
   data() {
-    return {}
+    return {
+      data: [],
+      id: '',
+    }
   },
   computed: {},
   watch: {},
-  created() {},
+  onLoad(o) {
+    this.id = o.id
+    this.$dict.load('realityStatus').then(() => {
+      // this.getDetail()
+    })
+  },
   mounted() {},
-  methods: {},
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.id}`).then((res) => {
+        if (res?.data) {
+          this.data = res.data
+          if (this.data.images) {
+            this.data.images = JSON.parse(this.data.images || '[]')
+          }
+        }
+      })
+    },
+  },
 }
 </script>
 

src/apps/AppSpecialPeople/AppSpecialPeople.vue

@@ -18,7 +18,7 @@ export default {
 
   data() {
     return {
-      component: 'add',
+      component: 'Detail',
       params: {}
     }
   },

src/apps/AppSpecialPeople/components/detail.vue

@@ -1,6 +1,102 @@
 <template>
   <div class="detail">
-    
+    <div class="tab-select">
+      <div class="item active">统计信息<span></span></div>
+      <div class="item">人员信息<span></span></div>
+    </div>
+    <div class="area-select">
+      <div class="select-content">
+        <div class="area-content">
+          <AiAreaPicker ref="areaIds" :areaId="areaId" mode="custom" all @select="areaSelect">
+            <img src="./img/local-icon.png" alt="">
+            <span class="label" v-if="addressArea">{{ addressArea }}</span>
+            <span v-else>请选择</span>
+            <u-icon name="arrow-down" color="#666" size="24" />
+          </AiAreaPicker>
+        </div>
+        <div class="search-input">
+          <img src="./img/search-icon.png" alt="">
+          <u-input type="text" placeholder="请输入姓名" placeholder-style="color:#999;font-size:13px;" height="18" />
+        </div>
+      </div>
+    </div>
+    <div v-if="!tabIndex">
+      <div class="info-content">
+      <div class="title">特殊人群</div>
+      <div class="num-content">
+        <div class="num-item">
+          <h3>18</h3>
+          <p>残疾人</p>
+        </div>
+        <div class="num-item">
+          <h3>18</h3>
+          <p>精神疾病患者</p>
+        </div>
+        <div class="num-item">
+          <h3>18</h3>
+          <p>社区矫正人群</p>
+        </div>
+        <div class="num-item">
+          <h3>18</h3>
+          <p>吸毒人员</p>
+        </div>
+        <div class="num-item">
+          <h3>18</h3>
+          <p>刑满释放人员</p>
+        </div>
+      </div>
+      </div>
+      <div class="info-content">
+        <div class="title">本月新增</div>
+        <div class="num-content color-org">
+          <div class="num-item">
+            <h3>18</h3>
+            <p>残疾人</p>
+          </div>
+          <div class="num-item">
+            <h3>18</h3>
+            <p>精神疾病患者</p>
+          </div>
+          <div class="num-item">
+            <h3>18</h3>
+            <p>社区矫正人群</p>
+          </div>
+          <div class="num-item">
+            <h3>18</h3>
+            <p>吸毒人员</p>
+          </div>
+          <div class="num-item">
+            <h3>18</h3>
+            <p>刑满释放人员</p>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <div class="item-content">
+        <div class="title">
+          <h2>精神病患者</h2>
+          <img src="./img/down-icon.png" alt="">
+        </div>
+        <div class="user-list">
+          <div class="user-item">
+            <div class="user-img">
+              <img src="./img/user-img.png" alt="">
+            </div>
+            <div class="user-info">
+              <p class="name">李毅</p>
+              <div class="phone">
+                <span>428008******8765</span>
+                <span>18164065235</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="footer">
+        <div class="btn">新增特殊人群信息</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -10,16 +106,20 @@ export default {
 
   data() {
     return {
-
+      areaId: '',
+      tabIndex: 1,
+      addressArea: ''
     }
   },
   computed: { ...mapState(['user']) },
   mounted() {
-
+    this.areaId = this.user.areaId
   },
 
   methods: {
+    areaSelect() {
 
+    }
     
   }
 }
@@ -27,6 +127,205 @@ export default {
 
 <style lang="scss" scoped>
 .detail {
-  
+  .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;
+      }
+    }
+  }
+  .area-select{
+    width: 100%;
+    background: #FFF;
+    padding-left: 32px;
+    box-sizing: border-box;
+    .select-content{
+      width: 100%;
+      padding: 24px 32px 24px 0;
+      border-bottom: 1px solid #D8DDE6;
+      display: flex;
+      justify-content: space-between;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #333;
+      line-height: 44px;
+      box-sizing: border-box;
+      display: flex;
+      .area-content{
+        width: calc(100% - 402px);
+        line-height: 64px;
+        img{
+          width: 42px;
+          vertical-align: middle;
+          margin-right: 16px;
+        }
+        .u-icon{
+          margin-left: 6px;
+        }
+      }
+      .search-input{
+        width: 402px;
+        height: 64px;
+        background: #F5F5F5;
+        border-radius: 32px;
+        padding: 14px 32px;
+        box-sizing: border-box;
+        img{
+          width: 32px;
+          height: 32px;
+          margin-right: 12px;
+        }
+        ::v-deep .u-input{
+          display: inline-block;
+          width: 280px;
+          font-size: 26px;
+        }
+      }
+    }
+  }
+  .info-content{
+    width: calc(100% - 64px);
+    background: #FFF;
+    border-radius: 8px;
+    margin: 24px 32px 0;
+    .title{
+      padding-left: 32px;
+      line-height: 94px;
+      border-bottom: 1px solid #ddd;
+      font-size: 32px;
+      font-family: PingFangSC-Medium, PingFang SC;
+      font-weight: 500;
+      color: #333;
+    }
+    .num-content{
+      overflow: hidden;
+      .num-item{
+        float: left;
+        width: 33%;
+        padding: 40px 0;
+        text-align: center;
+        h3{
+          font-size: 64px;
+          font-family: DINAlternate-Bold, DINAlternate;
+          font-weight: bold;
+          color: #3192F4;
+          line-height: 74px;
+          margin-bottom: 10px;
+        }
+        p{
+          font-size: 28px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #999;
+          line-height: 40px;
+        }
+      }
+    }
+    .color-org{
+      .num-item{
+        h3{
+          color: #FF8700;
+        }
+      }
+    }
+  }
+  .item-content{
+    margin-bottom: 4px;
+    .title{
+      width: 100%;
+      height: 108px;
+      line-height: 108px;
+      background: #FFF;
+      padding: 0 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      h2{
+        font-size: 32px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        color: #333;
+      }
+      img{
+        width: 34px;
+        height: 34px;
+        margin-top: 38px;
+        transition: all .3s ease-in-out;
+      }
+      .img-active {
+        transform: rotate(180deg);
+      }
+    }
+    .user-list{
+      background-color: #fff;
+      .user-item{
+        padding: 24px 32px;
+        display: flex;
+        .user-img{
+          width: 112px;
+          img{
+            width: 80px;
+            height: 80px;
+          }
+        }
+        .user-info{
+          .name{
+            font-size: 32px;
+            font-family: PingFangSC-Medium, PingFang SC;
+            font-weight: 500;
+            color: #333;
+            line-height: 44px;
+            margin-bottom: 8px;
+          }
+          .phone{
+            font-size: 26px;
+            font-family: PingFangSC-Regular, PingFang SC;
+            color: #999;
+            line-height: 36px;
+            display: flex;
+            justify-content: space-between;
+          }
+        }
+      }
+    }
+  }
+  .footer{
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+  }
+  .btn{
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    background: #1365DD;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #FFF;
+  }
 }
 </style>

src/apps/AppWalkask/add.vue

@@ -4,8 +4,7 @@
       <div class="header-description">
         <u-form :model="forms" ref="uForm" label-width="auto">
           <u-form-item label="区域选择" prop="areaId" style="position: relative">
-            <AiAreaPicker v-model="forms.areaId" ref="areaIds" :areaId="areaIdProps" @select="areaSelect"
-                          style="color: #333"></AiAreaPicker>
+            <AiAreaPicker v-model="forms.areaId" ref="areaIds" :areaId="areaIdProps" @select="areaSelect" style="color: #333"></AiAreaPicker>
           </u-form-item>
 
           <u-form-item label="走访对象" prop="create_user_name" required style="position: relative">
@@ -17,21 +16,18 @@
           <u-form-item label="现实状态" prop="reality" style="position: relative">
             <u-input v-model="forms.reality" disabled placeholder="请选择走访慰问对象" @click="showStstus = true" />
 
-            <u-select v-model="showStstus" :list="$dict.getDict('realityStatus')" value-name="dictValue"
-                      label-name="dictName" @confirm="realityStstus"></u-select>
+            <u-select v-model="showStstus" :list="$dict.getDict('realityStatus')" value-name="dictValue" label-name="dictName" @confirm="realityStstus"></u-select>
 
             <u-icon name="arrow-right" color="#CCCCCC" style="position: absolute; top: 25px; right: 30px"></u-icon>
           </u-form-item>
 
           <u-form-item label="入户走访事项" prop="title" required label-position="top">
-            <u-input v-model="forms.title" placeholder="请输入入户走访事项(30字以内)" type="textarea" auto-height height="60"
-                     maxlength="30"/>
+            <u-input v-model="forms.title" placeholder="请输入入户走访事项(30字以内)" type="textarea" auto-height height="60" maxlength="30" />
             <div>{{ forms.title.length }}/30</div>
           </u-form-item>
 
           <u-form-item label="入户走访内容" prop="description" label-position="top">
-            <u-input v-model="forms.description" placeholder="请输入入户走访事项(500字以内)" type="textarea" auto-height height="60"
-                     maxlength="500"/>
+            <u-input v-model="forms.description" placeholder="请输入入户走访事项(500字以内)" type="textarea" auto-height height="60" maxlength="500" />
             <div>{{ forms.description.length }}/500</div>
           </u-form-item>
 
@@ -106,7 +102,6 @@ export default {
     },
 
     submit() {
-      console.log(1)
       if (this.flag) return
 
       this.$refs.uForm.validate((valid) => {
@@ -121,7 +116,6 @@ export default {
           const imgs = []
           if (this.forms.images) {
             this.forms.images.map((e) => {
-              console.log(e)
               imgs.push({ url: e.url, id: e.id })
             })
           }
@@ -142,13 +136,10 @@ export default {
               id: this.id,
             })
             .then((res) => {
-            console.log(4)
               if (res.code == 0) {
-              console.log(5)
                 this.$u.toast('保存成功')
                 this.flag = false
                 uni.navigateTo({ url: `./AppWalkask` })
-              console.log(6)
               }
             })
         } else {

src/components/AiAreaPicker.vue

@@ -54,7 +54,7 @@ export default {
       return this.fullArea?.slice(-1)?.[0] || {}
     },
     icon() {
-      return this.$cdn + '/img/location.svg'
+      return this.$cdn + 'location.svg'
     },
   },
   data() {