From acf4f32c4fabfe63dddd744927425477ae6f1956 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 10 Jun 2022 14:28:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9E=81=E5=85=89=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppTvMsg/AppTvMsg.vue     | 168 ++++++++++++++++++++++
 src/apps/AppTvMsg/add.vue          | 216 +++++++++++++++++++++++++++++
 src/apps/AppTvMsg/img/add-icon.png | Bin 0 -> 6242 bytes
 3 files changed, 384 insertions(+)
 create mode 100644 src/apps/AppTvMsg/AppTvMsg.vue
 create mode 100644 src/apps/AppTvMsg/add.vue
 create mode 100644 src/apps/AppTvMsg/img/add-icon.png

diff --git a/src/apps/AppTvMsg/AppTvMsg.vue b/src/apps/AppTvMsg/AppTvMsg.vue
new file mode 100644
index 00000000..bf8ceae9
--- /dev/null
+++ b/src/apps/AppTvMsg/AppTvMsg.vue
@@ -0,0 +1,168 @@
+<template>
+  <div class="AppTvMsg">
+    <AiTopFixed>
+      <div class="currentLeft-top">
+        <AiSelect @data="selectType" :list="typeList" v-model="type"></AiSelect>
+      </div>
+    </AiTopFixed>
+    <div class="record">
+      <div class="item" v-for="(item, index) in list" :key="index">
+        <p class="content">{{item.content}}</p>
+        <p :class="`type${item.type}`">{{item.type == '10' ? '主动报备提醒' : '核酸监测'}}</p>
+        <u-icon name="trash" color="#ff4466" size="40" class="del" @click="del(item)"></u-icon>
+      </div>
+    </div>
+    <AiEmpty v-if="!list.length"></AiEmpty>
+    <img src="./img/add-icon.png" alt="" class="add-img" @click="add">
+  </div>
+</template>
+<script>
+
+export default {
+  name: "AppTvMsg",
+  appName: '极光推送',
+  data() {
+    return {
+      list: [],
+      current: 1,
+      type: '',
+      typeList: [{label: '全部', value: ''}, {label: '核酸监测', value: '15' }, {label: '主动报备提醒', value: '10' }]
+    }
+  },
+  onLoad() {
+    this.getList()
+    uni.$on('getList', () => {
+      this.list = []
+      this.current = 1
+
+      this.$nextTick(() => {
+        this.getList()
+      })
+    })
+  },
+
+  onShow() {
+    document.title = '极光推送'
+  },
+
+  methods: {
+    selectType(selecteds) {
+      this.type = selecteds?.[0]?.value
+      this.getListInit()
+    },
+    add() {
+      uni.navigateTo({
+        url: `./add`
+      })
+    },
+
+    getListInit() {
+      this.list = []
+      this.current = 1
+      this.getList()
+    },
+    getList() {
+      this.$http.post(`/app/appiptvjpush/list`, null, {
+        params: {
+          type: this.type,
+          current: this.current,
+          size: 10
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records]
+          } else {
+            this.list = res.data.records
+          }
+        } else {
+          uni.hideLoading()
+        }
+      }).catch(() => {
+        uni.hideLoading()
+      })
+    },
+    del(item) {
+      this.$confirm(`是否要删除推送消息`).then(() => {
+        this.$http.post(`/app/appiptvjpush/delete?ids=${item.id}`).then((res) => {
+          if (res.code == 0) {
+            this.getListInit()
+            this.$u.toast('删除成功')
+          }
+        })
+      })
+    },
+  },
+
+  onReachBottom() {
+    this.current ++
+    this.getList()
+  }
+}
+</script>
+<style lang="scss" scoped>
+.AppTvMsg {
+  padding-bottom: 128px;
+  ::v-deep .AiTopFixed{
+    .content{
+      padding: 0;
+    }
+  }
+  .record {
+    padding: 32px;
+
+    .item {
+      width: 100%;
+      padding: 32px 30px;
+      box-sizing: border-box;
+      background-color: #fff;
+      border-radius: 8px;
+      margin-bottom: 16px;
+      position: relative;
+      .del{
+        position: absolute;
+        top: 32px;
+        right: 32px;
+      }
+      .content{
+        width: 500px;
+        word-break: break-all;
+        margin-bottom: 8px;
+      }
+      .type10{
+        color:#4E8EEE;
+      }
+      .type15{
+        color:#42D784;
+      }
+    }
+  }
+
+  .add-img {
+    width: 120px;
+    position: fixed;
+    bottom: 120px;
+    right: 32px;
+  }
+
+  .currentLeft-top {
+    display: flex;
+    align-items: center;
+    padding: 32px 32px 0;
+
+    .left {
+      width: 200px;
+      display: flex;
+      align-items: center;
+
+      img {
+        width: 48px;
+        height: 48px;
+      }
+    }
+  }
+  ::v-deep .u-search {
+    margin-bottom: 0 !important;
+  }
+}
+</style>
diff --git a/src/apps/AppTvMsg/add.vue b/src/apps/AppTvMsg/add.vue
new file mode 100644
index 00000000..1a82c15e
--- /dev/null
+++ b/src/apps/AppTvMsg/add.vue
@@ -0,0 +1,216 @@
+<template>
+  <div class="add">
+    <div class="item">
+      <span class="tips">*</span>
+      <div class="border not-border">
+        <span class="label">推送分类</span>
+        <span class="value">
+          <AiSelect :list="typeList" v-model="form.type" @data="selectType"></AiSelect>
+        </span>
+      </div>
+    </div>
+    <div class="item mar-b0">
+      <span class="tips">*</span>
+      <div class="border not-border">
+        <span class="label">消息内容</span>
+      </div>
+    </div>
+    <div class="text-area">
+      <textarea placeholder="请输入" maxlength="200" v-model="form.msgContent"></textarea>
+    </div>
+    <div class="item" v-if="form.type == 15">
+      <span class="tips">*</span>
+      <div class="border not-border">
+        <span class="label">日期</span>
+        <span class="value">
+          <input type="text" placeholder="请输入" v-model="form.msgTime" maxlength="30">
+        </span>
+      </div>
+    </div>
+    <div class="item" v-if="form.type == 15">
+      <span class="tips">*</span>
+      <div class="border not-border">
+        <span class="label">地点</span>
+        <span class="value">
+          <input type="text" placeholder="请输入" v-model="form.msgPlace" maxlength="100">
+        </span>
+      </div>
+    </div>
+    <div class="item" v-if="form.type == 15">
+      <span class="tips">*</span>
+      <div class="border not-border">
+        <span class="label">按钮标题</span>
+        <span class="value">
+          <input type="text" placeholder="请输入" v-model="form.msgBtnText" maxlength="20">
+        </span>
+      </div>
+    </div>
+
+    <div class="add-btn" @click="submit">
+      <div>提交</div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+export default {
+  name: 'add',
+  data() {
+    return {
+      form: {
+        type: '10',
+        msgContent: '',
+        msgTime: '',
+        msgPlace: '',
+        msgBtnText: '',
+      },
+      typeList: [{label: '核酸监测', value: '15' }, {label: '主动报备提醒', value: '10' }],
+      isFlag: true
+    }
+  },
+  onShow() {
+    document.title = '新增推送消息'
+  },
+  computed: {
+    ...mapState(['user']),
+  },
+  methods: {
+    rules() {
+      return {
+        type: '请选择推送分类',
+        msgContent: '请输入消息内容',
+        msgTime: '请选择日期',
+        msgPlace: '请输入地点',
+        msgBtnText: '请输入按钮标题',
+      }
+    },
+    selectType(selecteds) {
+      this.form.type = selecteds?.[0]?.value
+    },
+    submit() {
+      if(this.form.type == 10) {
+        this.confirm()
+        return
+      }
+      const rules = this.rules()
+      for (let v of Object.keys(rules)) {
+        if (!this.form[v]) {
+          return this.$u.toast(rules[v])
+        }
+      }
+      this.confirm()
+    },
+    confirm() {
+      if(!this.isFlag) {
+        return
+      }
+      if(!this.form.msgContent) {
+        return this.$u.toast('请输入推送消息')
+      }
+      this.isFlag = false
+      this.$http.post('/app/appiptvjpush/addOrUpdate', this.form).then(res => {
+        if (res.code === 0) {
+          
+          this.$u.toast('新增成功')
+          uni.$emit('getList')
+          uni.navigateBack({
+            delta: 1
+          })
+        }
+      }).catch((err) => {
+        this.$u.toast(err)
+      })
+    }
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.add {
+  .item{
+    width: 100%;
+    padding-left: 14px;
+    background: #FFF;
+    box-sizing: border-box;
+    display: flex;
+    margin-bottom: 16px;
+    .tips{
+      width: 18px;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #FF4466;
+      line-height: 44px;
+      padding: 34px 0 34px 0;
+    }
+    .border{
+      width: calc(100% - 18px);
+      padding: 34px 32px 34px 0;
+      line-height: 44px;
+      border-bottom: 1px solid #D8DDE6;
+      line-height: 44px;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #333;
+      display: flex;
+      box-sizing: border-box;
+      .label{
+        width: 170px;
+      }
+      .value{
+        width: calc(100% - 170px);
+        text-align: right;
+        img{
+          width: 32px;
+          height: 32px;
+          margin-left: 8px;
+          vertical-align: middle;
+        }
+      }
+      .color-999{
+        color: #999;
+      }
+    }
+    .not-border{
+      border-bottom: 0;
+    }
+  }
+  .mar-b0{
+    margin-bottom: 0;
+  }
+  .text-area{
+    width: 100%;
+    background-color: #fff;
+    padding: 0 32px;
+    margin-bottom: 16px;
+    box-sizing: border-box;
+    textarea{
+      width: 100%;
+      height: 88px;
+      padding-bottom: 32px;
+    }
+  }
+  .pad-b152{
+    width: 100%;
+    padding-bottom: 152px;
+    background-color: #f5f5f5;
+  }
+  .add-btn{
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #3975C6;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #FFF;
+    div{
+      text-align: center;
+    }
+  }
+}
+</style>
diff --git a/src/apps/AppTvMsg/img/add-icon.png b/src/apps/AppTvMsg/img/add-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9707ebbb5a8eab517366248118496ad0e656774
GIT binary patch
literal 6242
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
JQbqI7{{e{`I+6eY

literal 0
HcmV?d00001


From 04df1084298e4dc1d380f7c67d9e14d7866d152c Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Fri, 10 Jun 2022 15:50:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9E=81=E5=85=89=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppTvMsg/AppTvMsg.vue | 4 ++--
 src/apps/AppTvMsg/add.vue      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/apps/AppTvMsg/AppTvMsg.vue b/src/apps/AppTvMsg/AppTvMsg.vue
index bf8ceae9..d84fe15f 100644
--- a/src/apps/AppTvMsg/AppTvMsg.vue
+++ b/src/apps/AppTvMsg/AppTvMsg.vue
@@ -8,7 +8,7 @@
     <div class="record">
       <div class="item" v-for="(item, index) in list" :key="index">
         <p class="content">{{item.content}}</p>
-        <p :class="`type${item.type}`">{{item.type == '10' ? '主动报备提醒' : '核酸监测'}}</p>
+        <p :class="`type${item.type}`">{{item.type == '10' ? '主动报备提醒' : '核酸监测通知'}}</p>
         <u-icon name="trash" color="#ff4466" size="40" class="del" @click="del(item)"></u-icon>
       </div>
     </div>
@@ -26,7 +26,7 @@ export default {
       list: [],
       current: 1,
       type: '',
-      typeList: [{label: '全部', value: ''}, {label: '核酸监测', value: '15' }, {label: '主动报备提醒', value: '10' }]
+      typeList: [{label: '全部', value: ''}, {label: '核酸监测通知', value: '15' }, {label: '主动报备提醒', value: '10' }]
     }
   },
   onLoad() {
diff --git a/src/apps/AppTvMsg/add.vue b/src/apps/AppTvMsg/add.vue
index 1a82c15e..cfcd4009 100644
--- a/src/apps/AppTvMsg/add.vue
+++ b/src/apps/AppTvMsg/add.vue
@@ -21,7 +21,7 @@
     <div class="item" v-if="form.type == 15">
       <span class="tips">*</span>
       <div class="border not-border">
-        <span class="label">日期</span>
+        <span class="label">时间</span>
         <span class="value">
           <input type="text" placeholder="请输入" v-model="form.msgTime" maxlength="30">
         </span>
@@ -65,7 +65,7 @@ export default {
         msgPlace: '',
         msgBtnText: '',
       },
-      typeList: [{label: '核酸监测', value: '15' }, {label: '主动报备提醒', value: '10' }],
+      typeList: [{label: '核酸监测通知', value: '15' }, {label: '主动报备提醒', value: '10' }],
       isFlag: true
     }
   },
@@ -80,7 +80,7 @@ export default {
       return {
         type: '请选择推送分类',
         msgContent: '请输入消息内容',
-        msgTime: '请选择日期',
+        msgTime: '请选择时间',
         msgPlace: '请输入地点',
         msgBtnText: '请输入按钮标题',
       }