Merge branch 'develop/3.1.4' into test

src/api/device/warning.js

@@ -0,0 +1,35 @@
+import request from '@/utils/request'
+
+// 列表
+export function list(data) {
+  return request({
+    url: `/admin/yumxiaowei/waring/page`,
+    method: 'post',
+    data
+  })
+}
+
+// 详情
+export function detail(id) {
+  return request({
+    url: `admin/yumxiaowei/waring/getBullframeById/${id}`,
+    method: 'get'
+  })
+}
+
+// 新增 编辑
+export function submit(data) {
+  return request({
+    url: `/admin/yumxiaowei/waring/saveOrUpdate`,
+    method: 'post',
+    data
+  })
+}
+
+// 更改状态
+export function change(id, status) {
+  return request({
+    url: `/admin/yumxiaowei/waring/hitOrSold/${id}/${status}`,
+    method: 'get'
+  })
+}

src/api/music/blogclass.js

@@ -0,0 +1,43 @@
+import request from '@/utils/request'
+
+// 列表
+export function list(data) {
+  return request({
+    url: `/admin/podcast/category/page`,
+    method: 'post',
+    data
+  })
+}
+
+// 新增 编辑
+export function submit(data) {
+  return request({
+    url: `/admin/podcast/category/addOrUpdate`,
+    method: 'post',
+    data
+  })
+}
+
+// 详情
+export function detail(id) {
+  return request({
+    url: `/admin/podcast/category/queryById/${id}`,
+    method: 'get'
+  })
+}
+
+// 改变状态
+export function change(id, status) {
+  return request({
+    url: `/admin/podcast/category/hitOrSold/${id}/${status}`,
+    method: 'get'
+  })
+}
+
+// 播客分类下拉列表
+export function options() {
+  return request({
+    url: `/admin/podcast/category/list`,
+    method: 'get'
+  })
+}

src/mixin/index.js

@@ -4,12 +4,12 @@ import { platform, audioType } from '@/api/music/platform'
 
 import { options } from '@/api/music/radio'
 
-import { channelTemplate } from '@/api/operation/channel'
-
 import { list as categoryList } from '@/api/device/category'
 
 import { list as functionList } from '@/api/device/function'
 
