新增banner跳转来源

src/api/nobleman/nobleman.js

@@ -261,3 +261,21 @@ export const removeMember = query => {
         params: query
     });
 };
+
+// -审核列表
+export const guildApplyList = query => {
+    return request({
+        url: '/admin/guildApply/list',
+        method: 'get',
+        params: query
+    });
+};
+
+// -审核操作
+export const guildApplyAudit = query => {
+    return request({
+        url: '/admin/guildApply/audit',
+        method: 'post',
+        params: query
+    });
+};

src/api/personalHomepageResourceManagement/personalHomepageResourceManagement.js

@@ -0,0 +1,52 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+import qs from 'qs';
+
+// 地区接口
+export const listPartitionInfo = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};
+// 个人主页资源管理列表
+export const pesonalBackgroundListByPage = query => {
+    return request({
+        url: '/admin/pesonalBackground/listByPage',
+        method: 'get',
+        params: query
+    });
+};
+// 个人主页资源管理赠送
+export const pesonalBackgroundListSend = query => {
+    return request({
+        url: '/admin/pesonalBackground/send',
+        method: 'get',
+        params: query
+    });
+};
+// 个人主页资源管理保存
+export const pesonalBackgroundSaveOrUpdate = query => {
+    return request({
+        url: '/admin/pesonalBackground/saveOrUpdate',
+        method: 'post',
+        params: query
+    });
+};
+// 个人主页记录管理&个人赠送记录
+export const pesonalBackgroundListRecordByPage = query => {
+    return request({
+        url: '/admin/pesonalBackground/listRecordByPage',
+        method: 'get',
+        params: query
+    });
+};
+// 个人赠送记录撤回
+export const pesonalBackgroundListRecordRecoveryPersonalBackground = query => {
+    return request({
+        url: '/admin/pesonalBackground/recoveryPersonalBackground',
+        method: 'get',
+        params: query
+    });
+};

src/api/refund/refund.js

@@ -0,0 +1,34 @@
+import request from '@/utils/request';
+import qs from 'qs';
+import { genQueryParam } from '@/utils/maintainer';
+// 活动配置 相关接口（一级菜单：活动配置）
+
+// 分区接口
+export const listPartitionInfo = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};
+// 国家
+export const regionInfoList = query => {
+    return request({
+        url: '/admin/regionInfo/list',
+        method: 'get',
+        params: query
+    });
+};
+// 列表
+export const refundList = query => {
+    return request({
+        url: '/admin/chargeRecord/refundList',
+        method: 'get',
+        params: query
+    });
+};
+// 导出
+export const refundExport = query => {
+    window.location.href = `/admin/chargeRecord/refundExport?${genQueryParam(query)}`;
+    return;
+};

src/main.js

@@ -60,6 +60,17 @@ const app = createApp(App)
 app.config.globalProperties.$copy = function (text) {
     copy(text, this);
 };
-
+// 全局错误处理
+window.onerror = function (message, source, lineno, colno, error) {
+    console.log(error)
+    // 判断是否是 'insertBefore' 错误
+    if (error instanceof TypeError && message.includes('insertBefore')) {
+        console.error('捕获到 TypeError 错误:', error);
+        window.location.reload();
+        // 你可以在这里处理错误，比如记录日志或执行其他操作
+        return true;  // 阻止浏览器默认的错误处理
+    }
+    return false;  // 默认处理其他类型的错误
+};
 app.config.warnHandler = () => null;
 app.use(store).use(router).use(components).use(VueClipboard).mount('#app')

src/utils/partitionDesc.js

@@ -0,0 +1,20 @@
+const partitionInfoMap = {
+    1: '英语区',
+    2: '阿拉伯语区',
+    4: '华语区',
+    8: '土耳其区',
+}
+
+export const partitionDesc = (val) => {
+    return Object.keys(partitionInfoMap).filter(k=>{
+        return(Number(val) & Number(k)) != 0 
+    }).map(k=>partitionInfoMap[k]).join(",");
+}
+
+export const partitionIdArr = (val) => {
+    var arr =[];
+     Object.keys(partitionInfoMap).filter(k=>{
+        return(Number(val) & Number(k)) != 0 
+    }).map(k=>arr.push(Number(k)));
+    return arr
+}

src/utils/request.js

