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

src/apps/AppHandSnapshot/Detail.vue

@@ -71,7 +71,7 @@
                 {{ item.girdMemberName && item.girdMemberName.substring(item.girdMemberName.length, item.girdMemberName.length - 2) }}
               </span>
 
-              <img src="./components/1.png" class="avatarIcon" alt="" />
+              <!-- <img src="./components/1.png" class="avatarIcon" alt="" /> -->
             </div>
 
             <div class="cardss-right">
@@ -102,12 +102,12 @@
     <div class="fixedBtn">
       <div class="status00" v-if="data.eventStatus == 0">
         <div class="columns border-r" @click="toContent(1)">
-          <img src="./components/img/zhuanjiao.png" alt="" />
+          <!-- <img src="./components/img/zhuanjiao.png" alt="" /> -->
           <span class="hint">转交事件</span>
         </div>
 
         <div class="columns" @click="toContent(2)">
-          <img src="./components/img/jujue.png" alt="" />
+          <!-- <img src="./components/img/jujue.png" alt="" /> -->
           <span class="hint">拒绝受理</span>
         </div>
 
@@ -198,7 +198,7 @@ uni-page-body {
       width: 80px;
       height: 80px;
       line-height: 80px;
-      background: #4e8eee;
+      background: #3975c6;
       border-radius: 50%;
       color: #fff;
       text-align: center;

src/apps/AppHelpDeclaration/SelectUser.vue

@@ -0,0 +1,339 @@
+<template>
+  <div class="SelectUser">
+    <div class="header-middle">
+      <div class="hint">
+        <span v-for="(item, index) in slectList" :key="index"><span v-if="index" style="margin:0 4px;">/</span><span style="color:#3F8DF5" @click="girdNameClick(item, index)">{{item.girdName}}</span></span>
+      </div>
+
+      <div class="showTypes" v-if="!userList.length">
+        <div v-if="treeList.length > 0">
+          <div class="cards" v-for="(item, index) in treeList" :key="index" @click="itemClick(item)">
+            <div class="imges">
+              <span v-if="item.girdLevel == 2">
+                <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="item.isChecked" @click.stop="girdClick(item, index)" />
+                <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click.stop="girdClick(item, index)" />
+              </span>
+              <img src="./components/img/gird--select-icon.png" alt="" class="avatras" />
+            </div>
+            <div class="rightes">
+              <div class="applicationNames">{{ item.girdName }}</div>
+              <img src="./components/img/right-icon.png" alt="" class="imgs" />
+            </div>
+          </div>
+        </div>
+
+        <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+      </div>
+
+      <div class="showUsers" v-else>
+        <div v-if="userList.length > 0">
+          <div class="cards" v-for="(e, index) in userList" :key="index">
+            <div class="imges">
+              <img src="./components/img/xzh.png" alt="" class="imgselect" v-if="e.isChecked" @click="userClick(e, index)" />
+              <img src="./components/img/xz.png" alt="" class="imgselect" v-else @click="userClick(e, index)" />
+
+              <img src="./components/img/tx@2x.png" alt="" class="avatras" />
+            </div>
+
+            <div class="rights">
+              <div class="applicationNames">{{ e.name }}</div>
+              <div class="idNumbers">{{ e.phone }}</div>
+            </div>
+          </div>
+        </div>
+
+        <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>
+      </div>
+    </div>
+
+    <div class="subBtn" @click="submit">
+      <div>确定选择</div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'SelectUser',
+  data() {
+    return {
+      selectUser: {},
+      allData: null,
+      treeList: [],
+      slectList: [],
+      userList: [],
+    }
+  },
+  onLoad() {
+    this.getTree()
+  },
+  onShow() {
+    document.title = '选择人员'
+  },
+  methods: {
+    getTree() {
+      this.slectList = []
+      this.$http.post('/app/appgirdinfo/listAllByTop').then((res) => {
+        if (res?.data) {
+          this.allData = res.data
+          this.treeInit()
+        }
+      })
+    },
+
+    treeInit() {
+      if(this.allData[0].girdLevel == 2) {
+        if(this.allData[0].girdMemberList && this.allData[0].girdMemberList.length) {
+            this.userList = this.allData[0].girdMemberList
+            this.userList.map((item) => {
+            item.isChecked = false
+          })
+        }
+      }else {
+        this.treeList = this.allData[0].girdList
+      }
+      var obj = {
+        girdName: this.allData[0].girdName,
+        id: this.allData[0].id,
+        girdLevel: this.allData[0].girdLevel
+      }
+      this.slectList.push(obj)
+    },
+
+    itemClick(row) {
+      console.log(row)
+      var obj = {
+        girdName: row.girdName,
+        id: row.id,
+        girdLevel: row.girdLevel
+      }
+      this.slectList.push(obj)
+      this.searckGird(row)
+    },
+
+    searckGird(row) {
+      this.treeList = []
+      if(row.girdLevel != 2) { //查网格
+        this.$http.post(`/app/appgirdinfo/list?parentGirdId=${row.id}&size=999`).then((res) => {
+          if (res?.data) {
+            this.treeList = res.data.records
+          }
+        })
+      }else { //查网格员
+        this.userList = []
+        this.$http.post(`/app/appgirdmemberinfo/listByGirdIdByThree?girdId=${row.id}`).then((res) => {
+          if (res?.data) {
+            this.userList = res.data
+            this.userList.map((item) => {
+              item.isChecked = false
+            })
+          }
+        })
+      }
+    },
+
+    girdNameClick(row, index) {
+      this.userList = []
+      if(!index) { //第一级别
+        this.slectList = []
+        this.treeInit()
+      }else {
+        var list = []
+        this.slectList.map((item, i) => {
+          if(i <= index) {
+            list.push(item)
+          }
+        })
+        this.slectList = list
+        this.searckGird(row)
+      }
+    },
+    
+
+    girdClick(row, index) {
+      if (this.treeList[index].isChecked) {//取消
+        this.treeList[index].isChecked = false
+        this.selectUser = {}
+      } else {
+        this.treeList.map((item) => {
+          item.isChecked = false
+        })
+        this.treeList[index].isChecked = true
+        this.selectUser = row
+      }
+      this.$forceUpdate()
+    },
+
+    userClick(row, index) {
+      if (this.userList[index].isChecked) {//取消
+        this.userList[index].isChecked = false
+        this.selectUser = {}
+      } else {
+        this.userList.map((item) => {
+          item.isChecked = false
+        })
+        this.userList[index].isChecked = true
+        this.selectUser = row
+      }
+      this.$forceUpdate()
+    },
+
+    submit() {
+      if (this.selectUser.id != null) {
+        uni.$emit('goback', this.selectUser)
+        uni.navigateBack()
+      } else {
+        return this.$u.toast('请选择网格或网格员')
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.SelectUser {
+  height: 100%;
+  background: #fff;
+  .header-top {
+    background: #fff;
+    padding: 20px 32px;
+  }
+
+  .header-middle {
+    padding-bottom: 140px;
+    .hint {
+      padding: 28px 20px 28px 32px;
+      line-height: 56px;
+      box-shadow: 0px 1px 0px 0px #e4e5e6;
+      font-size: 30px;
+      font-weight: 500;
+      word-break: break-all;
+    }
+
+    .showTypes {
+      .empty-div {
+        height: 16px;
+        background: #f5f5f5;
+      }
+
+      .cards {
+        display: flex;
+        align-items: center;
+        height: 120px;
+        line-height: 120px;
+        // background: pink;
+        padding: 0 0 0 32px;
+
+        .imges {
+          display: flex;
+          align-items: center;
+          // width: 200px;
+          .imgselect {
+            width: 48px;
+            height: 48px;
+            vertical-align: middle;
+          }
+
+          .avatras {
+            width: 74px;
+            height: 74px;
+            border-radius: 8px;
+            margin-left: 36px;
+          }
+        }
+        img {
+          width: 74px;
+          height: 74px;
+          border-radius: 8px;
+        }
+        .rightes {
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-left: 32px;
+          border-bottom: 1px solid #e4e5e6;
+          .applicationNames {
+            font-size: 36px;
+            font-weight: 500;
+            color: #333333;
+          }
+          .imgs {
+            width: 40px;
+            height: 40px;
+            margin-right: 20px;
+          }
+        }
+      }
+    }
+
+    .showUsers {
+      .cards {
+        display: flex;
+        align-items: center;
+        height: 120px;
+        line-height: 120px;
+        // background: pink;
+        padding: 0 0 0 32px;
+
+        .imges {
+          display: flex;
+          align-items: center;
+          width: 200px;
+          .imgselect {
+            width: 48px;
+            height: 48px;
+          }
+
+          .avatras {
+            width: 74px;
+            height: 74px;
+            border-radius: 8px;
+            margin-left: 36px;
+          }
+        }
+
+        .rights {
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-left: 32px;
+          border-bottom: 1px solid #e4e5e6;
+          padding-right: 40px;
+          .applicationNames {
+            font-size: 36px;
+            font-weight: 500;
+            color: #333333;
+          }
+          .idNumbers {
+            color: #666;
+          }
+        }
+      }
+    }
+  }
+
+  .subBtn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 118px;
+    background: #f4f8fb;
+    div {
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 4px;
+      font-size: 32px;
+      color: #fff;
+      margin: 20px 34px 0 0;
+      float: right;
+    }
+  }
+}
+</style>

src/apps/AppHelpDeclaration/add.vue

@@ -0,0 +1,290 @@
+<template>
+  <div class="add">
+    <div class="tips">我承认本次申请帮扶情况属实，愿接受有关部门依法核实家庭资产信息，如存在虚报、伪造，造成社会资源浪费。本人资源承担相关惩戒措施。</div>
+    <div class="user_info">
+      <div class="item">
+        <div class="left">
+          <span>*</span><span>申请人姓名</span>
+        </div>
+        <input type="text" class="right__text" v-model="form.name" placeholder="请输入" maxlength="20"/>
+      </div>
+      <div class="item">
+        <div class="left">
+          <span>*</span><span>申请人身份证号</span>
+        </div>
+        <input type="number" class="right__text" v-model="form.idNumber" placeholder="请输入" maxlength="20"/>
+      </div>
+      <div class="item">
+        <div class="left">
+          <span>*</span><span>联系方式</span>
+        </div>
+        <input type="number" class="right__text" v-model="form.phone" placeholder="请输入" maxlength="11"/>
+      </div>
+    </div>
+
+    <div class="family_info">
+      <div class="item">
+        <div class="left">
+          <span>*</span><span>家庭人口数</span>
+        </div>
+        <input type="number" class="right__text" v-model="form.householdNumber" placeholder="请输入" maxlength="10"/>
+      </div>
+      <div class="item">
+        <div class="left">
+          <span>*</span><span>所在地区</span>
+        </div>
+        <AiAreaPicker v-model="form.areaId" class="right__text" :fullName.sync="form.areaName">
+          <span :class="form.areaName == '' ? 'color-999' : 'color-333' ">{{ form.areaName || "请选择" }}</span>
+          <u-icon name="arrow-right" color="#ddd" style="display: inline-block;"/>
+        </AiAreaPicker>
+      </div>
+      <div class="items">
+        <div class="left">
+          <span>*</span><span>详细地址</span>
+        </div>
+        <input type="text" class="textarea" v-model="form.address" placeholder="请输入详细地址" maxlength="100"/>
+      </div>
+      <div class="items">
+        <div class="left">
+          <span>*</span><span>申请帮扶原因（最多2项）</span>
+        </div>
+        <div class="tags">
+          <span v-for="(item,index) in list" :key="index" :class="item.checked? 'isCheck':''" @click="helpCheck(item)">{{ item.dictName }}</span>
+        </div>
+      </div>
+      <div class="items">
+        <div class="left">
+          <span>*</span><span>返贫致贫风险说明</span>
+        </div>
+        <input type="text" class="text" v-model="form.riskDescription" placeholder="请简要说明返贫致贫风险说明" maxlength="200"/>
+      </div>
+      <div class="items">
+        <div class="left">
+          <span style="margin-right: 8px"></span><span>上传佐证材料（最多9张）</span>
+        </div>
+        <div style="margin-top: 10px;">
+          <AiUploader v-model="form.files" :limit="9" multiple></AiUploader>
+        </div>
+      </div>
+    </div>
+
+    <div style="height: 60px;"></div>
+
+    <div class="btn" @click="comfirm">提交</div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      form: {
+        name: '',
+        idNumber: '',
+        phone: '',
+        householdNumber: '',
+        areaId: '',
+        areaName: '',
+        address: '',
+        declareReason: [],
+        reason: '',
+        riskDescription: '',
+        files: []
+      },
+      list: [],
+      flag: false,
+      checkList: [],
+    }
+  },
+  onLoad() {
+    this.$dict.load('helpDeclarationReason').then(()=>{
+      this.list = this.$dict.getDict('helpDeclarationReason').map((item)=>{
+        return {
+          dictName: item.dictName,
+          dictValue: item.dictValue,
+          checked: false
+        }
+      })
+    })
+  },
+
+  onShow() {
+    document.title = '添加帮扶申报'
+  },
+  methods: {
+    helpCheck(e) {
+      e.checked = !e.checked
+      this.checkList = this.list.filter(e=>e.checked)
+      this.form.declareReason = this.checkList.map(v=> v.dictValue).toString()
+      this.form.reason = this.checkList.map(o=>o.dictName).toString()
+    },
+    comfirm() {
+      if(this.flag) return
+
+      if(!this.form.name) {
+        return this.$u.toast('请输入姓名')
+      }
+      if(!this.form.idNumber) {
+        return this.$u.toast('请输入身份证号')
+      }
+      if(this.form.idNumber) {
+        if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.form.idNumber)) {
+          return this.$u.toast('请输入正确的身份证号')
+        }
+      }
+      if(!this.form.phone) {
+        return this.$u.toast('请输入手机号')
+      }
+      if(!this.form.householdNumber) {
+        return this.$u.toast('请输入家庭人口数')
+      }
+      if(!this.form.areaId) {
+        return this.$u.toast('请选择所在地区')
+      }
+      if(!this.form.address) {
+        return this.$u.toast('请输入详细地址')
+      }
+      if(!this.form.declareReason) {
+        return this.$u.toast('请选择帮扶原因')
+      }
+      if(this.form.declareReason) {
+        if(this.checkList.length > 2) {
+          return this.$u.toast('帮扶原因最多选2项')
+        }
+      }
+      if(!this.form.riskDescription) {
+        return this.$u.toast('请输入帮扶原因说明')
+      }
+
+      this.flag = true
+      this.$http.post('/app/apphelpdeclarationinfo/addByEw',{...this.form}).then((res) => {
+        if(res.code ==0) {
+          this.$u.toast('提交成功')
+          uni.$emit('update')
+          setTimeout(() => {
+            uni.navigateBack()
+          },600)
+        }
+      })
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep uni-page-body {
+  height: 100%;
+  font-size: 32px !important;
+}
+.add {
+  .tips {
+    padding: 32px;
+    box-sizing: border-box;
+    background: #FFF8F3;
+    color: #FF883C;
+    font-size: 30px;
+  }
+
+  .user_info,
+  .family_info {
+    background: #FFF;
+    .item {
+      display: flex;
+      padding: 32px;
+      box-sizing: border-box;
+      border-bottom: 1px solid #DDDDDD;
+
+      .left {
+        width: 240px;
+        span:first-child {
+          color: #FF4466;
+        }
+      }
+      
+      .right__text {
+        width: calc(100% - 240px);
+        text-align: right;
+      }
+
+      .color-999 {
+        color: #999;
+      }
+      .color-333 {
+        color: #333;
+      }
+      
+    }
+    
+    .item:last-child {
+      border-bottom: none;
+    }
+    .items {
+      padding: 32px;
+      box-sizing: border-box;
+      border-bottom: 1px solid #DDDDDD;
+
+      .left {
+        span:first-child {
+          color: #FF4466;
+        }
+      }
+      .text {
+        margin-top: 20px;
+      }
+      .textarea {
+        margin-top: 32px;
+      }
+      .tags {
+        margin-top: 20px;
+        span {
+          display: inline-block; 
+          width: 31%;
+          height: 80px;
+          line-height: 80px;
+          text-align: center;
+          box-sizing: border-box;
+          border-radius: 16px;
+          border: 1px solid #CCCCCC;
+          margin-right: 20px;
+          margin-bottom: 16px;
+        }
+        span:nth-child(3n) {
+          margin-right: 0;
+        }
+        .isCheck {
+          color: #FFF;
+          background: #4181FF;
+        }
+      }
+    }
+
+    .items:last-child {
+      border-bottom: none;
+    }
+  }
+  
+  .family_info {
+    margin-top: 16px;
+  }
+
+  ::v-deep .uni-input-wrapper .uni-input-placeholder {
+    font-size: 28px;
+    color: #999;
+  }
+
+  .btn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    background: #4181FF;
+    color: #FFF;
+    font-size: 34px;
+    z-index: 999;
+  }
+}
+</style>

