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

src/apps/AppBroadcast1/AppBroadcast1.vue

@@ -52,7 +52,7 @@ export default {
         {
           title: '音频录制',
           text: '音频文件的录制',
-          path: './AppResourcesManage/addMedia?type=1',
+          path: './AppResourcesManage/addPlay?type=1',
           imgUrl: require('./img/bigHorn-icon33@2x.png'),
           bgClass: 'bg-E5B565'
         },

src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue

@@ -5,7 +5,7 @@
         <div class="left">
           <AiSelect @data="selectType" :list="typeList" v-model="type"></AiSelect>
         </div>
-        <u-search v-model="keyword" :clearabled="true" placeholder="请输入素材名称/创建人员" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
+        <u-search v-model="keyword" :clearabled="true" placeholder="请输入素材名称/创建人员" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getListInit" @clear="handerClear"></u-search>
       </div>
       <div class="tab">
         <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96" :bar-style="barStyle"></u-tabs>

src/apps/AppBroadcast1/addPlay.vue

@@ -27,10 +27,12 @@
     </div>
     <div class="radio-content">
       <div class="title">播放方式</div>
-      <div class="item mar-r50" :class="formData.taskType == 0 ? 'active' : ''" @click="formData.taskType = 0">立即播放<img
+      <div class="flex">
+        <div class="item mar-r50" :class="formData.taskType == 0 ? 'active' : ''" @click="formData.taskType = 0">立即播放<img
           src="./img/bigHorn-xz.png" alt=""></div>
-      <div class="item" :class="formData.taskType == 1 ? 'active' : ''" @click="formData.taskType = 1"><img
+        <div class="item" :class="formData.taskType == 1 ? 'active' : ''" @click="formData.taskType = 1"><img
-          src="./img/bigHorn-xz.png" alt="">定时播放
+            src="./img/bigHorn-xz.png" alt="">定时播放
+        </div>
       </div>
     </div>
     <div class="content" v-if="formData.taskType != 0">
@@ -426,9 +428,13 @@ export default {
       }
     }
 