@@ -5,7 +5,7 @@ import global from "@/constants/global";
 const service = axios.create();
 import { ElMessage } from 'element-plus'
 service.interceptors.request.use(config => {
-    console.log('config', config);
+    // console.log('config', config);
     return config;
 }, error => {
     Promise.reject(error);
@@ -13,7 +13,7 @@ service.interceptors.request.use(config => {
 
 service.interceptors.response.use(res => {
     userLogout(res.headers[global.NEED_LOGOUT.toLowerCase()]);
-    console.log('res.data', res);
+    // console.log('res.data', res);
     // if (res.data.code == 200) {
         // ElMessage({
         //     message: "成功",

src/views/charge/ChargeRegionView.vue

@@ -11,21 +11,23 @@
         <div id="toolbar">
           <div class="col-sm-12">
             <label for="searchType"
-                   class="col-sm-4 control-label">地区:</label>
+                   class="col-sm-2 control-label">地区:</label>
-            <div class="col-sm-6">
+            <div class="col-sm-8">
               <select name="searchType"
                       id="searchType"
                       data-btn-class="btn-warning"
                       class="form-control">
               </select>
             </div>
-          </div>
+            <div class="col-sm-2">
-          <button id="btnSearch"
+              <button id="btnSearch" class="btn btn-default">
-                  class="btn btn-default">
                 <i class="glyphicon glyphicon-search"></i>查询
               </button>
             </div>
           </div>
+
+        </div>
+      </div>
       <div class="box-body"
            style="height:150%;">
         <!-- Content Header (Page header) -->
@@ -60,9 +62,6 @@
             <input type="hidden"
                    name="code"
                    id="code" />
-            <input type="hidden"
-                   name="currency"
-                   id="currency" />
             <input type="hidden"
                    name="type"
                    id="type" />
@@ -76,9 +75,19 @@
                        id="name">
               </div>
             </div>
+            <div class="form-group">
+              <label for="currency"
+                     class="col-sm-3 control-label">货币：</label>
+              <div class="col-sm-9">
+                <input type="text"
+                       readonly
+                       class="form-control"
+                       id="currency">
+              </div>
+            </div>
             <div class="form-group">
               <label for="rate"
-                     class="col-sm-3 control-label">USD汇率：</label>
+                     class="col-sm-3 control-label">兑USD汇率：</label>
               <div class="col-sm-9">
                 <input type="text"
                        class="form-control"
@@ -324,9 +333,10 @@ export default {
         $('#regionTable').bootstrapTable({
           columns: [
             { field: 'name', title: '地区', align: 'center', width: '5%' },
+            { field: 'currency', title: '货币', align: 'center', width: '5%'},
             {
               field: 'rate',
-              title: 'USD汇率',
+              title: '兑USD汇率',
               align: 'center',
               width: '5%',
               formatter: function (val, row, index) {
@@ -430,7 +440,7 @@ export default {
                 return '<img src="' + val + '" style="width:90px;height:90px;" alt="">'
               }
             },
-            { field: 'regionName', title: '地区', align: 'center', width: '5%' },
+            { field: 'currency', title: '货币', align: 'center', width: '5%' },
             {
               field: 'isEnabled',
               title: '是否展示在充值H5',
@@ -823,7 +833,7 @@ export default {
           var $select = $('#searchType');
           for (let i = 0; i < array.length; i++) {
             var $option = $('<option value="' + array[i].type + '" />');
-            $option.html(array[i].name);
+            $option.html(array[i].desc + '(' + array[i].name + ')');
             if (i == 0) {
               $option.attr('selected', true);
             }

src/views/chatbubble/ChatbubbleManageView.vue

@@ -100,6 +100,7 @@
                                 <input type="text" class="form-control validate[required]" name="name" id="tr_modal_name" placeholder="请输入气泡名称">
                             </div>
                         </div>
+                        <form class="form-horizontal" id="addForm1">
                             <div class="form-group">
                                 <label class="col-sm-4 control-label">安卓图片:</label>
                                 <div class="col-sm-6">
@@ -111,6 +112,8 @@
                                     <input type="hidden" id="androidUrl" name="androidUrl" class="form-control" />
                                 </div>
                             </div>
+                        </form>
+                        <form class="form-horizontal" id="addForm2">
                             <div class="form-group" >
                                 <label class="col-sm-4 control-label">IOS图片:</label>
                                 <div class="col-sm-6">
@@ -122,6 +125,7 @@
                                     <input type="hidden" id="iosUrl" name="iosUrl" class="form-control" />
                                 </div>
                             </div>
+                        </form>
                         <div class="form-group">
                             <label for="status" class="col-sm-4 control-label">装扮状态:</label>
                             <div class="col-sm-6">
@@ -422,28 +426,39 @@ export default {
                 });
 
 
-                $("[name='uploadBtn']").on('click', function () {
+                $("#addAndroidIconPicUrl_androidUrl").on('click', function () {
-                    let id = $(this).attr('id');
-                    let b = id.split("_");
-                    let imageId = b[0];
-                    let inputId = b[1];
-                    console.log(imageId)
-                    console.log(inputId)
                     var options = {
                         type: 'post',
                         url: '/admin/upload/img',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
-                                $("#" + inputId).val(json.path);
+                                $("#addAndroidIconPicUrl").val(json.path);
-                                $("#" + imageId).attr("src", json.path);
+                                $("#addAndroidIconPicUrl").attr("src", json.path);
                             } else {
                                 $("#tipMsg").text(json.msg);
                                 $("#tipModal").modal('show');
                             }
                         }
                     };
-                    $("#addForm").ajaxSubmit(options);
+                    $("#addForm1").ajaxSubmit(options);
+                });
+                $("#addIosIconPicUrl_iosUrl").on('click', function () {
+                    var options = {
+                        type: 'post',
+                        url: '/admin/upload/img',
+                        dataType: 'json',
+                        success: function (json) {
+                            if (json.path) {
+                                $("#addIosIconPicUrl").val(json.path);
+                                $("#addIosIconPicUrl").attr("src", json.path);
+                            } else {
+                                $("#tipMsg").text(json.msg);
+                                $("#tipModal").modal('show');
+                            }
+                        }
+                    };
+                    $("#addForm2").ajaxSubmit(options);
                 });
 
 
@@ -484,6 +499,8 @@ export default {
                         partitionFlag |= partitionFlagArray[i].value;
                     }
                     formData.partitionFlag = partitionFlag;
+                    formData.androidUrl = $('#addAndroidIconPicUrl').attr('src');
+                    formData.iosUrl = $('#addIosIconPicUrl').attr('src');
                     // 将修改后的对象转换回序列化字符串
                     let newSerializeStr = $.param(formData);
                     //做下数据校验

src/views/dressShop/DressShopAdminView.vue

@@ -7,140 +7,221 @@
           <h1 id="itemTitle"></h1>
         </section>
         <div id="toolbar">
+          <el-form-item label="装扮类型" prop="dateCycle">
+            <el-select placeholder="请选择" v-model="dressTypeVal">
+              <el-option
+                v-for="(item, i) in dressTypeArr"
+                :key="i"
+                :label="item.desc"
+                :value="item.val"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="获得方式" prop="dateCycle">
+            <el-select placeholder="请选择" v-model="obtainWayVal">
+              <el-option
+                v-for="(item, i) in obtainWayArr"
+                :key="i"
+                :label="item.desc"
+                :value="item.val"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <div class="col-sm-12">
-            <button id="btnAdd"
+            <button
-                    class="btn btn-default">
+              id="btnAdd"
+              class="btn btn-default"
+              style="margin-right: 20px"
+            >
               <i class="glyphicon glyphicon-plus"></i>增加
             </button>
+            <button @click="initData" id="getData" class="btn btn-default">
+              查询
+            </button>
           </div>
-
         </div>
       </div>
 
       <!-- .content -->
       <div id="table"></div>
-
     </div>
   </section>
 
-  <div class="modal fade"
+  <div
+    class="modal fade"
     id="roomTagModal"
     tabindex="-1"
     role="dialog"
-       aria-labelledby="modalLabel">
+    aria-labelledby="modalLabel"
-    <div class="modal-dialog"
+  >
-         role="document">
+    <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button"
+          <button
+            type="button"
             class="close"
             data-dismiss="modal"
-                  aria-label="Close"><span aria-hidden="true">&times;</span>
+            aria-label="Close"
+          >
+            <span aria-hidden="true">&times;</span>
           </button>
-          <h4 class="modal-title"
+          <h4 class="modal-title" id="modalLabel">新增</h4>
-              id="modalLabel">新增</h4>
         </div>
         <div class="modal-body">
-          <form class="form-horizontal"
+          <form class="form-horizontal" id="addForm">
-                id="addForm">
+            <input type="hidden" name="id" id="id" />
-            <input type="hidden"
-                   name="id"
-                   id="id" />
             <div class="form-group">
-              <label for="dressType"
+              <label for="dressType" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">装扮类型:</label>
+                >装扮类型:</label
+              >
               <div class="col-sm-9">
-                <select name="dressType"
+                <select name="dressType" id="dressType">
-                        id="dressType">
                   <option value="">-- 请选择 --</option>
                   <option value="0">头饰</option>
                   <option value="1">座驾</option>
                   <option value="2">铭牌</option>
                   <option value="3">资料卡</option>
                   <option value="4">聊天气泡</option>
+                  <option value="5">个人装扮</option>
                 </select>
               </div>
             </div>
-            <div class="form-group"
+            <div class="form-group">
-                 id="txtBox">
+              <label for="obtainWay" class="col-sm-3 control-label"
-              <label for="dressId"
+                >获得方式:</label
-                     class="col-sm-3 control-label">装扮id<font color="red">*</font>：</label>
+              >
               <div class="col-sm-9">
-                <input type="text"
+                <select name="obtainWay" id="obtainWay">
+                  <option value="">-- 请选择 --</option>
+                  <option value="1">普通</option>
+                  <option value="2">活动</option>
+                </select>
+              </div>
+            </div>
+            <div class="form-group" id="txtBox">
+              <label for="dressId" class="col-sm-3 control-label"
+                >装扮id<font color="red">*</font>：</label
+              >
+              <div class="col-sm-9">
+                <input
+                  type="text"
                   class="form-control validate[required]"
                   name="dressId"
                   id="dressId"
-                       placeholder="请输入对应的装扮id">
+                  placeholder="请输入对应的装扮id"
+                />
               </div>
             </div>
             <div class="form-group">
-              <label for="dressSeq"
+              <label for="dressSeq" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">展示排序<font color="red">*</font>：</label>
+                >展示排序<font color="red">*</font>：</label
+              >
               <div class="col-sm-9">
-                <input type="text"
+                <input
+                  type="text"
                   class="form-control validate[required]"
                   name="dressSeq"
                   id="dressSeq"
-                       placeholder="数字小的排前面，必填">
+                  placeholder="数字小的排前面，必填"
+                />
               </div>
             </div>
             <div class="form-group">
-              <label for="dressPrice"
+              <label for="dressPrice" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">装扮价格:</label>
+                >装扮价格:</label
+              >
               <div class="col-sm-9">
-                <input type="text"
+                <input
+                  type="text"
                   class="form-control validate[required]"
                   name="dressPrice"
                   id="dressPrice"
-                       placeholder="请输入价格">
+                  placeholder="请输入价格"
+                />
               </div>
             </div>
             <div class="form-group">
-              <label for="dressDay"
+              <label for="dressDay" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">有效期（天）:</label>
+                >有效期（天）:</label
+              >
               <div class="col-sm-9">
-                <input type="text"
+                <input
+                  type="text"
                   class="form-control validate[required]"
                   name="dressDay"
                   id="dressDay"
-                       placeholder="请输入天数">
+                  placeholder="请输入天数"
+                />
               </div>
             </div>
             <div class="form-group">
-              <label for="dressLimitStatus"
+              <label for="dressLimitStatus" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">装扮限时状态:</label>
+                >装扮限时状态:</label
+              >
               <div class="col-sm-9">
-                <select name="dressType"
+                <select name="dressType" id="dressLimitStatus">
-                        id="dressLimitStatus">
                   <option value="0">是</option>
                   <option value="1">否</option>
                 </select>
               </div>
             </div>
+            <div class="form-group">
+              <label for="vipLimit" class="col-sm-3 control-label"
+                >贵族限定:</label
+              >
+              <div class="col-sm-9">
+                <select name="dressType" id="vipLimit">
+                  <option value="0">无限制</option>
+                  <option value="1">VIP1</option>
+                  <option value="2">VIP2</option>
+                  <option value="3">VIP3</option>
+                  <option value="4">VIP4</option>
+                  <option value="5">VIP5</option>
+                  <option value="6">VIP6</option>
+                  <option value="7">VIP7</option>
+                  <option value="8">VIP8</option>
+                  <option value="9">VIP9</option>
+                </select>
+              </div>
+            </div>
           </form>
         </div>
         <div class="modal-footer">
-          <button type="button"
+          <button type="button" class="btn btn-default" data-dismiss="modal">
-                  class="btn btn-default"
+            关闭
-                  data-dismiss="modal">关闭</button>
+          </button>
-          <button type="button"
+          <button type="button" class="btn btn-primary" id="add">确定</button>
-                  class="btn btn-primary"
-                  id="add">确定</button>
         </div>
-
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import TableHelper from '@/utils/bootstrap-table-helper';
+import TableHelper from "@/utils/bootstrap-table-helper";
-import { serverError } from '@/utils/maintainer';
+import { serverError } from "@/utils/maintainer";
 
 export default {
   name: "DressShopAdminView",
-  setup () {
+  data() {
-    return {};
+    return {
+      dressTypeVal: "",
+      dressTypeArr: [
+        { desc: "全部", val: "" },
+        { desc: "头饰", val: "0" },
+        { desc: "座驾", val: "1" },
+        { desc: "铭牌", val: "2" },
+        { desc: "资料卡", val: "3" },
+        { desc: "聊天气泡", val: "4" },
+        { desc: "个人装扮", val: "5" },
+      ],
+      obtainWayVal: "",
+      obtainWayArr: [
+        { desc: "全部", val: "" },
+        { desc: "普通", val: "1" },
+        { desc: "活动", val: "2" },
+      ],
+    };
   },
   created() {
     this.$nextTick(function () {
@@ -149,81 +230,209 @@ export default {
   },
   methods: {
     initData() {
-      $(function () {
+      var dressTypeVal = this.dressTypeVal;
-        $('#table').bootstrapTable('destroy');
+      var obtainWayVal = this.obtainWayVal;
-        $('#table').bootstrapTable({
+      $("#table").bootstrapTable("destroy");
+      $("#table").bootstrapTable({
         columns: [
-            { field: 'id', title: 'ID', align: 'center', valign: 'middle', width: '10%' },
-            { field: 'dressId', title: '装扮id', align: 'center', valign: 'middle', width: '10%' },
-            { field: 'name.zh', title: '装扮名称', align: 'left', valign: 'middle', width: '10%' },
-            { field: 'name.ar', title: '阿语装扮名称', align: 'left', valign: 'middle', width: '10%' },
-            { field: 'name.en', title: '英语装扮名称', align: 'left', valign: 'middle', width: '10%' },
-            { field: 'name.tr', title: '土耳其装扮名称', align: 'left', valign: 'middle', width: '10%' },
           {
-              field: 'pic', title: '装扮图片', align: 'left', valign: 'middle', width: '10%',
+            field: "id",
-              formatter: function (val, row, index) {
+            title: "ID",
-                if (null != val && val != '') {
+            align: "center",
-                  return '<img src="' + val + '" alt="" style="width: 30px; height: 30px;">';
+            valign: "middle",
-                }
+            width: "10%",
-                return '-';
-              }
           },
           {
-              field: 'dressType',
+            field: "dressId",
-              title: '装扮类型',
+            title: "装扮id",
-              align: 'center',
+            align: "center",
-              width: '5%',
+            valign: "middle",
-              valign: 'middle',
+            width: "10%",
+          },
+          {
+            field: "name.zh",
+            title: "装扮名称",
+            align: "left",
+            valign: "middle",
+            width: "10%",
+          },
+          {
+            field: "name.ar",
+            title: "阿语装扮名称",
+            align: "left",
+            valign: "middle",
+            width: "10%",
+          },
+          {
+            field: "name.en",
+            title: "英语装扮名称",
+            align: "left",
+            valign: "middle",
+            width: "10%",
+          },
+          {
+            field: "pic",
+            title: "装扮图片",
+            align: "left",
+            valign: "middle",
+            width: "10%",
             formatter: function (val, row, index) {
-                if (val == '0') {
+              if (null != val && val != "") {
+                return (
+                  '<img src="' +
+                  val +
+                  '" alt="" style="width: 30px; height: 30px;">'
+                );
+              }
+              return "-";
+            },
+          },
+          {
+            field: "dressType",
+            title: "装扮类型",
+            align: "center",
+            width: "5%",
+            valign: "middle",
+            formatter: function (val, row, index) {
+              if (val == "0") {
                 return "头饰";
-                } else if (val == '1') {
+              } else if (val == "1") {
-                  return '座驾';
+                return "座驾";
-                } else if (val == '2') {
+              } else if (val == "2") {
-                  return '铭牌';
+                return "铭牌";
-                } else if (val == '3') {
+              } else if (val == "3") {
-                  return '资料卡';
+                return "资料卡";
-                } else if (val == '4') {
+              } else if (val == "4") {
-                  return '聊天气泡';
+                return "聊天气泡";
+              } else if (val == "5") {
+                return "个人装扮";
               } else {
-                  return '-';
+                return "-";
               }
-              }
-
             },
-            { field: 'dressSeq', title: '装扮排序', align: 'center', valign: 'middle', width: '10%' },
+          },
-            { field: 'dressPrice', title: '装扮展示价值', align: 'center', valign: 'middle', width: '10%' },
-            { field: 'dressDay', title: '装扮有效期（天）', align: 'center', valign: 'middle', width: '10%' },
-            { field: 'buyNum', title: '购买数量', align: '购买数量   ', valign: 'middle', width: '10%' },
-            { field: 'userDonateNum', title: '购买赠送用户数量', align: '购买数量', valign: 'middle', width: '10%' },
           {
-              field: 'dressLimitStatus',
+            field: "obtainWay",
-              title: '装扮限时状态',
+            title: "获得方式",
-              align: 'center',
+            align: "center",
-              width: '5%',
+            width: "5%",
-              valign: 'middle',
+            valign: "middle",
             formatter: function (val, row, index) {
-                if (val == '0') {
+              if (val == "1") {
+                return "普通";
+              } else if (val == "2") {
+                return "活动";
+              } else {
+                return "-";
+              }
+            },
+          },
+          {
+            field: "dressSeq",
+            title: "装扮排序",
+            align: "center",
+            valign: "middle",
+            width: "10%",
+          },
+          {
+            field: "dressPrice",
+            title: "装扮展示价值",
+            align: "center",
+            valign: "middle",
+            width: "10%",
+          },
+          {
+            field: "dressDay",
+            title: "装扮有效期（天）",
+            align: "center",
+            valign: "middle",
+            width: "10%",
+          },
+          {
+            field: "buyNum",
+            title: "购买数量",
+            align: "购买数量   ",
+            valign: "middle",
+            width: "10%",
+          },
+          {
+            field: "userDonateNum",
+            title: "购买赠送用户数量",
+            align: "购买数量",
+            valign: "middle",
+            width: "10%",
+          },
+          {
+            field: "dressLimitStatus",
+            title: "装扮限时状态",
+            align: "center",
+            width: "5%",
+            valign: "middle",
+            formatter: function (val, row, index) {
+              if (val == "0") {
                 return "有效";
               } else {
-                  return '无效';
+                return "无效";
               }
-              }
+            },
-
           },
           {
-              field: 'id',
+            field: "vipLimit",
-              title: '操作',
+            title: "贵族限定",
-              align: 'center',
+            align: "center",
-              width: '10%',
+            width: "5%",
+            valign: "middle",
             formatter: function (val, row, index) {
-                return '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" data-id=' + val + '>' +
+              if (val == "1") {
+                return "VIP1";
+              }
+              if (val == "2") {
+                return "VIP2";
+              }
+              if (val == "3") {
+                return "VIP3";
+              }
+              if (val == "4") {
+                return "VIP4";
+              }
+              if (val == "5") {
+                return "VIP5";
+              }
+              if (val == "6") {
+                return "VIP6";
+              }
+              if (val == "7") {
+                return "VIP7";
+              }
+              if (val == "8") {
+                return "VIP8";
+              }
+              if (val == "9") {
+                return "VIP9";
+              } else {
+                return "无限制";
+              }
+            },
+          },
+          {
+            field: "id",
+            title: "操作",
+            align: "center",
+            width: "10%",
+            formatter: function (val, row, index) {
+              return (
+                '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" data-id=' +
+                val +
+                ">" +
                 '<i class="glyphicon glyphicon-edit"></i> 编辑</button>' +
-                  '&nbsp;&nbsp;<button class="btn btn-sm btn-danger opt-remove" data-id=' + val + ' data-new-status=' + 2 +
+                '&nbsp;&nbsp;<button class="btn btn-sm btn-danger opt-remove" data-id=' +
-                  '><i class="glyphicon glyphicon-remove"></i>删除</button>';
+                val +
-
+                " data-new-status=" +
-              }
+                2 +
-            }
+                '><i class="glyphicon glyphicon-remove"></i>删除</button>'
+              );
+            },
+          },
         ],
         undefinedText: "-",
         cache: false,
@@ -235,28 +444,32 @@ export default {
         search: false,
         sidePagination: "server", //表示服务端请求
         queryParamsType: "undefined",
-          queryParams: function queryParams (params) {   //设置查询参数
+        queryParams: function queryParams(params) {
+          //设置查询参数
           var param = {
             pageNum: params.pageNumber,
-              pageSize: params.pageSize
+            pageSize: params.pageSize,
+            dressType: dressTypeVal,
+            obtainWay: obtainWayVal,
           };
           return param;
         },
-          ajax: function (request) {                    //使用ajax请求
+        ajax: function (request) {
+          //使用ajax请求
           $.ajax({
             type: "GET",
-              url: '/admin/dress/shop/list',
+            url: "/admin/dress/shop/list",
-              contentType: 'application/json;charset=utf-8',
+            contentType: "application/json;charset=utf-8",
-              dataType: 'json',
+            dataType: "json",
             data: request.data,
             success: function (res) {
               apiResult(res);
-                console.log(res)
+              console.log(res);
               request.success({
                 total: res.data.total,
-                  rows: res.data.rows.map(i => {
+                rows: res.data.rows.map((i) => {
                   let value = i.name;
-                    if (value.startsWith('{') && value.endsWith('}')) {
+                  if (value.startsWith("{") && value.endsWith("}")) {
                     i.name = JSON.parse(i.name);
                   } else {
                     i.name = {
@@ -266,46 +479,48 @@ export default {
                     };
                   }
                   return i;
-                  })
+                }),
               });
             },
             error: function (req) {
               serverError(req);
-              }
-            })
             },
-          toolbar: '#toolbar',
+          });
-          onLoadSuccess: function () {  //加载成功时执行
+        },
+        toolbar: "#toolbar",
+        onLoadSuccess: function () {
+          //加载成功时执行
           console.log("load success");
         },
-          onLoadError: function () {  //加载失败时执行
+        onLoadError: function () {
+          //加载失败时执行
           console.log("load fail");
-          }
+        },
       });
 
-
       // 查询刷新
-        $('#btnSearch').on('click', function () {
+      $("#btnSearch").on("click", function () {
-          TableHelper.doRefresh('#table');
+        TableHelper.doRefresh("#table");
       });
 
-
       //新建标签
       $("#btnAdd").click(function () {
         clearModal();
-          $("#roomTagModal").modal('show');
+        $("#roomTagModal").modal("show");
       });
 
       $("#add").click(function () {
         var id = $("#id").val();
-          var dressType = $('#dressType').val();
+        var dressType = $("#dressType").val();
+        var obtainWay = $("#obtainWay").val();
         var dressId = $("#dressId").val();
-          var dressSeq = $('#dressSeq').val();
+        var dressSeq = $("#dressSeq").val();
-          var dressPrice = $('#dressPrice').val();
+        var dressPrice = $("#dressPrice").val();
-          var dressDay = $('#dressDay').val();
+        var dressDay = $("#dressDay").val();
-          var dressLimitStatus = $('#dressLimitStatus').val();
+        var dressLimitStatus = $("#dressLimitStatus").val();
+        var vipLimit = $("#vipLimit").val();
 
-          if ($("#addForm").validationEngine('validate')) {
+        if ($("#addForm").validationEngine("validate")) {
           $.ajax({
             type: "post",
             url: "/admin/dress/shop/saveOrUpdate",
@@ -313,31 +528,32 @@ export default {
               id: id,
               dressId: dressId,
               dressType: dressType,
+              obtainWay: obtainWay,
               dressSeq: dressSeq,
               dressPrice: dressPrice,
               dressDay: dressDay,
               dressLimitStatus: dressLimitStatus,
+              vipLimit: vipLimit,
             },
             dataType: "json",
             success: function (json) {
               if (json.code == 200) {
                 $("#tipMsg").text("保存成功");
-                  $("#tipModal").modal('show');
+                $("#tipModal").modal("show");
                 TableHelper.doRefresh("#table");
-                  $("#roomTagModal").modal('hide');
+                $("#roomTagModal").modal("hide");
               } else {
                 $("#tipMsg").text("保存失败." + json.message);
-                  $("#tipModal").modal('show');
+                $("#tipModal").modal("show");
                 TableHelper.doRefresh("#table");
-                  $("#roomTagModal").modal('hide');
+                $("#roomTagModal").modal("hide");
-                }
               }
+            },
           });
         }
-
       });
 
-        $("#table").on("click", '.opt-edit', function () {
+      $("#table").on("click", ".opt-edit", function () {
         var id = $(this).attr("data-id");
         clearModal();
 
@@ -350,116 +566,113 @@ export default {
             var json = res.data;
             if (json) {
               $("#id").val(id);
-                $('#dressId').val(json.dressId);
+              $("#dressId").val(json.dressId);
-                $('#dressType').val(json.dressType);
+              $("#dressType").val(json.dressType);
-                $('#dressSeq').val(json.dressSeq);
+              $("#obtainWay").val(json.obtainWay);
-                $('#dressPrice').val(json.dressPrice);
+              $("#dressSeq").val(json.dressSeq);
-                $('#dressDay').val(json.dressDay);
+              $("#dressPrice").val(json.dressPrice);
-                $('#dressLimitStatus').val(json.dressLimitStatus);
+              $("#dressDay").val(json.dressDay);
+              $("#dressLimitStatus").val(json.dressLimitStatus);
+              $("#vipLimit").val(json.vipLimit);
               // 打开编辑弹窗
-                $("#roomTagModal").modal('show');
+              $("#roomTagModal").modal("show");
               $("#modalLabel").text("编辑");
             } else {
               $("#tipMsg").text("获取信息出错");
-                $("#tipModal").modal('show');
+              $("#tipModal").modal("show");
-              }
             }
+          },
         });
       });
 
-        $("#table").on("click", '.opt-remove', function () {
+      $("#table").on("click", ".opt-remove", function () {
         var id = $(this).attr("data-id");
 
-          if (confirm("你确认删除该记录吗? \r\n 删除后再也不能找回，请谨慎操作！")) {
+        if (
+          confirm("你确认删除该记录吗? \r\n 删除后再也不能找回，请谨慎操作！")
+        ) {
           const requestParam = {
-              id: id
+            id: id,
-            }
+          };
 
           $.ajax({
             type: "get",
             url: "/admin/dress/shop/delById",
             data: requestParam,
             dataType: "json",
-              contentType: 'application/json',
+            contentType: "application/json",
             success: function (json) {
               if (json.code == 200) {
                 $("#tipMsg").text("修改成功");
-                  $("#tipModal").modal('show');
+                $("#tipModal").modal("show");
                 TableHelper.doRefresh("#table");
               } else {
                 $("#tipMsg").text("修改失败." + json.message);
-                  $("#tipModal").modal('show');
+                $("#tipModal").modal("show");
-                }
               }
+            },
           });
         }
       });
 
-
-
       function apiResult(json) {
-          if (json.code == 200 && json.message == 'success') {
+        if (json.code == 200 && json.message == "success") {
           return true;
         }
         $("#tipMsg").text("请求失败，错误信息：" + json.message);
-          $("#tipModal").modal('show');
+        $("#tipModal").modal("show");
         return false;
       }
 
-
+      $("#iconBtn").on("click", function () {
-        $('#iconBtn').on('click', function () {
+        if ($("#iconFile").val() == "") {
-          if ($('#iconFile').val() == '') {
+          $("#tipMsg").text("上传图片为空");
-            $('#tipMsg').text('上传图片为空');
+          $("#tipModal").modal("show");
-            $('#tipModal').modal('show');
           return;
         }
         $.ajaxFileUpload({
-            fileElementId: 'iconFile',    //需要上传的文件域的ID，即<input type="file">的ID。
+          fileElementId: "iconFile", //需要上传的文件域的ID，即<input type="file">的ID。
-            url: '/admin/upload/img', //后台方法的路径
+          url: "/admin/upload/img", //后台方法的路径
-            type: 'post',   //当要提交自定义参数时，这个参数要设置成post
+          type: "post", //当要提交自定义参数时，这个参数要设置成post
-            dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
+          dataType: "json", //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
           secureuri: false, //是否启用安全提交，默认为false。
           async: true, //是否是异步
-            success: function (json) {   //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
+          success: function (json) {
+            //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
             if (json.path) {
-                $('#iconUrl').val(json.path);
+              $("#iconUrl").val(json.path);
-                $('#iconImgUrl').attr("src", json.path);
+              $("#iconImgUrl").attr("src", json.path);
 
               console.log(json.path);
-
             } else {
               $("#tipMsg").text(json.msg);
-                $("#tipModal").modal('show');
+              $("#tipModal").modal("show");
             }
           },
-            error: function (data, status, e) {  //提交失败自动执行的处理函数。
+          error: function (data, status, e) {
+            //提交失败自动执行的处理函数。
             console.error(e);
-            }
+          },
+        });
       });
-        })
 
       function clearModal() {
-          $('#iconImgUrl').attr('src', '');
+        $("#iconImgUrl").attr("src", "");
 
-          $('#addForm').find('input[type=text],input[type=hidden],input[type=file]').each(function () {
+        $("#addForm")
-            $(this).val('');
+          .find("input[type=text],input[type=hidden],input[type=file]")
-          })
+          .each(function () {
-
+            $(this).val("");
-          $('#type').val(1);
+          });
 
+        $("#type").val(1);
       }
 
-
       $("#type").change(function () {
         var optVal = $(this).val();
       });
-
-
-
-      });
-    }
     },
-
+  },
 };
 </script>
 

src/views/firstpage/FirstPageBannerView.vue

@@ -19,6 +19,9 @@
                   <option value="2">Room ID</option>
                   <option value="1">指定地址</option>
                   <option value="3">跳转H5页面</option>
+                  <option value="4">CP活动</option>
+                  <option value="5">周星榜活动</option>
+                  <option value="6">定制礼物活动</option>
                 </select>
               </div>
               <label for="status"
@@ -170,6 +173,9 @@
                 <option value="2">Room ID</option>
                 <option value="1">指定地址</option>
                 <option value="3">跳转H5页面</option>
+                  <option value="4">CP活动</option>
+                  <option value="5">周星榜活动</option>
+                  <option value="6">定制礼物活动</option>
               </select>
               <div class="col-sm-6">
                 <input type="text"
@@ -408,6 +414,9 @@
                 <option value="2">Room ID</option>
                 <option value="1">指定地址</option>
                 <option value="3">跳转H5页面</option>
+                  <option value="4">CP活动</option>
+                  <option value="5">周星榜活动</option>
+                  <option value="6">定制礼物活动</option>
               </select>
               <div class="col-sm-6">
                 <input type="text"

src/views/firstpage/towPageBannerView.vue

@@ -197,6 +197,8 @@
                   class="form-control"
                   name="skipUri"
                   id="skipUrlContent"
+                  onkeydown="return event.key !== ' '"
+                  oninput="this.value = this.value.replace(/\s+/g, '')"
                 />
               </div>
             </div>
@@ -460,6 +462,8 @@
                   class="form-control"
                   name="skipUri"
                   id="addSkipUrlContent"
+                  onkeydown="return event.key !== ' '"
+                  oninput="this.value = this.value.replace(/\s+/g, '')"
                 />
               </div>
             </div>
@@ -733,7 +737,6 @@ export default {
         //         }
         //     }
         // }
-
         function initTable() {
           $("#table").bootstrapTable({
             columns: [

src/views/guildOperationManagement/anchorSalaryOperate.vue

@@ -527,7 +527,7 @@ export default {
       this.getData();
     },
     handlePageChange(val) {
-      this.pageParams.pageSize = val;
+      this.pageParams.pageNo = val;
       this.getData();
     },
     // 弹窗分页导航

src/views/guildOperationManagement/guildInfo.vue

@@ -115,6 +115,38 @@
         </template>
       </el-table-column>
       <el-table-column prop="adminName" align="center" label="操作人" />
+      <el-table-column
+        prop="guildContact"
+        align="center"
+        label="公会联系方式"
+      />
+      <el-table-column align="center" prop="idCard" label="公会长身份证件">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.idCard"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.idCard]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="inviteErbanNo" align="center" label="邀请人ID" />
+      <el-table-column prop="inviteCheck" align="center" label="邀请人证明">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.inviteCheck"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.inviteCheck]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
       <!-- <el-table-column align="center" label="收款账户" width="300">
         <template v-slot="scope">
           <el-button

src/views/infocard/InfocardManageView.vue

@@ -192,6 +192,7 @@
                 />
               </div>
             </div>
+            <form class="form-horizontal" id="addForm1">
               <div class="form-group">
                 <label class="col-sm-4 control-label">图片:</label>
                 <div class="col-sm-6">
@@ -200,15 +201,61 @@
                     type="file"
                     id="addUploadIconPic"
                     name="uploadFile"
-                  accept="image/gif,image/jpeg,image/jpg,image/png,image/svg"
+                    accept="image/gif,image/jpeg,image/jpg,image/png,image/svg,.mp4"
                   />
                   <button class="btn btn-success" type="button" id="uploadBtn">
                     上传
                   </button>
-                <input type="hidden" id="pic" name="pic" class="form-control" />
+                  <input
+                    type="hidden"
+                    id="pic"
+                    name="pic"
+                    class="form-control"
+                  />
                   <a href="javascript:void(0)" id="removeIconPic">清除</a>
                 </div>
               </div>
+            </form>
+            <div class="form-group">
+              <label for="effectType" class="col-sm-4 control-label"
+                >装扮动效图片类型:</label
+              >
+              <div class="col-sm-6">
+                <select
+                  name="effectType"
+                  id="effectType"
+                  data-btn-class="btn-warning"
+                  class="form-control"
+                >
+                  <option value="0">图片</option>
+                  <option value="1">MP4</option>
+                </select>
+              </div>
+            </div>
+            <form class="form-horizontal" id="addForm2">
+              <div class="form-group">
+                <label class="col-sm-4 control-label">装扮动效图片:</label>
+                <div class="col-sm-6">
+                  <img src="" id="addIconPicUrl2" style="height: 44px" alt="" />
+                  <input
+                    type="file"
+                    id="addEffect"
+                    name="uploadFile"
+                    accept="image/gif,image/jpeg,image/jpg,image/png,image/svg,.mp4"
+                  />
+                  <button class="btn btn-success" type="button" id="uploadBtn2">
+                    上传
+                  </button>
+                  <input
+                    type="hidden"
+                    id="effect"
+                    name="effect"
+                    class="form-control"
+                  />
+                  <a href="javascript:void(0)" id="removeIconPic2">清除</a>
+                </div>
+              </div>
+            </form>
             <div class="form-group">
               <label for="status" class="col-sm-4 control-label"
                 >装扮状态:</label
@@ -399,6 +446,24 @@ export default {
                 }
               },
             },
+            {
+              field: "effect",
+              title: "装扮动效图片",
+              align: "middle",
+              valign: "middle",
+              width: "5%",
+              formatter: function (val, row, index) {
+                if (val) {
+                  return (
+                    "<img style='max-width: 200px;max-height: 200px' src='" +
+                    val +
+                    "'>"
+                  );
+                } else {
+                  return "-";
+                }
+              },
+            },
             {
               field: "type",
               title: "装扮类型",
@@ -429,6 +494,21 @@ export default {
                 }
               },
             },
+            {
+              field: "effectType",
+              title: "装扮动效图片类型",
+              align: "middle",
+              width: "5%",
+              formatter: function (val) {
+                if (val === 0) {
+                  return "图片";
+                } else if (val === 1) {
+                  return "MP4";
+                } else {
+                  return "-";
+                }
+              },
+            },
             {
               field: "createTime",
               title: "添加时间",
@@ -571,8 +651,11 @@ export default {
             $("#addForm #tr_modal_name").val(name);
           }
           $("#addIconPicUrl").attr("src", row.pic);
+          $("#addIconPicUrl2").attr("src", row.effect);
           $("#addForm #pic").val(row.pic);
+          $("#addForm #effect").val(row.effect);
           $("#addForm #status").val(row.status);
+          $("#addForm #effectType").val(row.effectType);
           //分区
           let partitionFlag = row.partitionFlag;
           if ((partitionFlag & 1) != 0) {
@@ -608,7 +691,24 @@ export default {
               }
             },
           };
-          $("#addForm").ajaxSubmit(options);
+          $("#addForm1").ajaxSubmit(options);
+        });
+        $("#uploadBtn2").on("click", function () {
+          var options = {
+            type: "post",
+            url: "/admin/upload/img",
+            dataType: "json",
+            success: function (json) {
+              if (json.path) {
+                $("#effect").val(json.path);
+                $("#addIconPicUrl2").attr("src", json.path);
+              } else {
+                $("#tipMsg").text(json.msg);
+                $("#tipModal").modal("show");
+              }
+            },
+          };
+          $("#addForm2").ajaxSubmit(options);
         });
 
         $("#removeIconPic").on("click", function () {
@@ -616,6 +716,12 @@ export default {
           $("#addUploadIconPic").val("");
           $("#iconPic").val("");
         });
+        $("#removeIconPic2").on("click", function () {
+          $("#addIconPicUrl2").attr("src", "");
+          $("#addEffect").val("");
+          $("#effect").val("");
+          $("#iconPic").val("");
+        });
 
         //打开新增页面
         $("#btnAdd").on("click", function () {
@@ -626,6 +732,7 @@ export default {
         //保存
         $("#button-save").on("click", function () {
           var pic = $("#pic").val();
+          var effect = $("#effect").val();
           var name = $("#modal_name").val();
           var arName = $("#ar_modal_name").val();
           var enName = $("#en_modal_name").val();
@@ -682,6 +789,9 @@ export default {
             }
             formData.partitionFlag = partitionFlag;
             // 将修改后的对象转换回序列化字符串
+            formData.pic = $('#addIconPicUrl').attr('src');
+            formData.effect = $('#addIconPicUrl2').attr('src');
+            console.log(formData,2222222222222);
             let newSerializeStr = $.param(formData);
             $.ajax({
               type: "post",
@@ -815,9 +925,14 @@ export default {
 function cleanModal() {
   $("#id").val("");
   $("#addIconPicUrl").attr("src", "");
+  $("#addIconPicUrl2").attr("src", "");
   $("#addUploadIconPic").val("");
+  $("#addEffect").val("");
+  $("#effect").val("");
   $("#pic").val("");
+  $("#effect").val("");
   $("#status").val("");
+  $("#effectType").val("");
   $("#modal_type").val("");
   $("#modal_name").val("");
   $('input[name="partitionFlag"]').each(function () {

src/views/luckGift/luckGiftData.vue

@@ -31,6 +31,11 @@
         </el-date-picker>
       </div>
     </div>
+    <el-button type="text">总进入：{{ totalInput }}</el-button>
+    <el-button type="text">总退出：{{ totalOutput }}</el-button>
+    <el-button type="text"
+      >总比例：{{ totalProductionRatio }}</el-button
+    >
     <!-- 按钮 -->
     <div class="but">
       <el-button class="primary" type="primary" @click="getData()"
@@ -145,6 +150,9 @@ export default {
   data() {
     return {
       loading: false,
+      totalInput: 0,
+      totalOutput: 0,
+      totalProductionRatio: 0,
       //查询所需条件对象
       inquire: {
         userId: "",
@@ -163,6 +171,10 @@ export default {
             name: "华语区",
             type: 4,
           },
+          {
+            type: 8,
+            name: "土耳其区",
+          },
         ],
       },
       // 表格
@@ -183,10 +195,10 @@ export default {
     // 查询接口
     getData() {
       console.log(dateFormat(this.inquire.time, "yyyy-MM-dd"));
-      if (!this.inquire.time) {
+      if (!this.inquire.time && this.inquire.userId == '') {
         ElMessage({
           showClose: true,
-          message: "请选择时间",
+          message: "时间和ID至少填一项",
           type: "error",
         });
         return;
@@ -196,12 +208,16 @@ export default {
         erbanNo: this.inquire.userId,
         pageNo: this.currentPage,
         pageSize: this.pageSize,
-        startDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
+        date: this.inquire.time
-        endDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
+          ? dateFormat(this.inquire.time, "yyyy-MM-dd")
+          : null,
         partitionId: this.inquire.value,
       }).then((res) => {
-        this.total = res.data.total;
+        this.total = res.data.dataPage.total;
-        this.tableData = res.data.rows;
+        this.tableData = res.data.dataPage.rows;
+        this.totalInput = res.data.totalInput;
+        this.totalOutput = res.data.totalOutput;
+        this.totalProductionRatio = res.data.totalProductionRatio;
         this.loading = false;
       });
     },

src/views/luckGift/luckGiftDataAll.vue

@@ -15,11 +15,11 @@
         </el-select>
       </div>
       <!-- 时间 -->
-      <div class="inquire">
+      <!-- <div class="inquire">
         <span>时间</span>
         <el-date-picker v-model="inquire.time" type="date" placeholder="请选择">
         </el-date-picker>
-      </div>
+      </div> -->
     </div>
     <!-- 按钮 -->
     <div class="but">
@@ -27,7 +27,9 @@
         >查询
       </el-button>
     </div>
-
+    <el-button type="text">数组出金币总额：{{ totalInput }}</el-button>
+    <el-button type="text">数组出返币总额：{{ totalOutput }}</el-button>
+    <el-button type="text">投产比：{{ totalProductionRatio }}</el-button>
     <!-- 表格 -->
     <el-table
       v-loading="loading"
@@ -38,21 +40,16 @@
       <el-table-column prop="date" align="center" label="日期" />
       <el-table-column prop="totalInput" align="center" label="进入" />
       <el-table-column prop="totalOutput" align="center" label="退出" />
-      <el-table-column prop="x" align="center" label="退出/进入比例"
+      <el-table-column
-        ><template v-slot="scope">
+        prop="productionRatio"
-          {{ (scope.row.totalOutput / scope.row.totalInput).toFixed(4) }}
+        align="center"
-        </template>
+        label="退出/进入比例"
-      </el-table-column>
+      />
       <el-table-column prop="num" align="center" label="参与次数" />
       <el-table-column prop="count" align="center" label="参与人数" />
       <el-table-column prop="winCount" align="center" label="得到人数" />
       <el-table-column prop="winNum" align="center" label="得到次数" />
-      <el-table-column prop="winRate" align="center" label="得到率"
+      <el-table-column prop="winRate" align="center" label="得到率" />
-        ><template v-slot="scope">
-          {{ scope.row.winRate ? scope.row.winRate : "-" }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="stock" align="center" label="数组库存" />
     </el-table>
   </div>
 </template>
@@ -68,6 +65,9 @@ export default {
   data() {
     return {
       loading: false,
+      totalInput: "0",
+      totalOutput: "0",
+      totalProductionRatio: "0",
       //查询所需条件对象
       inquire: {
         value: 2,
@@ -84,6 +84,10 @@ export default {
             value: 4,
             label: "华语区",
           },
+          {
+            value: 8,
+            label: "土耳其区",
+          },
         ],
         time: "",
       },
@@ -101,26 +105,15 @@ export default {
   methods: {
     // 查询接口
     getData() {
-      console.log(dateFormat(this.inquire.time, "yyyy-MM-dd"));
-      if (!this.inquire.time) {
-        ElMessage({
-          showClose: true,
-          message: "请选择时间",
-          type: "error",
-        });
-        return;
-      }
       this.loading = true;
       platform({
-        erbanNo: this.inquire.userId,
-        startDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
-        endDate: dateFormat(this.inquire.time, "yyyy-MM-dd"),
         partitionId: this.inquire.value,
       }).then((res) => {
-        this.total = res.data.total;
+        this.totalInput = res.data.totalInput;
-        this.tableData = res.data;
+        this.totalOutput = res.data.totalOutput;
+        this.totalProductionRatio = res.data.totalProductionRatio;
+        this.tableData = res.data.dataList;
         this.loading = false;
-        console.log(this.tableData, 123);
       });
     },
     // 分页导航

src/views/luckGift/luckGiftSet.vue

@@ -357,6 +357,10 @@ export default {
             name: "华语区",
             type: 4,
           },
+          {
+            name: "土耳其区",
+            type: 8,
+          },
         ],
         comparisonValue: "",
         goldInventory: "",

src/views/nobleman/GuildInfo.vue

@@ -133,6 +133,38 @@
       </el-table-column>
       <!-- <el-table-column prop="goldIncome" align="center" label="金币总收入" />
       <el-table-column prop="diamondRemain" align="center" label="钻石总收入" /> -->
+       <el-table-column
+        prop="guildContact"
+        align="center"
+        label="公会联系方式"
+      />
+      <el-table-column align="center" prop="idCard" label="公会长身份证件">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.idCard"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.idCard]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="inviteErbanNo" align="center" label="邀请人ID" />
+      <el-table-column prop="inviteCheck" align="center" label="邀请人证明">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.inviteCheck"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.inviteCheck]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
 
       <el-table-column align="center" label="操作" width="300">
         <template v-slot="scope">

src/views/nobleman/newGuildApplication.vue

@@ -0,0 +1,367 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>分区</span>
+      <el-select v-model="inquire.partitionId" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.partitionArr"
+          :key="item.id"
+          :label="item.desc"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="inquire">
+      <span>平台ID</span>
+      <el-input
+        v-model="inquire.userId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <div class="inquire">
+      <span>状态</span>
+      <el-select v-model="inquire.status" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.statusArr"
+          :key="item.id"
+          :label="item.desc"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <!-- 时间选择器 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">日期</span>
+        <el-date-picker
+          v-model="inquire.time"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <el-button class="primary" type="primary" @click="addDialog = true"
+      >重置搜索</el-button
+    >
+
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="id" align="center" label="序号" />
+      <el-table-column prop="guildId" align="center" label="公会ID" />
+      <el-table-column prop="erbanNo" align="center" label="公会长ID" />
+      <el-table-column prop="nick" align="center" label="公会长昵称" />
+      <el-table-column align="center" prop="giftInfo" label="公会长头像">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.avatar"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.avatar]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="guildName" align="center" label="公会昵称" />
+      <el-table-column align="center" prop="giftInfo" label="公会头像">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.guildAvatar"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.guildAvatar]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="guildContact"
+        align="center"
+        label="公会联系方式"
+      />
+      <el-table-column align="center" prop="idCard" label="公会长身份证件">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.idCard"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.idCard]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="inviteErbanNo" align="center" label="邀请人ID" />
+      <el-table-column prop="inviteCheck" align="center" label="邀请人证明">
+        <template v-slot="scope">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="scope.row.inviteCheck"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.inviteCheck]"
+            fit="scale-down"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="applyTime" align="center" label="申请时间" />
+      <el-table-column prop="auditStatus" align="center" label="状态">
+        <template v-slot="scope">
+          {{
+            scope.row.auditStatus == 0
+              ? "未审核"
+              : scope.row.auditStatus == 1
+              ? "已通过"
+              : "拒绝"
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="adminName" align="center" label="操作人" />
+      <el-table-column align="center" label="操作">
+        <template v-slot="scope">
+          <el-button
+            v-show="scope.row.auditStatus == 0"
+            @click="agree(scope.row.id)"
+            type="text"
+            size="default"
+            >同意</el-button
+          >
+          <el-button
+            v-show="scope.row.auditStatus == 0"
+            @click="refuse(scope.row.id)"
+            type="text"
+            size="default"
+            >拒绝</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+    <!-- 二次确认删除弹窗 -->
+    <el-dialog v-model="delDialog" title="提示" width="30%" center>
+      <span> 确定要解散该公会吗?</span>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="delDialog = false">取消</el-button>
+          <el-button type="primary" @click="delClick()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  listPartitionInfo,
+  guildApplyList,
+  guildApplyAudit,
+} from "@/api/nobleman/nobleman";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "newGuildApplication",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        partitionId: "",
+        partitionArr: [],
+        userId: "",
+        status: -1,
+        statusArr: [
+          { desc: "未审核", id: 0 },
+          { desc: "全部", id: -1 },
+          { desc: "通过", id: 1 },
+          { desc: "已拒绝", id: 2 },
+        ],
+        time: "",
+      },
+      // 表格
+      tableData: [],
+      //   新增弹窗
+      addDialog: false,
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    listPartitionInfo().then((res) => {
+      console.log(res.data);
+      this.inquire.partitionArr = res.data;
+      this.inquire.partitionId = this.inquire.partitionArr[0].id;
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd hh:mm:ss");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
+      }
+      guildApplyList({
+        partitionId: this.inquire.partitionId,
+        erbanNo: this.inquire.userId,
+        auditStatus: this.inquire.status,
+        startDate: startTime,
+        endDate: endTime,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+          this.loading = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    agree(id) {
+      guildApplyAudit({
+        auditStatus: 1,
+        id,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    refuse(id) {
+      guildApplyAudit({
+        auditStatus: 2,
+        id,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    beforeAvatarUpload() {
+      ElMessage({
+        showClose: true,
+        message: "上传中~",
+        type: "warning",
+      });
+    },
+    handleAvatarError() {
+      ElMessage({
+        showClose: true,
+        message: "上传失败！",
+        type: "error",
+      });
+    },
+    handleAvatarSuccess2(res, file) {
+      this.ediObj.imageUrl2 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    handleAvatarSuccess(res, file) {
+      this.ediObj.imageUrl1 = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+</style>

src/views/privilege/personalHomepageGiftRecordManagement.vue

@@ -0,0 +1,166 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>平台ID</span>
+      <el-input v-model="inquire.id" placeholder="" class="input"></el-input>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="backgroundId" align="center" label="个人主页id" />
+      <el-table-column
+        prop="backgroundName"
+        align="center"
+        label="个人主页名称"
+      />
+      <el-table-column prop="uid" align="center" label="用户uID" />
+      <el-table-column prop="nick" align="center" label="用户昵称" />
+      <el-table-column prop="days" align="center" label="赠送天数" />
+      <el-table-column prop="remake" align="center" label="备注" />
+      <el-table-column prop="createTime" align="center" label="操作时间" />
+      <el-table-column prop="optUser" align="center" label="操作人" />
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            v-if="scope.row.status=1"
+            @click="personalBackground(scope.row)"
+            class="primary"
+            type="primary"
+            size="default"
+            >撤回</el-button
+          >
+          <div v-else>已撤回</div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+<script>
+import {
+  pesonalBackgroundListRecordByPage,
+  pesonalBackgroundListRecordRecoveryPersonalBackground,
+} from "@/api/personalHomepageResourceManagement/personalHomepageResourceManagement";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "personalHomepageRecordManagementSend",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        id: "",
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      pesonalBackgroundListRecordByPage({
+        erbanNo: this.inquire.id,
+        page: this.currentPage,
+        comeFrom: 2,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.loading = false;
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    personalBackground(val) {
+      pesonalBackgroundListRecordRecoveryPersonalBackground({
+        recordId: val.recordId,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.getData();
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.operation {
+  margin-bottom: 20px;
+  width: 55%;
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+}
+</style>

src/views/privilege/personalHomepageRecordManagement.vue

@@ -0,0 +1,130 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>平台ID</span>
+      <el-input v-model="inquire.id" placeholder="" class="input"></el-input>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="backgroundId" align="center" label="个人主页id" />
+      <el-table-column prop="backgroundName" align="center" label="个人主页名称" />
+      <el-table-column prop="uid" align="center" label="用户uID" />
+      <el-table-column prop="nick" align="center" label="用户昵称" />
+      <el-table-column prop="status" align="center" label="个人主页状态" />
+      <el-table-column prop="createTime" align="center" label="购买天数" />
+      <el-table-column prop="days" align="center" label="有效时间" />
+      <el-table-column prop="expireTime" align="center" label="过期时间" />
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+<script>
+import { pesonalBackgroundListRecordByPage } from "@/api/personalHomepageResourceManagement/personalHomepageResourceManagement";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "personalHomepageRecordManagement",
+  data() {
+    return {
+      loading: false,
+      //查询所需条件对象
+      inquire: {
+        id: "",
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    this.getData();
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      pesonalBackgroundListRecordByPage({
+        erbanNo: this.inquire.id,
+        page: this.currentPage,
+        pageSize: this.pageSize,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.loading = false;
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.operation {
+  margin-bottom: 20px;
+  width: 55%;
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+}
+</style>

src/views/privilege/personalHomepageResourceManagement.vue

@@ -0,0 +1,802 @@
+<template>
+  <div class="box">
+    <!-- 查询 -->
+    <div class="inquire">
+      <span>地区</span>
+      <el-select v-model="inquire.partitionId" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.partitionArr"
+          :key="item.id"
+          :label="item.desc"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <div class="inquire">
+      <span>名称</span>
+      <el-input v-model="inquire.name" placeholder="" class="input"></el-input>
+    </div>
+    <div class="inquire">
+      <span>状态</span>
+      <el-select v-model="inquire.status" placeholder="请选择">
+        <el-option
+          v-for="item in inquire.options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >查询</el-button
+    >
+    <!-- 新增按钮 -->
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        operationValue.partitionVal = [];
+        operationValue.nameZh = '';
+        operationValue.nameEn = '';
+        operationValue.nameAr = '';
+        operationValue.nameTr = '';
+        operationValue.price = '';
+        operationValue.day = '';
+        operationValue.imageUrl = '';
+        operationValue.status = '';
+        operationType = 1;
+        filePreview: null; // 文件预览 URL
+        isImage = false;
+        isVideo = false;
+        isSVGA = false;
+        operationDialogTitle = '新增';
+        operationDialog = true;
+      "
+      >新增</el-button
+    >
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="id" align="center" label="id" />
+      <el-table-column prop="partitionFlag" align="center" label="地区">
+        <template v-slot="scope">
+          {{ partitionDesc(scope.row.partitionFlag) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="中文名称">
+        <template v-slot="scope">
+          {{ jsonFun(scope.row.name).zh }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="阿语名称">
+        <template v-slot="scope">
+          {{ jsonFun(scope.row.name).ar }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="英语名称"
+        ><template v-slot="scope">
+          {{ jsonFun(scope.row.name).en }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="土耳其名称"
+        ><template v-slot="scope">
+          {{ jsonFun(scope.row.name).tr }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="图片">
+        <template v-slot="scope">
+          <el-image
+            :src="scope.row.pic"
+            :zoom-rate="1.1"
+            :preview-src-list="[scope.row.pic]"
+            fit="contain"
+            preview-teleported="true"
+            hide-on-click-modal="true"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="装扮动效图片类型">
+        <template v-slot="scope">
+          {{
+            scope.row.effectType == 0
+              ? "无"
+              : scope.row.effectType == 1
+              ? "MP4"
+              : "SVGA"
+          }}
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        prop=""
+        width="300"
+        max-height="100"
+        align="center"
+        label="装扮动效图片"
+      >
+        <template v-slot="scope">
+          <div v-if="scope.row.effectType == 0">无</div>
+          <!-- 视频预览 -->
+          <video
+            v-if="scope.row.effectType == 1"
+            :src="scope.row.effect"
+            controls
+            style="width: 300px; max-height: 300px; display: block"
+          ></video>
+          <!-- SVGA 预览 -->
+          <div
+            v-if="scope.row.effectType == 2"
+            :id="`svga-player${scope.row.id}`"
+            style="width: 300px; max-height: 300px; display: block"
+          >
+            {{
+              scope.row.effect && scope.row.id
+                ? initSVGAList(scope.row.effect, scope.row.id)
+                : ""
+            }}
+            <!-- <img style="width: 100px; height: 100px; display: block" src="/Uploads/article/original_img/1487053722.jpg" alt="">
+      <el-image src=""></el-image> -->
+          </div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="" align="center" label="状态">
+        <template v-slot="scope">
+          {{ scope.row.status == 1 ? "有效" : "无效" }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="" align="center" label="贵族限定">
+        <template v-slot="scope">
+          {{ scope.row.type == 1 ? "普通" : "贵族" }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateTime" align="center" label="操作时间" />
+      <el-table-column align="center" label="操作" width="300">
+        <template v-slot="scope">
+          <el-button
+            @click="
+              operationValue.partitionVal = partitionIdArr(
+                scope.row.partitionFlag
+              );
+              operationValue.nameZh = jsonFun(scope.row.name).zh;
+              operationValue.nameEn = jsonFun(scope.row.name).en;
+              operationValue.nameAr = jsonFun(scope.row.name).ar;
+              operationValue.nameTr = jsonFun(scope.row.name).tr;
+              operationValue.imageUrl = scope.row.pic;
+              operationValue.status = scope.row.status;
+              operationType = 2;
+              operationValueId = scope.row.id;
+              operationDialogTitle = '编辑';
+              filePreview: scope.row.effect; // 文件预览 URL
+              scope.row.effectType == 1
+                ? (isVideo = true)
+                : scope.row.effectType == 2
+                ? (isSVGA = true)
+                : (isImage = true);
+              operationValue.effectType = scope.row.effectType;
+              initSVGA(scope.row.effect);
+              operationDialog = true;
+            "
+            class="primary"
+            type="primary"
+            size="default"
+            >编辑</el-button
+          >
+          <el-button
+            @click="
+              sendDialog = true;
+              sendObj.erbanNos = send.days = send.remark = null;
+              sendObj.personalBackgroundId = scope.row.id;
+            "
+            class="primary"
+            type="primary"
+            size="default"
+            >赠送</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 新增&编辑弹窗 -->
+    <el-dialog
+      v-model="operationDialog"
+      :title="operationDialogTitle"
+      width="28%"
+      center
+    >
+      <!-- <div class="operation">
+        <span style="margin-right: 20px">地区</span>
+        <el-select v-model="operationValue.partitionId" placeholder="请选择">
+          <el-option
+            v-for="item in operationValue.partitionArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          >
+          </el-option>
+        </el-select>
+      </div> -->
+      <div class="operation">
+        <span style="margin-right: 20px">地区</span>
+        <el-checkbox-group
+          v-model="operationValue.partitionVal"
+          v-for="(val, i) in inquire.partitionArr"
+          :key="i"
+        >
+          <el-checkbox style="margin-right: 10px" :label="val.id">{{
+            val.desc
+          }}</el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">华语名称</span>
+        <el-input
+          v-model="operationValue.nameZh"
+          style="width: 200px"
+          class="input"
+        ></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">英语名称</span>
+        <el-input
+          v-model="operationValue.nameEn"
+          style="width: 200px"
+          class="input"
+        ></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">阿拉伯名称</span>
+        <el-input
+          v-model="operationValue.nameAr"
+          style="width: 200px"
+          class="input"
+        ></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">土耳其名称</span>
+        <el-input
+          v-model="operationValue.nameTr"
+          style="width: 200px"
+          class="input"
+        ></el-input>
+      </div>
+      <!-- <div class="operation">
+        <span style="margin-right: 20px">价格</span>
+        <el-input
+          v-model="operationValue.price"
+          style="width: 200px"
+          class="input"
+        ></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">有效天数</span>
+        <el-input
+          v-model="operationValue.day"
+          style="width: 200px"
+          class="input"
+        ></el-input>
+      </div> -->
+      <div class="operation">
+        <span class="left" style="margin-right: 20px">图片</span>
+        <el-upload
+          class="avatar-uploader"
+          action="/admin/tencent/cos/upload/file"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <img
+            v-if="operationValue.imageUrl"
+            :src="operationValue.imageUrl"
+            class="avatar"
+          />
+          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+        </el-upload>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">装扮动效图片类型</span>
+        <el-select v-model="operationValue.effectType" placeholder="请选择">
+          <el-option
+            v-for="item in operationValue.effectTypeArr"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <div class="operation">
+        <span class="left" style="margin-right: 20px">装扮动效图片</span>
+        <el-upload
+          class="avatar-uploader"
+          action="/admin/tencent/cos/upload/file"
+          accept="image/*,.mp4,.svga"
+          :show-file-list="false"
+          :on-success="handleAvatarSuccess1"
+          :before-upload="beforeAvatarUpload"
+          :on-error="handleAvatarError"
+        >
+          <!-- 文件预览 -->
+          <div style="margin-top: 20px">
+            <!-- 图片预览 -->
+            <img
+              v-if="isImage"
+              :src="filePreview"
+              alt="Uploaded Image"
+              style="max-width: 300px"
+            />
+
+            <!-- 视频预览 -->
+            <video
+              v-else-if="isVideo"
+              :src="filePreview"
+              controls
+              style="max-width: 300px"
+            ></video>
+
+            <!-- SVGA 预览 -->
+            <div
+              v-else-if="isSVGA"
+              :id="`svga-player`"
+              style="width: 200px; height: 200px"
+            ></div>
+          </div>
+        </el-upload>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">状态</span>
+        <el-select v-model="operationValue.status" placeholder="请选择">
+          <el-option
+            v-for="item in operationValue.options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </div>
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button
+            @click="
+              operationDialog = false;
+              isImage = false;
+              isVideo = false;
+              isSVGA = false;
+            "
+            >取消</el-button
+          >
+          <el-button
+            type="primary"
+            @click="operation(type == 1 ? null : operationValueId)"
+          >
+            确认
+          </el-button>
+        </span>
+      </template>
+    </el-dialog>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+    <!-- 赠送 -->
+    <el-dialog v-model="sendDialog" title="赠送" width="28%" center>
+      <div class="operation">
+        <span style="margin-right: 20px">用户平台ID</span>
+        <el-input
+          v-model="sendObj.erbanNos"
+          style="width: 200px"
+          class="input"
+          placeholder="多个请用英文“,”隔开"
+        ></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">天数</span>
+        <el-input
+          v-model="sendObj.days"
+          style="width: 200px"
+          class="input"
+          placeholder=""
+        ></el-input>
+      </div>
+      <div class="operation">
+        <span style="margin-right: 20px">备注</span>
+        <el-input
+          v-model="sendObj.remark"
+          style="width: 200px"
+          class="input"
+          placeholder=""
+        ></el-input>
+      </div>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="sendDialog = false">取消</el-button>
+          <el-button type="primary" @click="send()"> 确认 </el-button>
+        </span>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  listPartitionInfo,
+  pesonalBackgroundListByPage,
+  pesonalBackgroundSaveOrUpdate,
+  pesonalBackgroundListSend,
+} from "@/api/personalHomepageResourceManagement/personalHomepageResourceManagement";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+import { partitionDesc, partitionIdArr } from "@/utils/partitionDesc.js";
+import { ref, reactive, onMounted, onUnmounted, nextTick } from "vue";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+import SVGA from "svgaplayerweb";
+export default {
+  name: "personalHomepageResourceManagement",
+  setup() {
+    // 响应式数据
+    const file = ref(null);
+    const filePreview = ref(null);
+    const isImage = ref(false);
+    const isVideo = ref(false);
+    const isSVGA = ref(false);
+    const loading = ref(false);
+
+    const inquire = reactive({
+      partitionId: "",
+      partitionArr: [],
+      name: "",
+      status: "",
+      options: [
+        { label: "有效", value: 1 },
+        { label: "无效", value: 2 },
+        { label: "全部", value: 3 },
+      ],
+    });
+
+    const operationDialog = ref(false);
+    const operationType = ref(null);
+    const operationDialogTitle = ref("新增%编辑");
+    const operationValueId = ref(null);
+
+    const operationValue = reactive({
+      partitionVal: [],
+      nameZh: "",
+      nameEn: "",
+      nameAr: "",
+      nameTr: "",
+      price: "",
+      day: "",
+      imageUrl: "",
+      status: "",
+      options: [
+        { label: "有效", value: 1 },
+        { label: "无效", value: 2 },
+      ],
+      effectType: "",
+      effectTypeArr: [
+        { label: "无", value: 0 },
+        { label: "MP4", value: 1 },
+        { label: "SVGA", value: 2 },
+      ],
+    });
+
+    const sendDialog = ref(false);
+    const sendObj = reactive({
+      erbanNos: null,
+      days: null,
+      personalBackgroundId: null,
+      remark: null,
+    });
+
+    const tableData = ref([]);
+    const total = ref(0); // 总页数
+    const currentPage = ref(1); // 页码
+    const pageSize = ref(10); // 条数
+
+    // 生命周期钩子
+    onMounted(() => {
+      console.log("组件已挂载");
+      listPartitionInfo().then((res) => {
+        inquire.partitionArr = operationValue.partitionArr = res.data;
+        inquire.partitionId = inquire.partitionArr[0].id;
+        getData();
+      });
+    });
+
+    onUnmounted(() => {
+      console.log("组件已卸载");
+    });
+
+    // 查询接口
+    const getData = () => {
+      loading.value = true;
+      pesonalBackgroundListByPage({
+        partitionId: inquire.partitionId,
+        name: inquire.name,
+        status: inquire.status,
+        page: currentPage.value,
+        pageSize: pageSize.value,
+      }).then((res) => {
+        if (res.code == 200) {
+          loading.value = false;
+          total.value = res.data.total;
+          tableData.value = res.data.list;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    };
+
+    const operation = (id) => {
+      const obj = {
+        partitionFlag: operationValue.partitionVal.reduce(
+          (accumulator, currentValue) => accumulator + currentValue,
+          0
+        ),
+        name: JSON.stringify({
+          ar: operationValue.nameAr,
+          zh: operationValue.nameZh,
+          en: operationValue.nameEn,
+          tr: operationValue.nameTr,
+        }),
+        pic: operationValue.imageUrl,
+        effectType: operationValue.effectType,
+        effect: filePreview.value,
+        status: operationValue.status,
+        type: 1, // 资料卡类型 1：普通 2：贵族
+        id,
+      };
+      console.log(obj);
+      pesonalBackgroundSaveOrUpdate(obj).then((res) => {
+        if (res.code == 200) {
+          operationDialog.value = false;
+          getData();
+          isImage.value = false;
+          isVideo.value = false;
+          isSVGA.value = false;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    };
+
+    const send = () => {
+      pesonalBackgroundListSend(sendObj).then((res) => {
+        if (res.code == 200) {
+          sendDialog.value = false;
+          ElMessage({
+            showClose: true,
+            message: "赠送成功",
+            type: "success",
+          });
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+      });
+    };
+
+    const beforeAvatarUpload = () => {
+      ElMessage({
+        showClose: true,
+        message: "上传中可能较慢，请等待上传成功后在进行下一步~",
+        type: "warning",
+      });
+    };
+
+    const handleAvatarError = () => {
+      ElMessage({
+        showClose: true,
+        message: "上传失败！",
+        type: "error",
+      });
+    };
+
+    const handleAvatarSuccess = (res, file) => {
+      console.log(file);
+      operationValue.imageUrl = file.response.data;
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    };
+
+    const handleAvatarSuccess1 = (res, files) => {
+      console.log(files.raw);
+      const selectedFile = files.raw;
+      if (!selectedFile) return;
+      // 清除旧的预览数据
+      // resetFile();
+      const fileType = selectedFile.type;
+      const fileName = selectedFile.name;
+      // 创建预览 URL
+      filePreview.value = res.data;
+      file.value = selectedFile;
+      // 根据文件类型判断
+      if (fileType.startsWith("image/")) {
+        isImage.value = true;
+      } else if (fileType === "video/mp4") {
+        isVideo.value = true;
+      } else if (fileName.endsWith(".svga")) {
+        isSVGA.value = true;
+        initSVGA(res.data);
+      }
+      ElMessage({
+        showClose: true,
+        message: "上传成功！",
+        type: "success",
+      });
+    };
+
+    // const resetFile = () => {
+    //   nextTick(() => {
+    //     file.value = null;
+    //     filePreview.value = null;
+    //     isImage.value = false;
+    //     isVideo.value = false;
+    //     isSVGA.value = false;
+    //     // 清除 SVGA 容器内容
+    //     const svgaPlayer = document.getElementById("svga-player");
+    //     if (svgaPlayer) {
+    //       svgaPlayer.innerHTML = "";
+    //     }
+    //   });
+    // };
+
+    const initSVGA = (url) => {
+      nextTick(() => {
+        setTimeout(function () {
+          const container = document.getElementById("svga-player");
+          if (container) {
+            const player = new SVGA.Player(container);
+            const parser = new SVGA.Parser();
+            parser.load(
+              url,
+              (videoItem) => {
+                player.setVideoItem(videoItem);
+                player.startAnimation();
+              },
+              (error) => {
+                console.log("SVGA失败", error);
+              }
+            );
+          }
+        }, 10);
+      });
+    };
+    const initializedIds = new Set();
+    const initSVGAList = (url, id) => {
+      if (initializedIds.has(id)) return; // 避免重复初始化
+      console.log('SVGASVGASVGASVGASVGASVGA',url,id);
+      nextTick(() => {
+        const container = document.getElementById("svga-player" + id);
+        if (!container) {
+          console.error(`SVGA container for ID ${id} not found`);
+          return;
+        }
+        try {
+          const player = new SVGA.Player(container);
+          const parser = new SVGA.Parser();
+          parser.load(url, (videoItem) => {
+            player.setVideoItem(videoItem);
+            player.startAnimation();
+          });
+          initializedIds.add(id); // 标记已初始化
+        } catch (error) {
+          console.error("SVGA initialization failed:", error);
+        }
+      });
+    };
+
+    const jsonFun = (val) => JSON.parse(val);
+
+    // 分页导航
+    const handleSizeChange = () => {
+      getData();
+    };
+
+    const handleCurrentChange = () => {
+      getData();
+    };
+
+    return {
+      partitionDesc,
+      partitionIdArr,
+      file,
+      filePreview,
+      isImage,
+      isVideo,
+      isSVGA,
+      loading,
+      inquire,
+      operationDialog,
+      operationType,
+      operationDialogTitle,
+      operationValueId,
+      operationValue,
+      sendDialog,
+      sendObj,
+      tableData,
+      total,
+      currentPage,
+      pageSize,
+      getData,
+      operation,
+      send,
+      beforeAvatarUpload,
+      handleAvatarError,
+      handleAvatarSuccess,
+      handleAvatarSuccess1,
+      // resetFile,
+      initSVGA,
+      initSVGAList,
+      jsonFun,
+      handleSizeChange,
+      handleCurrentChange,
+    };
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.operation {
+  margin-bottom: 20px;
+  width: 55%;
+  display: flex;
+  align-items: baseline;
+  justify-content: space-between;
+}
+.avatar {
+  width: 100%;
+}
+</style>

src/views/recharge/RechargeDiamondGiveDetailView.vue

@@ -9,31 +9,92 @@
         <!-- .content -->
         <div id="table"></div>
         <div id="toolbar">
-                    <form id="searchForm" action="/admin/recharge/user/give/export" method="get" target="_blank">
+          <form
+            id="searchForm"
+            action="/admin/recharge/user/give/export"
+            method="get"
+            target="_blank"
+          >
             <div class="col-sm-12">
-                            <label for="fromErBanNo" class="col-sm-2 control-label">转出人id:</label>
+              <label for="fromErBanNo" class="col-sm-2 control-label"
+                >转出人id:</label
+              >
               <div class="col-sm-2">
-                                <input type="text" class="form-control" name="fromErBanNo" id="fromErBanNo">
+                <input
+                  type="text"
+                  class="form-control"
+                  name="fromErBanNo"
+                  id="fromErBanNo"
+                />
               </div>
-                            <label for="toErBanNo" class="col-sm-2 control-label">收入人id:</label>
+              <label for="toErBanNo" class="col-sm-2 control-label"
+                >收入人id:</label
+              >
               <div class="col-sm-2">
-                                <input type="text" class="form-control" name="toErBanNo" id="toErBanNo">
+                <input
+                  type="text"
+                  class="form-control"
+                  name="toErBanNo"
+                  id="toErBanNo"
+                />
               </div>
-                            <label for="toRegion" class="col-sm-2 control-label">收入人地区:</label>
+              <label for="toRegion" class="col-sm-2 control-label"
+                >收入人地区:</label
+              >
               <div class="col-sm-2">
-                                <select name="toRegion" id="toRegion" data-btn-class="btn-warning" class="form-control">
+                <select
+                  name="toRegion"
+                  id="toRegion"
+                  data-btn-class="btn-warning"
+                  class="form-control"
+                >
                   <option value="" selected="selected">全部</option>
                 </select>
               </div>
             </div>
             <div class="col-sm-12">
-                            <label for="startTime" class="col-sm-2 control-label">时间:</label>
+              <label for="startTime" class="col-sm-2 control-label"
-                            <div class="col-sm-3"><input type="text" class="form-control" name="startTime" id="startTime">
+                >时间:</label
+              >
+              <div class="col-sm-3">
+                <input
+                  type="text"
+                  class="form-control"
+                  name="startTime"
+                  id="startTime"
+                />
               </div>
               <label for="endTime" class="col-sm-1 control-label">-</label>
-                            <div class="col-sm-3"><input type="text" class="form-control" name="endTime" id="endTime"></div>
+              <div class="col-sm-3">
+                <input
+                  type="text"
+                  class="form-control"
+                  name="endTime"
+                  id="endTime"
+                />
+              </div>
             </div>
           </form>
+          <div id="mapObjHtml">
+            <span
+              style="
+                margin-right: 10px;
+                display: inline-block;
+                font-size: 18px;
+                color: #2049a9;
+              "
+              >金币转赠明细: <b class="b1"></b
+            ></span>
+            <span
+              style="
+                margin-right: 10px;
+                display: inline-block;
+                font-size: 18px;
+                color: #2049a9;
+              "
+              >转赠非充值代理用户总数: <b class="b2"></b
+            ></span>
+          </div>
           <button id="btnSearch" class="btn btn-default">
             <i class="glyphicon glyphicon-search"></i>查询
           </button>
@@ -47,7 +108,7 @@
 </template>
 
 <script>
-import TableHelper from '@/utils/bootstrap-table-helper';
+import TableHelper from "@/utils/bootstrap-table-helper";
 
 export default {
   name: "RechargeDiamondGiveDetailView",
@@ -63,38 +124,83 @@ export default {
     initData() {
       $(function () {
         userRegion();
-                $('#table').bootstrapTable('destroy');
+        $("#table").bootstrapTable("destroy");
-                $('#table').bootstrapTable({
+        $("#table").bootstrapTable({
           columns: [
-                        { field: 'createTime', title: '时间', align: 'center', width: '5%' },
-                        { field: 'fromErBanNo', title: '转出人peko id', align: 'center', width: '5%' },
-                        { field: 'fromNick', title: '转出人昵称', align: 'center', width: '5%' },
-                        { field: 'fromClanName', title: '转出人所在公会', align: 'center', width: '5%' },
             {
-                            field: 'fromRegion',
+              field: "createTime",
-                            title: '转出人所属代充地区',
+              title: "时间",
-                            align: 'center',
+              align: "center",
-                            width: '5%',
+              width: "5%",
+            },
+            {
+              field: "fromErBanNo",
+              title: "转出人peko id",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "fromNick",
+              title: "转出人昵称",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "fromClanName",
+              title: "转出人所在公会",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "fromRegion",
+              title: "转出人所属代充地区",
+              align: "center",
+              width: "5%",
               formatter: function (val, row, index) {
-                                var value = '';
+                var value = "";
                 if (val) {
-                                    var array = val.split(',');
+                  var array = val.split(",");
                   for (let i = 0, len = array.length; i < len; i++) {
                     var region = array[i];
                     value += region;
                     if (i != len - 1) {
-                                            value += '<br/>';
+                      value += "<br/>";
                     }
                   }
                 }
                 return value;
-                            }
               },
-                        { field: 'toErBanNo', title: '收入人peko id', align: 'center', width: '5%' },
+            },
-                        { field: 'toNick', title: '收入人昵称', align: 'center', width: '5%' },
+            {
-                        { field: 'toRegion', title: '收入人地区', align: 'center', width: '5%' },
+              field: "toErBanNo",
-                        { field: 'inviteCode', title: '收入人填写的邀请码', align: 'center', width: '5%' },
+              title: "收入人peko id",
-                        { field: 'diamondNum', title: '转赠数额', align: 'center', width: '5%' },
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "toNick",
+              title: "收入人昵称",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "toRegion",
+              title: "收入人地区",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "inviteCode",
+              title: "收入人填写的邀请码",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "diamondNum",
+              title: "转赠数额",
+              align: "center",
+              width: "5%",
+            },
           ],
           cache: false,
           striped: true,
@@ -107,55 +213,60 @@ export default {
           //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
           //设置为limit可以获取limit, offset, search, sort, order
           queryParamsType: "undefined",
-                    queryParams: function queryParams(params) {   //设置查询参数
+          queryParams: function queryParams(params) {
+            //设置查询参数
             var param = {
               page: params.pageNumber,
               pageSize: params.pageSize,
-                            fromErBanNo: $('#fromErBanNo').val(),
+              fromErBanNo: $("#fromErBanNo").val(),
-                            toErBanNo: $('#toErBanNo').val(),
+              toErBanNo: $("#toErBanNo").val(),
-                            toRegion: $('#toRegion').val(),
+              toRegion: $("#toRegion").val(),
-                            startTime: $('#startTime').val(),
+              startTime: $("#startTime").val(),
-                            endTime: $('#endTime').val(),
+              endTime: $("#endTime").val(),
             };
             return param;
           },
-                    toolbar: '#toolbar',
+          toolbar: "#toolbar",
-                    url: '/admin/recharge/user/give/dayDetailPage',
+          url: "/admin/recharge/user/give/dayDetailPage",
-                    onLoadSuccess: function () {  //加载成功时执行
+          onLoadSuccess: function (res) {
-                        console.log("load success");
+            //加载成功时执行
+            console.log();
+            $("#mapObjHtml .b1").text(res.totalMap.totalDiamondNum);
+            $("#mapObjHtml .b2").text(res.totalMap.totalDiamondNum4Normal);
           },
-                    onLoadError: function () {  //加载失败时执行
+          onLoadError: function () {
+            //加载失败时执行
             console.log("load fail");
-                    }
+          },
         });
 
         var picker1 = $("#startTime").datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
+          format: "yyyy-mm-dd hh:ii:00",
           todayBtn: true,
           autoclose: true,
         });
         var picker2 = $("#endTime").datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
+          format: "yyyy-mm-dd hh:ii:00",
           todayBtn: true,
-                    autoclose: true
+          autoclose: true,
         });
-                picker1.on('changeDate', function () {
+        picker1.on("changeDate", function () {
-                    var date = $('#startTime').datetimepicker('getDate');
+          var date = $("#startTime").datetimepicker("getDate");
-                    picker2.datetimepicker('setStartDate', date);
+          picker2.datetimepicker("setStartDate", date);
         });
-                picker2.on('changeDate', function () {
+        picker2.on("changeDate", function () {
-                    var date = $('#endTime').datetimepicker('getDate');
+          var date = $("#endTime").datetimepicker("getDate");
-                    picker1.datetimepicker('setEndDate', date);
+          picker1.datetimepicker("setEndDate", date);
         });
 
         //导出功能
-                $("#btnExport").on('click', function () {
+        $("#btnExport").on("click", function () {
           $("#searchForm").submit();
         });
 
         // 查询刷新
-                $('#btnSearch').on('click', function () {
+        $("#btnSearch").on("click", function () {
-                    TableHelper.doRefresh('#table');
+          TableHelper.doRefresh("#table");
         });
 
         //用户地区
@@ -167,12 +278,12 @@ export default {
             dataType: "json",
             async: false,
             success: function (json) {
-                            if (json.success == 'true' || json.code == 200) {
+              if (json.success == "true" || json.code == 200) {
                 array = json.data;
               }
-                        }
+            },
           });
-                    var $select = $('#toRegion');
+          var $select = $("#toRegion");
           for (let i = 0; i < array.length; i++) {
             var value = array[i];
             var $option = $('<option value="' + value + '" />');
@@ -181,9 +292,8 @@ export default {
           }
         }
       });
-        }
     },
-
+  },
 };
 </script>
 

src/views/record/ChargeRecordView.vue

@@ -5,66 +5,55 @@
         <section class="content-header">
           <h1 id="itemTitle"></h1>
         </section>
-        <form id="form2"
+        <form id="form2" action="" method="post" target="_blank">
-              action=""
+          <input type="hidden" name="erbanNo" id="exportErbanNo" />
-              method="post"
+          <input type="hidden" name="channel" id="exportChannel" />
-              target="_blank">
+          <input type="hidden" name="startTime" id="exportStartTime" />
-          <input type="hidden"
+          <input type="hidden" name="endTime" id="exportEndTime" />
-                 name="erbanNo"
+          <input type="hidden" name="status" id="exportStatus" />
-                 id="exportErbanNo">
+          <input type="hidden" name="newUser" id="exportNewUser" />
-          <input type="hidden"
+          <input type="hidden" name="appChannel" id="exportAppChannel" />
-                 name="channel"
-                 id="exportChannel">
-          <input type="hidden"
-                 name="startTime"
-                 id="exportStartTime">
-          <input type="hidden"
-                 name="endTime"
-                 id="exportEndTime">
-          <input type="hidden"
-                 name="status"
-                 id="exportStatus">
-          <input type="hidden"
-                 name="newUser"
-                 id="exportNewUser">
-          <input type="hidden"
-                 name="appChannel"
-                 id="exportAppChannel">
         </form>
         <section class="content">
           <div id="toolbar">
             <form class="form-inline">
               <div class="form-group">
                 <label for="qErbanNo">平台号：</label>
-                <input type="text"
+                <input
+                  type="text"
                   class="form-control"
                   name="erbanNo"
-                       id="qErbanNo">
+                  id="qErbanNo"
+                />
               </div>
               <div class="form-group">
                 <label for="qChannel">渠道:</label>
-                <input type="text"
+                <input
+                  type="text"
                   class="form-control"
                   name="channel"
-                       id="qChannel">
+                  id="qChannel"
+                />
               </div>
               <div class="form-group">
                 <label for="qChannel">时间:</label>
-                <input type="text"
+                <input
+                  type="text"
                   class="form-control datetime"
                   name="startTime"
-                       id="qStartTime">
+                  id="qStartTime"
+                />
                 <label for="qChannel">-</label>
-                <input type="text"
+                <input
+                  type="text"
                   class="form-control datetime"
                   name="endTime"
-                       id="qEndTime">
+                  id="qEndTime"
+                />
               </div>
               <div class="form-group">
                 <label for="qStatus">状态:</label>
-                <select class="form-control"
+                <select class="form-control" name="status" id="qStatus">
-                        name="status"
-                        id="qStatus">
                   <option value="">全部</option>
                   <option value="1">发起充值</option>
                   <option value="2">充值成功</option>
@@ -72,9 +61,7 @@
               </div>
               <div class="form-group">
                 <label for="qNewUser">新用户:</label>
-                <select class="form-control"
+                <select class="form-control" name="newUser" id="qNewUser">
-                        name="newUser"
-                        id="qNewUser">
                   <option value="">全部</option>
                   <option value="1">是</option>
                   <option value="0">否</option>
@@ -82,20 +69,20 @@
               </div>
               <div class="form-group">
                 <label for="qChannel">app渠道</label>
-                <input type="text"
+                <input
+                  type="text"
                   class="form-control"
                   name="appChannel"
-                       id="qAppChannel">
+                  id="qAppChannel"
+                />
               </div>
             </form>
-            <button id="btnSearch"
+            <div id="mapObjHtml"></div>
-                    class="btn btn-sm btn-primary">查询</button>
+            <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
-            <button id="btnExport"
+            <button id="btnExport" class="btn btn-sm btn-primary">导出</button>
-                    class="btn btn-sm btn-primary">导出</button>
           </div>
           <!-- .content -->
-          <div class="content"
+          <div class="content" id="table"></div>
-               id="table"></div>
         </section>
       </div>
     </div>
@@ -103,13 +90,9 @@
 </template>
 
 <script>
-import TableHelper from '@/utils/bootstrap-table-helper';
+import TableHelper from "@/utils/bootstrap-table-helper";
-
 export default {
   name: "ChargeRecordView",
-  setup () {
-    return {};
-  },
   created() {
     this.$nextTick(function () {
       this.initData();
@@ -117,47 +100,79 @@ export default {
   },
   methods: {
     initData() {
-      $(function () {
+      $(".datetime").datetimepicker({
-        $('.datetime').datetimepicker({
+        format: "yyyy-mm-dd hh:ii:00",
-          format: 'yyyy-mm-dd hh:ii:00',
+        autoclose: true,
-          autoclose: true
       });
-        $('#table').bootstrapTable('destroy');
+
-        $('#table').bootstrapTable({
+      // 初始化表格，但不设置 `ajax` 方法，也不绑定 `url`，只提供列配置
+      $("#table").bootstrapTable({
         columns: [
-            { field: 'erbanNo', title: '平台号', align: 'center', width: '5%' },
+          { field: "erbanNo", title: "平台号", align: "center", width: "5%" },
-            { field: 'uid', title: 'uid', align: 'center', width: '5%' },
+          { field: "uid", title: "uid", align: "center", width: "5%" },
-            { field: 'nick', title: '昵称', align: 'center', width: '5%' },
+          { field: "nick", title: "昵称", align: "center", width: "5%" },
-            { field: 'partitionName', title: '分区', align: 'center', width: '5%' },
-            { field: 'createTime', title: '创建时间', align: 'center', valign: 'middle', width: '10%' },
-            { field: 'channel', title: '渠道', align: 'center', width: '5%' },
-            { field: 'localCurrencyCode', title: '当地货币代码', align: 'center', width: '5%' },
-            { field: 'localAmount', title: '当地金额', align: 'center', width: '5%' },
-            { field: 'chargeRecordId', title: '商户订单号', align: 'center', width: '5%' },
-            { field: 'pingxxChargeId', title: '第三方订单号', align: 'center', width: '5%' },
           {
-              field: 'status', title: '状态', align: 'center', width: '5%',
+            field: "partitionName",
-              formatter: function (val, row, index) {
+            title: "分区",
-                if (val == 2) {
+            align: "center",
-                  return '充值成功';
+            width: "5%",
-                } else {
-                  return '发起充值';
-                }
-
-              }
           },
           {
-              field: 'newUser', title: '是否新用户', align: 'center', width: '5%',
+            field: "createTime",
-              formatter: function (val, row, index) {
+            title: "创建时间",
-                if (val) {
+            align: "center",
-                  return '是';
+            valign: "middle",
-                } else {
+            width: "10%",
-                  return '否';
+          },
-                }
+          { field: "channel", title: "渠道", align: "center", width: "5%" },
-
+          {
-              }
+            field: "localCurrencyCode",
+            title: "当地货币代码",
+            align: "center",
+            width: "5%",
+          },
+          {
+            field: "localAmount",
+            title: "当地金额",
+            align: "center",
+            width: "5%",
+          },
+          {
+            field: "chargeRecordId",
+            title: "商户订单号",
+            align: "center",
+            width: "5%",
+          },
+          {
+            field: "pingxxChargeId",
+            title: "第三方订单号",
+            align: "center",
+            width: "5%",
+          },
+          {
+            field: "status",
+            title: "状态",
+            align: "center",
+            width: "5%",
+            formatter: function (val, row, index) {
+              return val == 2 ? "充值成功" : "发起充值";
+            },
+          },
+          {
+            field: "newUser",
+            title: "是否新用户",
+            align: "center",
+            width: "5%",
+            formatter: function (val, row, index) {
+              return val ? "是" : "否";
+            },
+          },
+          {
+            field: "appChannel",
+            title: "app渠道",
+            align: "center",
+            width: "5%",
           },
-            { field: 'appChannel', title: 'app渠道', align: 'center', width: '5%' },
         ],
         undefinedText: "-",
         cache: false,
@@ -167,88 +182,93 @@ export default {
         pagination: true,
         pageList: [20, 50, 100, 200, 300, 500],
         search: false,
-          sidePagination: "server", //表示服务端请求
+        sidePagination: "server",
         queryParamsType: "undefined",
-          queryParams: function queryParams (params) {   //设置查询参数
+        data: [], // 初始化为空数据
-            var param = {
-              pageNumber: params.pageNumber,
-              pageSize: params.pageSize,
-              erbanNo: $('#qErbanNo').val(),
-              channel: $('#qChannel').val(),
-              startTime: $('#qStartTime').val(),
-              endTime: $('#qEndTime').val(),
-              status: $('#qStatus').val(),
-              newUser: $('#qNewUser').val(),
-              appChannel: $('#qAppChannel').val(),
-            };
-            return param;
-          },
-          ajax: function (request) {                    //使用ajax请求
-            $.ajax({
-              type: "GET",
-              url: '/admin/chargeRecord/list',
-              contentType: 'application/json;charset=utf-8',
-              dataType: 'json',
-              data: request.data,
-              success: function (res) {
-                apiResult(res);
-                request.success({
-                  rows: res.data.records,
-                  total: res.data.total
-                });
-              },
-              error: function (req) {
-                serverError(req);
-              }
-            })
-          },
-          toolbar: '#toolbar',
-          onLoadSuccess: function () {  //加载成功时执行
-            console.log("load success");
-          },
-          onLoadError: function () {  //加载失败时执行
-            console.log("load fail");
-          }
       });
 
       // 查询刷新
-        $('#btnSearch').on('click', function () {
+      $("#btnSearch").on("click", function () {
-          TableHelper.doRefresh('#table');
+        const params = {
+          pageNumber: 1,
+          pageSize: 20,
+          erbanNo: $("#qErbanNo").val(),
+          channel: $("#qChannel").val(),
+          startTime: $("#qStartTime").val(),
+          endTime: $("#qEndTime").val(),
+          status: $("#qStatus").val(),
+          newUser: $("#qNewUser").val(),
+          appChannel: $("#qAppChannel").val(),
+        };
+
+        // 手动加载数据
+        $.ajax({
+          type: "GET",
+          url: "/admin/chargeRecord/list",
+          contentType: "application/json;charset=utf-8",
+          dataType: "json",
+          data: params,
+          success: function (res) {
+            if (apiResult(res)) {
+              $("#table").bootstrapTable("load", {
+                rows: res.data.rows,
+                total: res.data.total,
+              });
+
+              $("#mapObjHtml span").remove();
+              const totalMap = res.data.totalMap;
+              let str = "";
+              const sortedKeys = Object.keys(totalMap).sort((keyA, keyB) => {
+                return keyA === "总充值{USD}"
+                  ? -1
+                  : keyB === "总充值{USD}"
+                  ? 1
+                  : 0;
+              });
+              for (const key of sortedKeys) {
+                str += `
+              <span style="margin-right:10px;display: inline-block;font-size: 18px;color: #2049a9;" type="text">${key}: ${totalMap[key]}, </span>
+            `;
+              }
+              $("#mapObjHtml").append(str);
+            }
+          },
+          error: function (req) {
+            serverError(req);
+          },
+        });
       });
 
       function serverError(req) {
         $("#tipMsg").text(req.responseJSON.message);
-          $("#tipModal").modal('show');
+        $("#tipModal").modal("show");
       }
 
       function apiResult(json) {
-          if (json.code == 200 && json.message == 'success') {
+        if (json.code == 200 && json.message == "success") {
           return true;
         }
         $("#tipMsg").text("请求失败，错误信息：" + json.message);
-          $("#tipModal").modal('show');
+        $("#tipModal").modal("show");
         return false;
       }
 
       // 导出excel
-        $('#btnExport').on('click', function () {
+      $("#btnExport").on("click", function () {
-          var form = $("#form2");
+        const form = $("#form2");
         form.attr("action", "/admin/chargeRecord/exportChargeDetail");
-          $('#exportErbanNo').val($('#qErbanNo').val());
+        $("#exportErbanNo").val($("#qErbanNo").val());
-          $('#exportChannel').val($('#qChannel').val());
+        $("#exportChannel").val($("#qChannel").val());
-          $('#exportStartTime').val($('#qStartTime').val());
+        $("#exportStartTime").val($("#qStartTime").val());
-          $('#exportEndTime').val($('#qEndTime').val());
+        $("#exportEndTime").val($("#qEndTime").val());
-          $('#exportStatus').val($('#qStatus').val());
+        $("#exportStatus").val($("#qStatus").val());
-          $('#exportNewUser').val($('#qNewUser').val());
+        $("#exportNewUser").val($("#qNewUser").val());
-          $('#exportAppChannel').val($('#qAppChannel').val());
+        $("#exportAppChannel").val($("#qAppChannel").val());
 
         form.submit();
-        })
-
       });
-    }
     },
-
+  },
 };
 </script>
 

src/views/refund/UserRefundQuiry.vue

@@ -0,0 +1,410 @@
+<template>
+  <div class="box">
+    <!-- 分区 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">分区</span>
+        <el-select
+          v-model="inquire.partitionId"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.partitionArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+    <!-- 平台ID -->
+    <div class="inquire">
+      <span>平台ID</span>
+      <el-input
+        v-model="inquire.userId"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 充值订单号 -->
+    <div class="inquire">
+      <span>充值订单号</span>
+      <el-input
+        v-model="inquire.rechargeNumber"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 第三方订单号 -->
+    <div class="inquire">
+      <span>第三方订单号</span>
+      <el-input
+        v-model="inquire.partyNumber"
+        placeholder=""
+        class="input"
+      ></el-input>
+    </div>
+    <!-- 国家 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">国家</span>
+        <el-select
+          v-model="inquire.country"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.countryArr"
+            :key="item.id"
+            :label="item.regionDesc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+    <!-- 状态 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">状态</span>
+        <el-select
+          v-model="inquire.status"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.statusArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+    <!-- 平台 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">平台</span>
+        <el-select
+          v-model="inquire.platform"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.platformArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+    <!-- 支付渠道 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">支付渠道</span>
+        <el-select
+          v-model="inquire.paymentChannels"
+          style="width: 75%"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in inquire.paymentChannelsArr"
+            :key="item.id"
+            :label="item.desc"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </div>
+    </div>
+    <!-- 时间选择器 -->
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">时间</span>
+        <el-date-picker
+          v-model="inquire.time"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
+    </div>
+    <!-- 查询按钮 -->
+    <el-button class="primary" type="primary" @click="getData()"
+      >搜索</el-button
+    >
+    <el-button
+      class="primary"
+      type="primary"
+      @click="
+        inquire.partitionId = inquire.partitionArr[0].id;
+        inquire.userId = '';
+        inquire.rechargeNumber = '';
+        inquire.partyNumber = '';
+        inquire.country = inquire.countryArr[0].id;
+        inquire.status = 0;
+        inquire.platform = '';
+        inquire.paymentChannels = '';
+        inquire.time = '';
+        getData();
+      "
+      >重置搜索</el-button
+    >
+    <el-button class="primary" type="primary" @click="exportInfoFun()"
+      >导出</el-button
+    >
+    <div>
+      <el-button v-for="(value, key) in sortedMapObj" :key="key" type="text"
+        >{{ key }}: {{ value }},
+      </el-button>
+    </div>
+    <!-- 表格 -->
+    <el-table
+      v-loading="loading"
+      :data="tableData"
+      border
+      style="width: 100%; margin-top: 25px"
+    >
+      <el-table-column prop="chargeStatusDesc" align="center" label="支付状态">
+      </el-table-column>
+      <el-table-column prop="chargeRecordId" align="center" label="订单ID" />
+      <el-table-column
+        prop="pingxxChargeId"
+        align="center"
+        label="第三方订单ID"
+      />
+      <el-table-column prop="channel" align="center" label="充值渠道" />
+      <el-table-column prop="erbanNo" align="center" label="平台ID" />
+      <el-table-column prop="nick" align="center" label="昵称" />
+      <el-table-column prop="partitionDesc" align="center" label="地区" />
+      <el-table-column prop="phone" align="center" label="电话" />
+      <el-table-column prop="os" align="center" label="平台" />
+      <el-table-column prop="genderDesc" align="center" label="性别" />
+      <el-table-column prop="chargeIp" align="center" label="用户IP" />
+      <el-table-column prop="totalGold" align="center" label="金币数量" />
+      <el-table-column prop="amount" align="center" label="花费金额（USD）" />
+      <el-table-column
+        prop="localCurrencyCode"
+        align="center"
+        label="当地货币代码"
+      />
+      <el-table-column
+        prop="localAmount"
+        align="center"
+        label="当地货币花费金额"
+      />
+      <el-table-column prop="createTime" align="center" label="购买时间" />
+      <el-table-column prop="successTime" align="center" label="回调时间" />
+      <el-table-column prop="successTime" align="center" label="退款时间" />
+      <el-table-column prop="amount" align="center" label="退款金额" />
+      <el-table-column
+        prop="refundDesc"
+        align="center"
+        label="状态"
+      ></el-table-column>
+      <el-table-column prop="regionName" align="center" label="国家" />
+    </el-table>
+    <!-- 分页 -->
+    <el-pagination
+      style="margin-top: 10px"
+      class="paginationClass"
+      v-model:current-page="currentPage"
+      v-model:page-size="pageSize"
+      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next"
+      :total="total"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    />
+  </div>
+</template>
+<script>
+import {
+  listPartitionInfo,
+  refundList,
+  regionInfoList,
+  refundExport,
+} from "@/api/refund/refund";
+// @ts-ignore
+import { dateFormat } from "@/utils/system-helper";
+// @ts-ignore
+import { ElMessage } from "element-plus";
+export default {
+  name: "userRefundQuiry",
+  computed: {
+    sortedMapObj() {
+      const entries = Object.entries(this.mapObj);
+      // 将 "总充值{USD}" 的键排到第一位
+      entries.sort(([keyA], [keyB]) =>
+        keyA === "总充值{USD}" ? -1 : keyB === "总充值{USD}" ? 1 : 0
+      );
+      return Object.fromEntries(entries);
+    },
+  },
+  data() {
+    return {
+      loading: false,
+      delDialog: false,
+      delDialogData: null,
+      mapObj: {},
+      //查询所需条件对象
+      inquire: {
+        partitionId: 0,
+        partitionArr: [],
+        userId: "",
+        rechargeNumber: "",
+        partyNumber: "",
+        country: "",
+        countryArr: [],
+        status: "",
+        statusArr: [
+          { desc: "全部", id: 0 },
+          { desc: "退款中", id: 2 },
+          { desc: "退款成功", id: 1 },
+          { desc: "退款失败", id: 3 },
+        ],
+        platform: "",
+        platformArr: [
+          { desc: "全部", id: "" },
+          { desc: "Android", id: "android" },
+          { desc: "iOS", id: "iOS" },
+        ],
+        paymentChannels: "",
+        paymentChannelsArr: [
+          { desc: "google内购", id: "google_play_billing" },
+          { desc: "payermax", id: "payermax" },
+          { desc: "myCard", id: "MyCard" },
+          { desc: "startPay", id: "start_pay" },
+          { desc: "ios内购", id: "ios_pay" },
+          { desc: "对公打款", id: "company" },
+        ],
+        time: "",
+      },
+      // 表格
+      tableData: [],
+      // 分页
+      total: 10, //总页数
+      currentPage: 1, //页码
+      pageSize: 10, //条数
+    };
+  },
+  created() {
+    listPartitionInfo().then((res) => {
+      this.inquire.partitionArr = res.data;
+      this.inquire.partitionId = this.inquire.partitionArr[0].id;
+    });
+    regionInfoList().then((res) => {
+      this.inquire.countryArr = res.data;
+    });
+  },
+  methods: {
+    // 查询接口
+    getData() {
+      this.loading = true;
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd 00:00:00");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd 23:59:59");
+      }
+      refundList({
+        partitionId: this.inquire.partitionId,
+        channel: this.inquire.paymentChannels,
+        chargeRecordId: this.inquire.rechargeNumber,
+        pingxxChargeId: this.inquire.partyNumber,
+        refundStatus: this.inquire.status,
+        regionId: this.inquire.country,
+        os: this.inquire.platform,
+        erbanNo: this.inquire.userId,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        beginDate: startTime,
+        endDate: endTime,
+      }).then((res) => {
+        if (res.code == 200) {
+          this.total = res.data.total;
+          this.tableData = res.data.rows;
+          this.mapObj = res.data.totalMap;
+        } else {
+          ElMessage({
+            showClose: true,
+            message: res.message,
+            type: "error",
+          });
+        }
+        this.loading = false;
+      });
+    },
+    jsonFun(val) {
+      return JSON.parse(val);
+    },
+    exportInfoFun() {
+      let time = this.inquire.time;
+      let startTime = "";
+      let endTime = "";
+      if (time && time.length > 0) {
+        startTime = dateFormat(this.inquire.time[0], "yyyy-MM-dd 00:00:00");
+        endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd 23:59:59");
+      }
+      refundExport({
+        partitionId: this.inquire.partitionId,
+        channel: this.inquire.paymentChannels,
+        chargeRecordId: this.inquire.rechargeNumber,
+        pingxxChargeId: this.inquire.partyNumber,
+        refundStatus: this.inquire.status,
+        regionId: this.inquire.country,
+        os: this.inquire.platform,
+        erbanNo: this.inquire.userId,
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        beginDate: startTime,
+        endDate: endTime,
+      }).then();
+    },
+    // 分页导航
+    handleSizeChange() {
+      this.getData();
+    },
+    handleCurrentChange() {
+      this.getData();
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.box {
+  padding-top: 20px;
+  background: #ecf0f5;
+  .inquire {
+    display: inline-block;
+    margin-right: 20px;
+    margin-bottom: 10px;
+    span {
+      margin-right: 10px;
+    }
+    .input {
+      width: 180px;
+      margin-right: 10px;
+    }
+  }
+  .dialogTableVisibleBut {
+    display: block;
+    margin: 30px 0 0 830px;
+  }
+  .paginationClass {
+    margin: 15px 0 5px 0px;
+  }
+}
+.selectBox {
+  display: flex;
+  height: 35px;
+  line-height: 35px;
+  margin-bottom: 20px;
+}
+.selectBoxImg {
+  height: 150px;
+}
+</style>

src/views/room/RoomTabHomeView.vue

@@ -8,36 +8,39 @@
         </section>
         <div id="toolbar">
           <div class="col-sm-12">
-            <label for="erbanNo"
+            <label for="erbanNo" class="col-sm-2 control-label"
-                   class="col-sm-2 control-label">房主平台号:</label>
+              >房主平台号:</label
+            >
             <div class="col-sm-2">
-              <input type="text"
+              <input
+                type="text"
                 class="form-control"
                 name="erbanNo"
                 id="erbanNo"
-                     placeholder="">
+                placeholder=""
+              />
             </div>
-            <label for="roomTitle"
+            <label for="roomTitle" class="col-sm-2 control-label"
-                   class="col-sm-2 control-label">房间标题:</label>
+              >房间标题:</label
+            >
             <div class="col-sm-2">
-              <input type="text"
+              <input
+                type="text"
                 class="form-control"
                 name="roomTitle"
                 id="roomTitle"
-                     placeholder="">
+                placeholder=""
+              />
             </div>
-            <label for="partitionId"
+            <label for="partitionId" class="col-sm-1 control-label"
-                   class="col-sm-1 control-label">地区:</label>
+              >地区:</label
+            >
             <div class="col-sm-2">
-              <select name="partitionId"
+              <select name="partitionId" id="partitionId" class="form-control">
-                      id="partitionId"
+                <option value="4" selected>华语区</option>
-                      class="form-control">
-                <option value="4"
-                        selected>华语区</option>
               </select>
             </div>
-            <button id="btnSearch"
+            <button id="btnSearch" class="btn btn-default">
-                    class="btn btn-default">
               <i class="glyphicon glyphicon-search"></i>查询
             </button>
           </div>
@@ -46,44 +49,40 @@
 
       <!-- .content -->
       <div id="table"></div>
-
     </div>
   </section>
 
   <!-- 编辑弹框 -->
-  <div class="modal fade"
+  <div
+    class="modal fade"
     id="roomTabHomeModal"
     tabindex="-1"
     role="dialog"
-       aria-labelledby="modalLabel">
+    aria-labelledby="modalLabel"
-    <div class="modal-dialog"
+  >
-         role="document">
+    <div class="modal-dialog" role="document">
       <div class="modal-content">
         <div class="modal-header">
-          <button type="button"
+          <button
+            type="button"
             class="close"
             data-dismiss="modal"
-                  aria-label="Close"><span aria-hidden="true">&times;</span>
+            aria-label="Close"
+          >
+            <span aria-hidden="true">&times;</span>
           </button>
-          <h4 class="modal-title"
+          <h4 class="modal-title" id="modalLabel">编辑</h4>
-              id="modalLabel">编辑</h4>
         </div>
         <div class="modal-body">
-          <form class="form-horizontal"
+          <form class="form-horizontal" id="addForm">
-                id="addForm">
+            <input type="hidden" name="id" id="id" />
-            <input type="hidden"
+            <input type="hidden" name="roomUid" id="roomUid" />
-                   name="id"
-                   id="id" />
-            <input type="hidden"
-                   name="roomUid"
-                   id="roomUid" />
             <div class="form-group">
-              <label for="modal_isTop"
+              <label for="modal_isTop" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">是否置顶<font color="red">*</font>：</label>
+                >是否置顶<font color="red">*</font>：</label
+              >
               <div class="col-sm-9">
-                <select name="isTop"
+                <select name="isTop" id="modal_isTop" class="form-control">
-                        id="modal_isTop"
-                        class="form-control">
                   <option value=""></option>
                   <option value="1">是</option>
                   <option value="0">否</option>
@@ -91,45 +90,69 @@
               </div>
             </div>
             <div class="form-group">
-              <label for="modal_seq"
+              <label for="modal_type" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">置顶排序<font color="red">*</font>:</label>
+                >房间类型：<font color="red">*</font>：</label
+              >
               <div class="col-sm-9">
-                <input type="text"
+                <select name="type" id="modal_type" class="form-control">
+                  <option value="1">客服房间</option>
+                  <option value="2">热门房间</option>
+                </select>
+              </div>
+            </div>
+            <div class="form-group">
+              <label for="modal_seq" class="col-sm-3 control-label"
+                >置顶排序调整为位置排序<font color="red">*</font>:</label
+              >
+              <div class="col-sm-9">
+                <input
+                  type="number"
                   class="form-control"
                   name="seq"
                   id="modal_seq"
-                       placeholder="数字小的排前面，必填">
+                  min="1"
+                  max="5"
+                  placeholder="填入的数字=在首页的第几个位置"
+                  oninput="this.value = Math.min(Math.max(this.value, 1), 5)"
+                />
               </div>
             </div>
             <div class="form-group">
-              <label for="modal_topStart"
+              <label for="modal_topStart" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">置顶开始时间<font color="red">*</font>
+                >置顶开始时间<font color="red">*</font> :</label
-                :</label>
+              >
               <div class="col-sm-9">
-                <input type="text"
+                <input
+                  type="text"
                   class="input-sm form-control datetime"
                   name="topStart"
-                       id="modal_topStart">
+                  id="modal_topStart"
+                />
               </div>
             </div>
             <div class="form-group">
-              <label for="modal_topEnd"
+              <label for="modal_topEnd" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">置顶结束时间<font color="red">*</font>
+                >置顶结束时间<font color="red">*</font> :</label
-                :</label>
+              >
               <div class="col-sm-9">
-                <input type="text"
+                <input
+                  type="text"
                   class="input-sm form-control datetime"
                   name="topEnd"
-                       id="modal_topEnd">
+                  id="modal_topEnd"
+                />
               </div>
             </div>
             <div class="form-group">
-              <label for="modal_isShow"
+              <label for="modal_isShow" class="col-sm-3 control-label"
-                     class="col-sm-3 control-label">是否在App首页展示<font color="red">*</font>：</label>
+                >是否在App首页展示<font color="red">*</font>：</label
+              >
               <div class="col-sm-9">
-                <select name="isShow"
+                <select
+                  name="isShow"
                   id="modal_isShow"
-                        class="form-control validate[required]">
+                  class="form-control validate[required]"
+                >
                   <option value="1">是</option>
                   <option value="0">否</option>
                 </select>
@@ -138,24 +161,23 @@
           </form>
         </div>
         <div class="modal-footer">
-          <button type="button"
+          <button type="button" class="btn btn-default" data-dismiss="modal">
-                  class="btn btn-default"
+            关闭
-                  data-dismiss="modal">关闭</button>
+          </button>
-          <button type="button"
+          <button type="button" class="btn btn-primary" id="btnConfirm">
-                  class="btn btn-primary"
+            确定
-                  id="btnConfirm">确定</button>
+          </button>
         </div>
-
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import TableHelper from '@/utils/bootstrap-table-helper';
+import TableHelper from "@/utils/bootstrap-table-helper";
-import { formatTime } from '@/utils/maintainer';
+import { formatTime } from "@/utils/maintainer";
-import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { getPartitionInfoList } from "@/api/partition/partitionInfo";
-import { buildSelectOption } from '@/utils/system-helper';
+import { buildSelectOption } from "@/utils/system-helper";
 
 // tab类型选择变化查询
 /*function selectOnTabChange(obj){
@@ -176,103 +198,161 @@ export default {
   methods: {
     initData() {
       $(function () {
-        $('.datetime').datetimepicker({
+        $(".datetime").datetimepicker({
-          format: 'yyyy-mm-dd hh:ii:00',
+          format: "yyyy-mm-dd hh:ii:00",
-          autoclose: true
+          autoclose: true,
         });
 
-        $('#table').bootstrapTable('destroy');
+        $("#table").bootstrapTable("destroy");
-        $('#table').bootstrapTable({
+        $("#table").bootstrapTable({
           columns: [
-            { field: 'erbanNo', title: '房主平台号', align: 'center', width: '5%' },
-            { field: 'roomUid', title: '房主Uid', align: 'center', width: '5%' },
-            { field: 'roomTitle', title: '房间标题', align: 'center', width: '8%' },
-            { field: 'roomTag', title: '房间标签', align: 'center', width: '5%' },
             {
-              field: 'isPermitRoom',
+              field: "erbanNo",
-              title: '房间类型',
+              title: "房主平台号",
-              align: 'center',
+              align: "center",
-              width: '5%',
+              width: "5%",
+            },
+            {
+              field: "roomUid",
+              title: "房主Uid",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "roomTitle",
+              title: "房间标题",
+              align: "center",
+              width: "8%",
+            },
+            {
+              field: "roomTag",
+              title: "房间标签",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "isPermitRoom",
+              title: "房间类型",
+              align: "center",
+              width: "5%",
               formatter: function (val, row, index) {
-                let value = '';
+                let value = "";
                 if (val == 1) {
-                  value = '牌照房';
+                  value = "牌照房";
                 } else if (val == 4) {
-                  value = '个播房';
+                  value = "个播房";
                 } else {
-                  value = '非牌照房';
+                  value = "非牌照房";
                 }
                 return value;
-              }
+              },
             },
             {
-              field: 'avatar',
+              field: "avatar",
-              title: '图标内容',
+              title: "图标内容",
-              align: 'center',
+              align: "center",
-              width: '5%',
+              width: "5%",
               formatter: function (val, row, index) {
                 return "<img src='" + val + "' width='40' height='40'>";
-              }
+              },
             },
             {
-              field: 'isTop',
+              field: "isTop",
-              title: '是否置顶',
+              title: "是否置顶",
-              align: 'center',
+              align: "center",
-              valign: 'middle',
+              valign: "middle",
-              width: '5%',
+              width: "5%",
               formatter: function (val, row, index) {
                 if (val == 1) {
-                  return '是';
+                  return "是";
                 } else if (val == 0) {
-                  return '否';
+                  return "否";
-                }
-                return '否';
                 }
+                return "否";
+              },
             },
             {
-              field: 'isShow',
+              field: "isShow",
-              title: '是否在App首页展示',
+              title: "是否在App首页展示",
-              align: 'center',
+              align: "center",
-              valign: 'middle',
+              valign: "middle",
-              width: '5%',
+              width: "5%",
               formatter: function (val, row, index) {
                 if (val == 1) {
-                  return '是';
+                  return "是";
                 } else if (val == 0) {
-                  return '否';
+                  return "否";
-                }
-                return '是';
                 }
+                return "是";
               },
-            { field: 'seq', title: '置顶排序', align: 'center', width: '5%' },
+            },
-            { field: 'topStart', title: '置顶开始时间', align: 'center', valign: 'middle', width: '10%', formatter: formatTime },
+            { field: "seq", title: "置顶排序", align: "center", width: "5%" },
-            { field: 'topEnd', title: '置顶结束时间', align: 'center', valign: 'middle', width: '10%', formatter: formatTime },
             {
-              field: 'isHourTop1', title: '小时榜top1', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
+              field: "topStart",
-                return val ? '是' : '否';
+              title: "置顶开始时间",
-              }
+              align: "center",
+              valign: "middle",
+              width: "10%",
+              formatter: formatTime,
             },
             {
-              field: 'isHourTop1', title: '周榜top1', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
+              field: "topEnd",
-                return val ? '是' : '否';
+              title: "置顶结束时间",
-              }
+              align: "center",
+              valign: "middle",
+              width: "10%",
+              formatter: formatTime,
             },
             {
-              field: 'micUserCount', title: '麦上人数', align: 'center', valign: 'middle', width: '10%'
+              field: "isHourTop1",
-            },
+              title: "小时榜top1",
-            {
+              align: "center",
-              field: 'onlineNum', title: '房间人数', align: 'center', valign: 'middle', width: '10%'
+              valign: "middle",
-            },
+              width: "10%",
-            {
-              field: 'id',
-              title: '操作',
-              align: 'center',
-              width: '10%',
               formatter: function (val, row, index) {
-                return '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" data-id="' + val + '" data-index="' + index + '">' +
+                return val ? "是" : "否";
-                  '<i class="glyphicon glyphicon-edit"></i> 编辑</button>';
+              },
-              }
+            },
-            }
+            {
+              field: "isHourTop1",
+              title: "周榜top1",
+              align: "center",
+              valign: "middle",
+              width: "10%",
+              formatter: function (val, row, index) {
+                return val ? "是" : "否";
+              },
+            },
+            {
+              field: "micUserCount",
+              title: "麦上人数",
+              align: "center",
+              valign: "middle",
+              width: "10%",
+            },
+            {
+              field: "onlineNum",
+              title: "房间人数",
+              align: "center",
+              valign: "middle",
+              width: "10%",
+            },
+            {
+              field: "id",
+              title: "操作",
+              align: "center",
+              width: "10%",
+              formatter: function (val, row, index) {
+                return (
+                  '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" data-id="' +
+                  val +
+                  '" data-index="' +
+                  index +
+                  '">' +
+                  '<i class="glyphicon glyphicon-edit"></i> 编辑</button>'
+                );
+              },
+            },
           ],
           undefinedText: "",
           cache: false,
@@ -281,51 +361,55 @@ export default {
           search: false,
           sidePagination: "server", //表示服务端请求
           queryParamsType: "undefined",
-          queryParams: function queryParams (params) {   //设置查询参数
+          queryParams: function queryParams(params) {
+            //设置查询参数
             var param = {
               page: params.pageNumber,
               pageSize: params.pageSize,
-              erbanNo: $('#erbanNo').val(),
+              erbanNo: $("#erbanNo").val(),
-              roomTitle: $('#roomTitle').val(),
+              roomTitle: $("#roomTitle").val(),
-              partitionId: $('#partitionId').val(),
+              partitionId: $("#partitionId").val(),
             };
             console.log(param);
             return param;
           },
-          url: '/admin/roomTabHome/list',
+          url: "/admin/roomTabHome/list",
           responseHandler: function (data) {
-            console.info(111, data)
+            console.info(111, data);
             if (data.code === 200) {
-              return { "rows": data.data, "total": data.data.length };
+              return { rows: data.data, total: data.data.length };
             } else {
-              return { "rows": [], "total": 0 };
+              return { rows: [], total: 0 };
             }
           },
-          toolbar: '#toolbar',
+          toolbar: "#toolbar",
-          onLoadSuccess: function () {  //加载成功时执行
+          onLoadSuccess: function () {
+            //加载成功时执行
             console.log("load success");
           },
-          onLoadError: function () {  //加载失败时执行
+          onLoadError: function () {
+            //加载失败时执行
             console.log("load fail");
-          }
+          },
         });
 
         // 查询刷新
-        $('#btnSearch').on('click', function () {
+        $("#btnSearch").on("click", function () {
-          TableHelper.doRefresh('#table');
+          TableHelper.doRefresh("#table");
         });
 
         // 编辑或者新增
         $("#btnConfirm").click(function () {
           var id = $("#id").val();
-          var roomUid = $('#roomUid').val();
+          var roomUid = $("#roomUid").val();
           var seq = $("#modal_seq").val();
           var isTop = $("#modal_isTop").val();
+          var type = $("#modal_type").val();
           var iconContent = $("#modal_iconContent").val();
           var topStart = $("#modal_topStart").val();
           var topEnd = $("#modal_topEnd").val();
-          var isShow = $('#modal_isShow').val();
+          var isShow = $("#modal_isShow").val();
-          if ($("#addForm").validationEngine('validate')) {
+          if ($("#addForm").validationEngine("validate")) {
             $.ajax({
               type: "post",
               url: "/admin/roomTabHome/save",
@@ -343,34 +427,34 @@ export default {
               success: function (json) {
                 if (json.code == 200) {
                   $("#tipMsg").text("保存成功");
-                  $("#tipModal").modal('show');
+                  $("#tipModal").modal("show");
                   TableHelper.doRefresh("#table");
-                  $("#roomTabHomeModal").modal('hide');
+                  $("#roomTabHomeModal").modal("hide");
                 } else {
                   $("#tipMsg").text("保存失败." + json.msg);
-                  $("#tipModal").modal('show');
+                  $("#tipModal").modal("show");
                   TableHelper.doRefresh("#table");
-                  $("#roomTabHomeModal").modal('hide');
+                  $("#roomTabHomeModal").modal("hide");
-                }
                 }
+              },
             });
           }
-
         });
 
         // 获取信息
-        $("#table").on("click", '.opt-edit', function () {
+        $("#table").on("click", ".opt-edit", function () {
           var id = $(this).attr("data-id");
-          const index = $(this).data('index');
+          const index = $(this).data("index");
-          const record = TableHelper.getData('#table')[index];
+          const record = TableHelper.getData("#table")[index];
           $("#id").val(null);
           $("#modal_seq").val(0);
           $("#modal_isTop").val(0);
-          $("#modal_topStart").val('');
+          $("#modal_type").val(0);
-          $("#modal_topEnd").val('');
+          $("#modal_topStart").val("");
+          $("#modal_topEnd").val("");
           $("#modal_isShow").val(0);
-          $('#roomUid').val(record.roomUid);
+          $("#roomUid").val(record.roomUid);
-          if (id && id != 'null') {
+          if (id && id != "null") {
             $.ajax({
               type: "get",
               url: "/admin/roomTabHome/get",
@@ -382,53 +466,53 @@ export default {
                   $("#id").val(id);
                   $("#modal_seq").val(json.seq);
                   $("#modal_isTop").val(json.isTop ? 1 : 0);
+                  $("#modal_type").val(json.type);
                   $("#modal_topStart").val(formatTime(json.topStart));
                   $("#modal_topEnd").val(formatTime(json.topEnd));
                   $("#modal_isShow").val(json.isShow ? 1 : 0);
                 } else {
                   $("#tipMsg").text("获取菜单信息出错");
-                  $("#tipModal").modal('show');
+                  $("#tipModal").modal("show");
-                }
                 }
+              },
             });
           }
           // 打开编辑弹窗
-          $("#roomTabHomeModal").modal('show');
+          $("#roomTabHomeModal").modal("show");
           $("#modalLabel").text("编辑");
         });
 
         // 删除操作
-        $("#table").on("click", '.opt-remove', function () {
+        $("#table").on("click", ".opt-remove", function () {
           var id = $(this).attr("data-id");
-          if (id == 'undefined') {
+          if (id == "undefined") {
             $("#tipMsg").text("id参数有误");
-            $("#tipModal").modal('show');
+            $("#tipModal").modal("show");
             return;
           }
           if (confirm("你确认删除吗? \r\n 删除后不会恢复，请谨慎操作！")) {
             $.ajax({
-              type: 'post',
+              type: "post",
               url: "/admin/roomTabHome/delete",
               data: { id: id },
               dataType: "json",
               success: function (json) {
                 if (json.code == 200) {
                   $("#tipMsg").text("删除成功");
-                  $("#tipModal").modal('show');
+                  $("#tipModal").modal("show");
                   TableHelper.doRefresh("#table");
                 } else {
                   $("#tipMsg").text("删除失败");
-                  $("#tipModal").modal('show');
+                  $("#tipModal").modal("show");
-                }
                 }
+              },
             });
           }
         });
-
       });
     },
     initPartition() {
-      getPartitionInfoList().then(res => {
+      getPartitionInfoList().then((res) => {
         let data = res.data;
         buildSelectOption(
           "#partitionId",

src/views/ssGuild/SsGuild.vue

@@ -178,6 +178,7 @@ export default {
         endTime = dateFormat(this.inquire.time[1], "yyyy-MM-dd hh:mm:ss");
       }
       list({
+        partitionId: 2,
         erbanNo: this.inquire.anchorId,
         guildId: this.inquire.guildId,
         ownerErbanNo: this.inquire.guildUserId,

src/views/users/DiamondGiveHistoryView.vue

@@ -29,8 +29,8 @@
                             </div>
 
                             <label class="col-sm-2 control-label">统计时间:</label>
-                            <div class="col-sm-2"><input type="text" class="form-control" name="beginTime" id="beginTime">
+                            <div class="col-sm-2"><input type="text" class="form-control" name="beginTime" id="beginTime"></div>
-                            </div><span class="col-sm-1">至</span>
+                            <span class="col-sm-1">至</span>
                             <div class="col-sm-2"><input type="text" class="form-control" name="endTime" id="endTime"></div>
 
                         </div>
@@ -111,24 +111,7 @@
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 
-var picker1 = $("#beginTime").datetimepicker({
+
-    format: 'yyyy-mm-dd hh:ii:00',
-    autoclose: true,
-    todayBtn: true,
-});
-var picker2 = $("#endTime").datetimepicker({
-    format: 'yyyy-mm-dd hh:ii:00',
-    autoclose: true,
-    todayBtn: true
-});
-var picker3 = $('#editEndTime').datetimepicker({
-    format: 'yyyy-mm-dd hh:ii:00',
-    autoclose: true
-})
-var picker4 = $('#editStartTime').datetimepicker({
-    format: 'yyyy-mm-dd hh:ii:00',
-    autoclose: true
-})
 
 /*picker1.on('changeDate', function () {
     var date = $('#beginDate').datetimepicker('getDate');
@@ -290,7 +273,16 @@ export default {
                         console.log("load fail");
                     }
                 });
-
+                var picker1 = $("#beginTime").datetimepicker({
+                    format: 'yyyy-mm-dd hh:mm:ss',
+                    autoclose: true,
+                    todayBtn: true,
+                });
+                var picker2 = $("#endTime").datetimepicker({
+                    format: 'yyyy-mm-dd hh:mm:ss',
+                    autoclose: true,
+                    todayBtn: true
+                });
                 // 查询刷新
                 $('#btnSearch').on('click', function () {
                     TableHelper.doRefresh('#table');

src/views/users/GenAccountView.vue

@@ -15,58 +15,85 @@
                 <option value="4">工会账号</option>
                 <option value="5">大头账号</option>
               </select>
-                            &nbsp;&nbsp;&nbsp;
+              &nbsp;&nbsp;&nbsp; 操作时间：
-                            操作时间：
+              <input
-                            <input type="text" name="startTime" id="startTime" class="input-sm" placeholder="请选择开始时间">
+                type="text"
-                            - <input type="text" name="endTime" id="endTime" class="input-sm" placeholder="请选择结束时间">
+                name="startTime"
+                id="startTime"
+                class="input-sm"
+                placeholder="请选择开始时间"
+              />
+              -
+              <input
+                type="text"
+                name="endTime"
+                id="endTime"
+                class="input-sm"
+                placeholder="请选择结束时间"
+              />
             </form>
             <button id="btnSearch" class="btn btn-primary">
               <i class="glyphicon glyphicon-search"></i>查询
             </button>
-                        <button class="btn btn-success" id='addBtn'>
+            <button class="btn btn-success" id="addBtn">
               <i class="glyphicon glyphicon-plus"></i>生成账号
             </button>
             <button id="btnExport" class="btn btn-default">
               <i class="glyphicon glyphicon-export"></i>导出
             </button>
           </div>
-
         </div>
         <!-- .content -->
         <div id="table"></div>
       </div>
-
-
-
     </div>
   </section>
 
-    <div class="modal fade" id="genAccountModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
+  <div
+    class="modal fade"
+    id="genAccountModal"
+    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
+          <button
-                            aria-hidden="true">&times;</span>
+            type="button"
+            class="close"
+            data-dismiss="modal"
+            aria-label="Close"
+          >
+            <span aria-hidden="true">&times;</span>
           </button>
           <h4 class="modal-title" id="modalLabel">生成账号</h4>
         </div>
         <div class="modal-body">
           <form class="form-horizontal" id="addForm">
             <div class="form-group">
-                            <label for="partitionId" class="col-sm-3 control-label">选择地区：</label>
+              <label for="partitionId" class="col-sm-3 control-label"
-                            <div class="col-sm-9">
+                >选择地区:</label
-                                <select name="partitionId" id="partitionId" class="form-control">
+              >
-                                    <option value="1">英语区</option>
+              <div class="col-sm-7">
-                                    <option value="2">阿拉伯语区</option>
+                <select
-                                    <option value="4">华语区</option>
+                  name="partitionId"
-                                </select>
+                  id="partitionId"
+                  class="form-control validate[required]"
+                ></select>
               </div>
             </div>
 
             <div class="form-group">
               <label for="nick" class="col-sm-3 control-label">昵称:</label>
               <div class="col-sm-9">
-                                <input type="text" class="form-control" name="nick" id="nick" placeholder='不填写默认“Peko小新”'>
+                <input
+                  type="text"
+                  class="form-control"
+                  name="nick"
+                  id="nick"
+                  placeholder="不填写默认“Peko小新”"
+                />
               </div>
             </div>
             <div class="form-group">
@@ -81,116 +108,204 @@
             <div class="form-group">
               <label for="avatar" class="col-sm-3 control-label">头像:</label>
               <div class="col-sm-9">
-                                <img src="" id="picUrl" style="width:40px;height:40px;" alt="">
+                <img
-                                <input type="file" id="uploadAvatarFile" name="uploadAvatarFile"
+                  src=""
-                                    accept="image/gif,image/jpeg,image/jpg,image/png,image/svg">
+                  id="picUrl"
-                                <button class="btn btn-success" type="button" id="uploadPicBtn">上传</button>
+                  style="width: 40px; height: 40px"
-                                <input type="hidden" class="form-control validate[required]" name="avatar" id="avatar"
+                  alt=""
-                                    style="width:40px"><span>不上传将使用默认头像</span>
+                />
+                <input
+                  type="file"
+                  id="uploadAvatarFile"
+                  name="uploadAvatarFile"
+                  accept="image/gif,image/jpeg,image/jpg,image/png,image/svg"
+                />
+                <button class="btn btn-success" type="button" id="uploadPicBtn">
+                  上传
+                </button>
+                <input
+                  type="hidden"
+                  class="form-control validate[required]"
+                  name="avatar"
+                  id="avatar"
+                  style="width: 40px"
+                /><span>不上传将使用默认头像</span>
               </div>
             </div>
-                        <div class="form-group">
+            <div class="form-group"></div>
-
-                        </div>
             <div class="form-group">
               <label for="size" class="col-sm-3 control-label">数量:</label>
               <div class="col-sm-9">
-                                <input type="text" class="form-control" name="size" id="size" placeholder='一次生成最多不超过20个'
+                <input
-                                    oninput="value=value.replace(/[^\d]/g,'')">
+                  type="text"
+                  class="form-control"
+                  name="size"
+                  id="size"
+                  placeholder="一次生成最多不超过20个"
+                  oninput="value=value.replace(/[^\d]/g,'')"
+                />
               </div>
             </div>
             <div class="form-group">
               <label for="remark" class="col-sm-3 control-label">备注:</label>
               <div class="col-sm-9">
-                                <input type="text" class="form-control" name="remark" id="remark" value="仅供后台记录用"
+                <input
-                                    placeholder="请输入备注，50字内">
+                  type="text"
+                  class="form-control"
+                  name="remark"
+                  id="remark"
+                  value="仅供后台记录用"
+                  placeholder="请输入备注，50字内"
+                />
               </div>
             </div>
             <div class="form-group">
-                            <label for="genDefUser" class="col-sm-3 control-label">帐号类型:</label>
+              <label for="genDefUser" class="col-sm-3 control-label"
+                >帐号类型:</label
+              >
               <div class="col-sm-9">
-                                <select name="defUser" id="genDefUser" class="form-control validate[required]">
+                <select
+                  name="defUser"
+                  id="genDefUser"
+                  class="form-control validate[required]"
+                >
                   <option value="4">工会账号</option>
                   <!-- <option value="5">大头账号</option> -->
                 </select>
               </div>
             </div>
-                        <div id="header_block" style="display: none;">
+            <div id="header_block" style="display: none">
               <div class="form-group">
-                                <label for="phone" class="col-sm-3 control-label">手机号:</label>
+                <label for="phone" class="col-sm-3 control-label"
+                  >手机号:</label
+                >
                 <div class="col-sm-9">
-                                    <input type="text" class="form-control validate[required, maxlength: 20]" name="phone"
+                  <input
-                                        id="phone" placeholder='请输入手机号，必填'>
+                    type="text"
+                    class="form-control validate[required, maxlength: 20]"
+                    name="phone"
+                    id="phone"
+                    placeholder="请输入手机号，必填"
+                  />
                 </div>
               </div>
               <div class="form-group">
-                                <label for="realName" class="col-sm-3 control-label">实际姓名:</label>
+                <label for="realName" class="col-sm-3 control-label"
+                  >实际姓名:</label
+                >
                 <div class="col-sm-9">
-                                    <input type="text" class="form-control validate[required] validate[maxlength: 20]"
+                  <input
-                                        name="realName" id="realName" placeholder='请输入身份证上的姓名，必填'>
+                    type="text"
+                    class="form-control validate[required] validate[maxlength: 20]"
+                    name="realName"
+                    id="realName"
+                    placeholder="请输入身份证上的姓名，必填"
+                  />
                 </div>
               </div>
               <div class="form-group">
-                                <label for="idCardNum" class="col-sm-3 control-label">身份证号:</label>
+                <label for="idCardNum" class="col-sm-3 control-label"
+                  >身份证号:</label
+                >
                 <div class="col-sm-9">
-                                    <input type="text" class="form-control validate[required] validate[maxlength: 30]"
+                  <input
-                                        name="idCardNum" id="idCardNum" placeholder='请输入身份证号码，必填'>
+                    type="text"
+                    class="form-control validate[required] validate[maxlength: 30]"
+                    name="idCardNum"
+                    id="idCardNum"
+                    placeholder="请输入身份证号码，必填"
+                  />
                 </div>
               </div>
               <div class="form-group">
-                                <label for="alipayAccount" class="col-sm-3 control-label">支付宝账号:</label>
+                <label for="alipayAccount" class="col-sm-3 control-label"
+                  >支付宝账号:</label
+                >
                 <div class="col-sm-9">
-                                    <input type="text" class="form-control validate[required] validate[maxlength: 60]"
+                  <input
-                                        name="alipayAccount" id="alipayAccount" placeholder='请输入支付宝帐号，必填'>
+                    type="text"
+                    class="form-control validate[required] validate[maxlength: 60]"
+                    name="alipayAccount"
+                    id="alipayAccount"
+                    placeholder="请输入支付宝帐号，必填"
+                  />
                 </div>
               </div>
               <div class="form-group">
-                                <label for="alipayAccountName" class="col-sm-3 control-label">支付宝姓名:</label>
+                <label for="alipayAccountName" class="col-sm-3 control-label"
+                  >支付宝姓名:</label
+                >
                 <div class="col-sm-9">
-                                    <input type="text" class="form-control validate[required] validate[maxlength: 60]"
+                  <input
-                                        name="alipayAccountName" id="alipayAccountName" placeholder='请输入支付宝姓名'>
+                    type="text"
+                    class="form-control validate[required] validate[maxlength: 60]"
+                    name="alipayAccountName"
+                    id="alipayAccountName"
+                    placeholder="请输入支付宝姓名"
+                  />
                 </div>
               </div>
               <div class="form-group">
-                                <label for="bankCardNum" class="col-sm-3 control-label">银行卡号:</label>
+                <label for="bankCardNum" class="col-sm-3 control-label"
+                  >银行卡号:</label
+                >
                 <div class="col-sm-9">
-                                    <input type="text" class="form-control validate[required] validate[maxlength: 30]"
+                  <input
-                                        name="bankCardNum" id="bankCardNum" placeholder='请输入银行卡号'>
+                    type="text"
+                    class="form-control validate[required] validate[maxlength: 30]"
+                    name="bankCardNum"
+                    id="bankCardNum"
+                    placeholder="请输入银行卡号"
+                  />
                 </div>
               </div>
               <div class="form-group">
-                                <label for="bankCardName" class="col-sm-3 control-label">持卡人:</label>
+                <label for="bankCardName" class="col-sm-3 control-label"
+                  >持卡人:</label
+                >
                 <div class="col-sm-9">
-                                    <input type="text" class="form-control validate[required] validate[maxlength: 20]"
+                  <input
-                                        name="bankCardName" id="bankCardName" placeholder='请输入银行卡-持卡人姓名'>
+                    type="text"
+                    class="form-control validate[required] validate[maxlength: 20]"
+                    name="bankCardName"
+                    id="bankCardName"
+                    placeholder="请输入银行卡-持卡人姓名"
+                  />
                 </div>
               </div>
               <div class="form-group">
-                                <label for="paymentPwd" class="col-sm-3 control-label">支付密码:</label>
+                <label for="paymentPwd" class="col-sm-3 control-label"
+                  >支付密码:</label
+                >
                 <div class="col-sm-9">
-                                    <input type="text"
+                  <input
+                    type="text"
                     class="form-control validate[required] validate[minlength: 6] validate[maxlength: 20]"
-                                        name="paymentPwd" id="paymentPwd" placeholder='请输入6位数字的支付密码，必填'>
+                    name="paymentPwd"
+                    id="paymentPwd"
+                    placeholder="请输入6位数字的支付密码，必填"
+                  />
                 </div>
               </div>
             </div>
           </form>
         </div>
         <div class="modal-footer">
-
+          <button type="button" class="btn btn-default" data-dismiss="modal">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+            关闭
+          </button>
           <button type="button" class="btn btn-primary" id="add">确定</button>
         </div>
-
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import TableHelper from '@/utils/bootstrap-table-helper';
+import TableHelper from "@/utils/bootstrap-table-helper";
-import { showLoading, hideLoading } from '@/utils/maintainer';
+import { showLoading, hideLoading } from "@/utils/maintainer";
-
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { buildSelectOption } from '@/utils/system-helper';
 export default {
   name: "GenAccountView",
   setup() {
@@ -198,74 +313,102 @@ export default {
   },
   created() {
     this.$nextTick(function () {
+      this.initPartition();
       this.initData();
     });
   },
   methods: {
+    initPartition() {
+      getPartitionInfoList().then((res) => {
+        let data = res.data;
+        this.partitionInfos = data;
+        buildSelectOption(
+          "#partitionId",
+          null,
+          data.map((v) => {
+            return {
+              value: v.id,
+              text: v.desc,
+            };
+          })
+        );
+      });
+    },
     initData() {
       $(function () {
-                var picker1 = $('#startTime').datetimepicker({
+        var picker1 = $("#startTime").datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
+          format: "yyyy-mm-dd hh:ii:00",
           autoclose: true,
-                    endDate: new Date()
+          endDate: new Date(),
         });
 
-                var picker2 = $('#endTime').datetimepicker({
+        var picker2 = $("#endTime").datetimepicker({
-                    format: 'yyyy-mm-dd hh:ii:00',
+          format: "yyyy-mm-dd hh:ii:00",
-                    autoclose: true
+          autoclose: true,
         });
 
-                picker1.on('changeDate', function () {
+        picker1.on("changeDate", function () {
-                    var date = $('#startTime').datetimepicker('getDate');
+          var date = $("#startTime").datetimepicker("getDate");
-                    picker2.datetimepicker('setStartDate', date);
+          picker2.datetimepicker("setStartDate", date);
         });
 
-                picker2.on('changeDate', function () {
+        picker2.on("changeDate", function () {
-                    var date = $('#endTime').datetimepicker('getDate');
+          var date = $("#endTime").datetimepicker("getDate");
-                    picker1.datetimepicker('setEndDate', date);
+          picker1.datetimepicker("setEndDate", date);
         });
-                $('#table').bootstrapTable('destroy');
+        $("#table").bootstrapTable("destroy");
-                $('#table').bootstrapTable({
+        $("#table").bootstrapTable({
           columns: [
-                        { field: 'uid', title: 'UID', align: 'center', width: '5%' },
+            { field: "uid", title: "UID", align: "center", width: "5%" },
-                        { field: 'erbanNo', title: 'ID', align: 'center', width: '5%' },
+            { field: "erbanNo", title: "ID", align: "center", width: "5%" },
-                        { field: 'nick', title: '昵称', align: 'center', width: '5%' },
+            { field: "nick", title: "昵称", align: "center", width: "5%" },
             {
-                            field: 'defUser', title: '账号类型', align: 'center', width: '5%',
+              field: "defUser",
+              title: "账号类型",
+              align: "center",
+              width: "5%",
               formatter: function (val, row, index) {
                 if (val == null) {
-                                    return '-';
+                  return "-";
                 }
                 if (val == 1) {
-                                    return '普通账号';
+                  return "普通账号";
                 } else if (val == 2) {
-                                    return '官方账号';
+                  return "官方账号";
                 } else if (val == 3) {
-                                    return '机器账号';
+                  return "机器账号";
                 } else if (val == 4) {
-                                    return '工会账户';
+                  return "工会账户";
                 } else if (val == 5) {
-                                    return '大头账号';
+                  return "大头账号";
                 }
                 return val;
-                            }
               },
-                        { field: 'remark', title: '备注', align: 'center', width: '5%' },
+            },
-                        { field: 'operator', title: '操作人', align: 'center', width: '5%' },
+            { field: "remark", title: "备注", align: "center", width: "5%" },
             {
-                            field: 'createTime', title: '操作时间', align: 'center', valign: 'middle', width: '10%',
+              field: "operator",
+              title: "操作人",
+              align: "center",
+              width: "5%",
+            },
+            {
+              field: "createTime",
+              title: "操作时间",
+              align: "center",
+              valign: "middle",
+              width: "10%",
               formatter: function (val, row, index) {
-
                 if (val) {
                   var date = new Date(val);
-                                    return date.format('yyyy-MM-dd hh:mm:ss');
+                  return date.format("yyyy-MM-dd hh:mm:ss");
                 } else {
-                                    return '-';
+                  return "-";
-                                }
-                            }
                 }
+              },
+            },
           ],
-                    undefinedText: '-',
+          undefinedText: "-",
           cache: false,
           striped: true,
           showRefresh: false,
@@ -275,107 +418,110 @@ export default {
           search: false,
           sidePagination: "server", //表示服务端请求
           queryParamsType: "undefined",
-                    queryParams: function queryParams(params) {   //设置查询参数
+          queryParams: function queryParams(params) {
+            //设置查询参数
             var param = {
               pageNum: params.pageNumber,
               pageSize: params.pageSize,
-                            defUser: $('#defUser').val(),
+              defUser: $("#defUser").val(),
-                            startTime: $('#startTime').val(),
+              startTime: $("#startTime").val(),
-                            endTime: $('#endTime').val()
+              endTime: $("#endTime").val(),
             };
             return param;
           },
-                    toolbar: '#toolbar',
+          toolbar: "#toolbar",
-                    url: '/admin/gen/account/list',
+          url: "/admin/gen/account/list",
-                    onLoadSuccess: function () {  //加载成功时执行
+          onLoadSuccess: function () {
+            //加载成功时执行
             console.log("load success");
           },
-                    onLoadError: function () {  //加载失败时执行
+          onLoadError: function () {
+            //加载失败时执行
             console.log("load fail");
-                    }
+          },
         });
-                $('#addBtn').on('click', function () {
+        $("#addBtn").on("click", function () {
           $("#addForm")[0].reset();
-                    $('#addForm').validationEngine('hideAll');
+          $("#addForm").validationEngine("hideAll");
-                    $('#picUrl').attr('src', '');
+          $("#picUrl").attr("src", "");
-                    $('#genDefUser').val(4);
+          $("#genDefUser").val(4);
-                    $('#header_block').attr('style', 'display:none;');
+          $("#header_block").attr("style", "display:none;");
-                    $('#genAccountModal').modal('show');
+          $("#genAccountModal").modal("show");
         });
 
         // 查询刷新
-                $('#btnSearch').on('click', function () {
+        $("#btnSearch").on("click", function () {
-                    TableHelper.doRefresh('#table');
+          TableHelper.doRefresh("#table");
         });
-                $('#uploadPicBtn').on('click', function () {
+        $("#uploadPicBtn").on("click", function () {
           var options = {
-                        type: 'post',
+            type: "post",
-                        url: '/admin/gen/account/headImg',
+            url: "/admin/gen/account/headImg",
-                        dataType: 'json',
+            dataType: "json",
             success: function (json) {
               if (json.path) {
-                                $('#avatar').val(json.path);
+                $("#avatar").val(json.path);
-                                $('#picUrl').attr('src', json.path);
+                $("#picUrl").attr("src", json.path);
               } else {
-                                $('#tipMsg').text(json.msg);
+                $("#tipMsg").text(json.msg);
-                                $('#tipModal').modal('show');
+                $("#tipModal").modal("show");
               }
-                        }
+            },
-                    }
+          };
-                    $('#addForm').ajaxSubmit(options);
+          $("#addForm").ajaxSubmit(options);
         });
         $("#add").click(function () {
-                    if ($('#addForm').validationEngine('validate')) {
+          if ($("#addForm").validationEngine("validate")) {
-                        var size = $('#size').val();
+            var size = $("#size").val();
             if (!size) {
               $("#tipMsg").text("请填写数量");
-                            $("#tipModal").modal('show');
+              $("#tipModal").modal("show");
               return;
             }
             if (size > 20) {
               $("#tipMsg").text("一次只允许生成20个账号");
-                            $("#tipModal").modal('show');
+              $("#tipModal").modal("show");
               return;
             }
-                        if (!$('#gender').val()) {
+            if (!$("#gender").val()) {
               $("#tipMsg").text("请选择性别");
-                            $("#tipModal").modal('show');
+              $("#tipModal").modal("show");
               return;
             }
-                        if ($('#remark').val().length > 50) {
+            if ($("#remark").val().length > 50) {
               $("#tipMsg").text("备注不能超过50字");
-                            $("#tipModal").modal('show');
+              $("#tipModal").modal("show");
               return;
             }
-                        if ($('#genDefUser').val() == 5) {
+            if ($("#genDefUser").val() == 5) {
               // 验证手机号
               var phoneReg = /^1[0-9]{10}$/;
-                            if (!phoneReg.test($('#phone').val())) {
+              if (!phoneReg.test($("#phone").val())) {
                 $("#tipMsg").text("手机号不正确");
-                                $("#tipModal").modal('show');
+                $("#tipModal").modal("show");
                 return;
               }
               // 验证身份证号
               var idCardNumReg = /(^\d{15}$)|(^\d{17}(\d|X|x)$)/;
-                            if (!idCardNumReg.test($('#idCardNum').val())) {
+              if (!idCardNumReg.test($("#idCardNum").val())) {
                 $("#tipMsg").text("身份证号不正确");
-                                $("#tipModal").modal('show');
+                $("#tipModal").modal("show");
                 return;
               }
 
               // 验证银行卡号
               var bankCardNumReg = /^\d{10,30}$/;
-                            if (!bankCardNumReg.test($('#bankCardNum').val())) {
+              if (!bankCardNumReg.test($("#bankCardNum").val())) {
                 $("#tipMsg").text("银行卡号不正确");
-                                $("#tipModal").modal('show');
+                $("#tipModal").modal("show");
                 return;
               }
 
               // 验证支付密码
               var paymentPwdReg = /^\d{6}$/;
-                            if (!paymentPwdReg.test($('#paymentPwd').val())) {
+              if (!paymentPwdReg.test($("#paymentPwd").val())) {
                 $("#tipMsg").text("支付密码不正确，必须为6位数字");
-                                $("#tipModal").modal('show');
+                $("#tipModal").modal("show");
                 return;
               }
             }
@@ -384,52 +530,51 @@ export default {
             $.ajax({
               type: "post",
               url: "/admin/gen/account/add",
-                            data: $('#addForm').serialize(),
+              data: $("#addForm").serialize(),
-                            dataType: 'json',
+              dataType: "json",
               success: function (json) {
-                                if (json.success == 'true') {
+                if (json.success == "true") {
-                                    $("#genAccountModal").modal('hide');
+                  $("#genAccountModal").modal("hide");
                   $("#tipMsg").text(json.msg);
-                                    $("#tipModal").modal('show');
+                  $("#tipModal").modal("show");
                   TableHelper.doRefresh("#table");
                   hideLoading();
                 } else {
                   $("#tipMsg").text("保存失败，错误信息：" + json.msg);
-                                    $("#tipModal").modal('show');
+                  $("#tipModal").modal("show");
                   hideLoading();
                 }
+              },
+            });
           }
-                        })
-                    }
-
         });
 
-                $('#genDefUser').on('change', function () {
+        $("#genDefUser").on("change", function () {
-                    var defUser = $('#genDefUser').val();
+          var defUser = $("#genDefUser").val();
           if (defUser == 4) {
-                        $('#header_block').attr('style', 'display:none;');
+            $("#header_block").attr("style", "display:none;");
           } else if (defUser == 5) {
-                        $('#header_block').removeAttr('style');
+            $("#header_block").removeAttr("style");
           }
         });
 
         //导出
-                $('#btnExport').on('click', function () {
+        $("#btnExport").on("click", function () {
-                    var startTime = $('#startTime').val();
+          var startTime = $("#startTime").val();
-                    var endTime = $('#endTime').val();
+          var endTime = $("#endTime").val();
-                    if (null == startTime || startTime.trim() == '') {
+          if (null == startTime || startTime.trim() == "") {
             $("#tipMsg").text("开始日期不能为空");
-                        $("#tipModal").modal('show');
+            $("#tipModal").modal("show");
             return;
           }
-                    if (null == endTime || endTime.trim() == '') {
+          if (null == endTime || endTime.trim() == "") {
             $("#tipMsg").text("结束日期不能为空");
-                        $("#tipModal").modal('show');
+            $("#tipModal").modal("show");
             return;
           }
           if (startTime > endTime) {
             $("#tipMsg").text("开始日期不能大于结束日期");
-                        $("#tipModal").modal('show');
+            $("#tipModal").modal("show");
             return;
           }
 
@@ -437,12 +582,9 @@ export default {
           form.attr("action", "/admin/gen/account/export");
           form.submit();
         });
-
-
       });
-        }
     },
-
+  },
 };
 </script>
 

src/views/users/GiftManageView.vue

@@ -189,6 +189,12 @@
                                 <input type="text" class="form-control validate[required]" name="giftName" id="giftEnName">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="giftTrName" class="col-sm-2 control-label">土耳其礼物名称</label>
+                            <div class="col-sm-10">
+                                <input type="text" class="form-control validate[required]" name="giftName" id="giftTrName">
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="goldPrice" class="col-sm-2 control-label">礼物价格</label>
                             <div class="col-sm-10">
@@ -283,6 +289,22 @@
                                 <label class="radio-inline"><input type="radio" name="isLatest" value="1">是</label>
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">是否需要全服通知</label>
+                            <div class="col-sm-3">
+                                <label class="radio-inline"><input type="radio" name="notifyFull" value="0" checked>否</label>
+                                <label class="radio-inline"><input type="radio" name="notifyFull" value="1">是</label>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">是否需要塞头像</label>
+                            <div class="col-sm-3">
+                                <label class="radio-inline"><input type="radio" name="showAvatarType" value="0" checked>否</label>
+                                <label class="radio-inline"><input type="radio" name="showAvatarType" value="1">送礼者</label>
+                                <label class="radio-inline"><input type="radio" name="showAvatarType" value="2">收礼者</label>
+                                <label class="radio-inline"><input type="radio" name="showAvatarType" value="3">左送右收</label>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-2 control-label">限时礼物</label>
                             <div class="col-sm-3">
@@ -774,6 +796,36 @@ export default {
                                 }
                             }
                         },
+                        {
+                            field: 'notifyFull',
+                            title: '是否需要全服通知',
+                            align: 'center',
+                            width: '10%',
+                            formatter: function (val, row, index) {
+                                if (val == 1) {
+                                    return '是';
+                                } else {
+                                    return '否'
+                                }
+                            }
+                        },
+                        {
+                            field: 'showAvatarType',
+                            title: '是否需要塞头像',
+                            align: 'center',
+                            width: '10%',
+                            formatter: function (val, row, index) {
+                                if (val == 0) {
+                                    return '否';
+                                }else if (val == 1) {
+                                    return '送礼者';
+                                } else if (val == 2) {
+                                    return '收礼者';
+                                }else {
+                                    return '左送右收'
+                                }
+                            }
+                        },
                         {
                             field: 'roomExclude',
                             title: '房间专属',
@@ -966,6 +1018,8 @@ export default {
                     $("input:radio[name='hasSvga']")[0].checked = true;
                     $("input:radio[name='isLatest']")[0].checked = true;
                     $("input:radio[name='isTimeLimit']")[0].checked = true;
+                    $("input:radio[name='notifyFull']")[0].checked = true;
+                    $("input:radio[name='showAvatarType']")[0].checked = true;
                     $("input:radio[name='roomExclude']")[0].checked = true;
                     $("#notifyStaySecond").val('');
                     $("#isSkipRoom").val('');
@@ -1217,6 +1271,8 @@ export default {
                     $("input:radio[name='hasSvga']")[0].checked = true;
                     $("input:radio[name='isLatest']")[1].checked = true;
                     $("input:radio[name='isTimeLimit']")[1].checked = true;
+                    $("input:radio[name='notifyFull']")[0].checked = true;
+                    $("input:radio[name='showAvatarType']")[0].checked = true;
                     $("input:radio[name='roomExclude']")[0].checked = true;
                     $('#giftType').val('');
                     $("#notifyStaySecond").val('');
@@ -1253,12 +1309,16 @@ export default {
                                     $("#giftArName").val(jsonName.ar);
                                     // 英语名称
                                     $("#giftEnName").val(jsonName.en);
+                                    // 土耳其
+                                    $("#giftTrName").val(jsonName.tr);
                                 } else {
                                     $("#giftName").val(giftName);
                                     // 阿语名称
                                     $("#giftArName").val(giftName);
                                     // 英语名称
                                     $("#giftEnName").val(giftName);
+                                    // 土耳其名称
+                                    $("#giftTrName").val(giftName);
                                 }
                                 $("#goldPrice").val(json.entity.goldPrice);
 
@@ -1295,6 +1355,8 @@ export default {
                                 var hasSvga = parseNum(json.entity.hasSvga);
                                 var isLatest = parseNum(json.entity.isLatest);
                                 var isTimeLimit = parseNum(json.entity.isTimeLimit);
+                                var notifyFull = parseNum(json.entity.notifyFull);
+                                var showAvatarType = json.entity.showAvatarType;
                                 var isWholeServer = parseNum(json.entity.isWholeServer);
                                 var roomExclude = parseNum(json.entity.roomExclude);
                                 var partitionFlag = json.entity.partitionFlag;
@@ -1312,6 +1374,8 @@ export default {
                                 $("input:radio[name='hasSvga']")[hasSvga].checked = true;
                                 $("input:radio[name='isLatest']")[isLatest].checked = true;
                                 $("input:radio[name='isTimeLimit']")[isTimeLimit].checked = true;
+                                $("input:radio[name='notifyFull']")[notifyFull].checked = true;
+                                $("input:radio[name='showAvatarType']")[showAvatarType].checked = true;
                                 $("input:radio[name='isWholeServerLabel']")[isWholeServer].checked = true;
                                 $("input:radio[name='roomExclude']")[roomExclude].checked = true;
 
@@ -1401,8 +1465,10 @@ export default {
                         var ar_name = $("#giftArName").val();
                         // 英语名称
                         var en_name = $("#giftEnName").val();
+                        // 土耳其名称
+                        var tr_name = $("#giftTrName").val();
                         // 国际化字段
-                        var jsonName = {"zh":name,"ar":ar_name,"en":en_name}
+                        var jsonName = {"zh":name,"ar":ar_name,"en":en_name,'tr':tr_name}
                         const nameValue = JSON.stringify(jsonName);
                         // 修改属性值
                         formData.giftName = nameValue; // 将giftName修改为"newGiftName"

src/views/users/GiftSendRecordView.vue

@@ -14,15 +14,6 @@
                     <div id="toolbar">
                         送礼用户id：<input type="text" name="senderErbanNo" id="senderErbanNo" class="input-sm" />
                         收礼用户id：<input type="text" name="receiverErbanNo" id="receiverErbanNo" class="input-sm" />
-                        礼物类型：
-                        <select name="giftType" id="giftType">
-                            <option value="">全部</option>
-                            <option value="0">背包礼物</option>
-                            <option value="2">普通礼物</option>
-                            <option value="5">福袋奖池礼物</option>
-                            <option value="7">贵族礼物</option>
-                            <option value="8">周星榜礼物</option>
-                        </select>
                         礼物名称：<input type="text" name="giftName" id="giftName" class="input-sm" />
                         送礼时间：<input type="text" name="startTime" id="startTime" class="input-sm">
                         - <input type="text" name="endTime" id="endTime" class="input-sm">
@@ -50,42 +41,30 @@ export default {
     },
     methods: {
         initData() {
-            let tableLoaded = false;
+
             let currParams = {};
 
             $('#table').bootstrapTable('destroy');
             $('#table').bootstrapTable({
                 columns: [
                     { field: 'senderErbanNo', title: '送礼用户id', align: 'center', width: '8%' },
-                    { field: 'senderNick', title: '送礼用户昵称', align: 'center', width: '16%' },
+                    { field: 'senderNick', title: '送礼用户昵称', align: 'center', width: '12%' },
                     { field: 'receiverErbanNo', title: '收礼用户id', align: 'center', width: '8%' },
-                    { field: 'receiverNick', title: '收礼用户昵称', align: 'center', width: '16%' },
+                    { field: 'receiverNick', title: '收礼用户昵称', align: 'center', width: '12%' },
-                    { field: 'giftType', title: '礼物类型', align: 'center', width: '16%' },
+                    { field: 'roomErbanNo', title: "房间id", align: 'center', width: '8%' },
-                    { field: 'giftName', title: '礼物名称', align: 'center', width: '10%' },
+                    { field: 'roomTitle', title: "房间", align: 'center', width: '12%' },
-                    { field: 'giftNum', title: '礼物数量', align: 'center', width: '6%' },
+                    { field: 'giftType', title: '礼物类型', align: 'center', width: '8%' },
+                    { field: 'giftName', title: '礼物名称', align: 'center', width: '8%' },
+                    { field: 'giftNum', title: '礼物数量', align: 'center', width: '4%' },
                     { field: 'totalGoldNum', title: '礼物总价值(钻)', align: 'center', width: '10%' },
-                    {
+                    { field: 'createTime', title: '送礼时间', align: 'center', valign: 'middle', width: '16%'},
-                        field: 'createTime',
-                        title: '送礼时间',
-                        align: 'center',
-                        valign: 'middle',
-                        width: '10%',
-                        formatter: function (val, row, index) {
-                            if (val) {
-                                var date = new Date(val);
-                                return date.format("yyyy-MM-dd hh:mm:ss");
-                            } else {
-                                return '-';
-                            }
-                        }
-                    }
                 ],
                 cache: false,
                 striped: true,
                 showRefresh: false,
-                pageSize: 10,
+                pageSize: 30,
                 pagination: true,
-                pageList: [10, 20, 30, 50],
+                pageList: [30, 50, 100, 200],
                 sidePagination: "server", //表示服务端请求
                 //设置为undefined可以获取pageNumber，pageSize，searchText，sortName，sortOrder
                 //设置为limit可以获取limit, offset, search, sort, order
@@ -110,11 +89,9 @@ export default {
                 url: '/admin/giftSendRecord/list',
                 onLoadSuccess: function () {  //加载成功时执行
                     console.log("load success");
-                    tableLoaded = true;
                 },
                 onLoadError: function () {  //加载失败时执行
                     console.log("load fail");
-                    tableLoaded = false;
                 }
             })
             $('#btnSearch').on('click', function () {
@@ -123,7 +100,6 @@ export default {
                 //     $("#tipModal").modal('show');
                 //     return;
                 // }
-                console.debug('ASDFASDF')
                 // if ($('#startTime').val() && $('#endTime').val()) {
                 //     var dateStart = new Date($('#startTime').val().replace(/\-/g, "/"));
                 //     var dateEnd = new Date($('#endTime').val().replace(/\-/g, "/"));
@@ -135,18 +111,24 @@ export default {
                 //         return;
                 //     }
                 // }
-                if (tableLoaded || currParams.pageNumber > 1) {
+                if (currParams.pageNumber > 1) {
                     TableHelper.doRefreshAndToPage1('#table');
                 } else {
                     TableHelper.doRefresh('#table');
                 }
             })
             var picker1 = $("#startTime").datetimepicker({
-                format: 'yyyy-mm-dd hh:ii:00',
+                todayHighlight: true,
+                todayBtn: true,
+                language: "zh-cn",
+                format: 'yyyy-mm-dd hh:ii:ss',
                 autoclose: true
             })
             var picker2 = $('#endTime').datetimepicker({
-                format: 'yyyy-mm-dd hh:ii:00',
+                todayHighlight: true,
+                todayBtn: true,
+                language: "zh-cn",
+                format: 'yyyy-mm-dd hh:ii:ss',
                 autoclose: true
             })
             picker1.on('changeDate', function () {