src/apps/AppHelpDeclaration/details.vue

@@ -0,0 +1,403 @@
+<template>
+  <div class="details">
+    <div class="user">
+      <div class="avatar">{{ data.name && data.name.substring(data.name.length, data.name.length - 2) }}</div>
+      <div class="right">
+        <p><span>{{ data.name }}</span>的帮扶申请</p>
+        <div>{{ data.declareTime }}</div>
+      </div>
+    </div>
+
+    <div class="event_info">
+      <div class="content">{{ data.riskDescription }}</div>
+      <div class="tags">
+        <span :style="{background: data.status == 0? '#FF883C':data.status == 1? '#1AAAFF': data.status==2? '#FF4466': '#42D784'}">{{ $dict.getLabel('helpDeclarationStatus', data.status) }}</span>
+      </div>
+    </div>
+
+    <div class="progress_info">
+      <div class="item">
+        <label>申报人姓名</label>
+        <div>{{ data.name }}</div>
+      </div>
+      <div class="item">
+        <label>家庭人口数</label>
+        <div>{{ data.householdNumber }}</div>
+      </div>
+      <div class="item">
+        <label>联系方式</label>
+        <div>{{ data.phone }}</div>
+      </div>
+      <div class="item">
+        <label>申报方式</label>
+        <div>自主申报</div>
+      </div>
+      <div class="item">
+        <label>身份证号</label>
+        <div>{{ data.idNumber }}</div>
+      </div>
+      <div class="item">
+        <label>所在地区</label>
+        <div>{{ data.areaName }}</div>
+      </div>
+      <div class="items" v-if="data.files && data.files.length">
+        <p>照片</p>
+        <div class="picture">
+          <img :src="item.url" v-for="(item,index) in data.files" :key="index" alt="" @click="preview(data.files, item.url)">
+        </div>
+      </div>
+    </div>
+
+    <div class="header-bottom">
+
+      <div class="plan">
+        <div class="nav">
+          <span>办理进度</span>
+          <span> ({{ $dict.getLabel('clapEventStatus', data.eventStatus) }})</span>
+        </div>
+
+        <div class="cards" v-for="(item, index) in data.processList" :key="index">
+          <div class="cardss">
+            <div class="cardss-left">
+              <span>
+                {{ item.doUsername && item.doUsername.substring(item.doUsername.length, item.doUsername.length - 2) }}
+              </span>
+
+              <img src="./components/1.png" class="avatarIcon" alt="" />
+            </div>
+
+            <div class="cardss-right">
+              <div class="cardsss-right-left">
+                <div class="cardssss-right-left-top">
+                  <span>{{ item.description }}</span>
+                  <div style="color: #2ea222; font-size: 16px; margin-top: 5px">
+                    {{ $dict.getLabel('helpDeclarationStatus', item.status) }}
+                  </div>
+                </div>
+              </div>
+
+              <div class="cardees-right-right">{{ item.doTime }}</div>
+            </div>
+
+            <div class="lines"></div>
+          </div>
+
+          <div class="cardes-msg-top" v-if="item.doExplain">{{ item.doExplain }}</div>
+
+          <div class="imgs">
+            <img :src="e.url" alt="" v-for="(e, index) in item.files" :key="index"  @click="previewImage(item.files, e.url)" />
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="fixedBtn">
+      <div class="status00">
+        <div class="columns border-r" @click="toContent(1)">
+          <span class="hint">转交事件</span>
+        </div>
+
+        <!-- <div class="columns" @click="toContent(2)">
+          <span class="hint">拒绝受理</span>
+        </div> -->
+
+        <div class="doIt" @click="doItShow = true">审核处理</div>
+      </div>
+
+      <div class="endDoIt" v-if="data.eventStatus == 1 && data.rightType == 0" @click="toContent(3)">前往办理</div>
+    </div>
+    <u-modal v-model="doItShow" :mask-close-able="true" z-index="99" content="确定处理该事件?" :show-cancel-button="true" @confirm="doThings"></u-modal>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      list: [],
+      data: {},
+      id: '',
+      doItShow: false,
+    }
+  },
+  onLoad(o) {
+    this.$dict.load('helpDeclarationStatus')
+    if (o.id) {
+      this.id = o.id
+      this.getDetail()
+    }
+  },
+  methods: {
+    getDetail() {
+      this.$http.post(`/app/apphelpdeclarationinfo/queryDetailById?id=${this.id}`).then(res => {
+        if(res.code == 0) {
+          this.data = res.data
+          this.list = res.data.reason.split(',')
+        }
+      })
+    },
+    preview(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
+    toContent(status) {
+      uni.navigateTo({ url: `./result?status=${status}` })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.details {
+  .user {
+    height: 120px;
+    padding: 26px 30px;
+    box-sizing: border-box;
+    display: flex;
+    background: #FFF;
+    .avatar {
+      width: 80px;
+      height: 80px;
+      line-height: 80px;
+      border-radius: 50%;
+      background: #4E8EEE;
+      text-align: center;
+      color: #FFFFFF;
+      font-size: 28px;
+      margin-right: 16px;
+    }
+
+    .right {
+      p {
+        font-weight: 600;
+        font-size: 32px;
+        color: #333333;
+      }
+      div {
+        color: #999999;
+        font-size: 28px;
+        margin-top: 8px;
+      }
+    }
+  }
+
+  .event_info {
+    background: #FFFFFF;
+    padding: 32px;
+    box-sizing: border-box;
+    .content {
+      background: #FFFFFF;
+    }
+    .picture {
+      margin-top: 32px;
+      img {
+        width: 220px;
+        height: 220px;
+        margin-right: 10px;
+      }
+    }
+    .tags {
+      margin-top: 20px;
+      span {
+        display: inline-block;
+        margin-right: 16px;
+        padding: 4px 8px;
+        box-sizing: border-box;
+        border-radius: 8px;
+        color: #FFF;
+        // margin-bottom: 16px;
+      }
+    }
+  }
+
+  .progress_info {
+    background: #FFF;
+    .item {
+      padding: 32px;
+      box-sizing: border-box;
+      display: flex;
+      justify-content: space-between;
+      border-top: 1px solid #DDDDDD;
+      label {
+        color: #999999;
+      }
+    }
+    .item:first-child {
+      border-top: none;
+    }
+    .items {
+      padding: 32px;
+      box-sizing: border-box;
+      border-top: 1px solid #DDDDDD;
+      p {
+        color: #999999;
+      }
+      div {
+        margin-top: 32px;
+      }
+    }
+    .status0 {
+      color: #FF883C
+    }
+    .status1 {
+      color: #1AAAFF
+    }
+    .status2 {
+      color: #42D784
+    }
+    .status3 {
+      color: #FF4466
+    }
+  }
+
+  .header-bottom {
+    padding-bottom: 80px;
+    background: #FFF;
+    margin-top: 16px;
+
+    .plan {
+      padding: 0 32px;
+      .nav {
+        padding: 26px 0;
+      }
+
+      .cards {
+        position: relative;
+        padding-bottom: 80px;
+        .cardss {
+          display: flex;
+          justify-content: space-between;
+
+          .cardss-left {
+            position: relative;
+            width: 80px;
+            height: 80px;
+            text-align: center;
+            line-height: 80px;
+            color: #fff;
+            background: #197df0;
+            border: 1px solid #dddddd;
+            border-radius: 50%;
+            font-size: 28px;
+            z-index: 9;
+
+            .avatarIcon {
+              position: absolute;
+              bottom: 0;
+              right: 0;
+              width: 38px;
+              height: 38px;
+            }
+          }
+          .cardss-right {
+            width: calc(100% - 110px);
+            display: flex;
+            justify-content: space-between;
+            .cardsss-right-left {
+              .cardssss-right-left-top {
+                width: 300px;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                font-size: 32px;
+              }
+              .cardssss-right-left-bottom {
+                margin-top: 10px;
+                font-size: 28px;
+                color: #666666;
+              }
+            }
+            .cardees-right-right {
+              font-size: 28px;
+              color: #999999;
+            }
+          }
+          .lines {
+            position: absolute;
+            top: 0;
+            left: 40px;
+            width: 4px;
+            height: 100%;
+            background: #eeeeee;
+          }
+        }
+        .cardes-msg-top {
+          font-size: 28px;
+          color: #343d65;
+          margin-top: 10px;
+          margin-left: 110px;
+        }
+
+        .imgs {
+          margin-top: 10px;
+          margin-left: 110px;
+          img {
+            width: 136px;
+            height: 136px;
+            border-radius: 4px;
+            margin-right: 12px;
+          }
+          img:nth-child(4n) {
+            margin-right: 0;
+          }
+        }
+      }
+      .cards:last-child {
+        .lines {
+          width: 0;
+          height: 0;
+        }
+      }
+    }
+  }
+
+  .fixedBtn {
+    background: #fff;
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    box-sizing: border-box;
+    z-index: 999;
+    .status00 {
+      display: flex;
+
+      .columns {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        width: 50%;
+        padding: 16px 0;
+        border-top: 1px solid #ddd;
+        .hint {
+          margin-top: 16px;
+          font-size: 32px;
+          color: #666666;
+        }
+      }
+      .border-r {
+        border-right: 1px solid #ddd;
+      }
+      .doIt {
+        width: 56%;
+        background: #3975c6;
+        text-align: center;
+        line-height: 112px;
+        font-size: 32px;
+        font-weight: 500;
+        color: #fff;
+      }
+    }
+
+    .endDoIt {
+      background: #3975c6;
+      text-align: center;
+      padding: 34px 0;
+
+      font-size: 32px;
+      font-weight: 500;
+      color: #ffffff;
+    }
+  }
+}
+</style>

src/apps/AppHelpDeclaration/list.vue

@@ -0,0 +1,232 @@
+<template>
+  <div class="list">
+    <AiTopFixed>
+      <div class="tab-select">
+        <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{item}}<span></span></div>
+      </div>
+      <div class="select-box">
+        <div class="left">
+          <!--  :areaId="user.areaId" @select="areaSelect" select-root -->
+          <AiAreaPicker v-model="areaId" :name.sync="areaName" >
+            <div style="display: flex;">
+              <span v-if="areaName" style="color:#333;fontSize: 14px;" class="areaName">{{ areaName }}</span>
+              <span v-else style="color: #999;fontSize: 14px;" class="areaName">所在地区</span>
+              <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px"></u-icon>
+              <u-icon name="close-circle" v-if="areaId" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px"></u-icon>
+            </div>
+          </AiAreaPicker>
+        </div>
+        <div class="right">
+          <AiSelect dict="helpDeclarationReason" v-model="declareReason">
+            <span v-if="!declareReason" style="color: #999;">风险类型</span>
+            <span v-else>{{ $dict.getLabel('helpDeclarationReason', declareReason) }}</span>
+            <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;"></u-icon>
+            <u-icon name="close-circle" v-if="declareReason" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;"></u-icon>
+          </AiSelect>
+        </div>
+      </div>
+    </AiTopFixed>
+    <div v-if="list.length">
+      <div class="card_list">
+        <div class="card" v-for="(item,index) in list" :key="index" @click="toDetail(item.id)">
+          <div class="top">
+            <div class="title">{{ item.riskDescription }}</div>
+            <div class="time">{{ item.declareTime }}</div>
+          </div>
+          <div class="bottom">
+            <span :style="{background: item.status == 0? '#FF883C':item.status == 1? '#1AAAFF': item.status==2? '#FF4466': '#42D784'}"></span>
+            <span :class="item.status == 0? 'status0': item.status==1? 'status1': item.status==2? 'status3': 'status2'">{{ $dict.getLabel('helpDeclarationStatus',item.status) }}</span>
+          </div>
+        </div>
+      </div>
+    </div>
+    <AiEmpty v-else description="暂无数据"/>
+
+    <!-- <AiFixedBtn>
+      <div class="addBtn iconfont iconfont-iconfangda" @tap="toAdd()"/>
+    </AiFixedBtn> -->
+    <div style="height: 56px"></div>
+    <div class="btn" @click="toAdd">申请帮扶</div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      tabs: ['全部待办','办理历史'],
+      tabIndex: 0,
+      list: [],
+      current: 1,
+      areaId: '',
+      areaName: '',
+      declareReason: '',
+    }
+  },
+  onShow() {
+    this.$dict.load('helpDeclarationStatus').then(() => {
+      uni.$on('update', () => {
+        this.getList()
+      })
+    })
+    this.getList()
+  },
+  methods: {
+    tabClick(index) {
+      this.current = 1,
+      this.list = [],
+      this.tabIndex = index,
+      this.getList()
+    },
+
+    getList() {
+      this.$http.post('/app/apphelpdeclarationinfo/listByEw',null,{
+        params: {
+          current: this.current,
+          areaId: this.areaId,
+          searchType: this.tabIndex,
+          declareReason: this.declareReason  // 风险类型
+        }
+      }).then((res) => {
+        if(res?.data) {
+          this.list = this.current == 1? res.data.records : [...this.list,...res.data.records]
+        }
+      })
+    },
+
+    toAdd() {
+       uni.navigateTo({url: './add'})
+    },
+
+    toDetail(id) {
+      uni.navigateTo({url: `./details?id=${id}`})
+    },
+
+    onReachBottom() {
+      this.current ++
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.list {
+  ::v-deep .AiTopFixed .content {
+    padding: 0;
+  }
+
+  .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;
+      }
+    }
+  }
+
+  .select-box {
+    display: flex;
+    height: 96px;
+    line-height: 96px;
+    width: 100%;
+    .left,
+    .right {
+      flex: 1;
+      text-align: center !important;
+      font-size: 28px;
+    }
+  }
+
+  .card_list {
+    padding: 24px 32px;
+    box-sizing: border-box;
+    .card {
+      background: #FFFFFF;
+      box-shadow: 0px 0px 8px 0px #00000005;
+      border-radius: 16px;
+      margin-bottom: 24px;
+      .top {
+        padding: 32px;
+        box-sizing: border-box;
+        border-bottom: 2px solid #DDDDDD;
+        .title {
+          color: #333333;
+          font-size: 32px;
+          font-weight: 600;
+          overflow:hidden; 
+          text-overflow:ellipsis;
+          display:-webkit-box;
+          -webkit-box-orient:vertical;
+          -webkit-line-clamp:2;
+        }
+        .time {
+          margin-top: 32px;
+          color: #999999;
+          font-size: 26px;
+        }
+      }
+      .bottom {
+        padding: 32px;
+        box-sizing: border-box;
+        span:first-child {
+          display: inline-block;
+          width: 8px;
+          height: 8px;
+          border-radius: 50%;
+          margin-right: 8px;
+          background: #FF4466;
+        }
+      }
+      .status0 {
+        color: #FF883C
+      }
+      .status1 {
+        color: #1AAAFF
+      }
+      .status2 {
+        color: #42D784
+      }
+      .status3 {
+        color: #FF4466
+      }
+    }
+  }
+
+  .btn {
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    color: #FFF;
+    background: #3975C6;
+  }
+}
+</style>

