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

src/apps/AppMeetingNotice/AppMeetingNotice.vue

@@ -68,9 +68,6 @@ export default {
       params: null,
     }
   },
-  created() {
-    document.title = "会议通知";
-  },
   computed: {
     grid() {
       return [
@@ -134,6 +131,7 @@ export default {
   },
 
   onShow() {
+    document.title = "会议通知";
     this.$dict.load("meetingNoticeBefore", "meetingNoticeAfter");
     this.getData();
   },

src/apps/AppMeetingNotice/belongToMe.vue

@@ -63,7 +63,6 @@ export default {
     }
   },
   created() {
-    document.title = "我发起的";
     this.injectJWeixin(['sendChatMessage']).then(() => {
       this.getList()
     })

src/apps/AppNotification/AppNotification.vue

@@ -132,13 +132,10 @@ export default {
     }
   },
 
-  created() {
-    document.title = "通知公告";
-    this.$dict.load("announcementStatus");
-  },
-
   onShow() {
     this.current = 1;
+    document.title = "通知公告";
+    this.$dict.load("announcementStatus");
     this.injectJWeixin(['sendChatMessage']).then(() => {
       this.getList();
     })
@@ -219,7 +216,8 @@ export default {
     change(val) {
       this.index = val;
       this.current = 1;
-      this.getList()
+      this.dataList = [];
+      this.getList();
     },
     getList() {
       this.$http.post(this.index == 0 ? "/app/appannouncement/list-latest" : "/app/appannouncement/list-mgr", null, {

src/apps/AppNotification/add.vue

@@ -99,7 +99,6 @@ export default {
   },
 
   onLoad(opt) {
-    document.title = "新增公告";
     if(opt.id) {
       this.form.id = opt.id;
       this.flag = opt.flag;
@@ -165,16 +164,15 @@ export default {
         status,
       }).then(res => {
         if (res.code == 0) {
-          this.$u.toast(status == 1 ? "发布成功" : "保存成功")
+          this.$u.toast(status == 1 ? "发布成功" : "保存成功");
-          this.$refs["aiBack"].back()
+          this.$refs["aiBack"].back();
         }
       })
     },
-    select() {
+  },
-      uni.navigateTo({
+
-        url: "/pages/meetingNotice/components/notice"
+  onShow() {
-      })
+    document.title = "新增公告";
-    }
   },
   computed: {
     background() {

src/apps/AppNotification/detail.vue

@@ -74,7 +74,6 @@
     },
 
     onLoad(opt) {
-      document.title = "公告详情";
       this.id = opt.id;
       this.flag = opt.flag;
     },
@@ -85,6 +84,10 @@
       })
     },
 
+    onShow() {
+      document.title = "公告详情";
+    },
+
     methods: {
       ...mapActions(['previewFile', 'injectJWeixin']),
       preFile(e) {
@@ -112,7 +115,7 @@
       },
       handleClick() {
         uni.navigateTo({
-          url:"/apps/notification/read?id=" + this.id,
+          url:"/apps/AppNotification/read?id=" + this.id,
         })
       }
     },

src/apps/AppWalkask/AppWalkask.vue

@@ -14,36 +14,20 @@
               <img src="./components/images/icon2.png" alt="" />
 
               <AiAreaPicker v-model="areaId" ref="areaIds" :areaId="areaId" @select="areaSelect" style="color: #fff"> </AiAreaPicker>
-
-              <!-- <div class="btns" style="display: inline-block" @click="show = true">
-                <u-icon name="arrow-down"></u-icon>
-              </div> -->
             </div>
 
             <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF" search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch" @clear="handerClear"></u-search>
-
-            <u-select v-model="show" :list="areaList"></u-select>
           </div>
 
-          <div @click.stop="btnHide" class="datas" v-if="data.length > 0">
+          <template v-if="data.length > 0">
-            <div class="cards" @click.stop="toDetail(item)" v-for="(item, i) in data" :key="i">
+            <AiCard v-for="(item, i) in data" :key="i" @click.native="goDetail(item, 1)">
-              <div class="cards-top">
+              <template #custom>
                 <div class="cards-left">
                   <span class="walkName">走访对象：{{ item.createUserName }}</span>
                   <span class="tags">残疾人</span>
                   <span class="tags">居家看护</span>
                 </div>
 
-                <div class="cards-right" @click.stop="showHide">
-                  <img src="./components/images/1.png" alt="" />
-                </div>
-
-                <div class="btn" v-if="showBtn">
-                  <span @click="toAdd(item)">编辑</span>
-                  <span @click="toDetele(item)">删除</span>
-                </div>
-              </div>
-
                 <div class="cards-hint">{{ item.description }}</div>
 
                 <div class="imgs">
@@ -52,15 +36,21 @@
 
                 <div class="cards-bottom">
                   <span>走访人：{{ item.createUserName }}</span>
-                <span>{{ item.createTime }}</span>
+                  <span style="margin-left: 8px">{{ item.createTime }}</span>
-              </div>
-            </div>
                 </div>
+              </template>
+
+              <template #menu>
+                <div class="menu" @tap.stop="goDetail(item, 2)">编辑</div>
+                <div class="menu" @tap.stop="toDetele(item)">删除</div>
+              </template>
+            </AiCard>
+          </template>
 
           <div v-else>
             <AiEmpty description="您还未添加过入户调查走访" class="emptyWrap"> </AiEmpty>
 
-            <div class="addBtn">点击<span class="toAdd" @click="toAdd">新增按钮</span>试试试吧~</div>
+            <div class="addBtn">点击<span class="toAdds" @click="goDetail">新增按钮</span>试试试吧~</div>
           </div>
         </div>
 
@@ -70,60 +60,52 @@
               <img src="./components/images/icon2.png" alt="" />
 
               <AiAreaPicker v-model="areaId" ref="areaIds" :areaId="areaId" @select="areaSelect" style="color: #fff"> </AiAreaPicker>
-
-              <!-- <div class="btns" style="display: inline-block" @click="show = true">
-                <u-icon name="arrow-down"></u-icon>
-              </div> -->
             </div>
 
             <u-search v-model="keyword" :clearabled="true" placeholder="请输入标题" :show-action="false" bg-color="#1F5CAF" search-icon-color="#E2E8F1" color="#E2E8F1" height="58" @search="handerSearch" @clear="handerClear"></u-search>
-
-            <u-select v-model="show" :list="areaList"></u-select>
           </div>
 
-          <div @click.stop="btnHide" class="datas" v-if="data.length > 0">
+          <template v-if="data.length > 0">
-            <div class="cards" @click.stop="toDetail(item)" v-for="(item, i) in data" :key="i">
+            <AiCard v-for="(item, i) in data" :key="i" @click.native="goDetail(item, 1)">
-              <div class="cards-top">
+              <template #custom>
                 <div class="cards-left">
                   <span class="walkName">走访对象：{{ item.createUserName }}</span>
                   <span class="tags">残疾人</span>
                   <span class="tags">居家看护</span>
                 </div>
 
-                <div class="cards-right" @click.stop="showHide">
-                  <img src="../AppWalkask/components/images/1.png" alt="" />
-                </div>
-
-                <div class="btn" v-if="showBtn">
-                  <span @click="toAdd(item)">编辑</span>
-                  <span @click="toDetele(item)">删除</span>
-                </div>
-              </div>
-
                 <div class="cards-hint">{{ item.description }}</div>
 
                 <div class="imgs">
-                <img :src="items.url" alt="" v-for="items in item.images" :key="items.id" @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)" />
                 </div>
 
                 <div class="cards-bottom">
                   <span>走访人：{{ item.createUserName }}</span>
-                <span>{{ item.createTime }}</span>
+                  <span style="margin-left: 8px">{{ item.createTime }}</span>
-              </div>
-            </div>
                 </div>
+              </template>
+
+              <template #menu>
+                <div class="menu" @tap.stop="goDetail(item, 2)">编辑</div>
+                <div class="menu" @tap.stop="toDetele(item)">删除</div>
+              </template>
+            </AiCard>
+          </template>
 
           <div v-else>
             <AiEmpty description="您还未添加过入户调查走访" class="emptyWrap"> </AiEmpty>
 
-            <div class="addBtn">点击<span class="toAdd" @click="toAdd">新增按钮</span>试试试吧~</div>
+            <div class="addBtn">点击<span class="toAdds" @click="goDetail">新增按钮</span>试试试吧~</div>
           </div>
         </div>
       </div>
 
       <u-modal v-model="deletShow" content="您确认要删除该条信息吗？" :show-cancel-button="true" :mask-close-able="true" :show-title="false" @confirm="delet"></u-modal>
 
-      <img src="../AppWalkask/components/images/add@2x.png" class="fixedImg" alt="" @click="toAdd" />
+      <AiFixedBtn>
+        <div class="addBtn iconfont iconfont-iconfangda" @tap.stop="goDetail()" />
+      </AiFixedBtn>
     </template>
 
     <component v-else :is="comp" :params="params"></component>
@@ -159,19 +141,8 @@ export default {
       ],
       currentTabs: 0,
       show: false,
-      areaList: [
-        {
-          value: '0',
-          label: '武汉',
-        },
-        {
-          value: '1',
-          label: '襄阳',
-        },
-      ],
       current: 0,
       keyword: '',
-      showBtn: false,
       deletShow: false,
       isList: true,
       comp: '',
@@ -183,7 +154,6 @@ export default {
   },
   computed: { ...mapState(['user']) },
   created() {
-    console.log(this.user)
     this.areaId = this.user.areaId
     this.getList()
   },
@@ -225,34 +195,25 @@ export default {
       this.currentTabs = index
     },
 
-    toAdd(item) {
+    goDetail(item, hint) {
-      console.log('编辑', '添加')
+      this.isList = false
-      const id = item.id
+      if (hint == 1 || hint == 2) {
-      // this.isList = false
+        console.log('left', item.id, hint)
-      // this.comp = 'add'
+        this.comp = hint == 1 ? 'detail' : 'add'
-      // this.params = 12313
+        this.params = item
-      if (id) {
+      } else {
+        console.log('right', 2)
         this.comp = 'add'
-        // this.params = id
+        this.params = 111
-        this.params = 12313
-        this.isList = false
       }
     },
 
-    toDetail(item) {
-      // const { id } = item.id
-      this.isList = false
-      this.comp = 'detail'
-      this.params = detail
-    },
-
     toDetele(item) {
       this.deletShow = true
       this.deletId = item.id
     },
 
     delet() {
-      console.log('delet')
       this.$http.post(`/app/appvisitvondolence/delete?ids=${this.deletId}`).then((res) => {
         if (res.code == 0) {
           this.$u.toast('删除成功！')
@@ -261,28 +222,14 @@ export default {
       })
     },
 
-    showHide() {
-      if (this.showBtn == false) {
-        this.showBtn = true
-      } else {
-        this.showBtn = false
-      }
-    },
-
-    btnHide() {
-      this.showBtn = false
-    },
-
     handerSearch(e) {
       this.keyword = e
       this.current = 1
-      // this.getList()
     },
 
     handerClear() {
       this.keyword = ''
       this.current = 1
-      // this.getList()
     },
 
     previewImage(images, img) {
@@ -308,6 +255,7 @@ export default {
         align-items: center;
         background: #3975c6;
         padding: 24px 30px;
+
         .left {
           width: 40%;
           display: flex;
@@ -319,18 +267,16 @@ export default {
         }
       }
 
-      .datas {
+      .AiCard {
-        .cards {
+        ::v-deep .start {
-          margin: 30px 30px 24px 30px;
           border-bottom: 1px solid #dddddd;
-          .cards-top {
+          .fill {
-            display: flex;
-            justify-content: space-between;
             .cards-left {
               .walkName {
                 font-size: 32px;
                 font-weight: 500;
                 margin-right: 16px;
+                color: #333;
               }
               .tags {
                 display: inline-block;
@@ -342,24 +288,6 @@ export default {
                 margin-left: 16px;
               }
             }
-            .cards-right {
-              position: relative;
-              width: 32px;
-              margin-top: 1%;
-            }
-            .btn {
-              position: absolute;
-              z-index: 99;
-              right: 45px;
-              top: 350px;
-              width: 224px;
-              height: 204px;
-              background: #ffffff;
-              box-shadow: 0px 4px 12px 4px rgba(162, 162, 162, 0.5);
-              border-radius: 4px;
-            }
-          }
-
             .cards-hint {
               margin-top: 16px;
               font-size: 30px;
@@ -372,19 +300,17 @@ export default {
               -webkit-line-clamp: 2;
               -webkit-box-orient: vertical;
             }
-
             .imgs {
               margin-top: 20px;
               img {
-              width: 224px;
+                width: 221px;
-              height: 224px;
+                height: 221px;
                 margin-right: 8px;
               }
               img:nth-child(3n + 0) {
                 margin-right: 0;
               }
             }
-
             .cards-bottom {
               margin: 24px 0 16px 0;
               font-size: 24px;
@@ -393,18 +319,47 @@ export default {
           }
         }
 
+        ::v-deep .mask {
+          .moreMenu {
+            .menu {
+              text-align: center;
+              line-height: 80px;
+              width: 192px;
+              height: 80px;
+              font-size: 28px;
+              font-weight: 400;
+              color: #333333;
+            }
+          }
+        }
+      }
+
       .addBtn {
         text-align: center;
         color: #b7b7b7;
         margin-top: 5px;
         font-weight: 800;
-        .toAdd {
+        .toAdds {
           color: #467dfe;
         }
       }
     }
   }
 
+  .addBtn {
+    width: 96px;
+    height: 96px;
+    flex-shrink: 0;
+    background: $uni-color-primary;
+    box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0.2);
+    font-size: 48px;
+    color: #fff;
+    border-radius: 50%;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+  }
+
   .fixedImg {
     position: fixed;
     right: 0;

src/apps/AppWalkask/add.vue

@@ -13,7 +13,7 @@
             <u-input v-model="forms.application" disabled placeholder="请选择走访对象" @click="toWalkObject" />
             <!-- @click="showObject = true" @click="toWalkObject" -->
 
-            <u-select v-model="showObject" :list="Objectlist" @confirm="applicaStatus"></u-select>
+            <!-- <u-select v-model="showObject" :list="Objectlist" @confirm="applicaStatus"></u-select> -->
 
             <u-icon name="arrow-right" color="#CCCCCC" style="position: absolute; top: 25px; right: 30px"></u-icon>
           </u-form-item>
@@ -61,12 +61,15 @@ export default {
   components: {
     walkObject,
   },
-  props: {},
+  props: {
+    params: {},
+  },
   data() {
     return {
       backgroundNavbar: {
         backgroundColor: '#3975C6',
       },
+      show: false,
       forms: {
         areaId: '',
         application: '',
@@ -77,12 +80,6 @@ export default {
         images: [],
       },
       showAreaId: false,
-      Objectlist: [
-        {
-          value: '0',
-          label: '武汉',
-        },
-      ],
       showObject: false,
       showStstus: false,
       flag: false,
@@ -93,9 +90,10 @@ export default {
   },
   computed: { ...mapState(['user']) },
   created() {
-    console.log(this.user)
     this.areaIdProps = this.user.areaId
-    this.$dict.load('realityStatus').then(() => {})
+    this.$dict.load('realityStatus').then(() => {
+      this.getDetail()
+    })
   },
   mounted() {
     this.$on('black', (data) => {
@@ -103,6 +101,20 @@ export default {
     })
   },
   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 || '[]')
+          }
+        }
+      })
+    },
+
     submit() {
       console.log(1)
       if (this.flag) return
@@ -115,7 +127,6 @@ export default {
           if (!this.forms.title) {
             return this.$u.toast('请输入入户走访事项')
           }
-          console.log(2)
 
           const imgs = []
           if (this.forms.images) {
@@ -125,14 +136,13 @@ export default {
             })
           }
 
-          console.log(3)
           this.flag = true
           this.$http
             .post(`/app/appvisitvondolence/addOrUpdate`, {
               areaId: this.forms.areaId,
               applicationId: '02fcf19c81154f6ea9560d9a9deee9f4',
               optionId: '4703806718f842a98a28df554c6aa6b2',
-              reality: this.forms.reality == Number ? this.forms.reality : this.forms.realitylabel,
+              reality: this.forms.realityValue ? this.forms.realityValue : this.forms.reality,
               title: this.forms.title,
               description: this.forms.description,
               createUserId: this.user.id,
@@ -146,7 +156,7 @@ export default {
                 console.log(5)
                 this.$u.toast('保存成功')
                 this.flag = false
-                uni.navigateBack({})
+                uni.navigateTo({ url: `./AppWalkask` })
                 console.log(6)
               }
             })
@@ -164,14 +174,7 @@ export default {
       }
     },
 
-    applicaStatus(e) {
-      console.log(e)
-      this.forms.object = e[0].value
-      this.forms.objectlabel = e[0].label
-    },
-
     realityStstus(e) {
-      console.log(e)
       this.forms.reality = e[0].label
       this.forms.realityValue = e[0].value
     },
@@ -193,15 +196,10 @@ export default {
     ::v-deep .u-form {
       .u-form-item {
         margin-bottom: 16px;
-        // padding-bottom: 10px !important;
         .u-form-item__body {
-          // .u-form-item--right {
-          //   .u-form-item--right__content {
           .u-form-item--right__content__slot {
             padding-bottom: 0;
           }
-          //   }
-          // }
         }
       }
       .u-form-item:last-child {
@@ -210,21 +208,11 @@ export default {
       }
       .avatars {
         .u-form-item__body {
-          // .u-form-item--right {
-          //   .u-form-item--right__content {
-          //     .u-form-item--right__content__slot {
-          //       .ai-uploader {
-          //         .fileList {
           .default {
             width: 160px;
             height: 160px;
           }
         }
-        // }
-        //       }
-        //     }
-        //   }
-        // }
       }
     }
   }

src/apps/AppWalkask/detail.vue

@@ -3,37 +3,34 @@
     <u-navbar title="走访详情" back-icon-color="#fff" title-color="#fff" title-width="300" title-size="36" :border-bottom="false" :background="backgroundNavbar"> </u-navbar>
 
     <div class="header-top">
-      <div class="hint">花园小区1栋101脱贫攻坚走访——沙堡村李维民</div>
+      <div class="hint">{{ data.title }}</div>
 
       <div class="walk-item">
         <span>走访对象：</span>
-        <span>李维民</span>
+        <span>{{ data.createUserName }}</span>
       </div>
 
-      <div class="walk-item">
+      <div class="walk-item" v-if="data.reality">
         <span>现实状态：</span>
-        <span>李维民</span>
+        <span>{{ $dict.getLabel('realityStatus', data.reality) }} </span>
       </div>
 
       <div class="walk-item">
         <span>走访人员：</span>
-        <span>李维民</span>
+        <span>{{ data.createUserName }}</span>
       </div>
 
       <div class="walk-item">
         <span>走访时间：</span>
-        <span>2021-12-28 14:00</span>
+        <span>{{ data.createTime }}</span>
       </div>
     </div>
 
     <div class="header-middle">
-      <div class="hint-con">本次议事会通过“7步议事法”即收集意见、确认议题、制定方案、发布公告、组织协商、结果运用、反馈公示的模拟方式，进行协商讨论，并教授议事会成员自如运用议事措施开展后续落地计划的学习性和功能性会议。 组织协商、结果运用、反馈公示的模拟方式，进行协商讨论，并教授议事会成员自如运用议事措施开展后续落地计划的线上学习性和功能性会议。作为基层民主自治的新亮点，已经全面铺开的互联网+“议事大厅”使得三联村成功走出了一条集思广益、民主决策和村民自治的新路子。</div>
+      <div class="hint-con" v-if="data.description">{{ data.description }}</div>
 
       <div class="imgs">
-        <img src="./components/images/天使彦5.jpg" alt="" />
+        <img :src="item.url" alt="" v-for="(item, index) in data.images" :key="index" />
-        <img src="./components/images/天使彦5.jpg" alt="" />
-        <img src="./components/images/天使彦5.jpg" alt="" />
-        <img src="./components/images/天使彦5.jpg" alt="" />
       </div>
     </div>
 
@@ -45,7 +42,9 @@
 export default {
   name: 'detail',
   components: {},
-  props: {},
+  props: {
+    params: {},
+  },
   data() {
     return {
       data: {},
@@ -56,14 +55,19 @@ export default {
   },
   computed: {},
   created() {
+    this.$dict.load('realityStatus').then(() => {
       this.getDetail()
+    })
   },
   mounted() {},
   methods: {
     getDetail() {
-      this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.id}`).then((res) => {
+      this.$http.post(`/app/appvisitvondolence/queryDetailById?id=${this.params.id}`).then((res) => {
         if (res?.data) {
           this.data = res.data
+          if (this.data.images) {
+            this.data.images = JSON.parse(this.data.images || '[]')
+          }
         }
       })
     },