小程序底座架构完成

src/components/AiPagePicker/AiPagePicker.vue

@@ -0,0 +1,68 @@
+<template>
+  <section class="AiPagePicker">
+    <div @click="handleJump">
+      <slot v-if="$slots.default"/>
+      <div v-else v-text="selectedLabel"/>
+    </div>
+  </section>
+</template>
+
+<script>
+import qs from 'query-string'
+
+export default {
+  name: "AiPagePicker",
+  model: {
+    prop: "value",
+    event: "change"
+  },
+  props: {
+    value: {default: ""},
+    type: {default: "resident"},
+    nodeKey: {default: "idNumber"},
+    selected: {default: () => []},
+    placeholder: {default: "选择人员"}
+  },
+  data() {
+    return {
+      configList: {
+        resident: {url: "/components/pages/selectResident", label: "name"},
+        gird: {url: "/components/pages/selectGird", label: "girdName"}
+      },
+    }
+  },
+  computed: {
+    config() {
+      return this.configList[this.type] || {}
+    },
+    selectedLabel() {
+      let {placeholder, config: {label}} = this
+      return this.selected?.map(e => e[label])?.toString() || placeholder
+    }
+  },
+  methods: {
+    handleJump() {
+      let {config, nodeKey} = this,
+          selected = this.value || this.selected?.map(e => e[nodeKey])
+      uni.$once('pagePicker', data => {
+        this.$emit("update:selected", data)
+        this.$emit("select", data)
+        this.$emit("change", data.map(e => e[nodeKey]))
+      })
+      let url = `${config.url}`,
+          qsstr = qs.stringify({
+            selected, ...this.$attrs
+          })
+      if (!!qsstr) {
+        url += `?${qsstr}`
+      }
+      uni.navigateTo({url})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AiPagePicker {
+}
+</style>

src/components/pages/selectGird.vue

@@ -0,0 +1,312 @@
+<template>
+  <div class="selectGird">
+    <AiTopFixed>
+      <u-search placeholder="搜索" v-model="name" :show-action="false"/>
+      <div class="hint">
+        <span v-for="(item, index) in selectList" :key="index"><span v-if="index" style="margin:0 4px;">/</span><span
+            style="color:#3F8DF5" @click="girdNameClick(item, index)">{{ item.girdName }}</span></span>
+      </div>
+    </AiTopFixed>
+    <div class="header-middle">
+      <div class="showTypes">
+        <div v-if="options.length > 0">
+          <div class="cards" v-for="(item, index) in options" :key="index" @click="itemClick(item)">
+            <div class="imges">
+              <img src="./img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
+                   @click.stop="girdClick(item, index)"/>
+              <img src="./img/xz.png" alt="" class="imgselect" v-else
+                   @click.stop="girdClick(item, index)"/>
+              <img src="./img/gird--select-icon.png" alt="" class="avatras"/>
+            </div>
+            <div class="rightes">
+              <div class="applicationNames fill">{{ item.girdName }}</div>
+              <u-icon v-if="item.girdLevel != 2" name="arrow-right" color="#ddd"/>
+            </div>
+          </div>
+        </div>
+        <AiEmpty description="暂无数据" class="emptyWrap" v-else/>
+      </div>
+    </div>
+    <div class="pad-b118"/>
+    <div class="footer">
+      <div class="btn" @click="confirm">确定选择</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'selectGird',
+  appName: "网格选择",
+  data() {
+    return {
+      current: 1,
+      name: '',
+      list: [],
+      selected: [],
+      SelectGird: {},
+      allData: null,
+      treeList: [],
+      selectList: [],
+      userGird: {},
+      userList: [],
+      girdLevel: 0,
+      parentGirdId: '',
+      isMyGird: false, //是否只查询当前户对应的网格员管理的三级网格
+    }
+  },
+  computed: {
+    options() {
+      return this.treeList.filter(e => e.girdName?.indexOf(this.name) > -1 || !this.name) || []
+    }
+  },
+  onLoad(params) {
+    console.log(params)
+    if (params.girdLevel) {
+      this.girdLevel = params.girdLevel
+    }
+    if (params.isMyGird) {
+      this.isMyGird = params.isMyGird
+    }
+    this.isGirdUser()
+  },
+  methods: {
+    isGirdUser() {
+      this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
+        if (res?.data) {
+          if (res.data.checkType) {
+            this.userGird = res.data
+            if (this.isMyGird) {
+              this.getMyGird()
+            } else {
+              this.getTree()
+            }
+
+          } else {
+            this.$u.toast('当前人员不是网格员或网格管理员')
+          }
+        }
+      })
+    },
+    getMyGird() {
+      this.selectList = []
+      this.$http.post('/app/appgirdmemberinfo/queryMyGirdListByLevel2AndUser').then((res) => {
+        if (res.code == 0) {
+          this.allData = res.data
+          this.treeInit()
+        }
+      })
+    },
+    getTree() {
+      this.selectList = []
+      this.$http.post(`/app/appgirdinfo/queryAppGirdInfoByGirdLevel?girdLevel=${this.girdLevel}&girdMemberId=${this.userGird.girdMemberId}&parentGirdId=${this.parentGirdId}`).then((res) => {
+        if (res?.data) {
+          this.allData = res.data
+          this.treeInit()
+        }
+      })
+    },
+
+    treeInit() {
+      this.treeList = this.allData
+      this.treeList.map((item) => {
+        item.isChecked = false
+      })
+      let obj = {
+        girdName: '可选范围',
+        id: '',
+        girdLevel: ''
+      }
+      this.selectList.push(obj)
+    },
+
+    itemClick(row) {
+      if (row.girdLevel == 2) return
+      const obj = {
+        girdName: row.girdName,
+        id: row.id,
+        girdLevel: row.girdLevel
+      };
+      this.selectList.push(obj)
+      this.searckGird(row)
+    },
+
+    searckGird(row) {
+      if (row.girdLevel == 2) return
+      const girdLevel = Number(row.girdLevel) + 1;
+      this.$http.post(`/app/appgirdinfo/queryAppGirdInfoByGirdLevel?girdLevel=${girdLevel}&girdMemberId=${this.userGird.girdMemberId}&parentGirdId=${row.id}`).then((res) => {
+        if (res?.data) {
+          this.treeList = res.data
+        }
+      })
+    },
+
+    girdNameClick(row, index) {
+      this.userList = []
+      if (!index) { //第一级别
+        this.selectList = []
+        this.treeInit()
+      } else {
+        const list = [];
+        this.selectList.map((item, i) => {
+          if (i <= index) {
+            list.push(item)
+          }
+        })
+        this.selectList = list
+        this.searckGird(row)
+      }
+    },
+
+
+    girdClick(row, index) {
+      if (this.treeList[index].isChecked) {//取消
+        this.treeList[index].isChecked = false
+        this.SelectGird = {}
+      } else {
+        this.treeList.map((item) => {
+          item.isChecked = false
+        })
+        this.treeList[index].isChecked = true
+        this.SelectGird = row
+      }
+      this.$forceUpdate()
+    },
+    confirm() {
+      if (this.SelectGird.id != null) {
+        uni.navigateBack({
+          success: () => {
+            uni.$emit("pagePicker", [this.SelectGird])
+          }
+        })
+      } else {
+        return this.$u.toast('请选择网格')
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.selectGird {
+  height: 100%;
+  background: #fff;
+  padding-bottom: 140px;
+
+  .hint {
+    padding-bottom: 28px;
+    line-height: 56px;
+    font-size: 30px;
+    font-weight: 500;
+    word-break: break-all;
+  }
+
+  .header-middle {
+    .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: calc(100% - 188px);
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-left: 32px;
+          border-bottom: 1px solid #e4e5e6;
+          padding-right: 16px;
+          box-sizing: border-box;
+
+          .applicationNames {
+            font-size: 36px;
+            font-weight: 500;
+            color: #333333;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+        }
+      }
+    }
+  }
+
+  .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;
+    }
+  }
+
+  .footer {
+    width: 100%;
+    height: 118px;
+    background: #F4F8FB;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    text-align: right;
+
+    .btn {
+      display: inline-block;
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      background: #1365DD;
+      border-radius: 4px;
+      text-align: center;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #FFF;
+      margin: 20px 34px 0 0;
+    }
+  }
+}
+</style>

src/components/pages/selectResident.vue

@@ -0,0 +1,171 @@
+<template>
+  <div class="selectResident">
+    <AiTopFixed>
+      <u-search placeholder="搜索" v-model="name" :show-action="false" @change="getList"></u-search>
+    </AiTopFixed>
+    <div class="user-list">
+      <template v-if="list.length>0">
+        <div class="item" v-for="(item, index) in list" :key="index">
+          <div class="select-img" @click="checkClick(index)">
+            <img :src="item.isCheck ? checkIcon : cirIcon" alt="">
+          </div>
+          <div class="user-info">
+            <img :src="item.photo" alt="" v-if="item.photo">
+            <img src="./img/user-img.png" alt="" v-else>{{ item.name }}
+          </div>
+        </div>
+      </template>
+      <AiEmpty v-else/>
+    </div>
+    <div class="pad-b118"></div>
+    <div class="footer">
+      <div class="btn" @click="confirm">确定选择</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "selectResident",
+  appName: "人员选择器(居民档案)",
+  data() {
+    return {
+      current: 1,
+      name: '',
+      list: [],
+      cirIcon: require('./img/xz.png'),
+      checkIcon: require('./img/xzh.png'),
+      selected: []
+    }
+  },
+  computed: {...mapState(['user'])},
+  onLoad(query) {
+    if (query.selected) {
+      this.selected = query.selected?.split(",") || []
+    }
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.$http.post(`/app/appresident/list`, null, {
+        params: {
+          current: this.current,
+          size: 20,
+          areaId: this.user.areaId,
+          con: this.name
+        }
+      }).then(res => {
+        if (res?.data) {
+          res.data.records.forEach(e => {
+            e.isCheck = this.selected.includes(e.idNumber)
+          })
+          if (this.current > 1 && this.current > res.data.pages) {
+            return
+          }
+          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+        }
+      })
+    },
+    checkClick(index) {
+      this.list[index].isCheck = !this.list[index].isCheck
+    },
+    confirm() {
+      let checkList = []
+      this.list.map((item) => {
+        if (item.isCheck) {
+          checkList.push(item)
+        }
+      })
+      if (!checkList.length) {
+        return this.$u.toast('请先选择人员')
+      } else {
+        uni.navigateBack({
+          success: () => {
+            uni.$emit("pagePicker", checkList)
+          }
+        })
+      }
+    }
+  },
+  onReachBottom() {
+    this.current++
+    this.getList()
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.selectResident {
+  ::v-deep .AiTopFixed .u-search {
+    margin-bottom: 0 !important;
+  }
+
+  .pad-b118 {
+    padding-bottom: 118px;
+  }
+
+  .user-list {
+    background-color: #fff;
+
+    .item {
+      .select-img {
+        display: inline-block;
+
+        img {
+          width: 48px;
+          height: 48px;
+          margin: 12px 36px 12px 30px;
+          vertical-align: middle;
+        }
+      }
+
+      .user-info {
+        display: inline-block;
+        padding: 20px 0 20px 0;
+        width: calc(100% - 114px);
+        height: 100%;
+        border-bottom: 1px solid #E4E5E6;
+        font-size: 36px;
+        font-family: PingFangSC-Medium, PingFang SC;
+        font-weight: 500;
+        color: #333;
+        line-height: 74px;
+
+        img {
+          width: 74px;
+          height: 74px;
+          border-radius: 8px;
+          margin-right: 34px;
+          vertical-align: bottom;
+        }
+      }
+    }
+  }
+
+  .footer {
+    width: 100%;
+    height: 118px;
+    background: #F4F8FB;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    text-align: right;
+
+    .btn {
+      display: inline-block;
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      background: #1365DD;
+      border-radius: 4px;
+      text-align: center;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #FFF;
+      margin: 20px 34px 0 0;
+    }
+  }
+}
+</style>

src/mods/AppActivityList/addContent.vue

@@ -22,14 +22,10 @@
   </div>
 </template>
 <script>
-import AiUploader from '@/components/AiUploader/AiUploader'
 import {mapState} from 'vuex'
 
 export default {
   name: "addContent",
-  components: {
-    AiUploader
-  },
   computed: {
     ...mapState(['user'])
   },

src/mods/AppAddressBook/AppAddressBook.vue

@@ -9,13 +9,13 @@
     <!-- <div class="areaSelection">
       <div class="area">区域选择</div>
       <div class="select">
-        <ai-area-picker ref="area" class="ai-area" :value="areaId" :name.sync="areaName" :areaId="$areaId" @select="areaSelect">
+        <AiAreaPicker ref="area" class="ai-area" :value="areaId" :name.sync="areaName" :areaId="$areaId" @select="areaSelect">
           <div class="ai-area__wrapper">
             <span class="label" v-if="areaName">{{ areaName }}</span>
             <span v-else>请选择</span>
             <u-icon name="arrow-right"></u-icon>
           </div>
-        </ai-area-picker>
+        </AiAreaPicker>
       </div>
     </div> -->
 
@@ -153,7 +153,7 @@ export default {
   box-sizing: border-box;
   padding: 32px 48px;
   background: #ffffff;
-  box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.02);
+  box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.02);
 
   & > label {
     font-size: 32px;

src/mods/AppAgProducts/agAdd.vue

@@ -72,11 +72,8 @@
 
 <script>
 
-import AiUploader from '../../components/AiUploader/AiUploader'
-
 export default {
   name: "agAdd",
-  components: {AiUploader},
   data() {
     return {
       show: false,

src/mods/AppContent/contentDetail.vue

@@ -5,11 +5,9 @@
 </template>
 
 <script>
-import AiDetail from "../../components/AiDetail/AiDetail";
 
 export default {
   name: "contentDetail",
-  components: {AiDetail},
   data() {
     return {
       detail: {title: "内容详情"},

src/mods/AppContent/contentManager.vue

@@ -6,7 +6,7 @@
           <div class="search">
             <u-icon name="search" color="rgba(255,255,255,0.5)" size="40"></u-icon>
             <input placeholder="请输入需要搜索的内容" class="desc" placeholder-style="color:rgba(255,255,255,0.5);"
-                   confirm-type="search" @change="onChange"></input>
+                   confirm-type="search" @change="onChange"/>
           </div>
         </div>
       </template>
@@ -16,11 +16,9 @@
 
 <script>
 import {mapState} from "vuex";
-import AiNewsList from "../../components/AiNewsList/AiNewsList";
 
 export default {
   name: "contentManager",
-  components: {AiNewsList},
   computed: {
     ...mapState(['user']),
     loadmore() {
@@ -47,7 +45,7 @@ export default {
       this.getData(val.detail.value);
     },
     getData(title = "") {
-      let {current, search} = this
+      let {current} = this
       this.moduleId && this.$instance.post("/app/appcontentinfo/list", null, {
         params: {moduleId: this.moduleId, current, size: 10, title}
       }).then(res => {

src/mods/AppJob/pubJob.vue

@@ -50,11 +50,9 @@
   </div>
 </template>
 <script>
-import AiUploader from '../../components/AiUploader/AiUploader'
 
 export default {
   name: "pubJob",
-  components: {AiUploader},
   data() {
     return {
       form: {

src/mods/AppMarFuneral/marAdd.vue

@@ -62,11 +62,9 @@
 </template>
 
 <script>
-import AiUploader from '../../components/AiUploader/AiUploader'
 
 export default {
   name: "marAdd",
-  components: {AiUploader},
   data() {
     return {
       form: {

src/mods/AppPlease/detail.vue

@@ -23,7 +23,7 @@
       <div class="detail-content">
         <p class="info-content">{{ detailInfo.content }}</p>
         <div class="img-list" v-if="detailInfo.iamgeList.length">
-          <img :src="item.url" alt="" v-for="(item,index) in detailInfo.iamgeList" key="index"
+          <img :src="item.url" alt="" v-for="(item,index) in detailInfo.iamgeList" :key="index"
                @click="previewdealListImage(index, detailInfo.iamgeList)">
         </div>
       </div>

src/mods/AppPlease/reply.vue

@@ -24,14 +24,10 @@
   </div>
 </template>
 <script>
-import AiUploader from '@/components/AiUploader/AiUploader'
 import {mapState} from 'vuex'
 
 export default {
   name: "my",
-  components: {
-    AiUploader
-  },
   computed: {
     ...mapState(['user', 'token'])
   },

src/mods/AppPolice/AppPolice.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="wrapper" v-if="pageShow">
     <div class="area">
-      <ai-area-picker ref="area" class="ai-area" :value="areaId" :name.sync="areaName" :areaId="$areaId"
+      <AiAreaPicker ref="area" class="ai-area" :value="areaId" :name.sync="areaName" :areaId="$areaId"
                       @select="handleSelect">
         <div class="ai-area__wrapper">
           <span class="label" v-if="areaName">{{ areaName }}</span>
           <span v-else>请选择</span>
           <image src="/static/img/area-bottom.png"/>
         </div>
-      </ai-area-picker>
+      </AiAreaPicker>
     </div>
     <tempate v-if="list.length">
       <header>
@@ -176,7 +176,7 @@ header {
     box-sizing: border-box;
     padding: 32px;
     background: #FFFFFF;
-    box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.02);
+    box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.02);
     border-radius: 16px;
     display: flex;
     align-items: center;

src/mods/AppVideoSurve/AppVideoSurve.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="videoSurve">
     <div class="top">
-      <ai-area-picker ref="area" class="ai-area" :value="areaId" :name.sync="areaName" :areaId="$areaId" @select="areaSelect">
+      <AiAreaPicker ref="area" class="ai-area" :value="areaId" :name.sync="areaName" :areaId="$areaId" @select="areaSelect">
         <div class="ai-area__wrapper">
           <span class="label" v-if="areaName">{{ areaName }}</span>
           <span v-else>请选择</span>
           <!-- <u-icon name="arrow-right"></u-icon> -->
         </div>
-      </ai-area-picker>
+      </AiAreaPicker>
 
       <div class="msgs">
         <div class="item">

src/mods/AppVillageActivity/AddDynamic.vue

@@ -19,7 +19,7 @@
           <span>(最多9张)</span>
         </div>
         <div class="form-item__img">
-          <ai-uploader v-model="images" :limit="9"></ai-uploader>
+          <AiUploader v-model="images" :limit="9"></AiUploader>
         </div>
       </div>
     </div>
@@ -30,103 +30,97 @@
 </template>
 
 <script>
-  import AiUploader from '@/components/AiUploader/AiUploader'
 
-  export default {
+export default {
-    data () {
+  data() {
-      return {
+    return {
-        content: '',
+      content: '',
-        images: [],
+      images: [],
-        id: '',
+      id: '',
-        flag: false
+      flag: false
+    }
+  },
+  onLoad(e) {
+    this.id = e.activityId
+  },
+
+  methods: {
+    submit() {
+      if (this.flag) return
+
+      if (!this.content && !this.images.length) {
+        return this.$u.toast('内容或图片不能为空')
       }
-    },
+      this.flag = true
 
-    components: {
-      AiUploader
-    },
 
-    onLoad (e) {
+      this.$loading()
-      this.id = e.activityId
+      this.$instance.post('/app/appvillageactivitypost/addOrUpdate', {
-    },
+        content: this.content,
-
+        activityId: this.id,
-    methods: {
+        avatar: this.$store.state.user.avatarUrl,
-      submit () {
+        name: this.$store.state.user.nickName,
-        if (this.flag) return
+        images: JSON.stringify(this.images)
-
+      }).then(res => {
-        if (!this.content && !this.images.length) {
+        if (res.code === 0) {
-          return this.$u.toast('内容或图片不能为空')
+          this.$toast('提交成功')
+          uni.$emit('update')
+          setTimeout(() => {
+            uni.navigateBack({
+              delta: 1
+            })
+          }, 800)
         }
-        this.flag = true
 
-
+        this.$hideLoading()
-        this.$loading()
+      })
-        this.$instance.post('/app/appvillageactivitypost/addOrUpdate', {
-          content: this.content,
-          activityId: this.id,
-          avatar: this.$store.state.user.avatarUrl,
-          name: this.$store.state.user.nickName,
-          images: JSON.stringify(this.images)
-        }).then(res => {
-          if (res.code === 0) {
-            this.$toast('提交成功')
-            uni.$emit('update')
-            setTimeout(() => {
-              uni.navigateBack({
-                delta: 1
-              })
-            }, 800)
-          }
-
-          this.$hideLoading()
-        })
-      }
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .dynamic {
+.dynamic {
-    .form-item {
+  .form-item {
-      margin-bottom: 24px;
+    margin-bottom: 24px;
-      padding-left: 32px;
+    padding-left: 32px;
-      padding-bottom: 20px;
+    padding-bottom: 20px;
-      background: #fff;
+    background: #fff;
 
-      .form-item__wrapper {
+    .form-item__wrapper {
-        padding-right: 32px;
+      padding-right: 32px;
+    }
+
+    .form-item__textarea, .form-item__img {
+      padding-left: 18px;
+
+      textarea {
+        width: 100%;
+      }
+    }
+
+    .form-item__title {
+      display: flex;
+      align-items: center;
+      padding: 32px 0;
+
+      i {
+        font-size: 32px;
+        color: #FF4466;
       }
 
-      .form-item__textarea, .form-item__img {
+      span {
-        padding-left: 18px;
+        font-size: 28px;
-
+        color: #999999;
-        textarea {
-          width: 100%;
-        }
       }
 
-      .form-item__title {
+      h2 {
-        display: flex;
+        padding: 0 4px;
-        align-items: center;
+        font-weight: 600;
-        padding: 32px 0;
+        font-size: 32px;
-
+        color: #333333;
-        i {
-          font-size: 32px;
-          color: #FF4466;
-        }
-
-        span {
-          font-size: 28px;
-          color: #999999;
-        }
-
-        h2 {
-          padding: 0 4px;
-          font-weight: 600;
-          font-size: 32px;
-          color: #333333;
-        }
       }
     }
   }
+}
 </style>

src/mods/service/AppHealthReport/AddReport.vue

@@ -9,7 +9,7 @@
             <h2>返乡人员姓名</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.name" disabled :maxlength="20" />
+            <input placeholder="请输入" v-model="form.name" disabled :maxlength="20"/>
           </div>
         </div>
       </div>
@@ -20,7 +20,7 @@
             <h2>身份证号</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.idNumber" disabled :maxlength="20" />
+            <input placeholder="请输入" v-model="form.idNumber" disabled :maxlength="20"/>
           </div>
         </div>
       </div>
@@ -33,7 +33,7 @@
             <h2>当前体温</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.temperature" :maxlength="20" />
+            <input placeholder="请输入" v-model="form.temperature" :maxlength="20"/>
             <i>℃</i>
           </div>
         </div>
@@ -119,7 +119,7 @@
             <h2>本人健康码截图</h2>
           </div>
           <div class="form-item__right">
-            <ai-uploader v-model="form.checkPhoto" :limit="1"></ai-uploader>
+            <AiUploader v-model="form.checkPhoto" :limit="1"></AiUploader>
           </div>
         </div>
       </div>
@@ -132,304 +132,299 @@
 </template>
 
 <script>
-  import AiUploader from '@/components/AiUploader/AiUploader'
+import {mapState} from 'vuex'
-  import AiSelect from '@/components/AiSelect/AiSelect'
-  import { mapState } from 'vuex'
 
-  export default {
+export default {
-    data () {
+  data() {
-      return {
+    return {
-        isShowDate: false,
+      isShowDate: false,
-				dataParams: {
+      dataParams: {
-					year: true,
+        year: true,
-					month: true,
+        month: true,
-					day: true
+        day: true
-				},
-        form: {
-          name: '',
-          idNumber: '',
-          checkPhoto: [],
-          checkResult: '',
-          health: '',
-          healthCode: '',
-          temperature: '',
-          vaccine: '',
-          checkTime: '',
-          memberId: ''
-        }
-      }
-    },
-
-    components: {
-      AiSelect,
-      AiUploader
-    },
-
-    computed: {
-      ...mapState(['user'])
-    },
-
-    onLoad (query) {
-      this.form.memberId = query.id
-      this.getInfo(query.id)
-    },
-
-    methods: {
-      getInfo (id) {
-        this.$instance.post(`/app/appepidemicreportmember/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.form.name = res.data.name
-            this.form.idNumber = res.data.idNumber
-
-            this.form.checkTime = res.data.checkTime ? res.data.checkTime.split(' ')[0] : ''
-            this.form.checkResult = res.data.checkResult || ''
-            this.form.healthCode = res.data.healthCode || ''
-            this.form.vaccine = res.data.vaccine || ''
-          }
-
-          this.$hideLoading()
-        }).catch(() => {
-          this.$hideLoading()
-        })
       },
-
+      form: {
-      onDateChange (e) {
+        name: '',
-        this.form.checkTime = `${e.year}-${e.month}-${e.day}`
+        idNumber: '',
-      },
+        checkPhoto: [],
-
+        checkResult: '',
-      submit () {
+        health: '',
-        if (!this.form.temperature) {
+        healthCode: '',
-          return this.$toast('请输入当前体温')
+        temperature: '',
-        }
+        vaccine: '',
-
+        checkTime: '',
-        if (!this.form.touchInFourteen) {
+        memberId: ''
-          return this.$toast('请选择14天内是否接触新冠确诊或疑似患者')
-        }
-
-        if (!this.form.health.length) {
-          return this.$toast('请选择当前健康状况')
-        }
-        if (!this.form.checkTime) {
-          return this.$toast('请选择核酸检测日期')
-        }
-
-        if (!this.form.checkResult) {
-          return this.$toast('请选择核酸检测结果')
-        }
-
-        if (!this.form.healthCode) {
-          return this.$toast('请选择健康码类型')
-        }
-
-        if (!this.form.vaccine) {
-          return this.$toast('请选择已接种疫苗次数')
-        }
-
-        if (!this.form.checkPhoto.length) {
-          return this.$toast('请上传健康码截图')
-        }
-        this.$loading()
-        this.$instance.post(`/app/appepidemichealthreport/addOrUpdate`, {
-          ...this.form,
-          openid: this.user.openid,
-          health: this.form.health.join(','),
-          checkPhoto: JSON.stringify(this.form.checkPhoto),
-          checkTime: this.form.checkTime + ' 00:00:00'
-        }).then(res => {
-          if (res.code == 0) {
-            uni.$emit('update')
-            this.$toast('提交成功')
-            setTimeout(() => {
-              uni.navigateBack()
-            }, 400)
-          }
-          this.$hideLoading()
-        })
       }
     }
+  },
+
+
+  computed: {
+    ...mapState(['user'])
+  },
+
+  onLoad(query) {
+    this.form.memberId = query.id
+    this.getInfo(query.id)
+  },
+
+  methods: {
+    getInfo(id) {
+      this.$instance.post(`/app/appepidemicreportmember/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form.name = res.data.name
+          this.form.idNumber = res.data.idNumber
+
+          this.form.checkTime = res.data.checkTime ? res.data.checkTime.split(' ')[0] : ''
+          this.form.checkResult = res.data.checkResult || ''
+          this.form.healthCode = res.data.healthCode || ''
+          this.form.vaccine = res.data.vaccine || ''
+        }
+
+        this.$hideLoading()
+      }).catch(() => {
+        this.$hideLoading()
+      })
+    },
+
+    onDateChange(e) {
+      this.form.checkTime = `${e.year}-${e.month}-${e.day}`
+    },
+
+    submit() {
+      if (!this.form.temperature) {
+        return this.$toast('请输入当前体温')
+      }
+
+      if (!this.form.touchInFourteen) {
+        return this.$toast('请选择14天内是否接触新冠确诊或疑似患者')
+      }
+
+      if (!this.form.health.length) {
+        return this.$toast('请选择当前健康状况')
+      }
+      if (!this.form.checkTime) {
+        return this.$toast('请选择核酸检测日期')
+      }
+
+      if (!this.form.checkResult) {
+        return this.$toast('请选择核酸检测结果')
+      }
+
+      if (!this.form.healthCode) {
+        return this.$toast('请选择健康码类型')
+      }
+
+      if (!this.form.vaccine) {
+        return this.$toast('请选择已接种疫苗次数')
+      }
+
+      if (!this.form.checkPhoto.length) {
+        return this.$toast('请上传健康码截图')
+      }
+      this.$loading()
+      this.$instance.post(`/app/appepidemichealthreport/addOrUpdate`, {
+        ...this.form,
+        openid: this.user.openid,
+        health: this.form.health.join(','),
+        checkPhoto: JSON.stringify(this.form.checkPhoto),
+        checkTime: this.form.checkTime + ' 00:00:00'
+      }).then(res => {
+        if (res.code == 0) {
+          uni.$emit('update')
+          this.$toast('提交成功')
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 400)
+        }
+        this.$hideLoading()
+      })
+    }
   }
+}
 </script>
 
 <style lang="scss">
-  .album {
+.album {
-    padding-bottom: 140px;
+  padding-bottom: 140px;
 
-    .tips {
+  .tips {
-      line-height: 1.3;
+    line-height: 1.3;
-      padding: 32px 32px;
+    padding: 32px 32px;
-      color: #FF883C;
+    color: #FF883C;
-      font-size: 30px;
+    font-size: 30px;
-      text-align: justify;
+    text-align: justify;
-      background: #FFF8F3;
+    background: #FFF8F3;
-    }
+  }
 
-    .form-item__group {
+  .form-item__group {
-      margin-bottom: 24px;
+    margin-bottom: 24px;
-      background: #fff;
+    background: #fff;
-    }
+  }
 
-    .form-item {
+  .form-item {
-      padding-left: 32px;
+    padding-left: 32px;
 
-      .form-item__checkbox {
+    .form-item__checkbox {
+      width: 100%;
+
+      div {
         width: 100%;
-        div {
+        height: 80px;
-          width: 100%;
+        line-height: 80px;
-          height: 80px;
+        margin-bottom: 24px;
-          line-height: 80px;
+        text-align: center;
-          margin-bottom: 24px;
+        background: #FFFFFF;
-          text-align: center;
+        border-radius: 16px;
-          background: #FFFFFF;
+        color: #333333;
-          border-radius: 16px;
+        font-size: 28px;
-          color: #333333;
+        border: 1px solid #CCCCCC;
-          font-size: 28px;
-          border: 1px solid #CCCCCC;
 
-          &.active {
+        &.active {
-            background: #4181FF;
+          background: #4181FF;
-            color: #fff;
+          color: #fff;
-            border-color: #4181FF;
+          border-color: #4181FF;
-          }
         }
       }
+    }
 
-      .form-item__radio {
+    .form-item__radio {
-        display: flex;
+      display: flex;
-        align-items: center;
+      align-items: center;
-        flex-wrap: wrap;
+      flex-wrap: wrap;
 
-        div {
+      div {
-          width: 212px;
+        width: 212px;
-          height: 80px;
+        height: 80px;
-          line-height: 80px;
+        line-height: 80px;
-          margin-right: 16px;
+        margin-right: 16px;
-          margin-bottom: 8px;
+        margin-bottom: 8px;
-          text-align: center;
+        text-align: center;
-          background: #FFFFFF;
+        background: #FFFFFF;
-          border-radius: 16px;
+        border-radius: 16px;
-          color: #333333;
+        color: #333333;
-          font-size: 28px;
+        font-size: 28px;
-          border: 1px solid #CCCCCC;
+        border: 1px solid #CCCCCC;
 
-          &:nth-of-type(3n) {
+        &:nth-of-type(3n) {
-            margin-right: 0;
+          margin-right: 0;
-          }
+        }
 
-          &.active {
+        &.active {
-            background: #4181FF;
+          background: #4181FF;
-            color: #fff;
+          color: #fff;
-            border-color: #4181FF;
+          border-color: #4181FF;
-          }
         }
       }
+    }
 
-      .ai-area__wrapper {
+    .ai-area__wrapper {
+      display: flex;
+      align-items: center;
+      padding-left: 100px;
+
+      span {
+        color: #333;
+        font-size: 30px;
+      }
+
+      i {
+        color: #999;
+        font-size: 30px;
+      }
+
+      image {
+        width: 16px;
+        height: 8px;
+      }
+    }
+
+    .form-item__wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 128px;
+      padding-right: 28px;
+      border-bottom: 1px solid #DDDDDD;
+
+      input {
+        flex: 1;
+        height: 100%;
+        text-align: right;
+        color: #333;
+        padding-right: 10px;
+      }
+
+      .form-item__right {
         display: flex;
         align-items: center;
-        padding-left: 100px;
+        font-size: 32px;
 
         span {
-          color: #333;
+          max-width: 400px;
-          font-size: 30px;
+          margin-right: 8px;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
         }
 
         i {
-          color: #999;
+          margin-right: 8px;
-          font-size: 30px;
+          color: #999999;
-        }
-
-        image {
-          width: 16px;
-          height: 8px;
         }
       }
+    }
 
+    &:last-child {
       .form-item__wrapper {
-        display: flex;
+        border-bottom: none;
-        align-items: center;
+      }
-        justify-content: space-between;
+    }
-        height: 128px;
-        padding-right: 28px;
-        border-bottom: 1px solid #DDDDDD;
 
-        input {
+    .form-item__title {
-          flex: 1;
+      display: flex;
-          height: 100%;
+      align-items: center;
-          text-align: right;
-          color: #333;
-          padding-right: 10px;
-        }
 
-        .form-item__right {
+      i {
-          display: flex;
+        font-size: 32px;
-          align-items: center;
+        color: #FF4466;
-          font-size: 32px;
-
-          span {
-            max-width: 400px;
-            margin-right: 8px;
-            color: #333333;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-          }
-
-          i {
-            margin-right: 8px;
-            color: #999999;
-          }
-        }
       }
 
-      &:last-child {
+      span {
-        .form-item__wrapper {
+        font-size: 28px;
-          border-bottom: none;
+        color: #999999;
-        }
+      }
+
+      h2 {
+        padding: 0 4px;
+        font-weight: 600;
+        font-size: 32px;
+        color: #333333;
+      }
+    }
+
+
+    &.form-item__imgs, &.form-item__textarea {
+      .form-item__wrapper {
+        display: block;
+        height: auto;
+        padding-bottom: 32px;
+      }
+
+      textarea {
+        width: 100%;
+        height: 90px;
       }
 
       .form-item__title {
-        display: flex;
+        padding: 32px 0;
-        align-items: center;
-
-        i {
-          font-size: 32px;
-          color: #FF4466;
-        }
-
-        span {
-          font-size: 28px;
-          color: #999999;
-        }
-
-        h2 {
-          padding: 0 4px;
-          font-weight: 600;
-          font-size: 32px;
-          color: #333333;
-        }
       }
 
-
+      .form-item__right {
-      &.form-item__imgs, &.form-item__textarea {
+        padding-left: 18px;
-        .form-item__wrapper {
-          display: block;
-          height: auto;
-          padding-bottom: 32px;
-        }
-
-        textarea {
-          width: 100%;
-          height: 90px;
-        }
-
-        .form-item__title {
-          padding: 32px 0;
-        }
-
-        .form-item__right {
-          padding-left: 18px;
-        }
       }
     }
   }
+}
 </style>

src/mods/service/AppHealthReport/AddUser.vue

@@ -8,7 +8,7 @@
             <h2>上报人姓名</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.name" :maxlength="20" />
+            <input placeholder="请输入" v-model="form.name" :maxlength="20"/>
           </div>
         </div>
       </div>
@@ -19,7 +19,7 @@
             <h2>身份证号</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="20" />
+            <input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="20"/>
           </div>
         </div>
       </div>
@@ -30,7 +30,7 @@
             <h2>手机号码</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" type="number" v-model="form.phone" :maxlength="11" />
+            <input placeholder="请输入" type="number" v-model="form.phone" :maxlength="11"/>
           </div>
         </div>
       </div>
@@ -41,13 +41,14 @@
             <h2>上报地区</h2>
           </div>
           <div class="form-item__right">
-            <ai-area-picker ref="area" class="ai-area" :value="form.areaId" :areaId="$areaId" :fullName.sync="form.areaName" all mode="custom" @select="v => form.areaId = v">
+            <AiAreaPicker ref="area" class="ai-area" :value="form.areaId" :areaId="$areaId"
+                          :fullName.sync="form.areaName" all mode="custom" @select="v => form.areaId = v">
               <div class="ai-area__wrapper">
                 <span class="label" v-if="form.areaName">{{ form.areaName }}</span>
                 <i v-else>请选择</i>
                 <u-icon name="arrow-right" color="#ddd"/>
               </div>
-            </ai-area-picker>
+            </AiAreaPicker>
           </div>
         </div>
       </div>
@@ -58,7 +59,8 @@
             <h2>详细地址</h2>
           </div>
           <div class="form-item__right">
-            <textarea auto-height v-model="form.address" :maxlength="500" placeholder="请输入详细地址" placeholder-style="font-size: 16px;"></textarea>
+            <textarea auto-height v-model="form.address" :maxlength="500" placeholder="请输入详细地址"
+                      placeholder-style="font-size: 16px;"></textarea>
           </div>
         </div>
       </div>
@@ -70,261 +72,256 @@
 </template>
 
 <script>
-  import AiSelect from '@/components/AiSelect/AiSelect'
+import {mapState} from 'vuex'
-  import { mapState } from 'vuex'
 
-  export default {
+export default {
-    data () {
+  data() {
-      return {
+    return {
-        form: {
+      form: {
-          address: '',
+        address: '',
-          areaId: '',
+        areaId: '',
-          areaName: '',
+        areaName: '',
-          idNumber: '',
+        idNumber: '',
-          name: '',
+        name: '',
-          phone: ''
+        phone: ''
-        },
+      },
-        $areaId: '',
+      $areaId: '',
-        flag: false
+      flag: false
+    }
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+
+  methods: {
+    submit() {
+      if (!this.form.name) {
+        return this.$toast('请输入上报人姓名')
       }
-    },
 
-    components: {
+      if (!this.form.idNumber) {
-      AiSelect
+        return this.$toast('请输入上报人身份证号')
-    },
-
-    computed: {
-      ...mapState(['user'])
-    },
-
-    methods: {
-      submit () {
-        if (!this.form.name) {
-          return this.$toast('请输入上报人姓名')
-        }
-
-        if (!this.form.idNumber) {
-          return this.$toast('请输入上报人身份证号')
-        }
-
-        if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.form.idNumber)) {
-          return this.$toast('请输入正确的身份证账号')
-        }
-        if (!this.form.phone) {
-          return this.$toast('请选择上报人手机号码')
-        }
-
-        if (!/^1[0-9]{10,10}$/.test(this.form.phone)) {
-          return this.$toast('请输入正确的手机号码')
-        }
-
-        if (!this.form.areaId) {
-          return this.$toast('请选择上报地区')
-        }
-
-        if (this.form.areaId.substr(this.form.areaId.length - 3, 3) === '000') {
-          return this.$toast('上报地区必须选到村或社区')
-        }
-
-        if (!this.form.address) {
-          return this.$toast('请输入详细地址')
-        }
-        if (this.flag) return
-        this.flag = true
-
-        this.$loading()
-        this.$instance.post(`/app/appepidemicreportmember/addOrUpdate`, {
-          ...this.form,
-          openid: this.user.openid
-        }).then(res => {
-          this.$hideLoading()
-          this.flag = false
-          if (res.code == 0) {
-            this.$toast('提交成功')
-            uni.$emit('update')
-            setTimeout(() => {
-              uni.redirectTo({
-                url: `./Result?id=${res.data.id}`
-              })
-            }, 400)
-          }
-        })
       }
+
+      if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.form.idNumber)) {
+        return this.$toast('请输入正确的身份证账号')
+      }
+      if (!this.form.phone) {
+        return this.$toast('请选择上报人手机号码')
+      }
+
+      if (!/^1[0-9]{10,10}$/.test(this.form.phone)) {
+        return this.$toast('请输入正确的手机号码')
+      }
+
+      if (!this.form.areaId) {
+        return this.$toast('请选择上报地区')
+      }
+
+      if (this.form.areaId.substr(this.form.areaId.length - 3, 3) === '000') {
+        return this.$toast('上报地区必须选到村或社区')
+      }
+
+      if (!this.form.address) {
+        return this.$toast('请输入详细地址')
+      }
+      if (this.flag) return
+      this.flag = true
+
+      this.$loading()
+      this.$instance.post(`/app/appepidemicreportmember/addOrUpdate`, {
+        ...this.form,
+        openid: this.user.openid
+      }).then(res => {
+        this.$hideLoading()
+        this.flag = false
+        if (res.code == 0) {
+          this.$toast('提交成功')
+          uni.$emit('update')
+          setTimeout(() => {
+            uni.redirectTo({
+              url: `./Result?id=${res.data.id}`
+            })
+          }, 400)
+        }
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .album {
+.album {
-    padding-bottom: 140px;
+  padding-bottom: 140px;
 
-    .form-item__group {
+  .form-item__group {
-      margin-bottom: 24px;
+    margin-bottom: 24px;
-      background: #fff;
+    background: #fff;
+  }
+
+  .form-item {
+    padding-left: 32px;
+
+    .form-item__checkbox {
+      width: 100%;
+
+      div {
+        width: 100%;
+        height: 80px;
+        line-height: 80px;
+        margin-bottom: 24px;
+        text-align: center;
+        background: #FFFFFF;
+        border-radius: 16px;
+        color: #333333;
+        font-size: 28px;
+        border: 1px solid #CCCCCC;
+
+        &.active {
+          background: #4181FF;
+          color: #fff;
+          border-color: #4181FF;
+        }
+      }
     }
 
-    .form-item {
+    .form-item__radio {
-      padding-left: 32px;
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
 
-      .form-item__checkbox {
+      div {
-        width: 100%;
+        width: 212px;
-        div {
+        height: 80px;
-          width: 100%;
+        line-height: 80px;
-          height: 80px;
+        margin-right: 16px;
-          line-height: 80px;
+        margin-bottom: 8px;
-          margin-bottom: 24px;
+        text-align: center;
-          text-align: center;
+        background: #FFFFFF;
-          background: #FFFFFF;
+        border-radius: 16px;
-          border-radius: 16px;
+        color: #333333;
-          color: #333333;
+        font-size: 28px;
-          font-size: 28px;
+        border: 1px solid #CCCCCC;
-          border: 1px solid #CCCCCC;
 
-          &.active {
+        &:nth-of-type(3n) {
-            background: #4181FF;
+          margin-right: 0;
-            color: #fff;
+        }
-            border-color: #4181FF;
+
-          }
+        &.active {
+          background: #4181FF;
+          color: #fff;
+          border-color: #4181FF;
         }
       }
+    }
 
-      .form-item__radio {
+    .ai-area__wrapper {
-        display: flex;
+      display: flex;
-        align-items: center;
+      align-items: center;
-        flex-wrap: wrap;
+      padding-left: 100px;
 
-        div {
+      span {
-          width: 212px;
+        color: #333;
-          height: 80px;
+        font-size: 30px;
-          line-height: 80px;
-          margin-right: 16px;
-          margin-bottom: 8px;
-          text-align: center;
-          background: #FFFFFF;
-          border-radius: 16px;
-          color: #333333;
-          font-size: 28px;
-          border: 1px solid #CCCCCC;
-
-          &:nth-of-type(3n) {
-            margin-right: 0;
-          }
-
-          &.active {
-            background: #4181FF;
-            color: #fff;
-            border-color: #4181FF;
-          }
-        }
       }
 
-      .ai-area__wrapper {
+      i {
+        color: #999;
+        font-size: 30px;
+      }
+
+      image {
+        width: 16px;
+        height: 8px;
+      }
+    }
+
+    .form-item__wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 128px;
+      padding-right: 28px;
+      border-bottom: 1px solid #DDDDDD;
+
+      input {
+        flex: 1;
+        height: 100%;
+        text-align: right;
+        color: #333;
+        padding-right: 10px;
+      }
+
+      .form-item__right {
         display: flex;
         align-items: center;
-        padding-left: 100px;
+        font-size: 32px;
 
         span {
-          color: #333;
+          max-width: 400px;
-          font-size: 30px;
+          margin-right: 8px;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
         }
 
         i {
-          color: #999;
+          margin-right: 8px;
-          font-size: 30px;
+          color: #999999;
-        }
-
-        image {
-          width: 16px;
-          height: 8px;
         }
       }
+    }
 
+    &:last-child {
       .form-item__wrapper {
-        display: flex;
+        border-bottom: none;
-        align-items: center;
+      }
-        justify-content: space-between;
+    }
-        height: 128px;
-        padding-right: 28px;
-        border-bottom: 1px solid #DDDDDD;
 
-        input {
+    .form-item__title {
-          flex: 1;
+      display: flex;
-          height: 100%;
+      align-items: center;
-          text-align: right;
-          color: #333;
-          padding-right: 10px;
-        }
 
-        .form-item__right {
+      i {
-          display: flex;
+        font-size: 32px;
-          align-items: center;
+        color: #FF4466;
-          font-size: 32px;
-
-          span {
-            max-width: 400px;
-            margin-right: 8px;
-            color: #333333;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-          }
-
-          i {
-            margin-right: 8px;
-            color: #999999;
-          }
-        }
       }
 
-      &:last-child {
+      span {
-        .form-item__wrapper {
+        font-size: 28px;
-          border-bottom: none;
+        color: #999999;
-        }
+      }
+
+      h2 {
+        padding: 0 4px;
+        font-weight: 600;
+        font-size: 32px;
+        color: #333333;
+      }
+    }
+
+
+    &.form-item__imgs, &.form-item__textarea {
+      .form-item__wrapper {
+        display: block;
+        height: auto;
+        padding-bottom: 32px;
+      }
+
+      textarea {
+        width: 100%;
+        height: 90px;
       }
 
       .form-item__title {
-        display: flex;
+        padding: 32px 0;
-        align-items: center;
-
-        i {
-          font-size: 32px;
-          color: #FF4466;
-        }
-
-        span {
-          font-size: 28px;
-          color: #999999;
-        }
-
-        h2 {
-          padding: 0 4px;
-          font-weight: 600;
-          font-size: 32px;
-          color: #333333;
-        }
       }
 
-
+      .form-item__right {
-      &.form-item__imgs, &.form-item__textarea {
+        padding-left: 18px;
-        .form-item__wrapper {
-          display: block;
-          height: auto;
-          padding-bottom: 32px;
-        }
-
-        textarea {
-          width: 100%;
-          height: 90px;
-        }
-
-        .form-item__title {
-          padding: 32px 0;
-        }
-
-        .form-item__right {
-          padding-left: 18px;
-        }
       }
     }
   }
+}
 </style>

src/mods/service/AppPhotoReport/PhotoForm.vue

@@ -35,7 +35,7 @@
           <div class="form-item__right" @click="chooseAddress">
             <span v-if="form.address">{{ form.address }}</span>
             <i v-else>请选择</i>
-            <u-icon name="arrow-right" color="#ddd" />
+            <u-icon name="arrow-right" color="#ddd"/>
           </div>
         </div>
       </div>
@@ -45,13 +45,14 @@
             <i>*</i>
             <h2>所属网格</h2>
           </div>
-            <picker :range="gridList" mode="multiSelector" range-key="girdName" @columnchange="onColumnChange" @change="onChange">
+          <picker :range="gridList" mode="multiSelector" range-key="girdName" @columnchange="onColumnChange"
-              <div class="form-item__right">
+                  @change="onChange">
-                <span v-if="form.girdName">{{ form.girdName }}</span>
+            <div class="form-item__right">
-                <i v-else>请选择</i>
+              <span v-if="form.girdName">{{ form.girdName }}</span>
-                <u-icon name="arrow-right" color="#ddd" />
+              <i v-else>请选择</i>
-              </div>
+              <u-icon name="arrow-right" color="#ddd"/>
-            </picker>
+            </div>
+          </picker>
         </div>
       </div>
     </div>
@@ -64,7 +65,7 @@
             <span>(最多9张)</span>
           </div>
           <div class="form-item__right">
-            <ai-uploader v-model="form.files" :limit="9"></ai-uploader>
+            <AiUploader v-model="form.files" :limit="9"></AiUploader>
           </div>
         </div>
       </div>
@@ -77,7 +78,7 @@
             <h2>姓名</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.name" :maxlength="20" />
+            <input placeholder="请输入" v-model="form.name" :maxlength="20"/>
           </div>
         </div>
       </div>
@@ -88,7 +89,7 @@
             <h2>联系方式</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.phone" :maxlength="20" />
+            <input placeholder="请输入" v-model="form.phone" :maxlength="20"/>
           </div>
         </div>
       </div>
@@ -100,285 +101,277 @@
 </template>
 
 <script>
-  import AiUploader from '@/components/AiUploader/AiUploader'
+import {mapState} from 'vuex'
-  import AiSelect from '@/components/AiSelect/AiSelect'
-  import { mapState } from 'vuex'
 
-  export default {
+export default {
-    data () {
+  data() {
-      return {
+    return {
-        isShowType: false,
+      isShowType: false,
-        form: {
+      form: {
-          content: '',
+        content: '',
-          lat: '',
+        lat: '',
-          lng: '',
+        lng: '',
-          address: '',
+        address: '',
-          name: '',
+        name: '',
-          phone: '',
+        phone: '',
-          groupId: '',
+        groupId: '',
-          groupName: '',
+        groupName: '',
-          girdName: '',
+        girdName: '',
-          girdId: '',
+        girdId: '',
-          files: []
+        files: []
+      },
+      dictList: [],
+      arr: [],
+      gridList: [[], []],
+      flag: false
+    }
+  },
+
+  computed: {
+    ...mapState(['user'])
+  },
+
+  onLoad() {
+    this.getDict()
+    this.form.phone = this.user.phone
+    this.form.name = this.user.realName || ''
+    this.getGirdList()
+  },
+
+  methods: {
+    chooseAddress() {
+      uni.authorize({
+        scope: 'scope.userLocation',
+        success: () => {
+          uni.chooseLocation({
+            success: res => {
+              this.form.address = res.address
+              this.form.lat = res.latitude
+              this.form.lng = res.longitude
+            }
+          })
         },
-        dictList: [],
+        fail: () => {
-        arr: [],
+          this.$dialog.confirm({
-        gridList: [[], []],
+            content: '您未授权定位权限，无法选择位置'
-        flag: false
+          }).then(() => {
-      }
+            wx.openSetting({
-    },
-
-    components: {
-      AiSelect,
-      AiUploader
-    },
-
-    computed: {
-      ...mapState(['user'])
-    },
-
-    onLoad () {
-      this.getDict()
-      this.form.phone = this.user.phone
-      this.form.name = this.user.realName || ''
-      this.getGirdList()
-    },
-
-    methods: {
-      chooseAddress () {
-        uni.authorize({
-          scope: 'scope.userLocation',
-          success: () => {
-            uni.chooseLocation({
               success: res => {
-                this.form.address = res.address
+                if (!res.authSetting['scope.userLocation']) {
-                this.form.lat = res.latitude
+                  this.$dialog.alert({
-                this.form.lng = res.longitude
+                    content: '您未授权定位权限，无法选择位置'
-              }
+                  }).then(() => {
-            })
+                  })
-          },
+                } else {
-          fail: () => {
+                  console.log('设置定位权限')
-            this.$dialog.confirm({
-              content: '您未授权定位权限，无法选择位置'
-            }).then(() => {
-              wx.openSetting({
-                success: res => {
-                  if (!res.authSetting['scope.userLocation']) {
-                    this.$dialog.alert({
-                      content: '您未授权定位权限，无法选择位置'
-                    }).then(() => {
-                    })
-                  } else {
-                    console.log('设置定位权限')
-                  }
                 }
-              })
-            })
-          }
-        })
-      },
-
-      getDict () {
-        this.$instance.post(`/app/appclapeventgroup/list?current=1&size=100000`).then(res => {
-          if (res.code == 0) {
-            this.dictList = res.data.records.map(v => {
-              return {
-                value: v.id,
-                label: v.groupName
               }
             })
-          }
+          })
-        })
-      },
-
-      getGirdData (x) {
-        if (x > -1) {
-          this.$set(this.gridList, '1', this.arr[0].girdList[x].girdList)
         }
-      },
+      })
+    },
 
-      getGirdList () {
+    getDict() {
-        this.$instance.post(`/app/appgirdinfo/listAllByTop`).then(res => {
+      this.$instance.post(`/app/appclapeventgroup/list?current=1&size=100000`).then(res => {
-          if (res.code == 0) {
+        if (res.code == 0) {
-            this.arr = res.data
+          this.dictList = res.data.records.map(v => {
-            this.gridList[0] = res.data[0].girdList
+            return {
-            this.gridList[1] = res.data[0].girdList[0].girdList
+              value: v.id,
-          }
+              label: v.groupName
-        })
+            }
-      },
+          })
-
-      onColumnChange (e) {
-        const column = e.detail.column
-        const value = e.detail.value
-
-
-
-        if (column === column) {
-          this.getGirdData(value)
         }
-      },
+      })
+    },
 
-      onChange (e) {
+    getGirdData(x) {
-        console.log(e)
+      if (x > -1) {
-        const v = e.detail.value[1]
+        this.$set(this.gridList, '1', this.arr[0].girdList[x].girdList)
-         console.log(v)
-        if (this.gridList[1][v]) {
-          this.form.girdName = this.gridList[1][v].girdName
-          this.form.girdId = this.gridList[1][v].id
-        } else {
-          return this.$toast('所属网格必须选第三级网格')
-          // this.form.girdName = this.gridList[e.detail.value[0].girdName
-          // this.form.girdId = this.gridList[e.detail.value[0].id
-        }
-      },
-
-      submit () {
-        if (!this.form.groupId) {
-          return this.$toast('请选择事件类型')
-        }
-
-        if (!this.form.content) {
-          return this.$toast('请输入事件描述')
-        }
-        if (!this.form.address) {
-          return this.$toast('请选择上报位置')
-        }
-
-        if (!this.form.girdName) {
-          return this.$toast('请选择所属网格')
-        }
-        if (!this.form.name) {
-          return this.$toast('请输入上报人姓名')
-        }
-
-        if (!this.form.girdName) {
-          return this.$toast('请输入上报人联系方式')
-        }
-        if(this.flag) return
-        this.flag = true
-
-        this.$loading()
-        this.$instance.post(`/app/appclapeventinfo/addOrUpdate`, {
-          ...this.form,
-          openid: this.user.openid,
-          portrait: this.user.avatarUrl,
-          files: this.form.files,
-          groupName: this.dictList.filter(v => v.value === this.form.groupId)[0].label
-        }).then(res => {
-          this.$hideLoading()
-          this.flag = false
-          if (res.code == 0) {
-            uni.$emit('update')
-            setTimeout(() => {
-              uni.redirectTo({
-                url: './PhotoResult?id=' + res.data.id
-              })
-            }, 400)
-          }
-          this.$hideLoading()
-        })
       }
+    },
+
+    getGirdList() {
+      this.$instance.post(`/app/appgirdinfo/listAllByTop`).then(res => {
+        if (res.code == 0) {
+          this.arr = res.data
+          this.gridList[0] = res.data[0].girdList
+          this.gridList[1] = res.data[0].girdList[0].girdList
+        }
+      })
+    },
+
+    onColumnChange(e) {
+      const column = e.detail.column
+      const value = e.detail.value
+
+
+      if (column === column) {
+        this.getGirdData(value)
+      }
+    },
+
+    onChange(e) {
+      console.log(e)
+      const v = e.detail.value[1]
+      console.log(v)
+      if (this.gridList[1][v]) {
+        this.form.girdName = this.gridList[1][v].girdName
+        this.form.girdId = this.gridList[1][v].id
+      } else {
+        return this.$toast('所属网格必须选第三级网格')
+        // this.form.girdName = this.gridList[e.detail.value[0].girdName
+        // this.form.girdId = this.gridList[e.detail.value[0].id
+      }
+    },
+
+    submit() {
+      if (!this.form.groupId) {
+        return this.$toast('请选择事件类型')
+      }
+
+      if (!this.form.content) {
+        return this.$toast('请输入事件描述')
+      }
+      if (!this.form.address) {
+        return this.$toast('请选择上报位置')
+      }
+
+      if (!this.form.girdName) {
+        return this.$toast('请选择所属网格')
+      }
+      if (!this.form.name) {
+        return this.$toast('请输入上报人姓名')
+      }
+
+      if (!this.form.girdName) {
+        return this.$toast('请输入上报人联系方式')
+      }
+      if (this.flag) return
+      this.flag = true
+
+      this.$loading()
+      this.$instance.post(`/app/appclapeventinfo/addOrUpdate`, {
+        ...this.form,
+        openid: this.user.openid,
+        portrait: this.user.avatarUrl,
+        files: this.form.files,
+        groupName: this.dictList.filter(v => v.value === this.form.groupId)[0].label
+      }).then(res => {
+        this.$hideLoading()
+        this.flag = false
+        if (res.code == 0) {
+          uni.$emit('update')
+          setTimeout(() => {
+            uni.redirectTo({
+              url: './PhotoResult?id=' + res.data.id
+            })
+          }, 400)
+        }
+        this.$hideLoading()
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .album {
+.album {
-    padding-bottom: 140px;
+  padding-bottom: 140px;
 
-    .form-item__group {
+  .form-item__group {
-      margin-bottom: 24px;
+    margin-bottom: 24px;
-      background: #fff;
+    background: #fff;
-    }
+  }
 
-    .form-item {
+  .form-item {
-      padding-left: 32px;
+    padding-left: 32px;
 
-      .form-item__wrapper {
+    .form-item__wrapper {
-        display: flex;
+      display: flex;
-        align-items: center;
+      align-items: center;
-        justify-content: space-between;
+      justify-content: space-between;
-        height: 128px;
+      height: 128px;
-        padding-right: 28px;
+      padding-right: 28px;
-        border-bottom: 1px solid #DDDDDD;
+      border-bottom: 1px solid #DDDDDD;
 
-        input {
+      input {
-          flex: 1;
+        flex: 1;
-          height: 100%;
+        height: 100%;
-          text-align: right;
+        text-align: right;
-          padding-right: 10px;
+        padding-right: 10px;
-        }
-
-        .form-item__right {
-          display: flex;
-          align-items: center;
-          font-size: 32px;
-
-          span {
-            max-width: 400px;
-            margin-right: 8px;
-            color: #333333;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-          }
-
-          i {
-            margin-right: 8px;
-            color: #999999;
-          }
-        }
       }
 
-      &:last-child {
+      .form-item__right {
-        .form-item__wrapper {
+        display: flex;
-          border-bottom: none;
+        align-items: center;
+        font-size: 32px;
+
+        span {
+          max-width: 400px;
+          margin-right: 8px;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
         }
+
+        i {
+          margin-right: 8px;
+          color: #999999;
+        }
+      }
+    }
+
+    &:last-child {
+      .form-item__wrapper {
+        border-bottom: none;
+      }
+    }
+
+    .form-item__title {
+      display: flex;
+      align-items: center;
+
+      i {
+        font-size: 32px;
+        color: #FF4466;
+      }
+
+      span {
+        font-size: 28px;
+        color: #999999;
+      }
+
+      h2 {
+        padding: 0 4px;
+        font-weight: 600;
+        font-size: 32px;
+        color: #333333;
+      }
+    }
+
+
+    &.form-item__imgs, &.form-item__textarea {
+      .form-item__wrapper {
+        display: block;
+        height: auto;
+        padding-bottom: 32px;
+      }
+
+      textarea {
+        width: 100%;
+        height: 160px;
       }
 
       .form-item__title {
-        display: flex;
+        padding: 32px 0;
-        align-items: center;
-
-        i {
-          font-size: 32px;
-          color: #FF4466;
-        }
-
-        span {
-          font-size: 28px;
-          color: #999999;
-        }
-
-        h2 {
-          padding: 0 4px;
-          font-weight: 600;
-          font-size: 32px;
-          color: #333333;
-        }
       }
 
-
+      .form-item__right {
-      &.form-item__imgs, &.form-item__textarea {
+        padding-left: 18px;
-        .form-item__wrapper {
-          display: block;
-          height: auto;
-          padding-bottom: 32px;
-        }
-
-        textarea {
-          width: 100%;
-          height: 160px;
-        }
-
-        .form-item__title {
-          padding: 32px 0;
-        }
-
-        .form-item__right {
-          padding-left: 18px;
-        }
       }
     }
   }
+}
 </style>

src/mods/service/AppReturnHomeRegister/Add.vue

@@ -9,7 +9,7 @@
             <h2>返乡人员姓名</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.name" :maxlength="20" />
+            <input placeholder="请输入" v-model="form.name" :maxlength="20"/>
           </div>
         </div>
       </div>
@@ -20,7 +20,7 @@
             <h2>身份证号</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="20" />
+            <input placeholder="请输入" type="idcard" v-model="form.idNumber" :maxlength="20"/>
           </div>
         </div>
       </div>
@@ -31,7 +31,7 @@
             <h2>手机号码</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" type="number" v-model="form.phone" :maxlength="11" />
+            <input placeholder="请输入" type="number" v-model="form.phone" :maxlength="11"/>
           </div>
         </div>
       </div>
@@ -83,13 +83,14 @@
             <h2>出发地区</h2>
           </div>
           <div class="form-item__right">
-            <ai-area-picker ref="area" class="ai-area" :value="form.startAreaId" :fullName.sync="form.startAreaName" all mode="custom" @select="v => form.startAreaId = v">
+            <AiAreaPicker ref="area" class="ai-area" :value="form.startAreaId" :fullName.sync="form.startAreaName" all
+                          mode="custom" @select="v => form.startAreaId = v">
               <div class="ai-area__wrapper">
                 <span class="label" v-if="form.startAreaName">{{ form.startAreaName }}</span>
                 <i v-else>请选择</i>
                 <u-icon name="arrow-right" color="#ddd"/>
               </div>
-            </ai-area-picker>
+            </AiAreaPicker>
           </div>
         </div>
       </div>
@@ -100,7 +101,8 @@
             <h2>出发地址</h2>
           </div>
           <div class="form-item__right">
-            <textarea auto-height v-model="form.startAddress" :maxlength="500" placeholder="请输入详细的出发地址"  placeholder-style="font-size: 16px"></textarea>
+            <textarea auto-height v-model="form.startAddress" :maxlength="500" placeholder="请输入详细的出发地址"
+                      placeholder-style="font-size: 16px"></textarea>
           </div>
         </div>
       </div>
@@ -128,19 +130,19 @@
             <h2>到达地区</h2>
           </div>
           <div class="form-item__right">
-            <ai-area-picker
+            <AiAreaPicker
-              ref="area"
+                ref="area"
-              class="ai-area"
+                class="ai-area"
-              :value="form.arriveAreaId"
+                :value="form.arriveAreaId"
-              :fullName.sync="form.arriveAreaName"
+                :fullName.sync="form.arriveAreaName"
-              :areaId="$areaId"
+                :areaId="$areaId"
-              mode="custom" @select="v => form.arriveAreaId = v">
+                mode="custom" @select="v => form.arriveAreaId = v">
               <div class="ai-area__wrapper">
                 <span class="label" v-if="form.arriveAreaName">{{ form.arriveAreaName }}</span>
                 <i v-else>请选择</i>
                 <u-icon name="arrow-right" color="#ddd"/>
               </div>
-            </ai-area-picker>
+            </AiAreaPicker>
           </div>
         </div>
       </div>
@@ -151,7 +153,8 @@
             <h2>返乡地址</h2>
           </div>
           <div class="form-item__right">
-            <textarea auto-height v-model="form.arriveAddress" :maxlength="500" placeholder="请输入详细的返乡地址" placeholder-style="font-size: 16px"></textarea>
+            <textarea auto-height v-model="form.arriveAddress" :maxlength="500" placeholder="请输入详细的返乡地址"
+                      placeholder-style="font-size: 16px"></textarea>
           </div>
         </div>
       </div>
@@ -162,7 +165,8 @@
             <h2>行程描述</h2>
           </div>
           <div class="form-item__right">
-            <textarea auto-height style="height: 90px" v-model="form.description" :maxlength="500" placeholder="请输入行程描述"  placeholder-style="font-size: 16px"></textarea>
+            <textarea auto-height style="height: 90px" v-model="form.description" :maxlength="500" placeholder="请输入行程描述"
+                      placeholder-style="font-size: 16px"></textarea>
           </div>
         </div>
       </div>
@@ -192,7 +196,7 @@
             <h2>本人健康码截图或核酸检测报告</h2>
           </div>
           <div class="form-item__right">
-            <ai-uploader v-model="form.checkPhoto" :limit="1"></ai-uploader>
+            <AiUploader v-model="form.checkPhoto" :limit="1"></AiUploader>
           </div>
         </div>
       </div>
@@ -216,7 +220,7 @@
             <h2>当前体温</h2>
           </div>
           <div class="form-item__right">
-            <input placeholder="请输入" v-model="form.temperature" :maxlength="20" />
+            <input placeholder="请输入" v-model="form.temperature" :maxlength="20"/>
             <i>℃</i>
           </div>
         </div>
@@ -254,389 +258,384 @@
 </template>
 
 <script>
-  import AiUploader from '@/components/AiUploader/AiUploader'
+import {mapState} from 'vuex'
-  import AiSelect from '@/components/AiSelect/AiSelect'
-  import { mapState } from 'vuex'
 
-  export default {
+export default {
-    data () {
+  data() {
-      return {
+    return {
-        isShowType: false,
+      isShowType: false,
-        isShowEndTime: false,
+      isShowEndTime: false,
-        isShowStartTime: false,
+      isShowStartTime: false,
-        isShowDate: false,
+      isShowDate: false,
-				params: {
+      params: {
-					year: true,
+        year: true,
-					month: true,
+        month: true,
-					day: true,
+        day: true,
-					hour: true,
+        hour: true,
-					minute: true
+        minute: true
-				},
+      },
-				dataParams: {
+      dataParams: {
-					year: true,
+        year: true,
-					month: true,
+        month: true,
-					day: true
+        day: true
-				},
+      },
-        form: {
+      form: {
-          arriveAddress: '',
+        arriveAddress: '',
-          arriveAreaId: '',
+        arriveAreaId: '',
-          arriveAreaName: '',
+        arriveAreaName: '',
-          arriveTime: '',
+        arriveTime: '',
-          checkPhoto: [],
+        checkPhoto: [],
-          checkResult: '',
+        checkResult: '',
-          checkTime: '',
+        checkTime: '',
-          description: '',
+        description: '',
-          health: [],
+        health: [],
-          idNumber: '',
+        idNumber: '',
-          name: '',
+        name: '',
-          phone: '',
+        phone: '',
-          startAddress: '',
+        startAddress: '',
-          startAreaId: '',
+        startAreaId: '',
-          startAreaName: '',
+        startAreaName: '',
-          startTime: '',
+        startTime: '',
-          temperature: '',
+        temperature: '',
-          touchInFourteen: '',
+        touchInFourteen: '',
-          travelType: '',
+        travelType: '',
-          type: '',
+        type: '',
-          unusual: '',
+        unusual: '',
-        },
+      },
-        dictList: [],
+      dictList: [],
-        arr: [],
+      arr: [],
-        gridList: [[], [], []],
+      gridList: [[], [], []],
-        flag: false,
+      flag: false,
-        $areaId: ''
+      $areaId: ''
+    }
+  },
+
+
+  computed: {
+    ...mapState(['user'])
+  },
+
+  onLoad() {
+    this.$areaId = this.user.$areaId
+  },
+
+  methods: {
+    onDateChange(e) {
+      this.form.checkTime = `${e.year}-${e.month}-${e.day}`
+    },
+
+    onStartChange(e) {
+      this.form.startTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
+    },
+
+    onEndChange(e) {
+      this.form.arriveTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
+    },
+
+    submit() {
+      if (!this.form.name) {
+        return this.$toast('请输入返乡人员姓名')
       }
-    },
 
-    components: {
+      if (!this.form.idNumber) {
-      AiSelect,
+        return this.$toast('请输入返乡人员身份证号')
-      AiUploader
-    },
-
-    computed: {
-      ...mapState(['user'])
-    },
-
-    onLoad () {
-      this.$areaId = this.user.$areaId
-    },
-
-    methods: {
-      onDateChange (e) {
-        this.form.checkTime = `${e.year}-${e.month}-${e.day}`
-      },
-
-      onStartChange (e) {
-        this.form.startTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
-      },
-
-      onEndChange (e) {
-        this.form.arriveTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}`
-      },
-
-      submit () {
-        if (!this.form.name) {
-          return this.$toast('请输入返乡人员姓名')
-        }
-
-        if (!this.form.idNumber) {
-          return this.$toast('请输入返乡人员身份证号')
-        }
-
-        if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.form.idNumber)) {
-          return this.$toast('请输入正确的身份证账号')
-        }
-
-        if (!this.form.phone) {
-          return this.$toast('请输入返乡人员手机号码')
-        }
-
-        if (!/^1[0-9]{10,10}$/.test(this.form.phone)) {
-          return this.$toast('请输入正确的手机号码')
-        }
-
-        if (!this.form.type) {
-          return this.$toast('请选择人员类别')
-        }
-
-        if (!this.form.travelType) {
-          return this.$toast('请选择出行方式')
-        }
-
-        if (!this.form.startTime) {
-          return this.$toast('请选择出发时间')
-        }
-
-        if (new Date(this.form.startTime.replace(/-/g, '/')).getTime() > new Date().getTime()) {
-          return this.$toast('出发时间不得晚于当前时间')
-        }
-
-        if (!this.form.startAreaName) {
-          return this.$toast('请选择出发地区')
-        }
-
-        if (this.form.startAreaId.substr(this.form.startAreaId.length - 3, 3) === '000') {
-          return this.$toast('出发地区必须选到村或社区')
-        }
-        if (!this.form.startAddress) {
-          return this.$toast('请输入出发详细地址')
-        }
-
-        if (!this.form.arriveTime) {
-          return this.$toast('请选择到达时间')
-        }
-
-        if (new Date(this.form.startTime.replace(/-/g, '/')).getTime() >= new Date(this.form.arriveTime.replace(/-/g, '/')).getTime()) {
-          return this.$toast('到达时间不得早于出发时间')
-        }
-
-        if (!this.form.arriveAreaName) {
-          return this.$toast('请选择到达地区')
-        }
-        if (this.form.arriveAreaId.substr(this.form.arriveAreaId.length - 3, 3) === '000') {
-          return this.$toast('到达地区必须选到村或社区')
-        }
-        if (!this.form.arriveAddress) {
-          return this.$toast('请输入返乡地址')
-        }
-
-        if (!this.form.description) {
-          return this.$toast('请输入行程描述')
-        }
-        if (!this.form.checkTime) {
-          return this.$toast('请选择核酸检测日期')
-        }
-        if (!this.form.checkPhoto.length) {
-          return this.$toast('请上传本人健康码截图或核酸检测报告')
-        }
-
-        if (!this.form.checkResult) {
-          return this.$toast('请选择核酸检测结果')
-        }
-        if (!this.form.temperature) {
-          return this.$toast('请输入当前体温')
-        }
-        if (!this.form.touchInFourteen) {
-          return this.$toast('请选择14天内是否接触新冠确诊或疑似患者')
-        }
-
-        if (!this.form.health.length) {
-          return this.$toast('请选择当前健康状况')
-        }
-        if (this.flag) return
-        this.flag = true
-
-        this.$loading()
-        this.$instance.post(`/app/appepidemicbackhomerecord/addOrUpdate`, {
-          ...this.form,
-          openid: this.user.openid,
-          startTime: this.form.startTime + ':00',
-          arriveTime: this.form.arriveTime + ':00',
-          checkTime: this.form.checkTime + ' 00:00:00',
-          health: this.form.health.join(','),
-          checkPhoto: JSON.stringify(this.form.checkPhoto)
-        }).then(res => {
-          this.$hideLoading()
-          this.flag = false
-          if (res.code == 0) {
-            uni.$emit('update')
-            this.$toast('提交成功')
-            setTimeout(() => {
-              uni.navigateBack()
-            }, 400)
-          }
-        })
       }
+
+      if (!/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(this.form.idNumber)) {
+        return this.$toast('请输入正确的身份证账号')
+      }
+
+      if (!this.form.phone) {
+        return this.$toast('请输入返乡人员手机号码')
+      }
+
+      if (!/^1[0-9]{10,10}$/.test(this.form.phone)) {
+        return this.$toast('请输入正确的手机号码')
+      }
+
+      if (!this.form.type) {
+        return this.$toast('请选择人员类别')
+      }
+
+      if (!this.form.travelType) {
+        return this.$toast('请选择出行方式')
+      }
+
+      if (!this.form.startTime) {
+        return this.$toast('请选择出发时间')
+      }
+
+      if (new Date(this.form.startTime.replace(/-/g, '/')).getTime() > new Date().getTime()) {
+        return this.$toast('出发时间不得晚于当前时间')
+      }
+
+      if (!this.form.startAreaName) {
+        return this.$toast('请选择出发地区')
+      }
+
+      if (this.form.startAreaId.substr(this.form.startAreaId.length - 3, 3) === '000') {
+        return this.$toast('出发地区必须选到村或社区')
+      }
+      if (!this.form.startAddress) {
+        return this.$toast('请输入出发详细地址')
+      }
+
+      if (!this.form.arriveTime) {
+        return this.$toast('请选择到达时间')
+      }
+
+      if (new Date(this.form.startTime.replace(/-/g, '/')).getTime() >= new Date(this.form.arriveTime.replace(/-/g, '/')).getTime()) {
+        return this.$toast('到达时间不得早于出发时间')
+      }
+
+      if (!this.form.arriveAreaName) {
+        return this.$toast('请选择到达地区')
+      }
+      if (this.form.arriveAreaId.substr(this.form.arriveAreaId.length - 3, 3) === '000') {
+        return this.$toast('到达地区必须选到村或社区')
+      }
+      if (!this.form.arriveAddress) {
+        return this.$toast('请输入返乡地址')
+      }
+
+      if (!this.form.description) {
+        return this.$toast('请输入行程描述')
+      }
+      if (!this.form.checkTime) {
+        return this.$toast('请选择核酸检测日期')
+      }
+      if (!this.form.checkPhoto.length) {
+        return this.$toast('请上传本人健康码截图或核酸检测报告')
+      }
+
+      if (!this.form.checkResult) {
+        return this.$toast('请选择核酸检测结果')
+      }
+      if (!this.form.temperature) {
+        return this.$toast('请输入当前体温')
+      }
+      if (!this.form.touchInFourteen) {
+        return this.$toast('请选择14天内是否接触新冠确诊或疑似患者')
+      }
+
+      if (!this.form.health.length) {
+        return this.$toast('请选择当前健康状况')
+      }
+      if (this.flag) return
+      this.flag = true
+
+      this.$loading()
+      this.$instance.post(`/app/appepidemicbackhomerecord/addOrUpdate`, {
+        ...this.form,
+        openid: this.user.openid,
+        startTime: this.form.startTime + ':00',
+        arriveTime: this.form.arriveTime + ':00',
+        checkTime: this.form.checkTime + ' 00:00:00',
+        health: this.form.health.join(','),
+        checkPhoto: JSON.stringify(this.form.checkPhoto)
+      }).then(res => {
+        this.$hideLoading()
+        this.flag = false
+        if (res.code == 0) {
+          uni.$emit('update')
+          this.$toast('提交成功')
+          setTimeout(() => {
+            uni.navigateBack()
+          }, 400)
+        }
+      })
     }
   }
+}
 </script>
 
 <style lang="scss">
-  .album {
+.album {
-    padding-bottom: 140px;
+  padding-bottom: 140px;
 
-    .tips {
+  .tips {
-      line-height: 1.3;
+    line-height: 1.3;
-      padding: 32px 32px;
+    padding: 32px 32px;
-      color: #FF883C;
+    color: #FF883C;
-      font-size: 30px;
+    font-size: 30px;
-      text-align: justify;
+    text-align: justify;
-      background: #FFF8F3;
+    background: #FFF8F3;
-    }
+  }
 
-    .form-item__group {
+  .form-item__group {
-      margin-bottom: 24px;
+    margin-bottom: 24px;
-      background: #fff;
+    background: #fff;
-    }
+  }
 
-    .form-item {
+  .form-item {
-      padding-left: 32px;
+    padding-left: 32px;
 
-      .form-item__checkbox {
+    .form-item__checkbox {
+      width: 100%;
+
+      div {
         width: 100%;
-        div {
+        height: 80px;
-          width: 100%;
+        line-height: 80px;
-          height: 80px;
+        margin-bottom: 24px;
-          line-height: 80px;
+        text-align: center;
-          margin-bottom: 24px;
+        background: #FFFFFF;
-          text-align: center;
+        border-radius: 16px;
-          background: #FFFFFF;
+        color: #333333;
-          border-radius: 16px;
+        font-size: 28px;
-          color: #333333;
+        border: 1px solid #CCCCCC;
-          font-size: 28px;
-          border: 1px solid #CCCCCC;
 
-          &.active {
+        &.active {
-            background: #4181FF;
+          background: #4181FF;
-            color: #fff;
+          color: #fff;
-            border-color: #4181FF;
+          border-color: #4181FF;
-          }
         }
       }
+    }
 
-      .form-item__radio {
+    .form-item__radio {
-        display: flex;
+      display: flex;
-        align-items: center;
+      align-items: center;
-        flex-wrap: wrap;
+      flex-wrap: wrap;
 
-        div {
+      div {
-          width: 212px;
+        width: 212px;
-          height: 80px;
+        height: 80px;
-          line-height: 80px;
+        line-height: 80px;
-          margin-right: 16px;
+        margin-right: 16px;
-          margin-bottom: 8px;
+        margin-bottom: 8px;
-          text-align: center;
+        text-align: center;
-          background: #FFFFFF;
+        background: #FFFFFF;
-          border-radius: 16px;
+        border-radius: 16px;
-          color: #333333;
+        color: #333333;
-          font-size: 28px;
+        font-size: 28px;
-          border: 1px solid #CCCCCC;
+        border: 1px solid #CCCCCC;
 
-          &:nth-of-type(3n) {
+        &:nth-of-type(3n) {
-            margin-right: 0;
+          margin-right: 0;
-          }
+        }
 
-          &.active {
+        &.active {
-            background: #4181FF;
+          background: #4181FF;
-            color: #fff;
+          color: #fff;
-            border-color: #4181FF;
+          border-color: #4181FF;
-          }
         }
       }
+    }
 
-      .ai-area__wrapper {
+    .ai-area__wrapper {
+      display: flex;
+      align-items: center;
+      padding-left: 100px;
+
+      span {
+        color: #333;
+        font-size: 30px;
+      }
+
+      i {
+        color: #999;
+        font-size: 30px;
+      }
+
+      image {
+        width: 16px;
+        height: 8px;
+      }
+    }
+
+    .form-item__wrapper {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 128px;
+      padding-right: 28px;
+      border-bottom: 1px solid #DDDDDD;
+
+      input {
+        flex: 1;
+        height: 100%;
+        text-align: right;
+        color: #333;
+        padding-right: 10px;
+      }
+
+      .form-item__right {
         display: flex;
         align-items: center;
-        padding-left: 100px;
+        font-size: 32px;
+
+        .select {
+          ._i {
+            padding-left: 100px;
+          }
+        }
 
         span {
-          color: #333;
+          max-width: 400px;
-          font-size: 30px;
+          margin-right: 8px;
+          color: #333333;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
         }
 
         i {
-          color: #999;
+          margin-right: 8px;
-          font-size: 30px;
+          color: #999999;
-        }
-
-        image {
-          width: 16px;
-          height: 8px;
         }
       }
+    }
 
+    &:last-child {
       .form-item__wrapper {
-        display: flex;
+        border-bottom: none;
-        align-items: center;
+      }
-        justify-content: space-between;
+    }
-        height: 128px;
-        padding-right: 28px;
-        border-bottom: 1px solid #DDDDDD;
 
-        input {
+    .form-item__title {
-          flex: 1;
+      display: flex;
-          height: 100%;
+      align-items: center;
-          text-align: right;
-          color: #333;
-          padding-right: 10px;
-        }
 
-        .form-item__right {
+      i {
-          display: flex;
+        font-size: 32px;
-          align-items: center;
+        color: #FF4466;
-          font-size: 32px;
-
-          .select {
-            ._i {
-              padding-left: 100px;
-            }
-          }
-
-          span {
-            max-width: 400px;
-            margin-right: 8px;
-            color: #333333;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-          }
-
-          i {
-            margin-right: 8px;
-            color: #999999;
-          }
-        }
       }
 
-      &:last-child {
+      span {
-        .form-item__wrapper {
+        font-size: 28px;
-          border-bottom: none;
+        color: #999999;
-        }
+      }
+
+      h2 {
+        padding: 0 4px;
+        font-weight: 600;
+        font-size: 32px;
+        color: #333333;
+      }
+    }
+
+
+    &.form-item__imgs, &.form-item__textarea {
+      .form-item__wrapper {
+        display: block;
+        height: auto;
+        padding-bottom: 32px;
+      }
+
+      textarea {
+        width: 100%;
+        height: 90px;
       }
 
       .form-item__title {
-        display: flex;
+        padding: 32px 0;
-        align-items: center;
-
-        i {
-          font-size: 32px;
-          color: #FF4466;
-        }
-
-        span {
-          font-size: 28px;
-          color: #999999;
-        }
-
-        h2 {
-          padding: 0 4px;
-          font-weight: 600;
-          font-size: 32px;
-          color: #333333;
-        }
       }
 
-
+      .form-item__right {
-      &.form-item__imgs, &.form-item__textarea {
+        padding-left: 18px;
-        .form-item__wrapper {
-          display: block;
-          height: auto;
-          padding-bottom: 32px;
-        }
-
-        textarea {
-          width: 100%;
-          height: 90px;
-        }
-
-        .form-item__title {
-          padding: 32px 0;
-        }
-
-        .form-item__right {
-          padding-left: 18px;
-        }
       }
     }
   }
+}
 </style>