src/apps/AppHelpDeclaration/result.vue

@@ -0,0 +1,232 @@
+<template>
+  <div class="result">
+    <div class="contents">
+      <u-form :model="forms" ref="uForm" label-width="auto" :border-bottom="false">
+        <u-form-item label="转交给" prop="status" required :border-bottom="false" right-icon="arrow-right" class="first-form" v-if="status == 1">
+          <u-input v-model="forms.name" placeholder="请选择转交对象" @click="toSelectUser" disabled />
+        </u-form-item>
+        <u-form-item label="事件分类" prop="groupName" required :border-bottom="false" right-icon="arrow-right" v-if="status != 1">
+          <!-- <u-input v-model="forms.groupName" placeholder="请选择事件分类"  /> -->
+          <span @click="show = true" class="right-span" :style="forms.groupName ? '' : 'color:#999;'">{{forms.groupName || '请选择事件分类'}}</span>
+
+          <u-select v-model="show" :list="myList" value-name="id" label-name="groupName" @confirm="selectStatus"></u-select>
+        </u-form-item>
+
+        <u-form-item :label="status == 3 ? '办结意见' : status == 2 ? '拒绝受理意见' : '办理意见'" prop="content" required :border-bottom="false" label-position="top" class="contents">
+          <u-input v-model="forms.content" :placeholder="status == 2 ? '请写下拒绝受理意见…' : '请写下你的办结意见...'" type="textarea" auto-height height="100" maxlength="500" />
+        </u-form-item>
+
+        <div class="line"></div>
+
+        <u-form-item label="图片上传(最多9张)" prop="files" :border-bottom="false" class="avatars" label-position="top">
+          <AiUploader :def.sync="forms.files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+        </u-form-item>
+
+      </u-form>
+    </div>
+
+    <div class="btn" v-if="this.status == 1" @click="confirm">
+      <span>转交事件</span>
+    </div>
+
+    <div class="btn" v-if="this.status == 2" @click="confirm">
+      <span>拒绝受理</span>
+    </div>
+
+    <div class="btn" v-if="this.status == 3" @click="confirm">
+      <span>我已办结</span>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      forms: {
+        groupName: '',
+        groupId: '',
+        content: '',
+        files: [],
+        name: ''
+      },
+      flag: false,
+      show: false,
+      status: '',  //1转交  2拒绝受理  3我已办结
+      myList: [],
+      id: '',
+      selectUser: {},
+      titleList: ['', '转交事件', '拒绝受理', '我已办结']
+    }
+  },
+  onLoad(option) {
+    this.status = option.status
+    this.id = option.id
+    this.forms.groupId = option.groupId
+    this.forms.groupName = option.groupName
+    this.typeList()
+    uni.$on('goback', (res) => {
+      this.selectUser = res
+      if(res.name) {
+        this.forms.name = res.name
+      }else{
+        this.forms.name = res.girdName
+      }
+    })
+  },
+  onShow() {
+    console.log(this.titleList[this.status])
+    document.title = this.titleList[this.status]
+  },
+  methods: {
+
+    typeList() {
+      this.$http.post(`/app/appclapeventgroup/list`, null, {
+        params: {
+          size: 9999,
+        },
+      })
+      .then((res) => {
+        if (res.code == 0) {
+          this.myList = res.data.records
+          this.$forceUpdate()
+        }
+      })
+    },
+
+    confirm() {
+      if(this.status == 1 && !this.forms.name) {
+        return this.$u.toast('请选择转交对象')
+      }
+      if(this.status != 1 && !this.forms.groupName) {
+        return this.$u.toast('请选择分类')
+      }
+      if(this.status != 1 && !this.forms.content) {
+        return this.$u.toast('请输入意见')
+      }
+      this.submit()
+    },
+    submit() {  //status 1转交  2拒绝受理  3我已办结
+      var url = '', successText= '', params= ''
+      if(this.status == 1) {
+        url = `/app/appclapeventinfo/transfer`
+        successText = '转交成功'
+        params = {
+          ...this.forms,
+          girdId: this.selectUser.id,
+          girdName: this.selectUser.girdName,
+        }
+        if(this.selectUser.name) { //选择的网格员
+          params.girdId = this.selectUser.girdId
+          params.girdMemberId = this.selectUser.id
+          params.girdMemberName = this.selectUser.name
+        }
+      }
+      if(this.status == 2) {
+        url = `/app/appclapeventinfo/refuse`
+        successText = '拒绝成功'
+        params = {...this.forms}
+      }
+      if(this.status == 3) {
+        url = `/app/appclapeventinfo/finishByGirdMember`
+        successText = '办结成功'
+        params = {...this.forms}
+      }
+      params.id = this.id
+      this.$http.post(url, params).then((res) => {
+        if (res.code == 0) {
+          this.$u.toast(successText)
+          uni.$emit('updateDeatil')
+          uni.$emit('getListInit')
+          setTimeout(() => {
+            if(this.status == 1) {
+              uni.navigateBack({delta: 2})
+            }else {
+              uni.navigateBack()
+            }
+          },600)
+        }
+      })
+    },
+    selectStatus(e) {
+      this.forms.groupName = e[0].label
+      this.forms.groupId = e[0].value
+    },
+    toSelectUser() {
+      uni.navigateTo({ url: './SelectUser' })
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.result {
+  height: 100%;
+  .contents {
+    padding-bottom: 140px;
+    ::v-deep .u-form {
+      .u-form-item {
+        padding: 0 45px !important;
+        .u-form-item__body {
+          .u-form-item--right__content__slot {
+            padding-bottom: 0;
+            .u-input {
+              text-align: right !important;
+            }
+          }
+        }
+      }
+
+      .u-form-item:first-child {
+        .u-form-item__body {
+          border-bottom: 1px solid #ddd;
+        }
+      }
+
+      .line {
+        height: 24px;
+        background: #f3f6f9;
+      }
+
+      .contents {
+        padding-bottom: 20px !important;
+        .u-form-item__body {
+          .u-form-item--right__content__slot {
+            .u-input {
+              text-align: left !important;
+            }
+          }
+        }
+      }
+
+      .avatars {
+        padding-bottom: 20px !important;
+        .u-form-item__body {
+          .default {
+            width: 160px;
+            height: 160px;
+          }
+        }
+      }
+    }
+  }
+
+  .btn {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    box-sizing: border-box;
+    background: #3975c6;
+    padding: 34px 0;
+    text-align: center;
+    font-size: 32px;
+    font-weight: 500;
+    color: #ffffff;
+  }
+  .right-span{
+    display: inline-block;
+    width: 100%;
+    text-align: right;
+  }
+}
+</style>

src/apps/AppPovertyHome/AppPovertyHome.vue

@@ -9,13 +9,13 @@
         <image :src="$cdn + 'yjjk.png'"/>
         <h2>预警监控</h2>
       </div>
-      <div class="info-top__item" @click="linkTo('../AppServicePublic/AppServicePublic?moduleId=ac80f2857f2c4e4d8f0e266a703aed7a&listName=政策动态')">
+      <div class="info-top__item" @click="linkTo('../AppHelpDeclaration/list')">
-        <image :src="$cdn + 'news.png'"/>
+        <image :src="$cdn + 'sbsp.png'"/>
-        <h2>政策动态</h2>
+        <h2>申报审批</h2>
       </div>
     </div>
     <div class="news">
-      <h2>最新动态</h2>
+      <u-section title="最新动态" :show-line="false" font-size="32" bold sub-title="全部" @click="linkTo('../AppServicePublic/AppServicePublic?moduleId=ac80f2857f2c4e4d8f0e266a703aed7a&listName=政策动态')"></u-section>
       <div class="news-list" v-if="list.length">
         <div class="news-item" v-for="(item, index) in list" :key="index"
           @click="linkTo(`../AppServicePublic/Detail?id=${item.id}&listName=政策动态`)">
@@ -48,7 +48,7 @@ export default {
       this.getList()
     })
 
-    console.log(this.$cdn + 'wdbf.png')
+    // console.log(this.$cdn + 'wdbf.png')
   },
   onShow() {
     document.title = "防返贫"
@@ -119,11 +119,8 @@ export default {
   }
 
   .news {
-    & > h2 {
+    & > .u-section {
       margin-bottom: 32px;
-      color: #333333;
-      font-weight: 600;
-      font-size: 32px;
     }
 
     .news-item {

src/common/axios.js

@@ -28,6 +28,14 @@ instance.interceptors.response.use(res => {
   if (res.data) {
     if (res.data.code) {
       if (res.data.code == 0) {
+        return res.data
+      } else if (res.data.code === 1) {
+        uni.showToast({
+          title: res.data.msg,
+          duration: 2000,
+          icon: 'none'
+        })
+
         return res.data
       } else if (res.data.code == 401) {
         store.commit("logout");

src/pending/AppPovertyAlleviation/AppPovertyAlleviation.vue

@@ -107,6 +107,7 @@ export default {
       color: #333333;
       font-weight: 600;
       font-size: 32px;
+      
     }
 
     .news-item {

src/saas/AppCountryAlbum/AlbumDetail.vue

@@ -40,11 +40,11 @@
         </div>
       </div>
       <div class="photo-item__wrapper">
-        <div class="photo-item" @click="linkTo('./Photo')" v-for="(group, index) in list" :key="index">
+        <div class="photo-item" @click="linkTo('./Photo?url=' + item.photoUrl + '&id=' + item.id)" v-for="(item, index) in list" :key="index">
-          <image src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/64f71761d2b04746ad640a43706a92e4~tplv-k3u1fbpfcp-zoom-crop-mark:1304:1304:1304:734.awebp?" @click="preview(item.url)" mode="aspectFill" />
+          <image :src="item.photoUrl" mode="aspectFill" />
           <div class="photo-item__text">
             <h2>张三</h2>
-            <p>02-12 12:32</p>
+            <p>{{ item.createTime }}</p>
           </div>
         </div>
         <AiEmpty v-if="!list.length"></AiEmpty>
@@ -95,10 +95,15 @@
       uni.$on('change', () => {
         this.getInfo(query.id)
       })
+
+      uni.$on('update', () => {
+        this.getList()
+      })
     },
 
     onUnload () {
       uni.$off('change')
+      uni.$off('update')
     },
 
     methods: {
@@ -116,18 +121,6 @@
         })
       },
 
-      preview (url) {
-        let imgs = []
-        this.list.forEach(item => {
-          imgs = [...imgs, ...item.list.map(v => v.url)]
-        })
-
-        uni.previewImage({
-          urls: imgs,
-          current: url
-        })
-      },
-
       getTotalInfo (id) {
         this.$http.post(`/api/appalbumphoto/photoDetail?id=${id}`).then(res => {
           if (res.code === 0) {
@@ -210,7 +203,7 @@
             }
 
             p {
-              color: #898482;
+              color: #fff;
               font-size: 28px;
             }
           }

src/saas/AppCountryAlbum/Form.vue

@@ -0,0 +1,151 @@
+<template>
+  <div class="form">
+    <div class="form-group">
+      <div class="form-item" :class="[config.fieldType === '1' ? 'textarea' : '']">
+        <span>{{ mapFieldLable(config.type) }}</span>
+        <div class="form-item__right" v-if="config.fieldType === '0'">
+          <input :placeholder="'请输入' + mapFieldLable(config.type)" v-model="config.defaultValue">
+          <span></span>
+        </div>
+        <div class="form-item__right" v-if="config.fieldType === 'date'" @click="isShowDate = true">
+          <span :style="{color: config.defaultValue ? '#333' : '#999'}">{{ config.defaultValue || '请选择' + mapFieldLable(config.type) }}</span>
+          <u-icon name="arrow-right" color="#E1E2E3" size="#E1E2E3"></u-icon>
+        </div>
+        <div class="form-item__right" v-if="config.fieldType === '1'">
+          <textarea :placeholder="'请输入' + mapFieldLable(config.type)" v-model="config.defaultValue" :maxlength="-1"></textarea>
+        </div>
+      </div>
+    </div>
+    <div class="form-btn" hover-class="text-hover" @click="save">保存</div>
+    <u-picker mode="time" v-model="isShowDate" :params="params" @confirm="onChange"></u-picker>
+  </div>
+</template>
+<script>
+  import { mapFieldLable } from './config'
+  export default {
+    data () {
+      return {
+        list: [],
+        mapFieldLable,
+        isShowDate: false,
+        params: {
+          year: true,
+          month: true,
+          day: true
+        },
+        currIndex: 0,
+        config: {
+          type: '',
+          fieldType: '',
+          defaultValue: ''
+        }
+      }
+    },
+
+    onLoad () {
+      this.config = {
+        ...this.config,
+        ...uni.getStorageSync('formConfig')
+      }
+    },
+
+    methods: {
+      onChange (e) {
+        this.$set(config, 'value', `${e.year}-${e.month}-${e.day}`)
+      },
+
+      save () {
+        uni.$emit('change', this.config)
+        uni.navigateBack({
+          delta: 1
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .form {
+    padding-bottom: 130px;
+
+    * {
+      line-height: 1;
+      box-sizing: border-box;
+    }
+
+    .form-btn {
+      position: fixed;
+      bottom: 0;
+      left: 0;
+      z-index: 1;
+      width: 100%;
+      height: 112px;
+      line-height: 112px;
+      text-align: center;
+      color: #fff;
+      font-size: 32px;
+      background: #1365DD;
+
+      &:active {
+        opacity: 0.8;
+      }
+    }
+    .form-group {
+      margin-bottom: 16px;
+      padding: 0 32px;
+      background: #fff;
+
+      .form-item {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: 120px;
+        font-size: 32px;
+        color: #333333;
+        border-bottom: 1px solid #DDDDDD;
+
+        &:last-child {
+          border: none;
+        }
+
+        & > span {
+          margin-right: 20px;
+        }
+
+        &.textarea {
+          display: block;
+          height: auto;
+          padding: 32px 0;
+
+          textarea {
+            width: 100%;
+            margin-top: 20px;
+            text-align: left;
+          }
+        }
+
+        .form-item__right {
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          text-align: right;
+          height: 100%;
+          flex: 1;
+
+          span {
+            font-size: 30px;
+            color: #333;
+          }
+
+          input {
+            width: 100%;
+            height: 100%;
+            text-align: right;
+            font-size: 30px;
+            color: #333;
+          }
+        }
+      }
+    }
+  }
+</style>

src/saas/AppCountryAlbum/Photo.vue

@@ -1,16 +1,16 @@
 <template>
   <div class="photo">
-    <image mode="aspectFit" src="https://p3-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/64f71761d2b04746ad640a43706a92e4~tplv-k3u1fbpfcp-zoom-crop-mark:1304:1304:1304:734.awebp?" />
+    <image mode="aspectFit" :src="img" @click="preview(img)" />
     <div class="photo-footer">
+      <div class="item" @click="back">
+        <image src="./images/fanhui.png" />
+        <span>返回</span>
+      </div>
       <div class="item" @click="back">
         <image src="./images/fenxiang.png" />
         <span>分享</span>
       </div>
-      <div class="item">
+      <div class="item" @click="remove">
-        <image src="./images/xiazai.png" />
-        <span>下载</span>
-      </div>
-      <div class="item">
         <image src="./images/shanchu.png" />
         <span>删除</span>
       </div>
@@ -26,12 +26,14 @@
 
     data () {
       return {
-
+        img: '',
+        id: ''
       }
     },
 
-    onLoad () {
+    onLoad (query) {
-
+      this.id = query.id
+      this.img = query.url
     },
 
     methods: {
@@ -39,6 +41,27 @@
         uni.navigateBack({
           delta: 1
         })
+      },
+
+      remove () {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.$http.post(`/api/appalbumphoto/delete?ids=${this.id}`).then(res => {
+            if (res.code == 0) {
+              this.$u.toast('删除成功')
+              uni.$emit('update')
+
+              this.back()
+            }
+          })
+        }).catch(() => {
+        })
+      },
+
+      preview (url) {
+        uni.previewImage({
+          urls: [url],
+          current: url
+        })
       }
     }
   }
@@ -49,6 +72,7 @@
     position: relative;
     width: 100%;
     height: 100vh;
+    overflow: auto;
     background: #000;
 
     .photo-footer {
@@ -84,7 +108,7 @@
 
     & > image {
       width: 100%;
-      height: 100%;
+      min-height: calc(100% - 216px);
     }
   }
-</style>
+</style>

src/saas/AppCountryAlbum/Watermark.vue

@@ -9,8 +9,8 @@
       <span @click="save">保存</span>
     </div>
     <image :src="img" mode="aspectFit" />
-    <div class="watermark" v-if="currIndex > -1">
+    <div class="watermark" v-if="currIndex > -1 && currWatermarkConfig.length">
-      <component :is="'Watermark' + (currIndex + 1)"></component>
+      <component :is="'Watermark' + (currIndex + 1)" :config="currWatermarkConfig"></component>
     </div>
     <div class="photo-bottom" data-html2canvas-ignore>
       <div class="photo-bottom__top">
@@ -25,7 +25,7 @@
           v-for="(item, index) in watermarkList"
           :key="item.id"
           @click="currIndex = index">
-          <image :src="config[index].thum" mode="aspectFill" />
+          <image :src="item.thum" mode="aspectFill" />
           <div class="water-item__bottom">{{ item.name }}</div>
         </div>
       </div>
@@ -60,7 +60,6 @@
   import Watermark7 from './components/watermark/Watermark7'
   import Watermark8 from './components/watermark/Watermark8'
 
-  import { config } from './config'
   export default {
     name: 'Watermark',
 
@@ -80,7 +79,6 @@
     data () {
       return {
         img: '',
-        config,
         currIndex: 0,
         isHide: false,
         height: '100%',
@@ -100,6 +98,12 @@
         }
 
         return [this.albumList.map(v => v.value).indexOf(this.albumId)]
+      },
+
+      currWatermarkConfig () {
+        if (this.currIndex < 0 || !this.watermarkList.length) return []
+
+        return this.watermarkList[this.currIndex].itemList
       }
     },
 
@@ -117,42 +121,44 @@
     methods: {
       save () {
         this.isHide = true
+        this.$loading()
         this.$nextTick(() => {
-          setTimeout(() => {
+          html2canvas(this.$refs.waterMarker, {
-            html2canvas(this.$refs.waterMarker, {
+            allowTaint: true,
-              allowTaint: true,
+            useCORS: true
-              useCORS: true
+          }).then((canvas) => {
-            }).then((canvas) => {
+            let dataURL = canvas.toDataURL('image/png')
-              let dataURL = canvas.toDataURL('image/png')
+            const file = this.dataURLtoFile(dataURL, 'photo.png')
-              const file = this.dataURLtoFile(dataURL, 'photo.png')
+            let formData = new FormData()
-              let formData = new FormData()
+            formData.append('file', file)
-              formData.append('file', file)
+            this.$http.post('/admin/file/add2?type=image', formData).then(res => {
-              this.$http.post('/admin/file/add2?type=image', formData).then(res => {
+              if (res.code === 0) {
-                if (res.code === 0) {
+                let info = {}
-                  console.log(res)
+                if (this.currIndex > -1) {
-                  let info = {}
+                  info = this.watermarkList[this.currIndex]
-                  if (this.currIndex > -1) {
-                    info = this.watermarkList[this.currIndex]
-                  }
-                  this.$http.post('/api/appalbumphoto/addOrUpdate', {
-                    albumId: this.albumId,
-                    photoUrl: res.data.url,
-                    fileId: res.data.id,
-                    watermarkType: this.currIndex > -1 ? info.watermarkType : '',
-                    templateId: this.currIndex > -1 ? info.id : ''
-                  }).then(res => {
-                    if (res.code === 0) {
-                      console.log(res)
-                      this.$u.toast('新增成功')
-                    }
-                  })
                 }
-              })
+                this.$http.post('/api/appalbumphoto/addOrUpdate', {
-              this.waterSrc = dataURL
+                  albumId: this.albumId,
-            }).catch(e => {
+                  photoUrl: res.data.url,
-              console.log(e)
+                  fileId: res.data.id,
+                  watermarkType: this.currIndex > -1 ? info.watermarkType : '',
+                  templateId: this.currIndex > -1 ? info.id : ''
+                }).then(res => {
+                  if (res.code === 0) {
+                    uni.$emit('update')
+                    this.$u.toast('新增成功')
+
+                    setTimeout(() => {
+                      this.back()
+                    }, 500)
+                  }
+                })
+              }
             })
-          }, 2000)
+            // this.waterSrc = dataURL
+          }).catch(e => {
+            console.log(e)
+          })
         })
       },
 

src/saas/AppCountryAlbum/WatermarkConfig.vue

@@ -1,80 +1,43 @@
 <template>
   <div class="AttendanceFiexdTime">
     <div class="form-group">
-      <div class="form-group__item">
+      <div class="form-group__item" hover-class="bg-hover" v-for="(item, index) in config" :key="index">
         <div class="left">
-          <switch color="#1088F9" checked />
+          <switch color="#1088F9" :checked="item.status === '1'" :disabled="item.editEnable === '0'" @change="e => onChange(e, index)" />
-          <div class="left-right">
+          <div class="left-right" @click="toInput(item)">
-            <h2>大标题</h2>
+            <h2>{{ mapFieldLable(item.type) }}</h2>
-            <p>打卡</p>
+            <p>{{ item.defaultValue || '' }}</p>
           </div>
         </div>
-        <div class="right">
+        <div class="right" @click="toInput(item)">
-          <u-icon name="arrow-right" color="#E1E2E3" size="#E1E2E3"></u-icon>
-        </div>
-      </div>
-      <div class="form-group__item">
-        <div class="left">
-          <switch color="#1088F9" disabled checked />
-          <div class="left-right">
-            <h2>时间</h2>
-            <p>2022-01-03</p>
-          </div>
-        </div>
-        <div class="right">
-          <u-icon name="arrow-right" color="#E1E2E3" size="#E1E2E3"></u-icon>
-        </div>
-      </div>
-      <div class="form-group__item">
-        <div class="left">
-          <switch color="#1088F9" checked />
-          <div class="left-right">
-            <h2>地点</h2>
-            <p>绿地蓝海</p>
-          </div>
-        </div>
-        <div class="right">
-          <u-icon name="arrow-right" color="#E1E2E3" size="#E1E2E3"></u-icon>
-        </div>
-      </div>
-      <div class="form-group__item">
-        <div class="left">
-          <switch color="#1088F9" checked />
-          <div class="left-right">
-            <h2>拍摄人</h2>
-            <p>陶白白</p>
-          </div>
-        </div>
-        <div class="right">
-          <u-icon name="arrow-right" color="#E1E2E3" size="#E1E2E3"></u-icon>
-        </div>
-      </div>
-      <div class="form-group__item">
-        <div class="left">
-          <switch color="#1088F9" checked />
-          <div class="left-right">
-            <h2>天气</h2>
-            <p>雨夹雪 北风3℃</p>
-          </div>
-        </div>
-        <div class="right">
           <u-icon name="arrow-right" color="#E1E2E3" size="#E1E2E3"></u-icon>
         </div>
       </div>
     </div>
-    <div class="form-btn" hover-class="text-hover">保存</div>
+    <div class="form-btn" hover-class="text-hover" @click="save">保存</div>
   </div>
 </template>
 <script>
+  import { mapFieldLable } from './config'
+
   export default {
     data () {
       return {
-
+        config: [],
+        mapFieldLable
       }
     },
 
     onLoad () {
+      this.config = uni.getStorageSync('waterConfig')
 
+      uni.$on('change', e => {
+        this.config.forEach((v, index) => {
+          if (v.type === e.type) {
+            this.$set(this.config[index], 'defaultValue', e.defaultValue)
+          }
+        })
+      })
     },
 
     methods: {
@@ -82,6 +45,32 @@
         uni.navigateTo({
           url
         })
+      },
+
+      onChange (e, index) {
+        this.$set(this.config[index], 'status', e.detail.value ? '1' : '0')
+      },
+
+      toInput (e) {
+        if (e.editEnable === '0') return
+
+        if (e.fieldType === '2') return
+
+        uni.setStorageSync('formConfig', e)
+        this.linkTo('./Form')
+      },
+
+      save () {
+        for (let i = 0; i < this.config.length; i ++) {
+          if ((this.config[i].fieldType === '0' || this.config[i].fieldType === '1') && !this.config[i].defaultValue && this.config[i].status === '1') {
+            return this.$u.toast(`请输入${this.mapFieldLable(this.config[i].type)}`)
+          }
+        }
+
+        uni.$emit('change', this.config)
+        uni.navigateBack({
+          delta: 1
+        })
       }
     }
   }
@@ -122,7 +111,7 @@
         display: flex;
         align-items: center;
         justify-content: space-between;
-        height: 160px;
+        padding: 32rpx 0;
         font-size: 32px;
         color: #333333;
         border-bottom: 1px solid #DDDDDD;
@@ -134,8 +123,11 @@
         .left {
           display: flex;
           align-items: center;
+          flex: 1;
+          margin-right: 10px;
 
           .left-right {
+            flex: 1;
             margin-left: 36px;
 
             h2 {

src/saas/AppCountryAlbum/components/Home.vue

@@ -80,13 +80,15 @@
       return {
         countPhotoNo: '',
         countPhotographer: '',
-        list: []
+        list: [],
+        msgInfo: {}
       }
     },
 
     mounted () {
       this.getCountPhotoNo()
       this.getAlbumList()
+      this.getMsgList()
     },
 
     methods: {
@@ -109,6 +111,14 @@
         })
       },
 
+      getMsgList () {
+        this.$http.post('/api/sysmessage/latestnews').then(res => {
+          if (res.code === 0) {
+            this.msgInfo = res.data
+          }
+        })
+      },
+
       getAlbumList () {
         this.$http.post('/api/appalbum/list', null, {
           parmas: {

src/saas/AppCountryAlbum/components/watermark/Watermark1.vue

@@ -6,22 +6,30 @@
     </div>
     <div class="info">
       <p>{{ date }} {{ weekCn }}</p>
-      <p>武汉市·绿地蓝海国际A座</p>
+      <p>{{ address }}</p>
-      <p>晴 7℃</p>
+      <p v-if="isShowWeather">{{ weather }}</p>
     </div>
-    <div class="text">#这是一条备注信息</div>
+    <div class="text" v-if="isShowRemark">{{ remark }}</div>
   </div>
 </template>
 
 <script>
-  import {mapActions} from 'vuex'
+  import { mapActions } from 'vuex'
   export default {
+    props: ['config'],
+
     data () {
       return {
         date: '',
         time: '',
         week: '',
-        timer: null
+        weather: '晴转多云',
+        remark: '',
+        address: '武汉市·绿地蓝海国际A座',
+        timer: null,
+        configList: [],
+        isShowWeather: false,
+        isShowRemark: false
       }
     },
 
@@ -51,7 +59,24 @@
       }
     },
 
+    watch: {
+      configList: {
+        handler: function (v) {
+          if (v.length) {
+            const weather = v.filter(v => v.type === '2')[0]
+            const remark = v.filter(v => v.type === '4')[0]
+            console.log(v)
+            this.isShowWeather = weather.status === '1'
+            this.isShowRemark = remark.status === '1'
+            this.remark = remark.defaultValue || ''
+          }
+        },
+        deep: true
+      },
+    },
+
     created () {
+      this.configList = JSON.parse(JSON.stringify(this.config))
       this.date = this.$dayjs(new Date).format('YYYY-MM-DD')
       this.time = this.$dayjs().format('HH:mm')
 
@@ -61,17 +86,12 @@
         this.week = new Date().getDay()
       }, 1000)
 
-      this.injectJWeixin(['getLocation']).then(res => {
+      this.getLocation()
-        console.log(res)
+
-        wx.getLocation({
+      uni.$on('change', e => {
-          type: 'wgs84',
+        this.configList = [
-          success: function (res) {
+          ...e
-            var latitude = res.latitude
+        ]
-            var longitude = res.longitude
-            var speed = res.speed
-            var accuracy = res.accuracy
-          }
-        });
       })
     },
 
@@ -82,21 +102,35 @@
     methods: {
       ...mapActions(['injectJWeixin']),
       getLocation () {
-        uni.getLocation({
+        this.injectJWeixin(['getLocation']).then(res => {
-          type: 'wgs84',
+          console.log(res)
-          success: res => {
+          wx.getLocation({
-            console.log(res)
+            type: 'wgs84',
-            this.$http.get('https://apis.map.qq.com/ws/geocoder/v1/?location=39.984154,116.307490&key=3RZBZ-LZUCF-CT6J5-NWKZH-FCWOQ-UUFKY&get_poi=1').then(res => {
+            success: function (res) {
               console.log(res)
-            })
+              var latitude = res.latitude
-          },
+              var longitude = res.longitude
-          fail: error => {
+              var speed = res.speed
-            console.log(error)
+              var accuracy = res.accuracy
-          }
+            }
+          })
         })
+        // uni.getLocation({
+        //   type: 'wgs84',
+        //   success: res => {
+        //     console.log(res)
+        //     this.$http.get('https://apis.map.qq.com/ws/geocoder/v1/?location=39.984154,116.307490&key=3RZBZ-LZUCF-CT6J5-NWKZH-FCWOQ-UUFKY&get_poi=1').then(res => {
+        //       console.log(res)
+        //     })
+        //   },
+        //   fail: error => {
+        //     console.log(error)
+        //   }
+        // })
       },
 
       linkTo (url) {
+        uni.setStorageSync('waterConfig', this.configList)
         uni.navigateTo({
           url
         })
@@ -115,6 +149,7 @@
       min-width: 274px;
       height: 48px;
       line-height: 48px;
+      margin-top: 32px;
       padding: 0 16px;
       font-size: 28px;
       background: linear-gradient(270deg, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.2) 100%);
@@ -146,7 +181,7 @@
 
     .info {
       line-height: 40px;
-      margin: 32px 0;
+      margin: 32px 0 0;
       padding-left: 22px;
       border-left: 6px solid #F8BC58;
 

src/saas/AppCountryAlbum/config/index.js

@@ -45,3 +45,41 @@ export const config = [
   //   thum: 'https://cdn.cunwuyun.cn/dvcp/h5/watermark/1.png'
   // }
 ]
+
+export const mapFieldLable = type => {
+  return {
+    0: '时间',
+    1: '日期',
+    2: '天气',
+    3: '地点',
+    4: '备注',
+    5: '标题',
+    6: '巡检人',
+    7: '巡查事项',
+    8: '工作主题',
+    9: '网格员',
+    10: '网格名称',
+    11: '服务对象',
+    12: '工作纪实',
+    13: '日历',
+    14: '拍摄人',
+    15: '经纬度',
+    16: '自定义文字',
+    17: '大标题',
+    18: '小标题',
+    19: '汇报人',
+    20: '汇报单位',
+    21: '颜色设置',
+    22: '工作单位',
+    23: '巡查地点',
+    24: '巡查人',
+    25: '巡查情况',
+    26: '主持人',
+    27: '记录人',
+    28: '参与人',
+    29: '会议地点',
+    30: '会议主题',
+    31: '会议内容',
+    32: '总结',
+  }[type]
+}