修复房间流水筛选bug

src/api/system/sysconf.js

@@ -5,4 +5,12 @@ export function getSysConfList() {
         url: '/admin/sysConf/getList',
         method: 'get'
     });
+}
+
+export const getConfigValueByKey = query => {
+    return request({
+        url: '/admin/sysConf/key',
+        method: 'get',
+        params: query,
+    });
 }

src/views/blinddate/BlindDateCapAdminView.vue

@@ -288,7 +288,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
-                                $("#updateItemModal").modal('hide');
+                                $("#updateCapModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');
@@ -334,6 +334,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
+                                $("#addCapModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');

src/views/blinddate/BlindDateJoinhandAdminView.vue

@@ -341,7 +341,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
-                                $("#updateItemModal").modal('hide');
+                                $("#updateJoinHandModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');
@@ -387,6 +387,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
+                                $("#addJoinHandModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');

src/views/nameplate/NameplateInfoView.vue

@@ -179,6 +179,7 @@
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
+import { getConfigValueByKey } from '@/api/system/sysconf';
 
 export default {
     name: "NameplateInfoView",
@@ -603,20 +604,34 @@ function setStatusSelectOption() {
 }
 
 function setStyleTypeSelectOption() {
-    var rows = {
-        "1": '3344~8887送出',
-        "2": '3344~8887收到',
-        "3": '8887+送出',
-        "4": '8887+收到',
-        "5": 'CP铭牌审核送出',
-        "6": '粉丝团铭牌送出',
-        "7": '贵族等级铭牌送出'
-    };
-    console.log(rows);
-    for (var key in rows) {
-        $('#type').append('<option value="' + key + '">' + rows[key] + '</option>');
-        $('#type1').append('<option value="' + key + '">' + rows[key] + '</option>');
-    }
+    getConfigValueByKey({
+        'configId': 'heartbeat_nameplate',
+    }).then(res => {
+        let sysConf = res.data;
+        if (sysConf && sysConf.configValue) {
+            let data = JSON.parse(sysConf.configValue);
+            let floor = 52000;
+            let upper = 131400;
+            if (data.length == 2) {
+                floor = data[0];
+                upper = data[1];
+            }
+            var rows = {
+                '1': floor + '~' + (upper - 1) + '送出',
+                '2': floor + '~' + (upper - 1) + '收到',
+                '3': upper + '+送出',
+                '4': upper + '+收到',
+                '5': 'CP铭牌审核送出',
+                '6': '粉丝团铭牌送出',
+                '7': '贵族等级铭牌送出'
+            };
+            console.log(rows);
+            for (var key in rows) {
+                $('#type').append('<option value="' + key + '">' + rows[key] + '</option>');
+                $('#type1').append('<option value="' + key + '">' + rows[key] + '</option>');
+            }
+        }
+    });
 }
 
 function setTypeSelectOption() {

src/views/record/ChargeRecordView.vue

@@ -51,9 +51,9 @@
                                 <label for="qChannel">app渠道</label>
                                 <input type="text" class="form-control" name="appChannel" id="qAppChannel">
                             </div>
-                            <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
-                            <button id="btnExport" class="btn btn-sm btn-primary">导出</button>
                         </form>
+                        <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
+                        <button id="btnExport" class="btn btn-sm btn-primary">导出</button>
                     </div>
                     <!-- .content -->
                     <div class="content" id="table"></div>

src/views/room/RoomSerialView.vue

@@ -1,311 +1,351 @@
 <template>
-    <section class="content-header">
-        <h1 id="itemTitle"></h1>
-    </section>
-    <!-- .content -->
-    <section class="content">
-        <div id="table"></div>
-        <div id="toolbar">
-            <div class="col-sm-12">
-                <div class="big-tips">
-                    数据量过大，不再默认加载所有的数据，请先选择时间后，再点查询按钮
-                </div>
-                <form id="searchForm" action="/admin/roomSerial/export.action" method="POST">
-                    房主平台号(多个查询以英文逗号分隔): <input type="text" name="erbanNos" id="erbanNos" class="input-sm">
-                    选择时间: <input type="text" name="startTime" id="startTime" class="input-sm">
-                    至 <input type="text" id="endTime" name="endTime" class="input-sm">
-                    房间类型:
-                    <select name="isPermit" id="isPermit" data-btn-class="btn-warning">
-                        <option value="0">全部</option>
-                        <option value="1">牌照房</option>
-                        <option value="3">新秀房</option>
-                        <!--<option value="4">个播房</option>-->
-                        <option value="4">个播房</option>
-                    </select>
-                </form>
-            </div>
-            <div class="col-sm-8">
-                <button id="room-serial-refresh" class="btn btn-default">
-                    <i class="glyphicon glyphicon-wrench"></i>查询
-                </button>
-                <button id="room-serial-export" class="btn btn-default">
-                    <i class="glyphicon glyphicon-plus"></i>导出
-                </button>
-            </div>
-        </div>
-    </section><!-- .content -->
-
-    <div class="modal fade" id="tipModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h4 class="modal-title">提示信息</h4>
-                </div>
-                <div class="modal-body" id="tipMsg"></div>
-            </div>
+  <section class="content-header">
+    <h1 id="itemTitle"></h1>
+  </section>
+  <!-- .content -->
+  <section class="content">
+    <div id="table"></div>
+    <div id="toolbar">
+      <div class="col-sm-12">
+        <div class="big-tips">
+          数据量过大，不再默认加载所有的数据，请先选择时间后，再点查询按钮
         </div>
+        <form id="searchForm" action="/admin/roomSerial/export.action" method="POST">
+          房主平台号(多个查询以英文逗号分隔):
+          <input type="text" name="erbanNos" id="erbanNos" class="input-sm"  style="margin-right: 40px;display: inline-block;"/> 选择时间:
+          <input type="text" name="startTime" id="startTime" class="input-sm" /> 至
+          <input type="text" id="endTime" name="endTime" class="input-sm" />
+          <br />
+          <div style="width: 60%">
+            房间类型:
+            <select name="isPermit" id="isPermit" class="input-sm" style="width: 30%;display: inline-block;">
+              <option value="0">全部</option>
+              <option value="1">牌照房</option>
+              <option value="3">新秀房</option>
+              <!--<option value="4">个播房</option>-->
+              <option value="4">个播房</option>
+            </select>
+          </div>
+        </form>
+      </div>
+      <div class="col-sm-8">
+        <button id="room-serial-refresh" class="btn btn-default">
+          <i class="glyphicon glyphicon-wrench"></i>查询
+        </button>
+        <button id="room-serial-export" class="btn btn-default">
+          <i class="glyphicon glyphicon-plus"></i>导出
+        </button>
+      </div>
     </div>
+  </section>
+  <!-- .content -->
 
-
-    <div class="modal fade" id="roomGiftSerialDetailModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span>
-                    </button>
-                    <h4 class="modal-title" id="roomGiftSerialDetailModalTitle">房间明细</h4>
-                </div>
-                <div class="modal-body">
-                    <div class="summary col-sm-12">
-                        <div class="col-sm-6">
-                            <span>房间ID：</span>
-                            <span id="roomId"></span>
-                        </div>
-                        <div class="col-sm-6">
-                            <span>房间昵称：</span>
-                            <span id="roomTitle"></span>
-                        </div>
-                        <div class="col-sm-6">
-                            <span>收礼总钻石：</span>
-                            <span id="totalDiamonds"></span>
-                        </div>
-                        <div class="col-sm-6">
-                            <span>房间抽成钻石数：</span>
-                            <span id="cutDiamonds"></span>
-                        </div>
-                    </div>
-                    <div id="roomGiftSerialDetailTable"></div>
-                </div>
-                <div class="modal-footer">
-                    <h4 id="roundDetailModalFooter"></h4>
-                    <button type="button" class="btn btn-default" data-dismiss="modal">确定</button>
-                </div>
-
-            </div>
+  <div
+    class="modal fade"
+    id="tipModal"
+    tabindex="-1"
+    role="dialog"
+    aria-labelledby="modalLabel"
+  >
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">提示信息</h4>
         </div>
+        <div class="modal-body" id="tipMsg"></div>
+      </div>
     </div>
+  </div>
+
+  <div
+    class="modal fade"
+    id="roomGiftSerialDetailModal"
+    tabindex="-1"
+    role="dialog"
+    aria-labelledby="modalLabel"
+  >
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+          <h4 class="modal-title" id="roomGiftSerialDetailModalTitle">房间明细</h4>
+        </div>
+        <div class="modal-body">
+          <div class="summary col-sm-12">
+            <div class="col-sm-6">
+              <span>房间ID：</span>
+              <span id="roomId"></span>
+            </div>
+            <div class="col-sm-6">
+              <span>房间昵称：</span>
+              <span id="roomTitle"></span>
+            </div>
+            <div class="col-sm-6">
+              <span>收礼总钻石：</span>
+              <span id="totalDiamonds"></span>
+            </div>
+            <div class="col-sm-6">
+              <span>房间抽成钻石数：</span>
+              <span id="cutDiamonds"></span>
+            </div>
+          </div>
+          <div id="roomGiftSerialDetailTable"></div>
+        </div>
+        <div class="modal-footer">
+          <h4 id="roundDetailModalFooter"></h4>
+          <button type="button" class="btn btn-default" data-dismiss="modal">确定</button>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
-import TableHelper from '@/utils/bootstrap-table-helper';
-import ComboboxHelper from '@/assets/plugins/bootstrap-combobox/js/bootstrap-combobox-helper';
-import { serverError } from '@/utils/maintainer';
+import TableHelper from "@/utils/bootstrap-table-helper";
+import ComboboxHelper from "@/assets/plugins/bootstrap-combobox/js/bootstrap-combobox-helper";
+import { serverError } from "@/utils/maintainer";
 
 export default {
-    name: "RoomSerialView",
-    setup() {
-        return {};
-    },
-    created() {
-        this.$nextTick(function () {
-            this.initData();
+  name: "RoomSerialView",
+  setup() {
+    return {};
+  },
+  created() {
+    this.$nextTick(function () {
+      this.initData();
+    });
+  },
+  methods: {
+    initData() {
+      // ComboboxHelper.build(null, '#isPermit');
+      $(function () {
+        $("#table").bootstrapTable("destroy");
+        $("#table").bootstrapTable({
+          columns: [
+            { field: "userNick", title: "用户名称", align: "center", width: "20%" },
+            { field: "userErbanNo", title: "房主平台号", align: "center", width: "15%" },
+            { field: "totalGold", title: "总流水", align: "center", width: "10%" },
+            {
+              field: "normalTotalGold",
+              title: "普通礼物流水",
+              align: "center",
+              width: "10%",
+            },
+            {
+              field: "backpackTotalGold",
+              title: "背包礼物流水",
+              align: "center",
+              width: "10%",
+            },
+            { field: "totalRadish", title: "萝卜流水", align: "center", width: "10%" },
+            { field: "roomTitle", title: "房间标题", align: "center", width: "10%" },
+            { field: "executionTime", title: "统计时间", align: "center", width: "15%" },
+            { field: "executionTime", title: "统计时间", align: "center", width: "15%" },
+            {
+              field: "id",
+              title: "操作",
+              align: "center",
+              width: "10%",
+              formatter: function (val, row, index) {
+                const roomUid = row.roomUid;
+                console.log("roomUid", roomUid);
+                return (
+                  '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-info opt-detail" roomUid=' +
+                  roomUid +
+                  ">" +
+                  '<i class="glyphicon glyphicon-file"></i> 查看明细</button>' +
+                  '<button id="btnExport" name="btnExport" class="btn btn-sm btn-success opt-export" roomUid=' +
+                  roomUid +
+                  '><i class="glyphicon glyphicon-export"></i>导出明细</button>'
+                );
+              },
+            },
+          ],
+          undefinedText: 0,
+          cache: false,
+          striped: true,
+          showRefresh: false,
+          pageSize: 10,
+          pagination: true,
+          pageList: [1, 10, 20, 30, 50],
+          search: false,
+          sidePagination: "server", //表示服务端请求
+          //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
+          //设置为limit可以获取limit, offset, search, sort, order
+          queryParamsType: "undefined",
+          queryParams: function queryParams(params) {
+            //设置查询参数
+            var param = {
+              pageNumber: params.pageNumber,
+              pageSize: params.pageSize,
+              searchText: params.searchText,
+              erbanNos: $("#erbanNos").val(),
+              startTime: $("#startTime").val(),
+              endTime: $("#endTime").val(),
+              isPermit: ComboboxHelper.getSelected("#isPermit"),
+            };
+            return param;
+          },
+          toolbar: "#toolbar",
+          url: "",
+          onLoadSuccess: function () {
+            //加载成功时执行
+            console.log("load success");
+            enableRefreshBtn();
+          },
+          onLoadError: function () {
+            //加载失败时执行
+            console.log("load fail");
+          },
         });
-    },
-    methods: {
-        initData() {
-            ComboboxHelper.build(null, '#isPermit');
-            $(function () {
-                $('#table').bootstrapTable('destroy');
-                $('#table').bootstrapTable({
-                    columns: [
-                        { field: 'userNick', title: '用户名称', align: 'center', width: '20%' },
-                        { field: 'userErbanNo', title: '房主平台号', align: 'center', width: '15%' },
-                        { field: 'totalGold', title: '总流水', align: 'center', width: '10%' },
-                        { field: 'normalTotalGold', title: '普通礼物流水', align: 'center', width: '10%' },
-                        { field: 'backpackTotalGold', title: '背包礼物流水', align: 'center', width: '10%' },
-                        { field: 'totalRadish', title: '萝卜流水', align: 'center', width: '10%' },
-                        { field: 'roomTitle', title: '房间标题', align: 'center', width: '10%' },
-                        { field: 'executionTime', title: '统计时间', align: 'center', width: '15%' },
-                        { field: 'executionTime', title: '统计时间', align: 'center', width: '15%' },
-                        {
-                            field: 'id',
-                            title: '操作',
-                            align: 'center',
-                            width: '10%',
-                            formatter: function (val, row, index) {
-                                const roomUid = row.roomUid;
-                                console.log("roomUid", roomUid)
-                                return '<button id="btnDetail" name="btnDetail" class="btn btn-sm btn-info opt-detail" roomUid=' + roomUid + '>' +
-                                    '<i class="glyphicon glyphicon-file"></i> 查看明细</button>' +
-                                    '<button id="btnExport" name="btnExport" class="btn btn-sm btn-success opt-export" roomUid=' + roomUid +
-                                    '><i class="glyphicon glyphicon-export"></i>导出明细</button>';
-                            }
-                        }
-                    ],
-                    undefinedText: 0,
-                    cache: false,
-                    striped: true,
-                    showRefresh: false,
-                    pageSize: 10,
-                    pagination: true,
-                    pageList: [1, 10, 20, 30, 50],
-                    search: false,
-                    sidePagination: "server", //表示服务端请求
-                    //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
-                    //设置为limit可以获取limit, offset, search, sort, order
-                    queryParamsType: "undefined",
-                    queryParams: function queryParams(params) {   //设置查询参数
-                        var param = {
-                            pageNumber: params.pageNumber,
-                            pageSize: params.pageSize,
-                            searchText: params.searchText,
-                            erbanNos: $("#erbanNos").val(),
-                            startTime: $("#startTime").val(),
-                            endTime: $("#endTime").val(),
-                            isPermit: ComboboxHelper.getSelected("#isPermit")
-                        };
-                        return param;
-                    },
-                    toolbar: '#toolbar',
-                    url: '',
-                    onLoadSuccess: function () {  //加载成功时执行
-                        console.log("load success");
-                        enableRefreshBtn();
-                    },
-                    onLoadError: function () {  //加载失败时执行
-                        console.log("load fail");
-                    }
-                });
 
-                $('#startTime').datetimepicker({
-                    todayBtn: true,
-                    format: 'yyyy-mm-dd hh:ii:00',
-                    language: 'zh-CN',
-                    autoclose: true
-                })
+        $("#startTime").datetimepicker({
+          todayBtn: true,
+          format: "yyyy-mm-dd hh:ii:00",
+          language: "zh-CN",
+          autoclose: true,
+        });
 
-                $("#endTime").datetimepicker({
-                    todayBtn: true,
-                    format: 'yyyy-mm-dd hh:ii:00',
-                    language: 'zh-CN',
-                    autoclose: true
-                });
+        $("#endTime").datetimepicker({
+          todayBtn: true,
+          format: "yyyy-mm-dd hh:ii:00",
+          language: "zh-CN",
+          autoclose: true,
+        });
 
-                $("#room-serial-refresh").click(function () {
-                    disableRefreshBtn();
-                    $("#table").bootstrapTable('refresh', { url: '/admin/roomSerial/listByPage' });
-                })
+        $("#room-serial-refresh").click(function () {
+          disableRefreshBtn();
+          $("#table").bootstrapTable("refresh", { url: "/admin/roomSerial/listByPage" });
+        });
 
-                $("#room-serial-export").click(function () {
-                    $("#searchForm").submit();
-                })
+        $("#room-serial-export").click(function () {
+          $("#searchForm").submit();
+        });
 
-                $("#erbanNos").change(function () {
-                    ComboboxHelper.setDef("#isPermit", '0');
-                    if ($(this).val() == '') {
-                        $("#isPermit").btComboBox('enable');
-                    } else {
-                        $("#isPermit").btComboBox('disable');
-                    }
-                })
+        $("#erbanNos").change(function () {
+          ComboboxHelper.setDef("#isPermit", "0");
+          if ($(this).val() == "") {
+            $("#isPermit").btComboBox("enable");
+          } else {
+            $("#isPermit").btComboBox("disable");
+          }
+        });
 
-                function disableRefreshBtn() {
-                    $('#room-serial-refresh').attr("disabled", "true");
-                }
-
-                function enableRefreshBtn() {
-                    $('#room-serial-refresh').removeAttr("disabled");
-                }
-
-                // 导出房间流水明细
-                $('#table').on('click', '.opt-export', function () {
-                    const roomUid = $(this).attr("roomUid");
-                    const start = $('#startTime').val();
-                    const end = $('#endTime').val();
-                    console.log("--------roomUid", roomUid, start, end);
-                    window.location.href = `/admin/roomSerial/exportRoomRevenueDetail?roomUid=${roomUid}&start=${start}&end=${end}`
-                });
-
-                $('#table').on('click', '.opt-detail', function () {
-                    const roomUid = $(this).attr("roomUid");
-                    const start = $('#startTime').val();
-                    const end = $('#endTime').val();
-                    $('#roomGiftSerialDetailTable').bootstrapTable('destroy');
-                    $('#roomGiftSerialDetailTable').bootstrapTable({
-                        columns: [
-                            { field: 'num', title: '序号', align: 'center', width: '5%' },
-                            { field: 'erbanNo', title: '平台号', align: 'center', width: '5%' },
-                            { field: 'nick', title: '昵称', align: 'center', width: '5%' },
-                            { field: 'amount', title: '收礼总钻石', align: 'center', width: '5%' },
-                            { field: 'cutDiamonds', title: '房间抽成钻石', align: 'center', width: '5%' },
-                            { field: 'bigAmount', title: '大光礼物价值', align: 'center', width: '5%', },
-                            { field: 'bigNum', title: '大光礼物数量', align: 'center', width: '5%', }
-                        ],
-                        undefinedText: 0,
-                        cache: false,
-                        striped: true,
-                        showRefresh: false,
-                        pageSize: 20,
-                        pagination: true,
-                        pageList: [20, 50, 100, 200],
-                        search: false,
-                        sidePagination: "server", //表示服务端请求
-                        queryParamsType: "undefined",
-                        queryParams: function queryParams(params) {   //设置查询参数
-                            var param = {
-                                page: params.pageNumber,
-                                pageSize: params.pageSize,
-                                start: start,
-                                end: end,
-                                roomUid: roomUid,
-                            };
-                            return param;
-                        },
-                        ajax: function (request) {                    //使用ajax请求
-                            $.ajax({
-                                type: "GET",
-                                url: '/admin/roomSerial/listRoomRevenueDetail.action',
-                                contentType: 'application/json;charset=utf-8',
-                                dataType: 'json',
-                                data: request.data,
-                                success: function (res) {
-                                    console.log('res-------', res)
-                                    apiResult(res);
-                                    request.success({
-                                        rows: res.data.rows,
-                                        total: res.data.total,
-                                    });
-                                    $("#roomId").html(res.data.roomId);
-                                    $("#roomTitle").html(res.data.roomTitle);
-                                    $("#totalDiamonds").html(res.data.totalDiamonds);
-                                    $("#cutDiamonds").html(res.data.cutDiamonds);
-                                    $("#roomGiftSerialDetailModal").modal('show');
-                                },
-                                error: function (req) {
-                                    serverError(req);
-                                }
-                            })
-                        },
-                        onLoadSuccess: function (res) {  //加载成功时执行
-                            console.log("load success");
-                        },
-                        onLoadError: function () {  //加载失败时执行
-                            console.log("load fail");
-                        }
-                    });
-                });
-
-                function apiResult(json) {
-                    if (json.code == 200 && json.message == 'success') {
-                        return true;
-                    }
-                    $("#tipMsg").text("请求失败，错误信息：" + json.message);
-                    $("#tipModal").modal('show');
-                    return false;
-                }
-
-            });
+        function disableRefreshBtn() {
+          $("#room-serial-refresh").attr("disabled", "true");
         }
-    },
 
+        function enableRefreshBtn() {
+          $("#room-serial-refresh").removeAttr("disabled");
+        }
+
+        // 导出房间流水明细
+        $("#table").on("click", ".opt-export", function () {
+          const roomUid = $(this).attr("roomUid");
+          const start = $("#startTime").val();
+          const end = $("#endTime").val();
+          console.log("--------roomUid", roomUid, start, end);
+          window.location.href = `/admin/roomSerial/exportRoomRevenueDetail?roomUid=${roomUid}&start=${start}&end=${end}`;
+        });
+
+        $("#table").on("click", ".opt-detail", function () {
+          const roomUid = $(this).attr("roomUid");
+          const start = $("#startTime").val();
+          const end = $("#endTime").val();
+          $("#roomGiftSerialDetailTable").bootstrapTable("destroy");
+          $("#roomGiftSerialDetailTable").bootstrapTable({
+            columns: [
+              { field: "num", title: "序号", align: "center", width: "5%" },
+              { field: "erbanNo", title: "平台号", align: "center", width: "5%" },
+              { field: "nick", title: "昵称", align: "center", width: "5%" },
+              { field: "amount", title: "收礼总钻石", align: "center", width: "5%" },
+              {
+                field: "cutDiamonds",
+                title: "房间抽成钻石",
+                align: "center",
+                width: "5%",
+              },
+              { field: "bigAmount", title: "大光礼物价值", align: "center", width: "5%" },
+              { field: "bigNum", title: "大光礼物数量", align: "center", width: "5%" },
+            ],
+            undefinedText: 0,
+            cache: false,
+            striped: true,
+            showRefresh: false,
+            pageSize: 20,
+            pagination: true,
+            pageList: [20, 50, 100, 200],
+            search: false,
+            sidePagination: "server", //表示服务端请求
+            queryParamsType: "undefined",
+            queryParams: function queryParams(params) {
+              //设置查询参数
+              var param = {
+                page: params.pageNumber,
+                pageSize: params.pageSize,
+                start: start,
+                end: end,
+                roomUid: roomUid,
+              };
+              return param;
+            },
+            ajax: function (request) {
+              //使用ajax请求
+              $.ajax({
+                type: "GET",
+                url: "/admin/roomSerial/listRoomRevenueDetail.action",
+                contentType: "application/json;charset=utf-8",
+                dataType: "json",
+                data: request.data,
+                success: function (res) {
+                  console.log("res-------", res);
+                  apiResult(res);
+                  request.success({
+                    rows: res.data.rows,
+                    total: res.data.total,
+                  });
+                  $("#roomId").html(res.data.roomId);
+                  $("#roomTitle").html(res.data.roomTitle);
+                  $("#totalDiamonds").html(res.data.totalDiamonds);
+                  $("#cutDiamonds").html(res.data.cutDiamonds);
+                  $("#roomGiftSerialDetailModal").modal("show");
+                },
+                error: function (req) {
+                  serverError(req);
+                },
+              });
+            },
+            onLoadSuccess: function (res) {
+              //加载成功时执行
+              console.log("load success");
+            },
+            onLoadError: function () {
+              //加载失败时执行
+              console.log("load fail");
+            },
+          });
+        });
+
+        function apiResult(json) {
+          if (json.code == 200 && json.message == "success") {
+            return true;
+          }
+          $("#tipMsg").text("请求失败，错误信息：" + json.message);
+          $("#tipModal").modal("show");
+          return false;
+        }
+      });
+    },
+  },
 };
 </script>
 
 <style scoped>
 .big-tips {
-    color: red;
-    font-size: larger;
-    font-weight: bold;
+  color: red;
+  font-size: larger;
+  font-weight: bold;
 }
-</style>
+</style>

src/views/statistic/LaborStatsView.vue

@@ -144,9 +144,9 @@ export default {
                                 data: request.data,
                                 success: function (res) {
                                     apiResult(res);
-                                    console.log("res.data", res.data);
-                                    console.log("res.data.length()", res.data.length);
                                     if (res.data == null || res.data.length > 0) {
+                                        console.log("res.data", res.data);
+                                        console.log("res.data.length()", res.data.length);
                                         $("#btnSearch").attr("disabled", false);
                                         if (getCacheDataTimer) {
                                             clearInterval(getCacheDataTimer);

src/views/users/GiftManageView.vue

@@ -56,10 +56,13 @@
                                     <option value="2">普通面板礼物</option>
                                     <option value="3">福袋礼物</option>
                                     <option value="5">福袋奖池礼物</option>
+                                    <option value="1">轻聊或者竞拍房</option>
+                                    <option value="4">卡片</option>
                                     <option value="7">贵族礼物</option>
                                     <option value="8">周星榜礼物</option>
                                     <option value="9">合成礼物</option>
                                     <option value="10">涂鸦礼物</option>
+                                    <option value="11">个播人气礼物</option>
                                     <option value="15">线性福袋礼物</option>
                                 </select>
                             </div>
@@ -164,8 +167,8 @@
                         <div class="form-group">
                             <label for="giftType" class="col-sm-2 control-label">礼物类型</label>
                             <div class="col-sm-10">
-                                <select name="giftType" id="giftType" data-btn-class="btn-warning">
-                                    <option value="2">普通面板礼物</option>
+                                <select name="giftType" id="giftType" class="form-control" data-btn-class="btn-warning">
+                                    <option value="2" selected>普通面板礼物</option>
                                     <option value="3">福袋礼物</option>
                                     <option value="5">福袋奖池礼物</option>
                                     <option value="1">轻聊或者竞拍房</option>
@@ -174,6 +177,7 @@
                                     <option value="8">周星榜礼物</option>
                                     <option value="9">合成礼物</option>
                                     <option value="10">涂鸦礼物</option>
+                                    <option value="11">个播人气礼物</option>
                                     <option value="15">线性福袋礼物</option>
                                 </select>
                             </div>
@@ -548,7 +552,6 @@ import TableHelper from '@/utils/bootstrap-table-helper';
 import ComboboxHelper from '@/assets/plugins/bootstrap-combobox/js/bootstrap-combobox-helper';
 import { formatTime, showLoading, hideLoading } from '@/utils/maintainer';
 
-//ComboboxHelper.build(null, '#giftType');
 //ComboboxHelper.build(null, '#condition_type');
 //ComboboxHelper.build(null, '#nobleId');
 export default {
@@ -562,7 +565,7 @@ export default {
                 $('.noble').removeClass("hidden");
             }
             if (val == 3) {
-                ComboboxHelper.setDef("#giftType", 2);
+                $('#giftType').val(2);
                 $("#giftType").attr('readonly', true);
                 $('#roomFreeGift').removeClass("hidden");
             } else {
@@ -849,10 +852,10 @@ export default {
                     // $("#goldPrice").attr('readonly', false);
                     $("#nobleId").btComboBox('disable');
                     ComboboxHelper.setDef("#nobleId", '0');
-                    ComboboxHelper.setDef("#giftType", '2');
+                    $('#giftType').val(2);
                     $("input:radio[name='giftStatus']")[1].checked = true;
-                    $("input:radio[name='hasEffect']")[0].checked = true;
-                    $("input:radio[name='hasVggPic']")[0].checked = true;
+                    $("input:radio[name='hasEffect']")[1].checked = true;
+                    $("input:radio[name='hasVggPic']")[1].checked = true;
                     $("input:radio[name='hasSvga']")[0].checked = true;
                     $("input:radio[name='isLatest']")[1].checked = true;
                     $("input:radio[name='isTimeLimit']")[1].checked = true;
@@ -1131,7 +1134,6 @@ export default {
                                 $("#consumeType").val(consumeType);
                                 $("#consumeType").attr("disabled", true);
 
-                                ComboboxHelper.setDef("#giftType", json.entity.giftType);
                                 $('#giftType').val(json.entity.giftType);
                                 if (consumeType == 1) {
                                     ComboboxHelper.setDef("#nobleId", '0');

src/views/users/MessageAdminView.vue

@@ -7,20 +7,29 @@
                 </section>
                 <section class="content">
                     <div id="table"></div>
-                    <div id="toolbar">消息类型:<select name="msgType" id="type" class="input-m">
-                            <option value="0">文本</option>
-                            <option value="1">图片</option>
-                            <option value="100">图文</option>
-                        </select>
+                    <div id="toolbar">
+                        <label for="erbanNum" class="col-sm-2 control-label">消息类型:</label>
+                        <div class="col-sm-3">
+                            <span>
+                                <select name="msgType" id="type" class="form-control input-m">
+                                    <option value="0">文本</option>
+                                    <option value="1">图片</option>
+                                    <option value="100">图文</option>
+                                </select>
+                            </span>
+                        </div>
                         <label for="erbanNum" class="col-sm-2 control-label">平台号:</label>
                         <div class="col-sm-3">
-                            <span><input type="text" class="form-control validate[required]" name="erbanNo"
-                                    id="erbanNum"></span>
+                            <span>
+                                <input type="text" class="form-control validate[required]" name="erbanNo" id="erbanNum">
+                            </span>
+                        </div>
+                        <div class="col-sm-12">
+                            <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
+                            <button id="add" class="btn btn-sm btn-default">
+                                <i class="glyphicon glyphicon-plus"></i>增加
+                            </button>
                         </div>
-                        <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
-                        <button id="add" class="btn btn-default">
-                            <i class="glyphicon glyphicon-plus"></i>增加
-                        </button>
                     </div>
                 </section>
             </div>
@@ -40,7 +49,7 @@
                         <div class="form-group">
                             <label for="receiver" class="col-sm-3 control-label">接收者：</label>
                             <div class="col-sm-8">
-                                <select name="receivers" id="receiver" class="col-sm-3">
+                                <select name="receivers" id="receiver" class="col-sm-3 form-control">
                                     <option value=1>所有用户</option>
                                     <option value=0>指定用户</option>
                                 </select>
@@ -50,7 +59,7 @@
                         <div class="form-group" id="appIdDiv">
                             <label for="appId" class="col-sm-3 control-label">渠道：</label>
                             <div class="col-sm-8">
-                                <select name="appId" id="appId" class="col-sm-3">
+                                <select name="appId" id="appId" class="col-sm-3 form-control">
                                     <option value="">全部</option>
                                     <option value="official">安卓官方包</option>
                                     <option value="google">安卓谷歌包</option>
@@ -63,7 +72,7 @@
                         <div class="form-group">
                             <label for="msgType" class="col-sm-3 control-label">消息类型：</label>
                             <div class="col-sm-8">
-                                <select name="msgTypeList" id="msgType" class="col-sm-3">
+                                <select name="msgTypeList" id="msgType" class="col-sm-3 form-control">
                                     <option value="0">文本</option>
                                     <option value="1">图片</option>
                                     <option value="100">图文</option>
@@ -74,13 +83,14 @@
                         <div class="form-group" id="skipUrlDiv">
                             <label for="skip" class="col-sm-3 control-label">跳转来源：</label>
                             <div class="col-sm-8">
-                                <select name="skip" id="skip" class="col-sm-3">
+                                <select name="skip" id="skip" class="col-sm-3 form-control">
                                     <option value="">无</option>
                                     <option value="2">跳H5页面</option>
                                     <option value="1" id="skipRoomType">跳转房间</option>
                                 </select>
                             </div>
-                            <div class="col-sm-6">
+                            <label for="skipUrlContent" class="col-sm-3 control-label"></label>
+                            <div class="col-sm-8">
                                 <input type="text" class="form-control" name="skipUri" id="skipUrlContent">
                             </div>
                         </div>
@@ -125,13 +135,24 @@
                                     class="form-control validate[required]" />
                             </div>
                         </div>
-
                         <div class="form-group">
                             <label for="pushTime" class="col-sm-3 control-label">推送时间(非必填)：</label>
-                            <div class="col-sm-9">
+                            <div class="col-sm-8">
                                 <input type="text" class="input-sm form-control datetime" name="pushTime" id="pushTime">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="ignoreVersion" class="col-sm-3 control-label">不接收用户版本(非必填)：</label>
+                            <div class="col-sm-8">
+                                <input type="text" class="input-sm form-control" name="ignoreVersion" id="ignoreVersion">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="ignoreChannel" class="col-sm-3 control-label">不接收用户渠道(非必填)：</label>
+                            <div class="col-sm-8">
+                                <input type="text" class="input-sm form-control" name="ignoreChannel" id="ignoreChannel">
+                            </div>
+                        </div>
                     </form>
                 </div>
                 <div class="modal-footer">
@@ -367,7 +388,9 @@ export default {
                                     skipType: $('#skip').val(),
                                     skipContent: $('#skipUrlContent').val(),
                                     appId: $("#appId").val(),
-                                    pushTime: $("#pushTime").val()
+                                    pushTime: $("#pushTime").val(),
+                                    ignoreVersion: $('#ignoreVersion').val(),
+                                    ignoreChannel: $('#ignoreChannel').val(),
                                 },
                                 dataType: 'json',
                                 success: function (data) {