Merge branch 'develop/3.1.7' into test

README.md

@@ -2,10 +2,10 @@
 
 ```bash
 # 克隆项目
-git clone http://60.205.190.38:9000/wuhao/Ohplay_system.git
+git clone http://60.205.190.38:9000/wuhao/ohplay_system.git
 
 # 进入项目目录
-cd Ohplay_system
+cd ohplay_system
 
 # 安装依赖
 npm install

src/components/Upload/index.vue

@@ -139,8 +139,10 @@ export default {
     async beforeUpload(file) {
       if (this.width && this.height) {
         const data = await this.readerImg(file)
-        if (data.width !== this.width || data.height !== this.height) {
-          this.$message.error(`请上传${this.width}x${this.height}尺寸的图片`)
+        let _width = data.width % this.width === 0 || this.width % data.width === 0 ? true : false
+        let _height = data.height % this.height === 0 || this.height % data.height === 0 ? true : false
+        if (!_width || !_height) {
+          this.$message.error(`请上传${this.width}x${this.height}尺寸或同比例倍数的图片`)
           return Promise.reject(false)
         }
       }

src/views/music/radio/detail.vue

@@ -29,7 +29,7 @@
       <el-form-item label="非加速链接：" prop="noStreamUrl">
         <el-input v-model="form.noStreamUrl" placeholder="请输入非加速链接" />
       </el-form-item>
-      <el-form-item label="加速链接：">
+      <el-form-item label="加速链接：" prop="fullUrl">
         <el-input v-model="form.fullUrl" placeholder="请输入加速链接" />
       </el-form-item>
       <el-form-item label="电台封面：" prop="thumb">
@@ -71,9 +71,6 @@ export default {
         platformId: [{
           required: true, message: '请选择资源平台', trigger: 'change'
         }],
-        noStreamUrl: [{
-          required: true, message: '请输入非加速链接', trigger: 'blur'
-        }],
         thumb: [{
           required: true, message: '请上传电台封面', trigger: 'change'
         }]

src/views/operation/recommend/detail.vue

@@ -88,6 +88,9 @@
     <!-- 弹窗 -->
     <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-form-item>
         <el-form-item label="音频类型：">
           <el-select v-model="dialogForm.audioType" placeholder="请选择类型" :disabled="disabled">
             <el-option v-for="item in audioOptions" :key="item.value" :label="item.label" :value="Number(item.value)" />

src/views/operation/recommend/index.vue

@@ -5,7 +5,8 @@
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
       <el-table-column width="80px">
         <template slot-scope="scope">
-          <el-link v-if="scope.row.hidden" :underline="false" class="el-icon-arrow-right" @click="getList(scope.row)" />
+          <el-link v-if="scope.row.hidden" :underline="false" class="el-icon-arrow-right"
+            @click="getList(scope.row, scope.$index)" />
         </template>
       </el-table-column>
       <el-table-column label="导航名称" align="center" prop="name" show-overflow-tooltip>
@@ -165,7 +166,9 @@ export default {
       }, {
         value: 3,
         label: '已失效'
-      }]
+      }],
+      // 当前数据缓存
+      index: null
     }
   },
   mounted() {
@@ -197,8 +200,8 @@ export default {
     },
 
     // 首次获取二级列表
-    getList(row) {
-      let e = this.tableData[row.tabIndex - 1]
+    getList(row, index) {
+      let e = this.tableData[index]
       list(row.id).then(res => {
         if (res.code === 0) {
           if (res.data.length > 0) {
@@ -222,7 +225,7 @@ export default {
             if (res.code === 0) {
               this.$message.success('提交成功')
               this.cancel()
-              this.getTabList()
+              this.getList(this.tableData[this.index], this.index)
             }
           })
         } else {
@@ -240,6 +243,7 @@ export default {
 
     // 弹窗
     getDialog(title, row) {
+      this.index = this.tableData.findIndex(i => i.id == row.id)
       this.title = title
       this.dialogVisible = true
       this.dialogForm.categoryId = row.id
@@ -272,10 +276,11 @@ export default {
       this.$confirm(`是否删除?`, '提醒', {
         type: 'warning'
       }).then(() => {
+        let index = this.tableData.findIndex(i => i.id == row.categoryId)
         remove(row.lv, row.id).then(res => {
           if (res.code === 0) {
             this.$message.success('删除成功！')
-            this.getTabList()
+            this.getList(this.tableData[index], index)
           }
         })
       }).catch(() => { })

src/views/operation/startPage/detail.vue

@@ -28,7 +28,7 @@
         <el-input v-model="form.forwardUrl" placeholder="请输入跳转地址" />
       </el-form-item>
       <el-form-item label="启动页图片：" prop="pic">
-        <Upload listType="picture-card" :width="375" :height="812" :url="form.pic" @upload="getUpload" :disabled="isRead" />
+        <Upload listType="picture-card" :width="750" :height="1624" :url="form.pic" @upload="getUpload" :disabled="isRead" />
       </el-form-item>
     </el-form>
     <div class="form-btn">

src/views/user/list/index.vue

@@ -33,6 +33,7 @@
         </template>
       </el-table-column>
       <el-table-column label="用户性别" prop="sex" align="center" :formatter="sexFormatter" />
+      <el-table-column label="绑定设备" align="center" />
       <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" />