管理后台-演出管理：点歌、赞赏记录

htmldev/manage/src/views/business/show/pickASong/index.vue

@@ -24,13 +24,20 @@
     <el-table :data="tableData" stripe v-loading="tableLoading" fit class="marginT-10 order-table" border
               :max-height="vheight">
       <el-table-column label="ID" prop="id"></el-table-column>
-      <el-table-column label="歌名" prop="created_at"></el-table-column>
-      <el-table-column label="演唱艺人" prop="department_name"></el-table-column>
-      <el-table-column label="点歌时间" prop="department_desc"></el-table-column>
-      <el-table-column label="点歌人昵称" prop="department_project_name"></el-table-column>
-      <el-table-column label="留言" prop="department_project_name"></el-table-column>
-      <el-table-column label="演出时间" prop="department_project_name"></el-table-column>
-      <el-table-column label="用户支付订单编号" prop="department_project_name"></el-table-column>
+      <el-table-column label="酒吧名称" prop="bar_name"></el-table-column>
+      <!--todo 缺字段-->
+      <el-table-column label="歌名" prop="bar_name"></el-table-column>
+      <el-table-column label="演唱艺人" prop="song_user_name"></el-table-column>
+      <el-table-column label="点歌时间" prop="created_at"></el-table-column>
+      <el-table-column label="点歌人昵称" prop="user_name"></el-table-column>
+      <el-table-column label="留言" prop="order_remark"></el-table-column>
+      <el-table-column label="演出时间" prop="plan_start_time"></el-table-column>
+      <el-table-column label="订单编号" prop="order_number"></el-table-column>
+      <el-table-column label="订单状态">
+        <template slot-scope="scope">
+          <p>{{ ['待支付', '已支付', '全部退款', '部分退款', '已取消'][scope.row.order_status] }}</p>
+        </template>
+      </el-table-column>
     </el-table>
     <el-pagination
       class="marginT-20"

htmldev/manage/src/views/business/show/plan/index.vue

@@ -18,7 +18,7 @@
           <el-button icon="el-icon-search" type="primary" @click="searchSubmit">查询</el-button>
         </el-form-item>
         <el-form-item class="ml-10">
-          <el-button icon="el-icon-plus" type="primary" @click="add" v-permission="'department_list_add'">新增</el-button>
+          <el-button icon="el-icon-plus" type="primary" @click="add">新增</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -29,13 +29,13 @@
       <el-table-column label="演唱时间" prop="department_name"></el-table-column>
       <el-table-column label="本节点歌歌单" prop="department_desc">
         <template slot-scope="scope">
-          <el-button type="text" @click="editPlayList(scope.row)" v-permission="'department_list_edit'">设置歌单</el-button>
+          <el-button type="text" @click="editPlayList(scope.row)">设置歌单</el-button>
         </template>
       </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
-          <el-button type="text" @click="edit(scope.row)" v-permission="'department_list_edit'">编辑</el-button>
-          <el-button type="text" @click="del(scope.row)" v-permission="'department_list_del'">删除</el-button>
+          <el-button type="text" @click="edit(scope.row)">编辑</el-button>
+          <el-button type="text" @click="del(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>

htmldev/manage/src/views/business/show/reward/index.vue

@@ -21,15 +21,25 @@
         </el-form-item>
       </el-form>
     </div>
-    <el-table :data="tableData" stripe v-loading="tableLoading" fit class="marginT-10 order-table" border
+    <el-table :data="tableData"
+              stripe
+              v-loading="tableLoading"
+              fit
+              class="marginT-10 order-table"
+              border
               :max-height="vheight">
       <el-table-column label="ID" prop="id"></el-table-column>
-      <el-table-column label="演唱艺人" prop="created_at"></el-table-column>
-      <el-table-column label="留言" prop="department_name"></el-table-column>
-      <el-table-column label="赞赏人昵称" prop="department_project_name"></el-table-column>
-      <el-table-column label="赞赏时间" prop="department_project_name"></el-table-column>
-      <el-table-column label="演出时间" prop="department_project_name"></el-table-column>
-      <el-table-column label="用户支付订单编号" prop="department_project_name"></el-table-column>
+      <el-table-column label="演唱艺人" prop="support_user_name"></el-table-column>
+      <el-table-column label="留言" prop="order_remark"></el-table-column>
+      <el-table-column label="赞赏人昵称" prop="user_name"></el-table-column>
+      <el-table-column label="赞赏时间" prop="created_at"></el-table-column>
+      <el-table-column label="演出时间" prop="plan_start_time"></el-table-column>
+      <el-table-column label="订单编号" prop="order_number"></el-table-column>
+      <el-table-column label="订单状态">
+        <template slot-scope="scope">
+          <p>{{ ['待支付', '已支付', '全部退款', '部分退款', '已取消'][scope.row.order_status] }}</p>
+        </template>
+      </el-table-column>
     </el-table>
     <el-pagination
       class="marginT-20"