Merge branch 'develop/3.1.7' into test

src/views/music/radioclass/index.vue

@@ -27,6 +27,11 @@
         <el-form-item label="分类名称：" prop="title">
           <el-input v-model="dialogForm.title" placeholder="请输入分类名称" />
         </el-form-item>
+        <el-form-item label="资源平台：" prop="platformId">
+          <el-select v-model="dialogForm.platformId" multiple placeholder="请选择资源平台">
+            <el-option v-for="item in platformOptions" :key="item.value" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer">
         <el-button @click="cancel">取消</el-button>
@@ -38,7 +43,9 @@
 
 <script>
 import { list, submit, detail, remove } from '@/api/music/radioclass'
+import { platformMixin } from '@/mixin/index'
 export default {
+  mixins: [platformMixin],
   data() {
     return {
       // 遮罩层
@@ -62,6 +69,9 @@ export default {
       rules: {
         title: [{
           required: true, message: '请输入分类名称', trigger: 'blur'
+        }],
+        platformId: [{
+          required: true, message: '请选择资源平台', trigger: 'change'
         }]
       }
     }
@@ -74,10 +84,12 @@ export default {
     getDialog(title, id) {
       this.dialogVisible = true
       this.title = title
+      this.getPlatform({})
       if (id) {
         detail(id).then(res => {
           if (res.code === 0) {
             this.dialogForm = res.data
+            this.dialogForm.platformId = JSON.parse(res.data.platformId)
           }
         })
       }

src/views/operation/recommend/detail.vue

@@ -89,7 +89,7 @@
     <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" />
+          <el-input v-model="dialogForm.audioId" placeholder="请输入音频ID" />
         </el-form-item>
         <el-form-item label="音频类型：">
           <el-select v-model="dialogForm.audioType" placeholder="请选择类型" :disabled="disabled">

src/views/user/list/index.vue

@@ -8,6 +8,11 @@
       <el-form-item label="用户手机号:">
         <el-input type="number" v-model="form.phone" placeholder="请输入用户手机号" clearable />
       </el-form-item>
+      <el-form-item label="设备型号：">
+        <el-select v-model="form.clientTypeId" filterable placeholder="请选择设备型号" clearable>
+          <el-option v-for="item in devOptions" :key="item.value" :value="item.value" :label="item.label" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="注册来源:">
         <el-select v-model="form.registerChannel" placeholder="请选择注册来源" clearable>
           <el-option v-for="item in regOptions" :key="item.value" :value="item.value" :label="item.label" />
@@ -33,7 +38,11 @@
         </template>
       </el-table-column>
       <el-table-column label="用户性别" prop="sex" align="center" :formatter="sexFormatter" />
-      <el-table-column label="绑定设备" align="center" />
+      <el-table-column label="绑定设备" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ scope.row.deviceList.join('，') }}
+        </template>
+      </el-table-column>
       <el-table-column label="注册来源" prop="registerChannel" align="center" :formatter="regFormatter" />
       <el-table-column label="注册系统" prop="mtype" align="center" :formatter="typeFormatter" />
       <el-table-column label="注册时间" prop="createTime" align="center" />
@@ -103,9 +112,9 @@
 
 <script>
 import { list } from '@/api/user/list'
-import { sexMixin } from '@/mixin/index'
+import { sexMixin, devMixin } from '@/mixin/index'
 export default {
-  mixins: [sexMixin],
+  mixins: [sexMixin, devMixin],
   data() {
     return {
       // 遮罩层