+    .flex{
+      display: flex;
+      justify-content: space-between;
+    }
+
     .item {
-      display: inline-block;
+      flex: 1;
-      width: 320px;
       height: 112px;
       line-height: 112px;
       text-align: center;

src/apps/AppBroadcast1/selectMedia.vue

@@ -5,7 +5,7 @@
         <div class="left">
           <AiSelect @data="selectType" :list="typeList" v-model="type"></AiSelect>
         </div>
-        <u-search v-model="keyword" :clearabled="true" placeholder="请输入素材名称/创建人员" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getList" @clear="handerClear"></u-search>
+        <u-search v-model="keyword" :clearabled="true" placeholder="请输入素材名称/创建人员" :show-action="false" bg-color="#F5F5F5" search-icon-color="#ccc" color="#666" height="58" @search="getListInit" @clear="handerClear"></u-search>
       </div>
       <div class="tab">
         <u-tabs :list="tab" :is-scroll="false" :current="currIndex" @change="change" height="96" :bar-style="barStyle"></u-tabs>
@@ -122,7 +122,7 @@ export default {
 
       this.$http.post(`/app/appdlbresource/list`, null, {
         params: {
-          ...this.search,
+          name: this.keyword,
           type: this.currIndex === 0 ? 1 : 3,
           current: this.current,
           size: 10,

src/apps/AppMessageNotification/AppMessageNotification.vue

@@ -0,0 +1,450 @@
+<template>
+  <section class="AppMessageNotification">
+    <div class="header">
+      <p>注意</p>
+      <p>每个用户每天可以接受10条群发消息，不限企业发布的群发还是个人发布的群发。</p>
+      <p>个人群发每天可以给用户发送10条群发消息。</p>
+    </div>
+    <div class="select-user">
+      <div class="label color-666">用户选择</div>
+      <div class="right" @click="toSelect">
+        <span>
+          <span v-if="!areaIdList.length && !tagIdList.length">全部</span>
+          <span v-else>已选择<!-- <span class="color-1365DD">10</span>人 --></span>
+        </span>
+        <img src="./components/img/right-icon.png" alt="">
+      </div>
+    </div>
+    <div class="content">
+      <p class="title fw500 mar-b32">群发消息设置</p>
+      <div class="select-user pad-lr0">
+        <div class="label color-666"><span class="tips">*</span>群发方式</div>
+        <div class="right">
+          <u-radio-group v-model="form.sendType">
+            <u-radio v-for="(item, index) in sendTypeList" :key="index" :label="item.name" :name="item.type">{{item.name}}</u-radio>
+          </u-radio-group>
+        </div>
+        <u-picker mode="time" v-model="timeShow" :params="timeParams" @confirm="timeSelect"></u-picker>
+      </div>
+      <div class="select-user pad-lr0" v-if="form.sendType == 1">
+        <div class="label color-666"><span class="tips">*</span>群发时间</div>
+        <div class="right"  @click="timeShow=true">
+          <span v-if="form.sendTime">{{form.sendTime}}</span>
+          <span class="color-999" v-else>请选择</span>
+        </div>
+        <u-picker mode="time" v-model="timeShow" :params="timeParams" @confirm="timeSelect"></u-picker>
+      </div>
+      <div class="mini-title color-666"><span class="tips">*</span>文本内容</div>
+      <div class="textarea">
+        <u-input v-model="form.content" type="textarea" :height="400" auto-height maxlength="1000" placeholder="请输入文本内容" />
+        <div class="hint">{{ form.content.length }}/1000</div>
+      </div>
+      <div class="type">
+        <p class="color-666">其它类型</p>
+        <u-radio-group v-model="form.contentType">
+          <u-radio v-for="(item, index) in typeList" :key="index" :name="item.type" @change="radioChange" > {{item.name}}</u-radio>
+        </u-radio-group>
+      </div>
+      <div class="type-content">
+        <div class="flex" v-if="form.contentType == 'image'">
+          <p class="label" style="width:40px;">图片</p>
+          <AiUploader :def.sync="formData.fileList" :limit="1" @data="(v) => fileData = v"></AiUploader>
+        </div>
+        <div class="flex" v-if="form.contentType == 'video'">
+          <p class="label" style="width:40px;">视频</p>
+          <AiUploader type="video" :limit="1" placeholder="上传视频" :def.sync="formData.fileList" @data="(v) => fileData = v"></AiUploader>
+        </div>
+        <div class="flex" v-if="form.contentType == 'file'">
+          <p class="label" style="width:40px;">附件</p>
+          <AiUploader type="file" :limit="1" placeholder="上传附件" :def.sync="formData.fileList" @data="(v) => fileData = v"></AiUploader>
+        </div>
+        <div v-if="form.contentType == 'link'">
+          <div class="flex border-b">
+            <p class="label">链接地址</p>
+            <div class="value">
+              <u-input v-model="formData.accessUrl" type="text" input-align="right" placeholder="请输入链接地址" height="44" />
+            </div>
+          </div>
+          <div class="flex border-b">
+            <p class="label">链接图片</p>
+            <AiUploader multiple :def.sync="formData.imgList" :limit="1" action="/admin/file/add2"></AiUploader>
+          </div>
+          <div class="flex">
+            <p class="label">链接标题</p>
+            <div class="value">
+              <u-input v-model="formData.accessTitle" type="text" input-align="right" placeholder="请输入链接标题" height="44" />
+            </div>
+          </div>
+        </div>
+        <div v-if="form.contentType == 'miniapp'" class="flex-label">
+          <div class="flex border-b">
+            <p class="label">小程序标题</p>
+            <div class="value">
+              <u-input v-model="formData.accessTitle" type="text" input-align="right" placeholder="请输入小程序标题" height="44" />
+            </div>
+          </div>
+          <div class="flex border-b">
+            <p class="label">小程序APPID</p>
+            <div class="value">
+              <u-input v-model="formData.accessAppid" type="text" input-align="right" placeholder="请输入小程序APPID" height="44" />
+            </div>
+          </div>
+          <div class="flex border-b">
+            <p class="label">小程序跳转页面</p>
+            <div class="value">
+              <u-input v-model="formData.accessUrl" type="text" input-align="right" placeholder="如pages/home/home" height="44" />
+            </div>
+          </div>
+          <div class="flex">
+            <p class="label" style="width:80px;">小程序图片</p>
+            <AiUploader multiple :def.sync="formData.imgList" :limit="1" action="/admin/file/add2"></AiUploader>
+          </div>
+        </div>
+      </div>
+      <!-- <div class="upload"><u-icon name="plus-circle-fill" color="#1365DD" size="32"></u-icon>添加附件</div> -->
+    </div>
+    <div class="bg-144"></div>
+    <div class="footer">
+      <div @click="back">取消</div>
+      <div class="confirm" @click="confirm">确认发送</div>
+    </div>
+    <!-- <u-popup v-model="show" mode="bottom">
+      <div class="popup">
+        <div class="item" v-for="(item, index) in popupList" :key="index">
+          <div class="icon-bg">
+            <u-icon :name="item.icon" size="56" color="#333"></u-icon>
+          </div>
+          <p>{{item.text}}</p>
+        </div>
+      </div>
+    </u-popup> -->
+  </section>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "AppMessageNotification",
+  appName: "消息通知",
+  data() {
+    return {
+      typeList: [
+        {name: '图片', type: 'image'}, 
+        {name: '视频', type: 'video'}, 
+        {name: '文件', type: 'file'}
+      ],
+      sendTypeList: [
+        {name: '立即发送', type: '0'}, 
+        {name: '定时发送', type: '1'}
+      ],
+      form: {
+        content: '',
+        contentType: 'text',
+        sendType: '0',
+        sendTime: ''
+      },
+      formData: {
+        fileList: [],
+        imgList: [],
+        accessImgurl: '',
+        accessTitle: '',
+        accessUrl: '',
+        accessAppid: '',
+        file: {},
+        mediaId: ''
+      },
+      areaIdList: [],
+      tagIdList: [],
+      timeShow: false,
+      timeParams: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+        second: true
+      },
+      fileData: null
+    }
+  },
+  computed: {...mapState(['user'])},
+  methods: {
+    radioChange(e) {
+      this.formDataInit()
+      this.$nextTick(() => {
+        this.form.contentType = e
+      })
+		},
+    toSelect() {
+      uni.navigateTo({url: `./SelectUser?tagIdList=${this.tagIdList}&areaList=${this.areaIdList}`})
+    },
+    timeSelect(e) {
+      var nowTime = new Date().getTime() * 1
+      var beginTimes = new Date(e.year + '/' + e.month + '/' + e.day + ' ' + e.hour + ':' + e.minute + ':' + e.second).getTime() * 1
+      if (nowTime > beginTimes) {
+        // this.form.sendTime = ''
+        return this.$u.toast('群发时间应大于当前时间')
+      } else {
+        this.form.sendTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`
+      }
+    },
+    confirm() {
+      // if(!this.areaIdList.length) {
+      //   return this.$u.toast('请选择用户')
+      // }
+      if(this.form.sendType == 1 && !this.form.sendTime) {
+        return this.$u.toast('请选择群发时间')
+      }
+      if(!this.form.content) {
+        return this.$u.toast('请输入文本内容')
+      }
+      if(this.form.contentType == 'image' && !this.formData.fileList.length) {
+        return this.$u.toast('请上传图片')
+      }
+      if(this.form.contentType == 'video' && !this.formData.fileList.length) {
+        return this.$u.toast('请上传视频')
+      }
+      if(this.form.contentType == 'file' && !this.formData.fileList.length) {
+        return this.$u.toast('请上传文件')
+      }
+      if(this.formData.fileList.length) {
+        this.formData.file = this.formData.fileList[0]
+        this.formData.accessUrl = this.formData.fileList[0].url
+        this.formData.mediaId = this.fileData.media.mediaId
+      }
+      var params = {
+        ...this.form, 
+        ...this.formData,
+        areaId: this.areaIdList.join(','),
+        tag: this.tagIdList.join(','),
+      }
+      this.$http.post("/app/pushmessage/addOrUpdate", params).then(res => {
+        if (res?.code == 0) {
+          this.$u.toast('发送成功')
+          this.form =  {
+            content: '',
+            contentType: 'text',
+            sendType: '0',
+            sendTime: ''
+          }
+          this.areaIdList = []
+          this.tagIdList = []
+          this.formDataInit()
+        }else {
+          this.$u.toast(res.msg)
+        }
+      }).catch((err) => {
+        this.$u.toast(err)
+      })
+    },
+    formDataInit() {
+      for(let key in this.formData) {
+        this.formData[key] = ''
+      }
+      this.formData.imgList = []
+      this.formData.fileList = []
+      this.formData.file = {}
+    },
+    back() {
+      uni.navigateBack()
+    }
+  },
+  created() {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+    uni.$on('selectTag', res => {
+      this.tagIdList = res.tagIdList
+      this.areaIdList = res.areaIdList
+    })
+  },
+}
+</script>
+<style lang="scss" scoped>
+.AppMessageNotification {
+  height: 100%;
+  background-color: #f3f6f9;
+  .fw500{
+    font-weight: 500;
+    font-size: 32px!important;
+  }
+  .color-666{
+    color: #666;
+    font-size: 30px;
+  }
+  .tips{
+    font-size: 34px;
+    color: #f46!important;
+    vertical-align: middle;
+  }
+  .mar-b32{
+    margin-bottom: 32px;
+  }
+  .header{
+    // background-color: #fff;
+    padding: 32px 32px 20px 32px;
+    box-sizing: border-box;
+    margin-bottom: 16px;
+    p{
+      line-height: 44px;
+      margin-bottom: 8px;
+      word-break: break-all;
+      font-size: 28px;
+      color: #666;
+    }
+  }
+  .select-user{
+    background-color: #fff;
+    padding: 34px 32px;
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 16px;
+    font-size: 30px;
+    img{
+      width: 44px;
+      height: 44px;
+      vertical-align: middle;
+    }
+    .color-999{
+      color: #999;
+    }
+    .color-1365DD{
+      color: #1365DD;
+    }
+    .label{
+      width: 160px;
+    }
+    .right{
+      width: calc(100% - 160px);
+      text-align: right;
+    }
+  }
+  .pad-lr0{
+    padding: 0;
+    margin-bottom: 32px;
+  }
+  .content{
+    padding: 32px;
+    box-sizing: border-box;
+    background-color: #fff;
+    .title{
+      line-height: 44px;
+      margin-bottom: 24px;
+    }
+    .mini-title{
+      line-height: 44px;
+      margin-bottom: 24px;
+    }
+    .textarea{
+      padding: 16px 32px;
+      box-sizing: border-box;
+      border: 1px solid #ddd;
+      .hint {
+        padding: 4px 0 8px 0;
+        text-align: right;
+        color: #999;
+      }
+    }
+    // .upload{
+    //   padding: 16px 32px;
+    //   line-height: 44px;
+    //   border: 1px solid #ddd;
+    //   border-top: 0;
+    //   .u-icon{
+    //     margin-right: 8px;
+    //   }
+    // }
+    .type{
+      margin-top: 32px;
+      p{
+        display: inline-block;
+        margin-right: 16px;
+      }
+    }
+    .type-content{
+      margin-top: 32px;
+      .label{
+        display: inline-block;
+        margin-right: 16px;
+        vertical-align: top;
+        font-size: 30px;
+        color: #666;
+        width: 130px;
+      }
+      .value{
+        width: calc(100% - 130px);
+      }
+      .ai-uploader{
+        display: inline-block;
+        width: calc(100% - 130px);
+      }
+      .flex{
+        padding: 34px 0;
+        line-height: 44px;
+        display: flex;
+      }
+      .border-b{
+        border-bottom: 1px solid #ddd;
+      }
+      .flex-label{
+        .label{
+          width: 260px;
+        }
+      }
+    }
+  }
+  .bg-144{
+    height: 144px;
+  }
+  .footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #fff;
+    display: flex;
+    font-size: 36px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    .confirm {
+      color: #fff;
+      background: #1365dd;
+    }
+    div {
+      flex: 1;
+      text-align: center;
+      color: #333;
+    }
+  }
+  .popup{
+    padding-top: 32px;
+    background-color: #f3f6f9;
+    .item{
+      display: inline-block;
+      width: 25%;
+      text-align: center;
+      padding: 32px 0;
+      .icon-bg{
+        width: 100px;
+        height: 100px;
+        line-height: 100px;
+        text-align: center;
+        background-color: #fff;
+        margin: 0 auto;
+        border-radius: 8px;
+        margin-bottom: 16px;
+        .u-icon{
+          margin-top: 20px;
+        }
+      }
+      p{
+        line-height: 44px;
+        font-size: 30px;
+        font-weight: 500;
+        color: #333;
+      }
+    }
+  }
+  
+}
+</style>

src/apps/AppMessageNotification/SelectUser.vue

@@ -0,0 +1,217 @@
+<template>
+  <section class="SelectUser">
+
+    <div class="select-content">
+      <div class="area-flex">
+        <p class="title">地区</p>
+        <AiAreaPicker v-model="areaList" multiple>
+          <span class="label" v-if="areaList.length">已选择</span>
+          <span v-else style="color:#999;">请选择</span>
+          <u-icon name="arrow-down" color="#666" size="24"/>
+        </AiAreaPicker>
+      </div>
+      <!-- <div class="area-flex">
+        <p class="title">部门</p>
+        <AiAreaPicker v-model="areaList" multiple>
+          <span class="label" v-if="areaList.length">已选择</span>
+          <span v-else style="color:#999;">请选择</span>
+          <u-icon name="arrow-down" color="#666" size="24"/>
+        </AiAreaPicker>
+      </div>
+      <div class="area-flex">
+        <p class="title">人员</p>
+        <AiAreaPicker v-model="areaList" multiple>
+          <span class="label" v-if="areaList.length">已选择</span>
+          <span v-else style="color:#999;">请选择</span>
+          <u-icon name="arrow-down" color="#666" size="24"/>
+        </AiAreaPicker>
+      </div>
+       -->
+      <div class="type-content">
+        <div class="type-list" v-for="(item, index) in tagList" :key="index">
+          <p>{{item.name}}</p>
+          <div class="list">
+            <div class="item" :class="items.isCheck ? 'active' : ''" v-for="(items, indexs) in item.tagList" :key="indexs" @click="typeClick(index, indexs)">{{items.name}}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="bg-144"></div>
+    <div class="footer">
+      <div class="confirm" @click="confirm">确定</div>
+    </div>
+  </section>
+</template>
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "SelectUser",
+  data() {
+    return {
+      value: '',
+      areaId: '',
+      areaName: '',
+      areaList: [],
+      tagList: [],
+      tagIdList: []
+    }
+  },
+  computed: {...mapState(['user'])},
+  methods: {
+    getTagList() {
+      this.$http.post("/app/wxcp/wxcorptag/listAll?size=100").then(res => {
+        if (res?.code == 0) {
+          res.data.records.map((item) => {
+            item.tagList.map((items) => {
+              items.isCheck = false
+              if(this.tagIdList.includes(items.id)) {
+                items.isCheck = true
+              }
+            })
+          })
+          this.tagList = res.data.records
+        }
+      })
+    },
+    typeClick(index, indexs) {
+      this.tagList[index].tagList[indexs].isCheck = !this.tagList[index].tagList[indexs].isCheck
+    },
+    confirm() {
+      // if(!this.areaList.length) {
+      //   return this.$u.toast('请选择地区')
+      // }
+      this.tagIdList = []
+      this.tagList.map((item) => {
+        item.tagList.map((items) => {
+          if(items.isCheck) {
+            this.tagIdList.push(items.id)
+          }
+        })
+      })
+      // if(!this.tagIdList.length) {
+      //   return this.$u.toast('请选择标签')
+      // }
+      uni.$emit('selectTag', {
+        areaIdList: this.areaList,
+        tagIdList: this.tagIdList
+      })
+      uni.navigateBack({})
+    }
+  },
+  onShow() {
+    document.title = '人员选择'
+  },
+  onLoad(option) {
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+    if(option.areaList) {
+      this.areaList = option.areaList.split(',')
+      this.tagIdList =  option.tagIdList.split(',')
+    }
+    this.getTagList()
+  },
+}
+</script>
+<style lang="scss" scoped>
+.SelectUser {
+  .select-content{
+    .area-flex{
+      display: flex;
+      justify-content: space-between;
+      padding: 34px 32px 0;
+      line-height: 44px;
+      margin-bottom: 16px;
+      background-color: #fff;
+    }
+    .area-content{
+      padding: 16px 32px 32px;
+      border-bottom: 1px solid #ddd;
+      .area-item{
+        display: inline-block;
+        margin-right: 16px;
+        .u-icon{
+          margin-left: 4px;
+        }
+      }
+    }
+    .title{
+      line-height: 44px;
+      margin-bottom: 16px;
+      font-size: 32px;
+      color: #666;
+      .tips{
+        font-size: 34px;
+        color: #f46;
+        vertical-align: middle;
+      }
+    }
+    .local-icon{
+      width: 32px;
+      height: 32px;
+      margin-right: 4px;
+    }
+    .AiAreaPicker{
+      margin-bottom: 24px;
+    }
+    .type-content{
+
+    }
+    .type-list{
+      padding-left: 16px;
+      margin-bottom: 16px;
+      padding: 34px 32px 32px;
+      background-color: #fff;
+      p{
+        line-height: 44px;
+        margin-bottom: 24px;
+        font-size: 30px;
+        color: #666;
+      }
+      .list{
+        overflow: hidden;
+        .item{
+          padding: 12px 32px;
+          float: left;
+          font-size: 28px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          color: #333;
+          line-height: 40px;
+          background-color: #F3F4F7;
+          border-radius: 4px;
+          margin: 0 16px 16px 0;
+        }
+        .active{
+          background-color: #3192F4;
+          color: #fff;
+        }
+      }
+    }
+  }
+  .bg-144{
+    height: 144px;
+  }
+  .footer {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 112px;
+    line-height: 112px;
+    background: #fff;
+    display: flex;
+    font-size: 36px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    .confirm {
+      color: #fff;
+      background: #1365dd;
+    }
+    div {
+      flex: 1;
+      text-align: center;
+      color: #333;
+    }
+  }
+  
+}
+</style>