Merge branch 'test'

src/mixin/index.js

@@ -292,8 +292,9 @@ const platformMixin = {
 
     // 第三方资源平台不可编辑
     disabledPlatformId(e) {
-      if (e) {
-        return this.platformOptions.find(i => i.value === e).joinType.includes('1')
+      let value = this.platformOptions.find(i => i.value == e)
+      if (value) {
+        return value.joinType.includes('1') ? true : false
       }
     },
 

src/views/music/menu/detail.vue

@@ -73,7 +73,7 @@
         <el-table-column label="播放时长" prop="playTime" align="center" />
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="text" @click="getChecked(scope.row)" :disabled="disabledList()">
+            <el-button type="text" @click="getChecked(scope.row)" :disabled="disabledList(scope.row)">
               选择
             </el-button>
           </template>
@@ -266,9 +266,9 @@ export default {
     },
 
     // 已有的歌曲不可重复选择
-    disabledList() {
+    disabledList(row) {
       if (this.form.programList.length > 0) {
-        return this.form.programList.findIndex(i => i.id === scope.row.id) === -1 ? false : true
+        return this.form.programList.findIndex(i => i.id === row.id) === -1 ? false : true
       }
     }
   }

src/views/operation/agreement/detail.vue

@@ -50,6 +50,9 @@ export default {
       }, {
         value: 5,
         label: '爱听付费协议'
+      }, {
+        value: 6,
+        label: '关于我们'
       }],
       // 校验
       rules: {