Merge branch 'develop/3.1.0' into test

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

src/views/order/list/index.vue

@@ -121,7 +121,7 @@
         <el-table-column label="操作人" prop="useName" align="center" />
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="text" @click="getDownLoad(scope.row)" :disabled="scope.row.status === 1">下载</el-button>
+            <el-button type="text" @click="getDownLoad(scope.row)">下载</el-button>
           </template>
         </el-table-column>
       </el-table>