From 326262eb57cf9bfe78325c33c195c0a37ea7bfa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Tue, 15 Feb 2022 18:08:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E7=94=A8=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppIntegralApply/AppIntegralApply.vue     |  10 +-
 src/mods/AppIntegralApply/add.vue             | 255 +++++++++++++++++-
 src/mods/AppIntegralApply/detail.vue          | 156 ++++++++++-
 src/mods/AppServiceOnline/serviceNotice.vue   |  57 ++--
 4 files changed, 426 insertions(+), 52 deletions(-)

diff --git a/src/mods/AppIntegralApply/AppIntegralApply.vue b/src/mods/AppIntegralApply/AppIntegralApply.vue
index 8da7f6c..5e8b9f4 100644
--- a/src/mods/AppIntegralApply/AppIntegralApply.vue
+++ b/src/mods/AppIntegralApply/AppIntegralApply.vue
@@ -83,7 +83,11 @@ export default {
   onLoad() {
     this.getList()
   },
-  onshow() {},
+  onshow() {
+    uni.$on('updateList', () => {
+      this.getList()
+    })
+  },
   methods: {
     getList() {
       this.$instance
@@ -112,10 +116,6 @@ export default {
       }
     },
 
-    confirmPicker(e){
-      console.log(e);
-    }
-
     init() {
       this.data = []
       this.current = 1
diff --git a/src/mods/AppIntegralApply/add.vue b/src/mods/AppIntegralApply/add.vue
index 7bd0da2..76202ff 100644
--- a/src/mods/AppIntegralApply/add.vue
+++ b/src/mods/AppIntegralApply/add.vue
@@ -1,25 +1,262 @@
 <template>
-  <div class="adds">1</div>
+  <div class="add">
+    <div class="u-forms">
+      <u-form class="u-form" :model="forms" ref="uForm" label-width="auto" :border-bottom="false">
+        <u-form-item label="申请人" prop="name" required :border-bottom="false">
+          <u-input v-model="forms.name" placeholder="请输入申请人" maxlength="30" />
+        </u-form-item>
+
+        <u-form-item label="申请时间" prop="beginTime" required :border-bottom="false" right-icon="arrow-right">
+          <u-input v-model="forms.beginTime" disabled placeholder="请选择申请时间" @click="showStartTime = true" />
+
+          <!-- <u-picker  mode="time" :params="params" v-model="showStartTime" @confirm="confirmPicker"></u-picker> -->
+          <u-calendar mode="date" v-model="showStartTime" @change="changeCalendar"></u-calendar>
+        </u-form-item>
+
+        <u-form-item label="位置" prop="address" required :border-bottom="false">
+          <u-input v-model="forms.address" disabled placeholder="请选择位置" @click="chooseAddress" />
+        </u-form-item>
+
+        <div class="line"></div>
+
+        <u-form-item label="积分类型" prop="type" required :border-bottom="false" right-icon="arrow-right">
+          <u-input v-model="forms.type" disabled placeholder="请选择积分类型" @click="showStstus = true" />
+
+          <u-select v-model="showStstus" :list="$dict.getDict('marriageType')" value-name="dictValue" label-name="dictName" @confirm="selectStatus"></u-select>
+        </u-form-item>
+
+        <u-form-item label="申请描述" prop="content" :border-bottom="false" label-position="top" class="contents">
+          <u-input v-model="forms.content" placeholder="请输入详细描述信息" type="textarea" :auto-height="true" maxlength="500" />
+        </u-form-item>
+        <div class="wordLength">{{ forms.content.length }}/500</div>
+
+        <div class="line"></div>
+
+        <u-form-item label="图片上传 (最多9张)" prop="files" :border-bottom="false" class="avatars" label-position="top">
+          <AiUploader :v-model="forms.files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+        </u-form-item>
+
+        <div class="line"></div>
+      </u-form>
+    </div>
+
+    <div class="btn" @click="submit">提交</div>
+  </div>
 </template>
 
 <script>
+import { mapState } from 'vuex'
+
 export default {
-  name: 'add',
+  name: 'Add',
   components: {},
   props: {},
   data() {
-    return {}
+    return {
+      forms: {
+        name: '',
+        beginTime: '',
+        address: '',
+        lat: '',
+        lng: '',
+
+        type: '',
+        typeValue: '',
+
+        phone: '',
+        address: '',
+        content: '',
+
+        personType: 1,
+        files: [],
+      },
+      showStstus: false,
+      showModeType: false,
+      flag: false,
+
+      showStartTime: false,
+      params: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+        second: false,
+        timestamp: true,
+      },
+    }
+  },
+  computed: { ...mapState(['user']) },
+  onLoad() {
+    this.$dict.load('marriageType', 'modeType')
   },
-  computed: {},
-  watch: {},
-  onLoad() {},
   onShow() {},
-  methods: {},
+
+  mounted() {},
+  methods: {
+    submit() {
+      if (this.flag) return
+
+      this.$refs.uForm.validate((valid) => {
+        if (valid) {
+          if (!this.forms.name) {
+            return this.$u.toast('请输入申请人')
+          }
+          if (!this.forms.beginTime) {
+            return this.$u.toast('请选择申请时间')
+          }
+          if (!this.forms.address) {
+            return this.$u.toast('请选择位置')
+          }
+          if (!this.forms.type) {
+            return this.$u.toast('请选择积分类型')
+          }
+          if (!this.forms.content) {
+            return this.$u.toast('请输入描述信息')
+          }
+
+          const imgs = []
+          if (this.forms.files) {
+            this.forms.files.map((e) => {
+              imgs.push({ url: e.url, id: e.id })
+            })
+          }
+
+          this.flag = true
+          this.$instance
+            .post(`/app/appmarriagefuneralinfo/addOrUpdate`, {
+              name: this.forms.name,
+              beginTime: this.forms.beginTime,
+              address: this.forms.address,
+              lat: this.forms.lat,
+              lng: this.forms.lng,
+
+              type: this.forms.typeValue,
+              content: this.forms.content,
+
+              files: imgs || [],
+            })
+            .then((res) => {
+              if (res.code == 0) {
+                this.flag = false
+                this.$u.toast('提交成功')
+                uni.$emit('updateList')
+                setTimeout(() => {
+                  uni.navigateBack()
+                }, 600)
+              }
+            })
+            .catch(() => {
+              this.$u.toast('提交失败')
+            })
+            .finally(() => {
+              this.flag = false
+            })
+        }
+      })
+    },
+
+    selectStatus(e) {
+      this.forms.type = e[0].label
+      this.forms.typeValue = e[0].value
+    },
+
+    changeCalendar(e) {
+      this.forms.beginTime = e.result
+    },
+
+    chooseAddress() {
+      uni.chooseLocation({
+        success: (res) => {
+          console.log(res)
+          this.forms.address = res.address
+          this.forms.lat = res.latitude
+          this.forms.lng = res.longitude
+        },
+      })
+    },
+  },
 }
 </script>
 
-<style scoped lang="scss">
-.adds {
+<style lang="scss" scoped>
+.add {
   height: 100%;
+
+  .u-forms {
+    padding-bottom: 112px;
+    ::v-deep .u-form {
+      background: #fff;
+      .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:last-child {
+        margin-bottom: 40px;
+      }
+
+      .contents {
+        padding-bottom: 20px !important;
+        .u-form-item__body {
+          .u-form-item--right__content__slot {
+            .u-input {
+              text-align: left !important;
+            }
+          }
+          .default {
+            width: 160px;
+            height: 160px;
+          }
+        }
+      }
+
+      .avatars {
+        ::v-deep .ai-uploader {
+          .imgs {
+            .img {
+              width: 100px;
+              height: 100px;
+              .image {
+                width: 100px;
+                height: 100px;
+              }
+            }
+          }
+        }
+      }
+
+      .line {
+        height: 24px;
+        background: #f3f6f9;
+      }
+    }
+  }
+  .wordLength {
+    color: #999;
+    text-align: right;
+    padding: 10px 40px;
+    background-color: #ffffff;
+  }
+
+  .btn {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #1365dd;
+    text-align: center;
+    font-size: 32px;
+    font-weight: 500;
+    color: #ffffff;
+  }
 }
 </style>
diff --git a/src/mods/AppIntegralApply/detail.vue b/src/mods/AppIntegralApply/detail.vue
index 66aa4e1..c6203e6 100644
--- a/src/mods/AppIntegralApply/detail.vue
+++ b/src/mods/AppIntegralApply/detail.vue
@@ -1,25 +1,157 @@
 <template>
-  <div class="details">detail</div>
+  <div class="page">
+    <div class="header-content">
+      <div class="header-middle">
+        <div class="img-title">{{ detail.title }}</div>
+
+        <div class="cards">
+          <div class="cards-left">活动时间</div>
+          <div class="cards-right">{{ detail.beginTime }}</div>
+        </div>
+
+        <div class="cards">
+          <div class="cards-left">活动人数</div>
+          <div class="cards-right">
+            <span style="color: #1c6bdf">{{ detail.realNum }}</span>
+          </div>
+        </div>
+
+        <div class="cards">
+          <div class="cards-left">活动地点</div>
+          <div class="cards-right" style="width: 75%; text-align: right">{{ detail.areaName }}{{ detail.address }}</div>
+        </div>
+
+        <div class="cards">
+          <div class="cards-left">活动地点</div>
+          <div class="cards-right" style="width: 75%; text-align: right">{{ detail.areaName }}{{ detail.address }}</div>
+        </div>
+
+        <div class="cards">
+          <div class="cards-left">活动地点</div>
+          <div class="cards-right" style="width: 75%; text-align: right">{{ detail.areaName }}{{ detail.address }}</div>
+        </div>
+
+        <div class="cards">
+          <div class="cards-left">活动地点</div>
+          <div class="cards-right" style="width: 75%; text-align: right">{{ detail.areaName }}{{ detail.address }}</div>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
 export default {
-  name: 'detail',
-  components: {},
-  props: {},
-  data() {
-    return {}
-  },
+  name: 'Detail',
   computed: {},
-  watch: {},
-  onLoad() {},
+  data() {
+    return {
+      id: '',
+      detail: {},
+    }
+  },
+  onLoad(option) {
+    this.id = option.id
+
+    this.$dict.load('').then(() => {
+      this.getDetail()
+    })
+  },
   onShow() {},
-  methods: {},
+  methods: {
+    getDetail() {
+      var ids = 'f16e54058cab4099bf3ee6e03e750b93'
+      this.$instance.post(`/app/appvillageactivityinfo/queryDetailById?id=${ids}`).then((res) => {
+        if (res.code == 0) {
+          this.detail = res.data
+        }
+      })
+    },
+  },
 }
 </script>
-
 <style scoped lang="scss">
-.details {
+.page {
+  width: 100%;
   height: 100%;
+  background-color: #fff;
+
+  .info-title {
+    padding-left: 32px;
+    line-height: 108px;
+    font-size: 32px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: #333;
+  }
+  .tab-title {
+    line-height: 108px;
+    font-size: 32px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: #333;
+    span {
+      display: inline-block;
+      width: 192px;
+      text-align: center;
+    }
+    .active {
+      color: #3671ee;
+      border-bottom: 4px solid #3671ee;
+    }
+  }
+  .status0 {
+    background: #000;
+  }
+  .status1 {
+    background: #ff883c;
+  }
+  .status3 {
+    background: #1aaaff;
+  }
+  .status2 {
+    background: #42d784;
+  }
+  .status4,
+  .status5 {
+    background: #e4e4e4;
+  }
+  .header-content {
+    // padding-bottom: 80px;
+    .header-top {
+      width: 100%;
+      height: 440px;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    .header-middle {
+      padding: 32px 32px 0 32px;
+
+      .img-title {
+        font-size: 36px;
+        font-weight: 600;
+      }
+
+      .cards {
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 2px solid #eee;
+        padding: 36px 0;
+        line-height: 40px;
+        font-size: 28px;
+
+        .cards-left {
+          color: #999;
+        }
+
+        .cards-right {
+          color: #333;
+        }
+      }
+    }
+  }
 }
 </style>
diff --git a/src/mods/AppServiceOnline/serviceNotice.vue b/src/mods/AppServiceOnline/serviceNotice.vue
index 0d8d148..54ced1a 100644
--- a/src/mods/AppServiceOnline/serviceNotice.vue
+++ b/src/mods/AppServiceOnline/serviceNotice.vue
@@ -2,7 +2,7 @@
   <div class="service-notice" v-if="pageShow">
     <h2>办理须知</h2>
     <div class="service-content">
-      <AiWxparse :imageProp="imageProp" className="articalContent" :content="content"/>
+      <u-parse :imageProp="imageProp" className="articalContent" :content="content" />
       <!-- <div v-html="content" class="articalContent"></div> -->
       <!-- <u-parse className="articalContent" :html="content"></u-parse> -->
     </div>
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import {mapState} from 'vuex'
+import { mapState } from 'vuex'
 
 export default {
   data() {
@@ -22,16 +22,16 @@ export default {
         mode: 'widthFix',
         padding: 0,
         lazyLoad: false,
-        domain: ''
+        domain: '',
       },
       id: '',
       title: '',
       pageShow: false,
-      processType: ''
+      processType: '',
     }
   },
   computed: {
-    ...mapState(['global', 'user', 'token'])
+    ...mapState(['global', 'user', 'token']),
   },
   onLoad(query) {
     this.id = query.id
@@ -41,31 +41,36 @@ export default {
   methods: {
     getInfo(id) {
       this.$loading()
-      this.$instance.post(`/app/approval-process-def/info-id?id=${id}`, null, {
-        withoutToken: true
-      }).then(res => {
-        if (res.code === 0) {
-          this.title = res.data.processName
-          this.content = res.data.needToKnow
-          this.processType = res.data.processType
-          uni.setNavigationBarTitle({
-            title: res.data.processName
-          })
-          this.pageShow = true
-          this.$hideLoading()
-        }
-      })
+      this.$instance
+        .post(`/app/approval-process-def/info-id?id=${id}`, null, {
+          withoutToken: true,
+        })
+        .then((res) => {
+          if (res.code === 0) {
+            this.title = res.data.processName
+            this.content = res.data.needToKnow
+            this.processType = res.data.processType
+            uni.setNavigationBarTitle({
+              title: res.data.processName,
+            })
+            this.pageShow = true
+            this.$hideLoading()
+          }
+        })
     },
 
     handleGoto(url, type) {
-      if (type) {//判断是否需要登录
-        if (this.token) {//判断是否登录
+      if (type) {
+        //判断是否需要登录
+        if (this.token) {
+          //判断是否登录
           if (type == 'token') {
             this.$linkTo(url)
           }
           if (type == 'idNumber') {
             if (this.user.status == 0) {
-              if (!this.user.phone) {//判断已经绑定手机
+              if (!this.user.phone) {
+                //判断已经绑定手机
                 this.$linkTo('/pages/phone/bingPhoneNumber?from=auth')
               } else {
                 this.$linkTo('/pages/auth/authenticationInfo')
@@ -92,14 +97,14 @@ export default {
 
     toSubmit() {
       this.handleGoto('./serviceForm?id=' + this.id, 'idNumber')
-    }
+    },
   },
   onShareAppMessage() {
     return {
       title: this.title,
-      path: `./serviceNotice?id=${this.id}`
+      path: `./serviceNotice?id=${this.id}`,
     }
-  }
+  },
 }
 </script>
 
@@ -120,7 +125,7 @@ export default {
     text-align: center;
     font-size: 34px;
     color: #fff;
-    background: #197DF0;
+    background: #197df0;
   }
 
   h2 {