+import { options as blogClass } from '@/api/music/blogclass'
+
 // 设备列表
 const devMixin = {
   data() {
@@ -477,7 +477,7 @@ const addressMixin = {
   }
 }
 
-// 内容分类
+// 广播分类
 const contentMixin = {
   data() {
     return {
@@ -503,28 +503,24 @@ const contentMixin = {
   }
 }
 
-// 分类
-const classifyMixin = {
+// 播客分类
+const blogClassMixin = {
   data() {
     return {
-      classifyOptions: []
+      blogClassOptions: []
     }
   },
-  methods: {
-    getClassify(e) {
-      channelTemplate({
-        audioType: e
-      }).then(res => {
-        if (res.code === 0) {
-          res.data.map(i => {
-            this.classifyOptions.push({
-              value: i.id,
-              label: i.name
-            })
+  mounted() {
+    blogClass().then(res => {
+      if (res.code === 0) {
+        res.data.map(i => {
+          this.blogClassOptions.push({
+            value: i.id,
+            label: i.name
           })
-        }
-      })
-    }
+        })
+      }
+    })
   }
 }
 
@@ -636,9 +632,9 @@ export {
   albumTypeMixin,
   addressMixin,
   contentMixin,
-  classifyMixin,
   currentMixin,
   coverMixin,
   channelMixin,
-  systemMixin
+  systemMixin,
+  blogClassMixin
 }

src/router/index.js

@@ -260,7 +260,7 @@ export const dynamicRoutes = [{
   children: [{
     path: 'article/detail',
     component: () => import('@/views/device/article/detail'),
-    name: 'articleDetail',
+    name: 'devArticleDetail',
     meta: {
       title: '文章详情',
       activeMenu: '/device/article'

src/views/content/article/detail.vue

@@ -4,26 +4,18 @@
       <el-form-item label="文章标题：">
         <el-input v-model="form.title" placeholder="请输入文章标题" />
       </el-form-item>
-      <el-form-item label="分享标题：">
-        <el-input v-model="form.shareTitle" placeholder="请输入分享标题" />
-      </el-form-item>
-      <el-form-item label="分享描述：">
-        <el-input v-model="form.shareDescription" type="textarea" :rows="5" placeholder="请输入分享描述" />
-      </el-form-item>
-      <el-form-item label="分享图片：">
-        <Upload listType="picture-card" :url="form.shareIcon" @upload="upload($event, 'shareIcon')" :disabled="disabled" />
-      </el-form-item>
       <el-form-item label="模板类型：">
         <el-select v-model="form.templateType" placeholder="请选择模板类型">
           <el-option v-for="item in typeOptions" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>
       <el-form-item label="背景图片：">
-        <Upload listType="picture-card" :url="form.backgroundImage" @upload="upload($event, 'backgroundImage')" :disabled="disabled" />
+        <Upload listType="picture-card" :url="form.backgroundImage" @upload="upload($event, 'backgroundImage')"
+          :disabled="disabled" />
       </el-form-item>
       <el-form-item v-if="form.templateType == 1" label="音频组件背景：">
-        <Upload listType="picture-card" :url="form.audioBackgroundImage"
-          @upload="upload($event, 'audioBackgroundImage')" :disabled="disabled" />
+        <Upload listType="picture-card" :url="form.audioBackgroundImage" @upload="upload($event, 'audioBackgroundImage')"
+          :disabled="disabled" />
       </el-form-item>
       <el-form-item v-if="form.templateType == 1" label="页面排版：" style="width: 80%">
         <el-button type="primary" icon="el-icon-plus" size="mini" @click="getAdd">添加</el-button>
@@ -74,17 +66,18 @@
             <el-input v-model="form.leftButtonText" placeholder="请输入按钮文案" />
           </el-form-item>
           <el-form-item label="左按钮图片：">
-            <Upload listType="picture-card" :url="form.leftButtonImg" @upload="upload($event, 'leftButtonImg')" :disabled="disabled" />
+            <Upload listType="picture-card" :url="form.leftButtonImg" @upload="upload($event, 'leftButtonImg')"
+              :disabled="disabled" />
           </el-form-item>
           <el-form-item label="跳转方式：">
-            <el-select v-model="form.leftButtonContentType" placeholder="请选择跳转方式">
+            <el-select v-model="form.leftButtonForwardType" placeholder="请选择跳转方式">
               <el-option v-for="item in changeOptions" :key="item.value" :value="item.value" :label="item.label" />
             </el-select>
           </el-form-item>
-          <el-form-item v-if="form.leftButtonContentType === 1" label="内容添加：">
+          <el-form-item v-if="form.leftButtonForwardType === 1" label="内容添加：">
             <el-input v-model="form.leftButtonContentName" readonly placeholder="请选择内容" />
           </el-form-item>
-          <el-form-item v-if="form.leftButtonContentType === 0" label="跳转链接：">
+          <el-form-item v-if="form.leftButtonForwardType === 0" label="跳转链接：">
             <el-input v-model="form.leftButtonForwardUrl" placeholder="请输入跳转链接" />
           </el-form-item>
         </el-col>
@@ -93,7 +86,8 @@
             <el-input v-model="form.rightButtonText" placeholder="请输入按钮文案" />
           </el-form-item>
           <el-form-item label="右按钮图片：">
-            <Upload listType="picture-card" :url="form.rightButtonImg" @upload="upload($event, 'rightButtonImg')" :disabled="disabled" />
+            <Upload listType="picture-card" :url="form.rightButtonImg" @upload="upload($event, 'rightButtonImg')"
+              :disabled="disabled" />
           </el-form-item>
           <el-form-item label="跳转方式：">
             <el-select v-model="form.rightButtonForwardType" placeholder="请选择跳转方式">
@@ -108,6 +102,16 @@
           </el-form-item>
         </el-col>
       </el-row>
+      <el-form-item label="分享标题：">
+        <el-input v-model="form.shareTitle" placeholder="请输入分享标题" />
+      </el-form-item>
+      <el-form-item label="分享描述：">
+        <el-input v-model="form.shareDescription" type="textarea" :rows="5" placeholder="请输入分享描述" />
+      </el-form-item>
+      <el-form-item label="分享图片：">
+        <Upload listType="picture-card" :url="form.shareIcon" @upload="upload($event, 'shareIcon')"
+          :disabled="disabled" />
+      </el-form-item>
     </el-form>
     <div style="margin-left: 110px;">
       <el-button @click="close">取消</el-button>
@@ -115,7 +119,7 @@
     </div>
 
     <!-- 弹出 -->
-    <el-dialog :visible.sync="dialogVisible" title="选择音频"  width="1000px">
+    <el-dialog :visible.sync="dialogVisible" title="选择音频" width="1000px">
       <el-form inline size="mini">
         <el-form-item label="音频ID：">
           <el-input v-model="dialogForm.id" placeholder="请输入音频ID" clearable />
@@ -321,7 +325,7 @@ export default {
     },
 
     // 重置
-    getRefresh(){
+    getRefresh() {
       this.dialogForm = {
         pageNum: 1,
         pageSize: 10,
@@ -333,11 +337,11 @@ export default {
     // 选择
     getChecked(row) {
       let e = this.form.contentShareLayoutList[this.index]
-      e.contentId = row.audioId
-      e.contentName = row.audioName
-      e.contentPic = row.audioPic
-      e.contentType = row.audioType
-      e.platformId = row.platformId
+      this.$set(e, 'contentId', row.audioId)
+      this.$set(e, 'contentName', row.audioName)
+      this.$set(e, 'contentPic', row.audioPic)
+      this.$set(e, 'contentType', row.audioType)
+      this.$set(e, 'platformId', row.platformId)
       this.$message.success('选择成功！')
       this.dialogVisible = false
     },
@@ -383,5 +387,4 @@ export default {
   .el-form-item {
     width: 500px;
   }
-}
-</style>
+}</style>

src/views/device/version/index.vue

@@ -23,7 +23,7 @@
       <el-table-column prop="id" label="型号ID" align="center" />
       <el-table-column prop="title" label="升级标题" align="center" show-overflow-tooltip />
       <el-table-column prop="deviceTypeName" label="设备名称" align="center" show-overflow-tooltip />
-      <el-table-column prop="listType" label="设备类型" align="center" :formatter="typeFormatter" />
+      <el-table-column prop="type" label="设备模式" align="center" :formatter="typeFormatter" />
       <el-table-column prop="version" label="版本号" align="center" />
       <el-table-column label="下载路径" align="center" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -129,7 +129,7 @@ export default {
 
     // 字典翻译
     typeFormatter(row) {
-      return row.listType.map(i => this.selectDictLabel(this.devModeOptions, i)).join(',')
+      return this.selectDictLabel(this.devModeOptions, row.type)
     }
   }
 }

src/views/device/warning/index.vue

@@ -0,0 +1,180 @@
+<template>
+  <div class='app-container'>
+    <!-- 搜索 -->
+    <el-form inline size="mini">
+      <el-form-item label="手机号：">
+        <el-input v-model="form.phone" placeholder="请输入手机号" clearable />
+      </el-form-item>
+      <el-form-item label="邮箱：">
+        <el-input v-model="form.email" placeholder="请输入邮箱" clearable />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="getSearch">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="getRefresh">重置</el-button>
+        <el-button type="primary" icon="el-icon-plus" plain @click="getDialog()">新增</el-button>
+      </el-form-item>
+    </el-form>
+    <!-- 列表 -->
+    <el-table :data="tableData" v-loading="loading">
+      <el-table-column label="序号" type="index" align="center" />
+      <el-table-column label="联系人" prop="username" align="center" />
+      <el-table-column label="手机号" prop="phone" align="center" />
+      <el-table-column label="邮箱" prop="email" align="center" />
+      <el-table-column label="创建时间" prop="createTime" align="center" />
+      <el-table-column label="操作" align="center">
+        <template slot-scope="scope">
+          <el-button type="text" @click="getDailog(scope.row.id)">编辑</el-button>
+          <el-button type="delete" @click="getDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 弹出 -->
+    <el-dialog :visible.sync="dialogVisible" :title="form.id ? '编辑' : '新增'" width="500px" :before-close="getClose">
+      <el-form :model="dialogForm" ref="dialogForm" :rules="rules" label-width="auto">
+        <el-form-item label="联系人：" prop="username">
+          <el-input v-model="dialogForm.username" placeholder="请输入联系人" />
+        </el-form-item>
+        <el-form-item label="手机号：" prop="phone">
+          <el-input v-model="dialogForm.phone" placeholder="请输入手机号" />
+        </el-form-item>
+        <el-form-item label="邮箱：" prop="email">
+          <el-input v-model="dialogForm.email" placeholder="请输入邮箱" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button @click="getClose">取消</el-button>
+        <el-button type="primary" @click="getSubmit">确定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { list, detail, submit, change } from '@/api/device/warning'
+export default {
+  data() {
+    var reg = /1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[0-35-9])\d{8}/
+    var checkPhone = (rule, value, callback) => {
+      if (value) {
+        if (!reg.test(value)) {
+          callback(new Error('请输入正确的手机号'))
+        } else {
+          callback()
+        }
+      }
+    }
+    return {
+      // 遮罩层
+      loading: false,
+      // 表单
+      form: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      // 列表
+      tableData: [],
+      // 总数据
+      total: 0,
+      // 弹窗
+      dialogVisible: false,
+      // 弹窗表单
+      dialogForm: {},
+      // 校验
+      rules: {
+        username: [{
+          required: true, message: '请输入联系人', trigger: 'blur'
+        }],
+        phone: [{
+          required: true, message: '请输入手机号', trigger: 'blur'
+        }, {
+          validator: checkPhone, trigger: 'blur'
+        }],
+        email: [{
+          required: true, message: '请输入邮箱', trigger: 'blur'
+        }, {
+          type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur'
+        }]
+      }
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    // 列表
+    getList() {
+      this.loading = true
+      list(this.form).then(res => {
+        if (res.code === 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+          this.loading = false
+        }
+      })
+    },
+
+    // 搜索
+    getSearch() {
+      this.form.pageNum = 1
+      this.getList()
+    },
+
+    // 重置
+    getRefresh() {
+      this.form = {
+        pageNum: 1,
+        pageSize: 10
+      }
+      this.getList()
+    },
+
+    // 弹窗
+    getDialog(id) {
+      this.dialogVisible = true
+      if (id) {
+        detail(id).then(res => {
+          if (res.code === 0) {
+            this.dialogForm = res.data
+          }
+        })
+      }
+    },
+
+    getClose() {
+      this.dialogForm = {}
+      this.$refs.dialogForm.resetFields()
+      this.dialogVisible = false
+    },
+
+    getSubmit() {
+      this.$refs.dialogForm.validate((valid) => {
+        if (valid) {
+          submit(this.dialogForm).then(res => {
+            if (res.code === 0) {
+              this.$message.success('提交成功！')
+              this.getClose()
+              this.getList()
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+
+    // 删除
+    getDelete(row) {
+      this.$confirm(`是否删除${row.username}的信息？`, '提示', {
+        type: 'warning'
+      }).then(() => {
+        change(row.id, 2).then(res => {
+          if (res.code === 0) {
+            this.$message.success('删除成功！')
+            this.getList()
+          }
+        })
+      }).catch(() => { })
+    }
+  }
+}
+</script>

src/views/music/blog/detail.vue

@@ -12,8 +12,7 @@
       </el-form-item>
       <el-form-item label="播客分类：" prop="categoryIds">
         <el-select v-model="form.categoryIds" multiple placeholder="请选择播客分类">
-          <el-option v-for="item in classifyOptions" :key="item.value" :value="item.value.toString()"
-            :label="item.label" />
+          <el-option v-for="item in blogClassOptions" :key="item.value" :value="item.value" :label="item.label" />
         </el-select>
       </el-form-item>
       <el-form-item label="播客介绍：" prop="description">
@@ -45,7 +44,7 @@
         <el-button @click="getDelete" :disabled="ids.length > 0 ? false : true">解除关联</el-button>
       </el-form-item>
       <el-form-item style="width: 100%">
-        <el-table :data="form.adminPodCastProgramDetailResp" height="497" @selection-change="handleSelect">
+        <el-table :data="form.adminPodCastProgramDetailResp" @selection-change="handleSelect">
           <el-table-column type="selection" align="center" />
           <el-table-column label="ID" prop="id" align="center" show-overflow-tooltip />
           <el-table-column label="节目名称" prop="name" align="center" show-overflow-tooltip />
@@ -106,11 +105,11 @@
 </template>
 
 <script>
-import { classifyMixin, platformMixin, payTypeMixin, onOrOffMixin, isFreeMixin } from '@/mixin/index'
+import { blogClassMixin, platformMixin, payTypeMixin, onOrOffMixin, isFreeMixin } from '@/mixin/index'
 import { selectAnchor } from '@/api/music/anchor'
 import { detail, submit, relieve, checkList } from '@/api/music/blog'
 export default {
-  mixins: [classifyMixin, platformMixin, payTypeMixin, onOrOffMixin, isFreeMixin],
+  mixins: [blogClassMixin, platformMixin, payTypeMixin, onOrOffMixin, isFreeMixin],
   data() {
     // 判断原价是否大于折扣价
     var checkPrice = (rule, value, callback) => {
@@ -199,8 +198,6 @@ export default {
     this.getPlatform({
       audioType: 8
     })
-    // 分类
-    this.getClassify(8)
     if (this.$route.query.id) {
       this.form.id = this.$route.query.id
       this.disabled = Boolean(this.$route.query.disabled)

src/views/music/blog/index.vue

@@ -11,6 +11,11 @@
       <el-form-item label="主播名称：">
         <el-input v-model="form.podcasterName" placeholder="请输入主播名称" clearable />
       </el-form-item>
+      <el-form-item label="内容分类：">
+        <el-select v-model="form.categoryId" filterable placeholder="请选择内容分类" clearable>
+          <el-option v-for="item in blogClassOptions" :key="item.value" :value="item.value" :label="item.label" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="付费类型：">
         <el-select v-model="form.payType" placeholder="请选择付费类型" clearable>
           <el-option v-for="item in payTypeOptions" :key="item.value" :value="item.value" :label="item.label" />
@@ -84,9 +89,9 @@
 
 <script>
 import { list, change, remove } from '@/api/music/blog'
-import { payTypeMixin, onOrOffMixin, platformMixin, classifyMixin } from '@/mixin/index'
+import { payTypeMixin, onOrOffMixin, platformMixin, blogClassMixin } from '@/mixin/index'
 export default {
-  mixins: [payTypeMixin, onOrOffMixin, platformMixin, classifyMixin],
+  mixins: [payTypeMixin, onOrOffMixin, platformMixin, blogClassMixin],
   data() {
     return {
       // 遮罩层
@@ -112,8 +117,6 @@ export default {
     this.getPlatform({
       audioType: 8
     })
-    // 获取分类
-    this.getClassify(8)
     this.getList()
   },
   methods: {
@@ -201,7 +204,7 @@ export default {
       return this.selectDictLabel(this.platformOptions, row.platformId)
     },
     categoryFormatter(row) {
-      return row.categoryIds.map((item, index) => (this.selectDictLabel(this.classifyOptions, item)) + (index + 1 < row.categoryIds.length ? '，' : ''))
+      return row.categoryIds.map((item, index) => (this.selectDictLabel(this.blogClassOptions, item)) + (index + 1 < row.categoryIds.length ? '，' : ''))
     }
   }
 }

src/views/music/blogclass/index.vue

@@ -1,22 +1,28 @@
 <template>
   <div class='app-container'>
-    <el-button type="primary" icon="el-icon-plus" size="mini" @click="getDialog">新增</el-button>
+    <el-button type="primary" icon="el-icon-plus" size="mini" @click="getDialog()">新增</el-button>
     <!-- 列表 -->
     <el-table :data="tableData" v-loading="loading">
       <el-table-column label="序号" type="index" align="center" />
-      <el-table-column label="分类名称" align="center" />
-      <el-table-column label="更新时间" align="center" />
+      <el-table-column label="分类名称" prop="name" align="center" />
+      <el-table-column label="更新时间" align="center">
+        <template slot-scope="scope">
+          {{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center">
         <template slot-scope="scope">
-          <el-button type="text" @click="getDialog('编辑', scope.row.id)">编辑</el-button>
+          <el-button type="text" @click="getDialog(scope.row.id)">编辑</el-button>
           <el-button type="delete" @click="getDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="form.pageNum" :limit.sync="form.pageSize"
+      @pagination="getList" />
     <!-- 弹窗 -->
     <el-dialog :visible.sync="dialogVisible" :title="dialogForm.id ? '编辑' : '新增'" width="500px" :before-close="getClose">
-      <el-form label-width="auto">
-        <el-form-item label="分类名称：">
+      <el-form label-width="auto" :model="dialogForm" ref="dialogForm">
+        <el-form-item label="分类名称：" prop="name" :rules="[{ required: true, message: '请输入分类名称', trigger: 'blur' }]">
           <el-input v-model="dialogForm.name" placeholder="请输入分类名称" />
         </el-form-item>
       </el-form>
@@ -29,6 +35,7 @@
 </template>
 
 <script>
+import { list, detail, submit, change } from '@/api/music/blogclass'
 export default {
   data() {
     return {
@@ -50,17 +57,31 @@ export default {
     }
   },
   mounted() {
-
+    this.getList()
   },
   methods: {
     // 列表
     getList() {
-
+      this.loading = true
+      list(this.form).then(res => {
+        if (res.code === 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+          this.loading = false
+        }
+      })
     },
 
     // 弹窗
     getDialog(id) {
       this.dialogVisible = true
+      if (id) {
+        detail(id).then(res => {
+          if (res.code === 0) {
+            this.dialogForm = res.data
+          }
+        })
+      }
     },
 
     // 取消
@@ -71,7 +92,33 @@ export default {
 
     // 确定
     getSubmit() {
+      this.$refs.dialogForm.validate((valid) => {
+        if (valid) {
+          submit(this.dialogForm).then(res => {
+            if (res.code === 0) {
+              this.$message.success('提交成功！')
+              this.getClose()
+              this.getList()
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
 
+    // 删除
+    getDelete(row) {
+      this.$confirm(`是否删除${row.name}？`, '提示', {
+        type: 'warning'
+      }).then(() => {
+        change(row.id, 2).then(res => {
+          if (res.code === 0) {
+            this.$message.success('删除成功！')
+            this.getList()
+          }
+        })
+      }).catch(() => { })
     }
   }
 }

src/views/ohplay/content/index.vue

@@ -7,7 +7,7 @@
           <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item label="内容分类：">
+      <el-form-item label="栏目分类：">
         <el-select v-model="form.type" placeholder="请选择内容分类" clearable>
           <el-option v-for="item in classifyOptions" :key="item.id" :label="item.name" :value='item.id' />
         </el-select>