Merge branch 'develop/3.0.8' into test

src/components/Dialog/index.vue

@@ -35,8 +35,20 @@
           <el-image v-if="scope.row.audioPic" :src="scope.row.audioPic" />
         </template>
       </el-table-column>
-      <el-table-column label="音频作者" prop="singerName" align="center" />
-      <el-table-column label="专辑名称" prop="songName" align="center" />
+      <el-table-column label="音频作者" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>
+            {{ scope.row.singerName ? scope.row.singerName : '-' }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="专辑名称" prop="songName" align="center" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>
+            {{ scope.row.songName ? scope.row.songName : '-' }}
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column label="付费类型" prop="isFree" align="center" :formatter="freeFormatter" />
       <el-table-column label="资源平台" align="center" :formatter="platfromFormatter" />
     </el-table>

src/views/operation/channel/detail.vue

@@ -35,8 +35,20 @@
               <el-image :src="scope.row.audioPic" />
             </template>
           </el-table-column>
-          <el-table-column label="音频作者" prop="singerName" align="center" show-overflow-tooltip />
-          <el-table-column label="专辑名称" prop="songName" align="center" show-overflow-tooltip />
+          <el-table-column label="音频作者" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>
+                {{ scope.row.singerName ? scope.row.singerName : '-' }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column label="专辑名称" prop="songName" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>
+                {{ scope.row.songName ? scope.row.songName : '-' }}
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column label="付费类型" prop="isFree" align="center" :formatter="freeFormatter" />
           <el-table-column label="资源平台" align="center" :formatter="platfromFormatter" />
           <el-table-column label="当前状态" align="center" :formatter="statusFormatter" />

src/views/operation/recommend/detail.vue

@@ -108,8 +108,20 @@
             <el-image :src="scope.row.audioPic" />
           </template>
         </el-table-column>
-        <el-table-column label="音频作者" prop="singerName" align="center" show-overflow-tooltip />
-        <el-table-column label="专辑名称" prop="songName" align="center" show-overflow-tooltip />
+        <el-table-column label="音频作者" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.singerName ? scope.row.singerName : '-' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="专辑名称" prop="songName" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.songName ? scope.row.songName : '-' }}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="音频类型" prop="audioType" align="center" key="audioType" :formatter="audioFormatter" />
         <el-table-column label="音频数量" prop="programCount" align="center" key="programCount" />
         <el-table-column label="付费类型" align="center" key="isFree" :formatter="freeFormatter" width="100px" />

src/views/operation/sceneTime/index.vue

@@ -40,7 +40,7 @@
       </el-form>
       <div slot="footer">
         <el-button @click="cancel">取消</el-button>
-        <el-button v-if="disabled" type="primary" @click="getSubmit">确定</el-button>
+        <el-button v-if="!disabled" type="primary" @click="getSubmit">确定</el-button>
       </div>
     </el-dialog>
   </div>

src/views/operation/tag/detail.vue

@@ -32,8 +32,20 @@
               <el-image :src="scope.row.audioPic" />
             </template>
           </el-table-column>
-          <el-table-column label="音频作者" prop="singerName" align="center" show-overflow-tooltip />
-          <el-table-column label="专辑名称" prop="songName" align="center" show-overflow-tooltip />
+          <el-table-column label="音频作者" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>
+                {{ scope.row.singerName ? scope.row.singerName : '-' }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column label="专辑名称" prop="songName" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>
+                {{ scope.row.songName ? scope.row.songName : '-' }}
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column label="音频类型" prop="audioType" align="center" :formatter="audioTypeFormatter" />
           <el-table-column label="资源平台" align="center" :formatter="platfromFormatter" />
           <el-table-column label="当前状态" align="center" :formatter="statusFormatter" />

src/views/operation/waken/detail.vue

@@ -30,6 +30,20 @@
               <el-image :src="scope.row.audioPic" />
             </template>
           </el-table-column>
+          <el-table-column label="音频作者" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>
+                {{ scope.row.singerName ? scope.row.singerName : '-' }}
+              </span>
+            </template>
+          </el-table-column>
+          <el-table-column label="专辑名称" prop="songName" align="center" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>
+                {{ scope.row.songName ? scope.row.songName : '-' }}
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column label="付费类型" align="center" prop="isFree" :formatter="freeFormatter" />
           <el-table-column label="资源平台" align="center" prop="platformId" :formatter="platfromFormatter" />
           <el-table-column label="当前状态" align="center" :formatter="statusFormatter" />
@@ -77,8 +91,20 @@
             <el-image :src="scope.row.audioPic" />
           </template>
         </el-table-column>
-        <el-table-column label="音频作者" prop="singerName" align="center" show-overflow-tooltip />
-        <el-table-column label="专辑名称" prop="songName" align="center" show-overflow-tooltip />
+        <el-table-column label="音频作者" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.singerName ? scope.row.singerName : '-' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="专辑名称" prop="songName" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.songName ? scope.row.songName : '-' }}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="付费类型" align="center" prop="isFree" :formatter="freeFormatter" />
         <el-table-column label="资源平台" align="center" prop="platformId" :formatter="platfromFormatter" />
       </el-table>

src/views/registration/content/detail.vue

@@ -50,8 +50,20 @@
             <el-image :src="scope.row.audioPic" />
           </template>
         </el-table-column>
-        <el-table-column label="音频作者" prop="singerName" align="center" show-overflow-tooltip />
-        <el-table-column label="专辑名称" prop="songName" align="center" show-overflow-tooltip />
+        <el-table-column label="音频作者" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.singerName ? scope.row.singerName : '-' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="专辑名称" prop="songName" align="center" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <span>
+              {{ scope.row.songName ? scope.row.songName : '-' }}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="音频类型" prop="audioType" align="center" :formatter="audioTypeFormatter" />
         <el-table-column label="音频数量" prop="programCount" align="center" />
         <el-table-column label="付费类型" prop="isFree" align="center" :formatter="freeFormatter" />