新增反馈

(cherry picked from commit ce063dc77e0f5be34a03939f9474062f448b0230)

src/api/chat/publicChatTopRecord.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const getPublicChatTopRecordPage = query => {
+    return request({
+        url: '/admin/publicChatTopRecord/page',
+        method: 'get',
+        params: query
+    });
+};

src/api/common/gift.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const getGiftList = query => {
+    return request({
+        url: '/admin/gift/getAll',
+        method: 'get',
+        params: query
+    });
+};

src/api/common/upload.js

@@ -1,3 +1,4 @@
+import request from "@/utils/request";
 import '@/utils/ajaxfileupload';
 
 export const uploadFile = id => {
@@ -20,4 +21,52 @@ export const uploadFile = id => {
             }
         });
     });
+};
+
+export const uploadQiNiuFile = (file) => {
+    console.log(file);
+    let formData = new FormData();
+    formData.append('file', file);
+    return new Promise((resolve, reject) => {
+        request.post('/admin/qiniu/upload/file', formData).then(res => {
+            resolve(res);
+        }).catch(e => {
+            reject(e);
+        });
+    });
+};
+
+export const uploadTencentFile = id => {
+    return new Promise((resolve, reject) => {
+        $.ajaxFileUpload({
+            fileElementId: id,
+            url: '/admin/upload/tencent/file',
+            type: 'post',
+            dataType: 'json',
+            secureuri: false,
+            async: true,
+            submitType: 'ajax',
+            success: function (res) {
+                resolve(res);
+            },
+            error: function (res, status, e) {
+                console.error(res);
+                console.error(status);
+                reject(e);
+            }
+        });
+    });
+};
+
+export const uploadGift = (file) => {
+    let formData = new FormData();
+    console.log(file);
+    formData.append('file', file);
+    return new Promise((resolve, reject) => {
+        request.post('/admin/gift/upload', formData).then(res => {
+            resolve(res);
+        }).catch(e => {
+            reject(e);
+        });
+    });
 };

src/api/feedBack/feedBack.js

@@ -0,0 +1,21 @@
+import request from '@/utils/request';
+import qs from 'qs';
+import { genQueryParam } from '@/utils/maintainer';
+
+// ==================================每日数据====================================
+// 反馈类型
+export const listType = query => {
+    return request({
+        url: '/admin/feedback/listType',
+        method: 'get',
+        params: query
+    });
+};
+// 反馈列表
+export const pageRecord = query => {
+    return request({
+        url: '/admin/feedback/pageRecord',
+        method: 'get',
+        params: query
+    });
+};

src/api/gameAdmin/gameAdmin.js

@@ -0,0 +1,20 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+
+// 获取游戏列表
+export const mgList = query => {
+    return request({
+        url: '/admin/miniGame/statis/mgList',
+        method: 'get',
+        params: query
+    });
+};
+// 游戏编辑
+export const save = query => {
+    return request({
+        url: '/admin/miniGame/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    });
+};

src/api/invitationFission/invitationFission.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request';
+import qs from 'qs';
+import { genQueryParam } from '@/utils/maintainer';
+
+// ==================================每日数据====================================
+// 表单
+export const userInviteFissionRecordGetDailyPage = query => {
+    return request({
+        url: '/admin/userInviteFissionRecord/getDailyPage',
+        method: 'get',
+        params: query
+    });
+};
+// 详情表单
+export const userInviteFissionRecordGetDailyDetailList = query => {
+    return request({
+        url: '/admin/userInviteFissionRecord/getDailyDetailList',
+        method: 'get',
+        params: query
+    });
+};
+// 导出
+export const userInviteFissionRecordExport = query => {
+    window.location.href = `/admin/userInviteFissionRecord/export?${genQueryParam(query)}`;
+    return;
+};
+// ==================================邀请排名====================================
+// 设置白名单
+export const userInviteFissionRecordSetBlack = query => {
+    return request({
+        url: '/admin/userInviteFissionRecord/setBlack',
+        headers: { "Content-Type": 'application/x-www-form-urlencoded' },
+        method: 'post',
+        data: query
+    });
+};
+// 邀请排名列表
+export const userInviteFissionRecordGetInviteRank = query => {
+    return request({
+        url: '/admin/userInviteFissionRecord/getInviteRank',
+        method: 'get',
+        params: query
+    });
+};

src/api/lucky/luckyGiftRangeConfig.js

@@ -0,0 +1,80 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+
+export const getLuckyGiftRangeConfigList = query => {
+    return request({
+        url: '/admin/luckyGiftRangeConfig/list',
+        method: 'get',
+        params: query
+    });
+};
+
+export const saveLuckyGiftRangeConfig = data => {
+    return request({
+        url: '/admin/luckyGiftRangeConfig/save',
+        method: 'post',
+        data: data
+    });
+};
+
+// 获取礼物
+export const getAll = query => {
+    return request({
+        url: '/admin/gift/getAll',
+        method: 'get',
+        params: query
+    });
+};
+// 获取礼物区间
+export const luckyGiftRangeConfigList = query => {
+    return request({
+        url: '/admin/luckyGiftRangeConfig/list',
+        method: 'get',
+        params: query
+    });
+};
+// 幸运礼物配置列表
+export const luckyGiftRewardList = query => {
+    return request({
+        url: '/admin/luckyGiftReward/list',
+        method: 'get',
+        params: query
+    });
+};
+// 幸运礼物配置删除
+export const luckyGiftRewardDelete = query => {
+    return request({
+        url: '/admin/luckyGiftReward/delete',
+        method: 'get',
+        params: query
+    });
+};
+// 幸运礼保存列表
+export const luckyGiftRewardSave = query => {
+    return request({
+        url: '/admin/luckyGiftReward/save',
+        method: 'post',
+        params: query
+    });
+};
+// 幸运礼物明细
+export const getGiftSendPage = query => {
+    return request({
+        url: '/admin/luckyGiftRewardRecord/getGiftSendPage',
+        method: 'get',
+        params: query
+    });
+};
+// 幸运礼物详情
+export const getRewardList = query => {
+    return request({
+        url: '/admin/luckyGiftRewardRecord/getRewardList',
+        method: 'get',
+        params: query
+    });
+};
+// 幸运礼物详情导出 
+export const luckyGiftRewardRecordExport = query => {
+    window.location.href = `/admin/luckyGiftRewardRecord/export?${genQueryParam(query)}`;
+    return;
+};

src/api/luckyTycoon/luckyTycoon.js

@@ -0,0 +1,173 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+
+// 地区接口
+export const listPartitionInfo = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};
+// 福袋列表请求
+export const listLuckyBagLinearGift = query => {
+    return request({
+        url: '/admin/gift/getGiftByTypes',
+        method: 'get',
+        params: query
+    });
+};
+// 福袋礼物列表请求
+export const getPrizeGroupsInfo = query => {
+    return request({
+        url: '/admin/luckyBag/getGroupInfo',
+        method: 'get',
+        params: query
+    });
+};
+// 所有礼物列表请求
+export const getAll = query => {
+    return request({
+        url: '/admin/gift/getAll',
+        method: 'get',
+        params: query
+    });
+};
+// 所有座驾列表请求
+export const carAll = query => {
+    return request({
+        url: '/admin/car/goods/total/list',
+        method: 'get',
+        params: query
+    });
+};
+// 所有头饰列表请求
+export const headwearAll = query => {
+    return request({
+        url: '/admin/headwear/total/list',
+        method: 'get',
+        params: query
+    });
+};
+// 所有铭牌列表请求
+export const nameplateAll = query => {
+    return request({
+        url: '/admin/nameplate/total/list',
+        method: 'get',
+        params: query
+    });
+};
+// 所有气泡列表请求
+export const chatbubbleAll = query => {
+    return request({
+        url: '/admin/chatbubble/total/list',
+        method: 'get',
+        params: query
+    });
+};
+// 所有资料卡列表请求
+export const infocard = query => {
+    return request({
+        url: '/admin/infocard/total/list',
+        method: 'get',
+        params: query
+    });
+};
+// 榜单统计-列表接口
+export const luckyBagWeekRankList = query => {
+    return request({
+        url: '/admin/luckyBagWeekRank/list',
+        method: 'get',
+        params: query
+    });
+};
+// 榜单统计-详情列表接口
+export const luckyBagWeekRankListRank = query => {
+    return request({
+        url: '/admin/luckyBagWeekRank/pageRank',
+        method: 'get',
+        params: query
+    });
+};
+// 榜单统计-总导出
+export const exportList = query => {
+    window.location.href = `/admin/luckyBagWeekRank/exportList?${genQueryParam(query)}`;
+    return;
+};
+// 榜单统计-详情导出
+export const exportRank = query => {
+    window.location.href = `/admin/luckyBagWeekRank/exportRank?${genQueryParam(query)}`;
+    return;
+};
+// 用户中奖记录-列表
+export const getRecordPage = query => {
+    return request({
+        url: '/admin/luckyBagFortunate/getRecordPage',
+        method: 'get',
+        params: query
+    });
+};
+// 用户中奖记录-导出
+export const exportForReward = query => {
+    window.location.href = `/admin/luckyBagFortunate/exportForReward?${genQueryParam(query)}`;
+    return;
+};
+// 欧气1+1-导出
+export const luckyBagFortunateExport = query => {
+    window.location.href = `/admin/luckyBagFortunate/export?${genQueryParam(query)}`;
+    return;
+};
+// 欧气1+1-列表
+export const luckyBagFortunatePage = query => {
+    return request({
+        url: '/admin/luckyBagFortunate/page',
+        method: 'get',
+        params: query
+    });
+};
+// 欧气1+1-保存
+export const luckyBagFortunateSave = query => {
+    return request({
+        url: '/admin/luckyBagFortunate/save',
+        method: 'post',
+        params: query
+    });
+};
+// 欧气1+1-上下线
+export const luckyBagFortunateUpdateEnabled = query => {
+    return request({
+        url: '/admin/luckyBagFortunate/updateEnabled',
+        method: 'post',
+        params: query
+    });
+};
+// 收藏-列表
+export const luckyBagCollectPage = query => {
+    return request({
+        url: '/admin/luckyBagCollect/page',
+        method: 'get',
+        params: query
+    });
+};
+// 收藏-上下线
+export const updateEnabled = query => {
+    return request({
+        url: '/admin/luckyBagCollect/updateEnabled',
+        method: 'post',
+        params: query
+    });
+};
+// 收藏-保存
+export const luckyBagCollectSave = query => {
+    return request({
+        url: '/admin/luckyBagCollect/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    });
+};
+// 收藏-导出
+export const luckyBagCollectExport = query => {
+    window.location.href = `/admin/luckyBagCollect/export?${genQueryParam(query)}`;
+    return;
+};

src/api/miniGame/miniGameForBaiShun.js

@@ -0,0 +1,28 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+
+export const miniGameForBaiShunPage = query => {
+    return request({
+        url: '/admin/miniGame/baiShun/statis/page',
+        method: 'get',
+        params: query
+    });
+};
+
+export const miniGameForBaiShunDetailPage = query => {
+    return request({
+        url: '/admin/miniGame/baiShun/statis/detailPage',
+        method: 'get',
+        params: query
+    });
+};
+
+export const miniGameForBaiShunExport = query => {
+    window.location.href = `/admin/miniGame/baiShun/statis/export?${genQueryParam(query)}`;
+    return;
+};
+
+export const miniGameForBaiShunExportAll = query => {
+    window.location.href = `/admin/miniGame/baiShun/statis/exportForMiniGame?${genQueryParam(query)}`;
+    return;
+};

src/api/miniGame/miniGameForNav.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const miniGameForNavPage = query => {
+    return request({
+        url: '/admin/miniGame/nav/page',
+        method: 'get',
+        params: query
+    });
+};

src/api/nobleman/nobleman.js

@@ -0,0 +1,117 @@
+import request from '@/utils/request';
+import { genQueryParam } from '@/utils/maintainer';
+
+// 邀请移除记录
+export const pageOperateRecord = query => {
+    return request({
+        url: '/admin/family/manage/pageOperateRecord',
+        method: 'get',
+        params: query
+    });
+};
+// 查询公会信息
+export const pageFamily = query => {
+    return request({
+        url: '/admin/family/manage/pageFamily',
+        method: 'get',
+        params: query
+    });
+};
+// 公会成员信息
+export const pageFamilyMember = query => {
+    return request({
+        url: '/admin/family/manage/pageFamilyMember',
+        method: 'get',
+        params: query
+    });
+};
+// 创建公会信息
+export const create = query => {
+    return request({
+        url: '/admin/family/manage/create',
+        method: 'post',
+        params: query
+    });
+};
+// 删除公会信息
+export const dismiss = query => {
+    return request({
+        url: '/admin/family/manage/dismiss',
+        method: 'post',
+        params: query
+    });
+};
+// 幸运礼物详情导出 
+export const luckyGiftRewardRecordExport = query => {
+    window.location.href = `/admin/luckyGiftRewardRecord/export?${genQueryParam(query)}`;
+    return;
+};
+// 公会信息编辑接口
+export const update = query => {
+    return request({
+        url: '/admin/family/manage/update',
+        method: 'post',
+        params: query
+    });
+};
+// 违规类型列表接口
+export const pageFun = query => {
+    return request({
+        url: '/admin/familyMember/violation/page',
+        method: 'get',
+        params: query
+    });
+};
+// 违规类型列表接口
+export const listFun = query => {
+    return request({
+        url: '/admin/familyMember/violation/list',
+        method: 'get',
+        params: query
+    });
+};
+// 违规类型添加接口
+export const addFun = query => {
+    return request({
+        url: '/admin/familyMember/violation/add',
+        method: 'post',
+        params: query
+    });
+};
+// 编辑
+export const updateFun = query => {
+    return request({
+        url: '/admin/familyMember/violation/update',
+        method: 'post',
+        params: query
+    });
+};
+// 删除
+export const delFun = query => {
+    return request({
+        url: '/admin/familyMember/violation/del',
+        method: 'post',
+        params: query
+    });
+};
+// 添加违规记录
+export const addRecord = query => {
+    return request({
+        url: '/admin/familyMember/violation/addRecord',
+        method: 'post',
+        params: query
+    });
+};
+// 违规类查询
+export const listRecord = query => {
+    return request({
+        url: '/admin/familyMember/violation/listRecord',
+        method: 'get',
+        params: query
+    });
+};
+// 导出
+export const exportFamilyMember = query => {
+    window.location.href = `/admin/family/manage/exportFamilyMember?${genQueryParam(query)}`;
+    return;
+};

src/api/official/officialConfig.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request';
+
+export const getOfficialConfigList = query => {
+    return request({
+        url: '/admin/official/config/list',
+        method: 'get',
+        params: query
+    });
+};
+
+export const saveOfficialConfig = data => {
+    return request({
+        url: '/admin/official/config/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: data
+    });
+}

src/api/official/officialRecord.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const browseFor30Days = query => {
+    return request({
+        url: '/admin/official/browse/record/browseFor30Days',
+        method: 'get',
+        params: query
+    });
+};

src/api/partition/partitionInfo.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request';
+
+export const getPartitionInfoList = query => {
+    return request({
+        url: '/partition/listPartitionInfo',
+        method: 'get',
+        params: query
+    });
+};

src/api/system/i18nMessage.js

@@ -0,0 +1,17 @@
+import request from "@/utils/request";
+
+export function getI18nMessageList() {
+    return request({
+        url: '/admin/i18nMessage/list',
+        method: 'get'
+    });
+}
+
+export function saveI18nMessage(data) {
+    return request({
+        url: '/admin/i18nMessage/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: data
+    });
+}

src/api/system/sysconf.js

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

src/api/wishingStar/wishingStar.js

@@ -0,0 +1,76 @@
+import request from '@/utils/request';
+import qs from 'qs';
+import { genQueryParam } from '@/utils/maintainer';
+
+// ==================================许愿礼物配置====================================
+// 表单
+export const promiseStarConfigList = query => {
+    return request({
+        url: '/admin/promiseStarConfig/list',
+        method: 'get',
+        params: query
+    });
+};
+// 新增弹窗列表数据
+export const giftGetAll = query => {
+    return request({
+        url: '/admin/gift/getAll',
+        method: 'get',
+        params: query
+    });
+};
+// 新增
+export const promiseStarConfigSave = query => {
+    return request({
+        url: '/admin/promiseStarConfig/save',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    });
+};
+// 下线
+export const promiseStarConfigUpdateEnable = query => {
+    return request({
+        url: '/admin/promiseStarConfig/updateEnable',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    });
+};
+
+export const promiseStarRoundPage = query => {
+    return request({
+        url: '/admin/promiseStarRound/page',
+        method: 'get',
+        params: query
+    });
+};
+
+export const promiseStarUserRecordGetPromiseUsers = query => {
+    return request({
+        url: '/admin/promiseStarUserRecord/getPromiseUsers',
+        method: 'get',
+        params: query
+    }); 
+};
+
+export const promiseStarUserRecordSetUserWhite = query => {
+    return request({
+        url: '/admin/promiseStarUserRecord/setUserWhite',
+        headers:{"Content-Type": 'application/x-www-form-urlencoded'},
+        method: 'post',
+        data: query
+    }); 
+};
+
+export const promiseStarUserRecordPage = query => {
+    return request({
+        url: '/admin/promiseStarUserRecord/page',
+        method: 'get',
+        params: query
+    });
+};
+export const promiseStarUserRecordExport = query => {
+    window.location.href = `/admin/promiseStarUserRecord/export?${genQueryParam(query)}`;
+    return;
+};

src/components/footer/index.vue

@@ -3,7 +3,7 @@
         <div class="pull-right hidden-xs">
             <b>Version</b> 2.0.0
         </div>
-        <strong>Copyright &copy; 2023 <a href="">触海网络</a>.</strong> All rights
+        <strong>Copyright &copy; 2024 <a href="">触海网络</a>.</strong> All rights
         reserved.
     </footer>
 </template>

src/components/header/index.vue

@@ -4,9 +4,9 @@
         <!-- Logo -->
         <a class="logo">
             <!-- mini logo for sidebar mini 50x50 pixels -->
-            <span class="logo-mini"><b>P</b>K</span>
+            <span class="logo-mini"><b>M</b>S</span>
             <!-- logo for regular state and mobile devices -->
-            <span class="logo-lg"><b>piko</b>管理系统</span>
+            <span class="logo-lg"><b>molistar</b>管理系统</span>
         </a>
         <!-- Header Navbar: style can be found in header.less -->
         <nav class="navbar navbar-static-top" role="navigation">

src/components/maintainer/index.vue

@@ -1,178 +1,253 @@
 <template>
-    <!-- Left side column. contains the logo and sidebar -->
-    <aside class="main-sidebar" style="height: 100%; overflow: hidden; overflow: scroll;">
-        <!-- sidebar: style can be found in sidebar.less -->
-        <section class="sidebar">
-            <!-- Sidebar user panel (optional) -->
-            <div class="user-panel">
-                <div class="pull-left image">
-                    <img :src="avatar" class="img-circle" :alt="username">
-                </div>
-                <div class="pull-left info">
-                    <p>{{ username }}</p>
-                    <!-- Status -->
-                    <a href="#"><i class="fa fa-circle text-success"></i> Online</a>
-                </div>
-            </div>
-            <!-- search form (Optional) -->
-            <form method="get" class="sidebar-form" onsubmit="return false;">
-                <div class="input-group">
-                    <input type="text" name="q" class="form-control" placeholder="Search..." @input="search">
-                    <span class="input-group-btn">
-                        <button name="search" id="search-btn" class="btn btn-flat" @click="search">
-                            <i class="fa fa-search"></i>
-                        </button>
-                    </span>
-                </div>
-            </form>
-            <!-- /.search form -->
-            <!-- Sidebar Menu -->
-            <ul class="sidebar-menu">
-                <li class="header">主导航</li>
-                <!-- Optionally, you can add icons to the links -->
-                <li v-for="(parent, parentIndex) in parentMenus" :key="parent" :data-index="parentIndex" class="treeview">
-                    <a>
-                        <i :class="[parent.icon ? parent.icon : 'fa fa-link']"></i>
-                        <span>{{ parent.name }}</span>
-                        <span class="label pull-right bg-yellow" :id="['ic' + parent.id]">
-                            {{ getChildLength(parent.id) }}
-                        </span>
-                    </a>
-                    <ul class="treeview-menu" :id="['menu' + parent.id]">
-                        <li v-for="(child, childIndex) in getChilds(parent.id)" :key="child" :data-index="childIndex">
-                            <a :data-url="child.path" @click="handleClick(child)">
-                                <i
-                                    :class="[child.icon && child.icon != '' ? child.icon : 'fa fa-circle-o text-yellow']"></i>
-                                <span>{{ child.name }}</span>
-                            </a>
-                        </li>
-                    </ul>
-                </li>
-            </ul>
-            <!-- /.sidebar-menu -->
-        </section>
-        <!-- /.sidebar -->
-    </aside>
-    <!-- Content Wrapper. Contains page content -->
-    <div class="content-wrapper" style="height: 100%;">
-        <!-- Content Header (Page header) -->
-        <section class="content-header"
-            :style="[childMenu.name && childMenu.name != '' ? 'display:block;' : 'display:none;']">
-            <h1>
-                {{ childMenu.name }}
-                <small>{{ childMenu.description }}</small>
-            </h1>
-            <ol class="breadcrumb">
-                <li><a href="#"><i class="fa fa-dashboard"></i> {{ childMenu.parentName }}</a></li>
-                <li class="active">{{ childMenu.name }}</li>
-            </ol>
-        </section>
-        <!-- Main content -->
-        <section class="content">
-        <!-- <section class="content" style="height: 100%; overflow: hidden; overflow: scroll;"> -->
-            <!-- Your Page Content Here -->
-            <component :is="componentName"></component>
-        </section>
-        <!-- /.content -->
-    </div>
-    <!-- /.content-wrapper -->
-    <div class="modal fade" id="tipModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h4 class="modal-title">提示信息</h4>
-                </div>
-                <div class="modal-body" id="tipMsg"></div>
-            </div>
+  <!-- Left side column. contains the logo and sidebar -->
+  <aside
+    class="main-sidebar"
+    style="height: 100%; overflow: hidden; overflow: scroll"
+  >
+    <!-- sidebar: style can be found in sidebar.less -->
+    <section class="sidebar">
+      <!-- Sidebar user panel (optional) -->
+      <div class="user-panel">
+        <div class="pull-left image">
+          <img :src="avatar" class="img-circle" :alt="username" />
         </div>
-    </div>
-    <div class="modal fade" id="confirmModal" tabindex="-1" role="dialog" aria-labelledby="modalLabel"
-         data-backdrop="static">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h4 class="modal-title">确认信息</h4>
-                </div>
-                <div class="modal-body" id="confirmMsg"></div>
-            </div>
+        <div class="pull-left info">
+          <p>{{ username }}</p>
+          <!-- Status -->
+          <a href="#"><i class="fa fa-circle text-success"></i> Online</a>
         </div>
+      </div>
+      <!-- search form (Optional) -->
+      <form method="get" class="sidebar-form" onsubmit="return false;">
+        <div class="input-group">
+          <input
+            type="text"
+            name="q"
+            class="form-control"
+            placeholder="Search..."
+            @input="search"
+          />
+          <span class="input-group-btn">
+            <button
+              name="search"
+              id="search-btn"
+              class="btn btn-flat"
+              @click="search"
+            >
+              <i class="fa fa-search"></i>
+            </button>
+          </span>
+        </div>
+      </form>
+      <!-- /.search form -->
+      <!-- Sidebar Menu -->
+      <ul class="sidebar-menu">
+        <li class="header">主导航</li>
+        <!-- Optionally, you can add icons to the links -->
+        <li
+          v-for="(parent, parentIndex) in parentMenus"
+          :key="parent"
+          :data-index="parentIndex"
+          class="treeview"
+        >
+          <a>
+            <i :class="[parent.icon ? parent.icon : 'fa fa-link']"></i>
+            <span>{{ parent.name }}</span>
+            <span class="label pull-right bg-yellow" :id="['ic' + parent.id]">
+              {{ getChildLength(parent.id) }}
+            </span>
+          </a>
+          <ul class="treeview-menu" :id="['menu' + parent.id]">
+            <li
+              v-for="(child, childIndex) in getChilds(parent.id)"
+              :key="child"
+              :data-index="childIndex"
+            >
+              <a :data-url="child.path" @click="handleClick(child)">
+                <i
+                  :class="[
+                    child.icon && child.icon != ''
+                      ? child.icon
+                      : 'fa fa-circle-o text-yellow',
+                  ]"
+                ></i>
+                <span>{{ child.name }}</span>
+              </a>
+            </li>
+          </ul>
+        </li>
+      </ul>
+      <!-- /.sidebar-menu -->
+    </section>
+    <!-- /.sidebar -->
+  </aside>
+  <!-- Content Wrapper. Contains page content -->
+  <div class="content-wrapper" style="height: 100%">
+    <!-- Content Header (Page header) -->
+    <section
+      class="content-header"
+      :style="[
+        childMenu.name && childMenu.name != ''
+          ? 'display:block;'
+          : 'display:none;',
+      ]"
+    >
+      <h1>
+        {{ childMenu.name }}
+        <small>{{ childMenu.description }}</small>
+      </h1>
+      <ol class="breadcrumb">
+        <li>
+          <a href="#"
+            ><i class="fa fa-dashboard"></i> {{ childMenu.parentName }}</a
+          >
+        </li>
+        <li class="active">{{ childMenu.name }}</li>
+      </ol>
+    </section>
+    <!-- Main content -->
+    <section class="content">
+      <!-- <section class="content" style="height: 100%; overflow: hidden; overflow: scroll;"> -->
+      <!-- Your Page Content Here -->
+      <component :is="componentName"></component>
+    </section>
+    <!-- /.content -->
+  </div>
+  <!-- /.content-wrapper -->
+  <div
+    class="modal fade"
+    id="tipModal"
+    tabindex="-1"
+    role="dialog"
+    aria-labelledby="modalLabel"
+  >
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">提示信息</h4>
+        </div>
+        <div class="modal-body" id="tipMsg"></div>
+      </div>
     </div>
-    <div class="modal fade loading" style="background: #00000040;" tabindex="-1" role="dialog"
-         aria-labelledby="loadingModalLabel" aria-hidden="true" data-backdrop="static" data-keyboard="false">
-        <div class="loadingGif" style="position: fixed;"><img :src="loading"></div>
+  </div>
+  <div
+    class="modal fade"
+    id="confirmModal"
+    tabindex="-1"
+    role="dialog"
+    aria-labelledby="modalLabel"
+    data-backdrop="static"
+  >
+    <div class="modal-dialog" role="document">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">确认信息</h4>
+        </div>
+        <div class="modal-body" id="confirmMsg"></div>
+      </div>
     </div>
+  </div>
+  <div
+    class="modal fade loading"
+    style="background: #00000040"
+    tabindex="-1"
+    role="dialog"
+    aria-labelledby="loadingModalLabel"
+    aria-hidden="true"
+    data-backdrop="static"
+    data-keyboard="false"
+  >
+    <div class="loadingGif" style="position: fixed; left: 50%; top: 50%">
+      <img
+        src="https://img.zcool.cn/community/0111345d94b0b8a801211d53cbd04d.gif"
+        style="width: 10%"
+      />
+    </div>
+  </div>
 </template>
   
 <script>
-import store from '@/store';
-import { getStore } from '@/utils/store';
-import loading from '@/assets/images/loading.gif';
+import store from "@/store";
+import Vue from "vue";
+import { getStore } from "@/utils/store";
 
 export default {
-    name: 'MaintainerView',
-    data() {
-        return {
-            componentName: "",
-            username: "",
-            avatar: "",
-            parentMenus: [],
-            childMenus: [],
-            childMenu: {
-                name: "",
-                parentName: "",
-                description: "",
-            }
-        };
+  name: "MaintainerView",
+  data() {
+    return {
+      componentName: "",
+      username: "",
+      avatar: "",
+      parentMenus: [],
+      childMenus: [],
+      childMenu: {
+        name: "",
+        parentName: "",
+        description: "",
+      },
+    };
+  },
+  created() {
+    this.getMenu();
+    this.username = store.getters.username;
+    this.avatar = store.getters.avatar;
+  },
+  methods: {
+    getMenu() {
+      this.parentMenus = getStore({ name: "parent_menus" });
+      this.childMenus = getStore({ name: "child_menus" });
+      store.dispatch("getMenu").then((res) => {
+        this.parentMenus = res.parents;
+        this.childMenus = res.childs;
+      });
     },
-    created() {
-        this.getMenu();
-        this.username = store.getters.username;
-        this.avatar = store.getters.avatar;
+    getChilds(parentId) {
+      return this.childMenus.filter((v) => v.parentid == parentId);
     },
-    methods: {
-        getMenu() {
-            this.parentMenus = getStore({ name: 'parent_menus' });
-            this.childMenus = getStore({ name: 'child_menus' });
-            store.dispatch('getMenu').then(res => {
-                this.parentMenus = res.parents;
-                this.childMenus = res.childs;
-            });
-        },
-        getChilds(parentId) {
-            return this.childMenus.filter(v => v.parentid == parentId);
-        },
-        getChildLength(parentId) {
-            return this.childMenus.filter(v => v.parentid == parentId).length;
-        },
-        handleClick(menu) {
-            this.childMenu.name = menu.name;
-            this.childMenu.parentName = menu.parentstr;
-            this.childMenu.description = menu.description;
-            store.dispatch('getViewComponent', menu.path).then(componentName => {
-                console.log(componentName);
-                this.componentName = componentName;
-            });
-        },
-        search() {
-            let text = $("input[type='text']").val();
-            this.childMenus = store.getters.childMenus.filter(v => v.name.indexOf(text) >= 0);
-            if (!this.childMenus.length || this.childMenus.length == 0) {
-                this.parentMenus = store.getters.parentMenus.filter(v => v.name.indexOf(text) >= 0);
-            } else {
-                let parentIds = this.childMenus.map(v => v.parentid);
-                let parentMenus = store.getters.parentMenus.filter(v => v.name.indexOf(text) >= 0);
-                if (parentMenus && parentMenus.length > 0) {
-                    parentMenus.forEach(v => {
-                        parentIds.push(v.id);
-                    });
-                }
-                this.parentMenus = store.getters.parentMenus.filter(v1 => parentIds.filter(v2 => v1.id == v2).length > 0);
-            }
+    getChildLength(parentId) {
+      return this.childMenus.filter((v) => v.parentid == parentId).length;
+    },
+    handleClick(menu) {
+      this.childMenu.name = menu.name;
+      this.childMenu.parentName = menu.parentstr;
+      this.childMenu.description = menu.description;
+      store.dispatch("getViewComponent", menu.path).then((componentName) => {
+        this.componentName = componentName;
+        const files = require.context("@/views", true, /\.vue$/);
+        let components = {};
+        files.keys().forEach((key) => {
+          components[key.replace(/(\.\/|\.vue)/g, "")] = files(key).default;
+        });
+      });
+    },
+    search() {
+      let text = $("input[type='text']").val();
+      this.childMenus = store.getters.childMenus.filter(
+        (v) => v.name.indexOf(text) >= 0
+      );
+      if (!this.childMenus.length || this.childMenus.length == 0) {
+        this.parentMenus = store.getters.parentMenus.filter(
+          (v) => v.name.indexOf(text) >= 0
+        );
+      } else {
+        let parentIds = this.childMenus.map((v) => v.parentid);
+        let parentMenus = store.getters.parentMenus.filter(
+          (v) => v.name.indexOf(text) >= 0
+        );
+        if (parentMenus && parentMenus.length > 0) {
+          parentMenus.forEach((v) => {
+            parentIds.push(v.id);
+          });
         }
+        this.parentMenus = store.getters.parentMenus.filter(
+          (v1) => parentIds.filter((v2) => v1.id == v2).length > 0
+        );
+      }
     },
-}
+  },
+};
 </script>
   
 <style scoped>
-@import '@/css/main.css';
+@import "@/css/main.css";
 </style>

src/constants/global.js

@@ -1,8 +1,8 @@
 export default {
     KEY: "piko",
     EXCLUDES: [
-        "/login/login.action",
-        "/login/sendSmsCode.action",
+        "/login/login",
+        "/login/sendSmsCode",
     ],
     NEED_LOGOUT: "needLogout",
 };

src/main.js

@@ -1,7 +1,9 @@
 import { createApp } from 'vue'
+// @ts-ignore
 import App from './App.vue'
 import router from './router'
 import store from './store'
+
 import 'jquery'
 import 'jquery.md5'
 import 'bootstrap/dist/css/bootstrap.min.css'
@@ -45,10 +47,13 @@ import '@/assets/plugins/jQuery-Validation-Engine/js/languages/jquery.validation
 import '@/assets/plugins/bootstrap-treeview/css/bootstrap-treeview.min.css'
 import '@/assets/plugins/bootstrap-treeview/js/bootstrap-treeview.min.js'
 
+// @ts-ignore
 import components from '@/utils/components.js'
 
 // import ElementPlus from 'element-plus'
 // import 'element-plus/dist/index.css'
 import '@/css/public.css'
 
-createApp(App).use(store).use(router).use(components).mount('#app')
+const app = createApp(App)
+app.config.warnHandler = () => null;
+app.use(store).use(router).use(components).mount('#app')

src/utils/bootstrap-table-helper.js

@@ -1,42 +1,50 @@
 export default {
-    idstr: null,
     // 是否有且只选择了一项
-    isSelectOne: function (idstr) {
-        if ($(idstr).bootstrapTable('getSelections').length == 1) {
+    isSelectOne: function (id) {
+        if ($(id).bootstrapTable('getSelections').length == 1) {
             return true;
         }
         return false;
     },
     //是否选择了至少一项
-    hasSelectAny: function (idstr) {
-        if ($(idstr).bootstrapTable('getSelections').length > 0) {
+    hasSelectAny: function (id) {
+        if ($(id).bootstrapTable('getSelections').length > 0) {
             return true;
         }
         return false;
     },
     // 获取选择的一项
-    getOneSelectItem: function (idstr) {
-        return $(idstr).bootstrapTable('getSelections')[0];
+    getOneSelectItem: function (id) {
+        return $(id).bootstrapTable('getSelections')[0];
     },
     // 已经选择的记录
-    getAllSelectItems: function (idstr) {
-        return $(idstr).bootstrapTable('getSelections');
+    getAllSelectItems: function (id) {
+        return $(id).bootstrapTable('getSelections');
     },
-    getRowByUniqueId: function (idstr, id) {
-        return $(idstr).bootstrapTable('getRowByUniqueId', id);
+    getRowByUniqueId: function (id, recordId) {
+        return $(id).bootstrapTable('getRowByUniqueId', recordId);
     },
     // 已选择的项数量
-    selectLength: function (idstr) {
-        return $(idstr).bootstrapTable('getSelections').length;
+    selectLength: function (id) {
+        return $(id).bootstrapTable('getSelections').length;
     },
     // 刷新
-    doRefresh: function (idstr) {
-        $(idstr).bootstrapTable('refresh');
+    doRefresh: function (id) {
+        $(id).bootstrapTable('refresh');
     },
-    unCheckAll: function (idstr) {
-        $(idstr).bootstrapTable('uncheckAll');
+    unCheckAll: function (id) {
+        $(id).bootstrapTable('uncheckAll');
     },
-    doRefreshAndToPage1: function (idstr) {
-        $(idstr).bootstrapTable('selectPage', 1);
+    doRefreshAndToPage1: function (id) {
+        $(id).bootstrapTable('selectPage', 1);
     },
+    getData: function(id) {
+        return $(id).bootstrapTable('getData');
+    },
+    destroy: function(id) {
+        $(id).bootstrapTable('destroy');
+    },
+    load: function(id, data) {
+        $(id).bootstrapTable('load', data);
+    }
 }

src/utils/maintainer.js

@@ -47,4 +47,13 @@ export function apiResult(json) {
     $("#tipMsg").text("请求失败，错误信息：" + json.message);
     $("#tipModal").modal('show');
     return false;
+}
+
+export function genQueryParam(json) {
+    if (!json) return ''
+    return cleanArray(Object.keys(json).map(key => {
+        if (json[key] === undefined) return ''
+        return encodeURIComponent(key) + '=' +
+            encodeURIComponent(json[key])
+    })).join('&');
 }

src/utils/notify.js

@@ -3,7 +3,7 @@ export const notifyNotice = () => {
     console.log(window.Notification.permission);
     if (window.Notification) {
         $.ajax({
-            url: "/admin/dynamic/verify/notifySwitch.action",
+            url: "/admin/dynamic/verify/notifySwitch",
             success: function (json) {
                 if (json == 'true') {
                     notifyInterval = setInterval(notify, 50000);
@@ -17,7 +17,7 @@ export const notifyNotice = () => {
 
     function notify() {
         $.ajax({
-            url: "/admin/dynamic/verify/notify.action",
+            url: "/admin/dynamic/verify/notify",
             success: function (json) {
                 if (json != null && json != "" && json != undefined && json != 'undefined') {
                     var dynamicCount = json.dynamic;

src/utils/system-helper.js

@@ -1,6 +1,54 @@
 //获取url中的参数
-function getUrlParam(name) {
+export function getUrlParam(name) {
     var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象
     var r = window.location.search.substr(1).match(reg);  //匹配目标参数
     if (r != null) return unescape(r[2]); return null; //返回参数值
+}
+
+export function dateFormat (date, fmt) {
+    date = new Date(date);
+    var o = {
+        'M+': date.getMonth() + 1,
+        'd+': date.getDate(),
+        'h+': date.getHours(),
+        'm+': date.getMinutes(),
+        's+': date.getSeconds()
+    };
+
+    // 补全0
+    let padLeftZero = (str) => {
+        return ('00' + str).substr(str.length);
+    }
+
+    // 年份
+    if (/(y+)/.test(fmt)) {
+        fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+    }
+
+    // 月日时分秒
+    for (var k in o) {
+        if (new RegExp('(' + k + ')').test(fmt)) {
+            var str = o[k] + '';
+            fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
+        }
+    }
+
+    date = o = padLeftZero = null;
+    return fmt;
+}
+
+export function buildSelectOption(id, defVal, array) {
+    let $select = $(id);
+    let children = $select.children(); 
+    if (children && children.length > 0) {
+        $select.empty();
+    }
+    for(let i in array) {
+        let obj = array[i];
+        let selected = false;
+        if (obj.value == defVal) {
+            selected = true;
+        }
+        $select.append('<option value="' + obj.value + '"' + (selected ? 'selected' : '') + '>' + obj.text + '</option>');
+    }
 }

src/views/OperationSmsAdminView.vue

@@ -213,7 +213,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/sms/list.action',
+                    url: '/admin/sms/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -256,7 +256,7 @@ export default {
                     showLoading();
                     var option = ({
                         type: "POST",
-                        url: "/admin/sms/uploadExcel.action",
+                        url: "/admin/sms/uploadExcel",
                         cache: false,
                         contentType: false,    //不可缺
                         processData: false,    //不可缺
@@ -310,7 +310,7 @@ export default {
                         createTime: createTime,
                         sendTime: sendTime
                     };
-                    var url = "/admin/sms/query/send.action";
+                    var url = "/admin/sms/query/send";
                     if (confirm("按查询条件发送最多一次可发送一万条短信!已发送过的用户不会重复发送,你确认批量发送吗?")) {
                         sendSmsByData(data, url);
                     }
@@ -329,7 +329,7 @@ export default {
                     var data = {
                         ids: JSON.stringify(idArr)
                     }
-                    var url = "/admin/sms/page/send.action";
+                    var url = "/admin/sms/page/send";
                     if (confirm("你确认批量发送吗?")) {
                         sendSmsByData(data, url);
                     }
@@ -338,7 +338,7 @@ export default {
                 $("#table").on('click', '.opt-send', function () {
                     var id = $(this).attr("data-id");
                     var data = { recordId: id };
-                    var url = "/admin/sms/send.action";
+                    var url = "/admin/sms/send";
                     if (confirm("已经发送过的短信将会重复发送,确定重复发送短信吗？")) {
                         sendSmsByData(data, url);
                     }
@@ -349,7 +349,7 @@ export default {
                     if (confirm("删除的数据将不能找回，确定删除吗？")) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/sms/del.action",
+                            url: "/admin/sms/del",
                             data: { recordId: id },
                             dataType: "json",
                             success: function (json) {

src/views/QiniuUploadAdminView.vue

@@ -62,7 +62,7 @@ export default {
             }
             $.ajax({
                 type: "POST",
-                url: "/admin/qiniu/uploadPatch.action",
+                url: "/admin/qiniu/uploadPatch",
                 data: data,
                 cache: false,
                 contentType: false,    //不可缺

src/views/TencentUploadAdminView.vue

@@ -0,0 +1,195 @@
+<template>
+    <section class="content">
+        <div class="box box-primary">
+            <div class="box-body">
+                <section class="content-header">
+                    <h1 id="itemTitle"></h1>
+                </section>
+                <!-- .content -->
+                <div id="table"></div>
+                <div id="toolbar">
+                    <br />
+                    <br />
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<button id="updateImgs" class="btn btn-sm btn-primary">上传文件</button>
+                    <h3 id="urlInfo"></h3>
+                    <br />
+                </div>
+            </div>
+        </div>
+    </section>
+
+    <div class=" modal fade" id="fileUpload" tabindex="-1" role="dialog" aria-labelledby="modalLabel1">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span>
+                    </button>
+                    <h4 class="modal-title" id="modalLabel1">上传文件</h4>
+                </div>
+                <div class="modal-footer" style="height: 20%">
+                    <span>上传文件</span>
+                    <!--<input type="file" name="file" id="uploadFile">-->
+                    <input type="file" name="logoFile1" id="logoFile1" onchange="setFiles(this);" style="display:inline;"
+                        multiple>
+                    <!--<button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>-->
+                    <!--<button type="button" class="btn btn-primary" id="upload">上传七牛</button>-->
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+
+export default {
+    name: "TencentUploadAdminView",
+    setup() {
+
+        function setFiles(obj) {
+            $("#confirmMsg").text("正在上传，请稍后");
+            $("#confirmModal").modal('show');
+            var f = $(obj).val();
+            if (f == null || f == undefined || f == '') {
+                return false;
+            }
+            var filePaths = $(obj)[0].files;
+            var num = filePaths.length;
+            var data = new FormData();
+            for (var i = 0; i <= num - 1; i++) {
+                var file = $(obj)[0].files[i];
+                data.append('file_' + i, file);
+            }
+            $.ajax({
+                type: "POST",
+                url: "/admin/tencent/cos/uploadPatch",
+                data: data,
+                cache: false,
+                contentType: false,    //不可缺
+                processData: false,    //不可缺
+                dataType: "json",
+                success: function (res) {
+                    $("#logoFile1").val("");
+                    $("#confirmModal").modal('hide');
+                    $("#fileUpload").modal('hide');
+                    console.log(res)
+                    if (res.code == 200) {
+                        $("#tipMsg").text("上传成功");
+                        $("#tipModal").modal('show');
+                        buildResult(res.data);
+                    } else {
+                        $("#tipMsg").text("上传失败.");
+                        $("#tipModal").modal('show');
+                    }
+                }
+            });
+        }
+        window.setFiles = setFiles;
+        return {
+            setFiles
+        };
+    },
+    created() {
+        this.$nextTick(function () {
+            this.initData();
+        });
+    },
+    methods: {
+        initData() {
+            $("#updateImgs").click(function () {
+                $("#uploadFile").val("");
+                $("#fileUpload").modal('show');
+            });
+
+            $("#upload").click(function () {
+                $.ajaxFileUpload({
+                    fileElementId: 'uploadFile',    //需要上传的文件域的ID，即<input type="file">的ID。
+                    url: "/admin/tencent/cos/upload", //后台方法的路径
+                    type: 'post',   //当要提交自定义参数时，这个参数要设置成post
+                    dataType: 'json',   //服务器返回的数据类型。可以为xml,script,json,html。如果不填写，jQuery会自动判断。
+                    secureuri: false,   //是否启用安全提交，默认为false。
+                    async: true,   //是否是异步
+                    success: function (json) {   //提交成功后自动执行的处理函数，参数data就是服务器返回的数据。
+                        console.log(json)
+                        if (json.flag) {
+                            $("#urlInfo").html(json.url);
+                            $("#tipMsg").text("上传成功");
+                            $("#tipModal").modal('show');
+                        }
+                        else {
+                            $("#tipMsg").text("上传失败.");
+                            $("#tipModal").modal('show');
+                        }
+                        $("#faceJsonImgsUpload").modal('hide');
+                    },
+                    error: function (data, status, e) {  //提交失败自动执行的处理函数。
+                        console.error(e);
+                        $("#tipMsg").text("上传失败");
+                        $("#tipModal").modal('show');
+                    }
+                });
+
+            });
+        }
+    },
+};
+
+function buildResult(data) {
+    var $urlInfo = $('#urlInfo');
+    for (var i = 0; i < data.length; i++) {
+        var $p = $('<p />');
+        $p.html(data[i]);
+        $urlInfo.append($p);
+    }
+}
+</script>
+
+<style scoped>
+ .bar1, .bar2 {
+        margin-bottom: 10px;
+    }
+
+    label.col-sm-1 {
+        padding: 0;
+        line-height: 30px;
+        text-align: right;
+        /*padding-right: 4px;*/
+    }
+
+    label.col-sm-1 {
+        padding: 0;
+        line-height: 30px;
+        text-align: right;
+        /*padding-right: 4px;*/
+    }
+
+    input, select {
+        margin-left: 8px;
+        margin-right: 8px;
+    }
+
+    .button-wrapper {
+        margin-top: 10px;
+    }
+
+    .record {
+        margin-top: 10px;
+    }
+
+    .record .title {
+        font-size: 16px;
+    }
+
+    .toggle-group {
+        display: none;
+    }
+
+    .tips {
+        font-size: 13px;
+        color: red;
+    }
+
+    .opt-group .col-sm-7 {
+        text-align: left;
+    }
+</style>

src/views/accessRestriction/AccessWhitelist.vue

@@ -57,7 +57,8 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column align="center" label="操作" width="400">
+      <el-table-column prop="adminName" align="center" label="操作人" />
+      <el-table-column align="center" label="操作" width="300">
         <template v-slot="scope">
           <el-button
             @click="delWhite(scope.row)"

src/views/activity/ActivityAwardAdminView.vue

@@ -10,7 +10,7 @@
                     <div id="toolbar">
                         奖品类别：<select name="prizeType" id="prizeType" class="input-m">
                             <option value="0">--全部--</option>
-                            <option value="1">金币</option>
+                            <option value="1">钻石</option>
                             <option value="2">线上礼物</option>
                             <option value="3">座驾</option>
                             <option value="4">头饰</option>
@@ -45,7 +45,7 @@
 
                             <div class="col-sm-8" style="padding-top:7px;">
                                 <select name="addType" id="addType" data-btn-class="btn btn-warning">
-                                    <option value="1">金币</option>
+                                    <option value="1">钻石</option>
                                     <option value="2">线上礼物</option>
                                     <option value="3">座驾</option>
                                     <option value="4">头饰</option>
@@ -179,7 +179,7 @@ export default {
                             field: 'prizeType', title: '奖品类别', align: 'center', valign: 'middle', width: '20%', formatter: function (val, row, index) {
                                 switch (val) {
                                     case 1:
-                                        return '金币';
+                                        return '钻石';
 
                                     case 2:
                                         return '在线礼物';
@@ -290,7 +290,7 @@ export default {
                     },
                     uniqueId: 'id',
                     toolbar: '#toolbar',
-                    url: '/admin/activityAward/list.action',
+                    url: '/admin/activityAward/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -529,7 +529,7 @@ export default {
                         $('#carChoose').combobox();
                     })
 
-                    $.get('/admin/nameplate//total/list', {}, function (res) {
+                    $.get('/admin/nameplate/total/list', {}, function (res) {
                         if (res.code == 200) {
                             for (var i = 0; i < res.data.length; i++) {
                                 //                        car.push(res.data[i]);

src/views/activity/ActivityPackAdminView.vue

@@ -655,7 +655,7 @@ export default {
                                 field: 'type', title: '奖品类型', align: 'center', width: '5%', valign: 'middle', formatter: function (val, row, index) {
                                     switch (val) {
                                         case 1:
-                                            return '金币';
+                                            return '钻石';
 
                                         case 2:
                                             return '在线礼物';

src/views/activity/ChargeActivityAdminView.vue

@@ -597,7 +597,7 @@ export default {
                     var id = $(this).data('id');
                     $.ajax({
                         type: "get",
-                        url: "/admin/charge/activity/getById.action",
+                        url: "/admin/charge/activity/getById",
                         data: { id: id },
                         dataType: "json",
                         success: function (json) {
@@ -716,7 +716,7 @@ export default {
                                 $('#modal_packName').append('<option value="">请选择...</option>');
                                 $.ajax({
                                     type: "get",
-                                    url: "/admin/activity/pack/list.action",
+                                    url: "/admin/activity/pack/list",
                                     data: {
                                         status: 1
                                     },
@@ -760,7 +760,7 @@ export default {
                     if (confirm("你确认删除该记录吗? \r\n 删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/charge/activity/delete.action",
+                            url: "/admin/charge/activity/delete",
                             data: { id: id },
                             dataType: "json",
                             success: function (json) {
@@ -791,7 +791,7 @@ export default {
                     }
                     $.ajax({
                         type: "get",
-                        url: "/admin/activity/pack/list.action",
+                        url: "/admin/activity/pack/list",
                         data: {
                             status: 1
                         },

src/views/activity/LuckySeaItemAdminView.vue

@@ -218,7 +218,7 @@ export default {
                     queryParamsType: "undefined",
                     uniqueId: 'id',
                     toolbar: '#toolbar',
-                    url: '/admin/luckySea/listItemGroup.action',
+                    url: '/admin/luckySea/listItemGroup',
                     onLoadSuccess: function (data) {  //加载成功时执行
                         console.log("load success");
                     },
@@ -410,7 +410,7 @@ export default {
                 }
 
                 function getPageInfo() {
-                    $.get('/admin/luckySea/listItem.action', {
+                    $.get('/admin/luckySea/listItem', {
                     }, function (res) {
                         console.log(res);
                         const data = res;

src/views/activity/LuckySeaPlatformAdminView.vue

@@ -154,7 +154,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/luckySea/listPlatformStat.action',
+                    url: '/admin/luckySea/listPlatformStat',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },

src/views/activity/LuckySeaRecordAdminView.vue

@@ -14,7 +14,7 @@
                         <i class="glyphicon glyphicon-search"></i>查询
                     </button>
                     <div class="col-sm-12">
-                        当前库存 <span name="stock" id="stock" />钻石
+                        当前库存 <span name="stock" id="stock" />金币
                         <button id="editStock" class="btn btn-default">编辑库存</button>
                     </div>
                 </div>
@@ -58,7 +58,7 @@
                     <h4 class="modal-title" id="editStockModalTitle">编辑库存</h4>
                 </div>
                 <div class="modal-body">
-                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 钻石
+                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 金币
                 </div>
                 <div class="modal-footer">
                     <h4 id="editStockModalFooter"></h4>
@@ -163,7 +163,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/luckySea/listActRecord.action',
+                    url: '/admin/luckySea/listActRecord',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -228,7 +228,7 @@ export default {
                             };
                             return param;
                         },
-                        url: '/admin/luckySea/listRoundDrawDetail.action',
+                        url: '/admin/luckySea/listRoundDrawDetail',
                         onLoadSuccess: function () {  //加载成功时执行
                             $("#roundDetailModal").modal('show');
                         },
@@ -247,7 +247,7 @@ export default {
                 function getStock() {
                     $.ajax({
                         type: 'get',
-                        url: "/admin/luckySea/getStock.action",
+                        url: "/admin/luckySea/getStock",
                         success: function (json) {
                             if (json.success) {
                                 console.log('data', json.data)
@@ -268,7 +268,7 @@ export default {
                 $('#editStockModelBtn').on('click', function () {
                     $.ajax({
                         type: 'get',
-                        url: "/admin/luckySea/editStock.action",
+                        url: "/admin/luckySea/editStock",
                         data: {
                             stock: $("#editedStock").val(),
                         },

src/views/activity/LuckySeaUserStatAdminView.vue

@@ -83,7 +83,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/luckySea/listUserDrawRecordList.action',
+                    url: '/admin/luckySea/listUserDrawRecordList',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },

src/views/activity/OperationActAdminView.vue

@@ -145,7 +145,7 @@ export default {
                     },
                     uniqueId: 'id',
                     toolbar: '#toolbar',
-                    url: '/admin/act/operational/list.action',
+                    url: '/admin/act/operational/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -176,7 +176,7 @@ export default {
                     if ($('#actForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/act/operational/save.action",
+                            url: "/admin/act/operational/save",
                             data: $('#actForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -197,7 +197,7 @@ export default {
                     var key = parseInt($(this).attr('data-id'));
                     $.ajax({
                         type: 'post',
-                        url: '/admin/act/operational/del.action',
+                        url: '/admin/act/operational/del',
                         data: { 'id': key },
                         dataType: 'json',
                         success: function (res) {
@@ -215,7 +215,7 @@ export default {
                 $('#uploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/upload/img.action',
+                        url: '/admin/upload/img',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {

src/views/activity/PageActivityView.vue

@@ -135,7 +135,7 @@ export default {
                     },
                     uniqueId: 'id',
                     toolbar: '#toolbar',
-                    url: '/admin/act/static/list.action',
+                    url: '/admin/act/static/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -165,7 +165,7 @@ export default {
                     if ($('#actForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/act/static/save.action",
+                            url: "/admin/act/static/save",
                             data: $('#actForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -190,7 +190,7 @@ export default {
                     var key = parseInt($(this).attr('data-id'));
                     $.ajax({
                         type: 'post',
-                        url: '/admin/act/static/delete.action',
+                        url: '/admin/act/static/delete',
                         data: { 'id': key },
                         dataType: 'json',
                         success: function (res) {
@@ -208,7 +208,7 @@ export default {
                 $('#uploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/upload/img.action',
+                        url: '/admin/upload/img',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {

src/views/activity/WeekStarConfigAdminView.vue

@@ -166,8 +166,14 @@ export default {
                                 field: 'charmAward', title: '魅力榜奖励', align: 'center', valign: 'middle', formatter: function (val, row, index) {
                                     var packArr = JSON.parse(val);
                                     var str = '';
-                                    for (var i = 0; i < packArr.length; i++) {
-                                        str += packObj[packArr[i]] + '，';
+                                    for (var i = 0, len = packArr.length; i < len; i++) {
+                                        let value = packObj[packArr[i]];
+                                        if (value) {
+                                            str += value;
+                                        }
+                                        if (i != len - 1) {
+                                            str += '，';
+                                        }
                                     }
                                     return str.substr(0, str.length - 2);
                                 }
@@ -176,8 +182,14 @@ export default {
                                 field: 'levelAward', title: '豪气榜奖励', align: 'center', valign: 'middle', formatter: function (val, row, index) {
                                     var packArr = JSON.parse(val);
                                     var str = '';
-                                    for (var i = 0; i < packArr.length; i++) {
-                                        str += packObj[packArr[i]] + '，';
+                                    for (var i = 0, len = packArr.length; i < len; i++) {
+                                        let value = packObj[packArr[i]];
+                                        if (value) {
+                                            str += value;
+                                        }
+                                        if (i != len - 1) {
+                                            str += '，';
+                                        }
                                     }
                                     return str.substr(0, str.length - 2);
                                 }
@@ -232,7 +244,7 @@ export default {
                         },
                         uniqueId: 'id',
                         toolbar: '#toolbar',
-                        url: '/admin/weekStarConfig/getWeekConfigList.action',
+                        url: '/admin/weekStarConfig/getWeekConfigList',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },
@@ -341,10 +353,15 @@ export default {
                         if (res.code == 200) {
                             var str = '';
                             for (var i = 0; i < res.data.length; i++) {
+                                let item = res.data[i];
+                                let giftName = item.giftName;
+                                if (giftName.startsWith('{') && giftName.endsWith('}')) {
+                                    giftName = JSON.parse(giftName).zh;
+                                } 
                                 // 存入对象
-                                giftObj[res.data[i].giftId] = res.data[i].giftName;
+                                giftObj[res.data[i].giftId] = giftName;
                                 // 渲染select
-                                str += '<option value="' + res.data[i].giftId + '">' + res.data[i].giftName + '</option>';
+                                str += '<option value="' + res.data[i].giftId + '">' + giftName + '</option>';
                             }
                             console.log(JSON.stringify(giftObj));
                             // $('.giftSelect').html(str);
@@ -362,10 +379,15 @@ export default {
                         if (res.code == 200) {
                             var str = '';
                             for (var i = 0; i < res.data.length; i++) {
+                                let item = res.data[i];
+                                let giftName = item.giftName;
+                                if (giftName.startsWith('{') && giftName.endsWith('}')) {
+                                    giftName = JSON.parse(giftName).zh;
+                                }
                                 // 存入对象
-                                giftObj[res.data[i].giftId] = res.data[i].giftName;
+                                giftObj[res.data[i].giftId] = giftName;
                                 // 渲染select
-                                str += '<option value="' + res.data[i].giftId + '">' + res.data[i].giftName + '</option>';
+                                str += '<option value="' + res.data[i].giftId + '">' + giftName + '</option>';
                             }
                             console.log(JSON.stringify(giftObj));
                             $('.giftSelect').html(str);

src/views/administrator/SuperAdminOperateRecordView.vue

@@ -150,7 +150,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/super/operate/record/list.action',
+                    url: '/admin/super/operate/record/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },

src/views/administrator/SuperAdminView.vue

@@ -83,7 +83,7 @@ export default {
                         var params = "uids=" + id;
                         $.ajax({
                             type: 'post',
-                            url: "/admin/super/del.action",
+                            url: "/admin/super/del",
                             data: params,
                             dataType: "json",
                             success: function (json) {
@@ -114,7 +114,7 @@ export default {
                         showLoading()
                         $.ajax({
                             type: "post",
-                            url: "/admin/super/save.action",
+                            url: "/admin/super/save",
                             data: 'erbanNo=' + erbanNo,
                             dataType: "json",
                             success: function (json) {
@@ -180,7 +180,7 @@ function initTable() {
             return param;
         },
         toolbar: '#toolbar',
-        url: '/admin/super/list.action',
+        url: '/admin/super/list',
         onLoadSuccess: function (data) {  //加载成功时执行
             setTimeout(function () {
                 loadCreateTime(data);
@@ -205,7 +205,7 @@ function loadCreateTime(data) {
     if (param != '') {
         $.ajax({
             type: "get",
-            url: "/admin/super/get/time.action",
+            url: "/admin/super/get/time",
             data: param,
             dataType: "json",
             success: function (json) {

src/views/anchor/AnchorBillUploadView.vue

@@ -41,8 +41,8 @@
                             <div class="col-sm-9">
                                 <span>
                                     <font color="#dd4b39">1.上传文件仅支持.xlsx格式的文件<br>
-                                        2.文件内容第一行为标题(例:平台号,金币,钻石)<br>
-                                        3.第一列为用户平台号,第二列为用户要添加的金币数量,第三列为用户要添加的钻石数量
+                                        2.文件内容第一行为标题(例:平台号,钻石,金币)<br>
+                                        3.第一列为用户平台号,第二列为用户要添加的钻石数量,第三列为用户要添加的金币数量
                                     </font>
                                 </span>
                             </div>

src/views/anchor/AnchorFansMpAudioView.vue

@@ -167,7 +167,7 @@ export default {
                     },
                     toolbar: '#toolbar',
                     uniqueId: 'id',
-                    url: '/admin/anchorFansTeamAudio/recordList.action',
+                    url: '/admin/anchorFansTeamAudio/recordList',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -195,7 +195,7 @@ export default {
                     if (confirm("确定批量批量审核通过图片吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/photo/batchPass.action',
+                            url: '/admin/photo/batchPass',
                             data: { pid: JSON.stringify(pid) },
                             dataType: 'json',
                             success: function (res) {
@@ -221,7 +221,7 @@ export default {
                         // console.log(data)
                         $.ajax({
                             type: 'post',
-                            url: '/admin/anchorFansTeamAudio/pass.action',
+                            url: '/admin/anchorFansTeamAudio/pass',
                             data: { pid: dataId, status: 2 },
                             dataType: 'json',
                             success: function (res) {
@@ -260,7 +260,7 @@ export default {
                     if ($("#messageForm").validationEngine('validate')) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/anchorFansTeamAudio/pass.action',
+                            url: '/admin/anchorFansTeamAudio/pass',
                             data: { pid: dataId, message: message, status: 1 },
                             dataType: 'json',
                             success: function (res) {

src/views/anchor/AnchorFansPrivilegeView.vue

@@ -261,7 +261,7 @@ export default {
                     ajax: function (request) {                    //使用ajax请求
                         $.ajax({
                             type: "GET",
-                            url: '/admin/anchorFansPrivilege/privilegeList.action',
+                            url: '/admin/anchorFansPrivilege/privilegeList',
                             contentType: 'application/json;charset=utf-8',
                             dataType: 'json',
                             data: request.data,
@@ -322,7 +322,7 @@ export default {
                         console.log(2333)
                         $.ajax({
                             type: "post",
-                            url: "/admin/anchorFansPrivilege/savePrivilege.action",
+                            url: "/admin/anchorFansPrivilege/savePrivilege",
                             data: {
                                 id: id,
                                 name: name,
@@ -361,7 +361,7 @@ export default {
 
                     $.ajax({
                         type: "get",
-                        url: "/admin/anchorFansPrivilege/getPrivilegeInfo.action",
+                        url: "/admin/anchorFansPrivilege/getPrivilegeInfo",
                         data: { id: id },
                         dataType: "json",
                         success: function (res) {

src/views/anchor/AnchorFansTeamStatsView.vue

@@ -127,7 +127,7 @@ export default {
                     },
                     toolbar: '#toolbar',
                     uniqueId: 'uid',
-                    url: '/admin/anchorFansTeam/statis/statisList.action',
+                    url: '/admin/anchorFansTeam/statis/statisList',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -184,7 +184,7 @@ export default {
                             };
                             return param;
                         },
-                        url: '/admin/anchorFansTeam/statis/team/DetailList.action',
+                        url: '/admin/anchorFansTeam/statis/team/DetailList',
                         onLoadSuccess: function () {  //加载成功时执行
                             $("#roundDetailModal").modal('show');
                         },

src/views/anchor/AnchorReleaseGoldView.vue

@@ -65,8 +65,8 @@
                             <div class="col-sm-9">
                                 <span>
                                     <font color="#dd4b39">1.上传文件仅支持.xlsx格式的文件<br>
-                                        2.文件内容第一行为标题(例:平台号,金币,钻石)<br>
-                                        3.第一列为用户平台号,第二列为用户要添加的金币数量,第三列为用户要添加的钻石数量
+                                        2.文件内容第一行为标题(例:平台号,钻石,金币)<br>
+                                        3.第一列为用户平台号,第二列为用户要添加的钻石数量,第三列为用户要添加的金币数量
                                     </font>
                                 </span>
                             </div>
@@ -107,8 +107,8 @@ export default {
                         // {field: 'temp', title: 'id', align: 'center', checkbox: true, width: '5%'},
                         { field: 'erbanNo', title: '平台号', align: 'center', width: '5%' },
                         { field: 'nick', title: '昵称', align: 'center', width: '5%' },
-                        { field: 'goldNum', title: '金币数量', align: 'center', width: '5%' },
-                        { field: 'diamondNum', title: '钻石数量', align: 'center', width: '5%' },
+                        { field: 'goldNum', title: '钻石数量', align: 'center', width: '5%' },
+                        { field: 'diamondNum', title: '金币数量', align: 'center', width: '5%' },
                         {
                             field: 'createTime',
                             title: '创建时间',
@@ -234,7 +234,7 @@ export default {
                     if (confirm("删除的数据将不能找回，确定删除吗？")) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/sms/del.action",
+                            url: "/admin/sms/del",
                             data: { recordId: id },
                             dataType: "json",
                             success: function (json) {

src/views/app/AppBottomBarAdminView.vue

@@ -415,7 +415,7 @@ export default {
                     ajax: function (request) {                    //使用ajax请求
                         $.ajax({
                             type: "GET",
-                            url: '/admin/bottomBar/list.action',
+                            url: '/admin/bottomBar/list',
                             contentType: 'application/json;charset=utf-8',
                             dataType: 'json',
                             data: request.data,
@@ -544,7 +544,7 @@ export default {
                     if ($("#addForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/bottomBar/saveBottomBar.action",
+                            url: "/admin/bottomBar/saveBottomBar",
                             data: {
                                 refSeq: refSeq,
                                 configName: configName,
@@ -594,7 +594,7 @@ export default {
 
                     $.ajax({
                         type: "get",
-                        url: "/admin/bottomBar/getBarByRefSeq.action",
+                        url: "/admin/bottomBar/getBarByRefSeq",
                         data: { refSeq: refSeq },
                         dataType: "json",
                         success: function (res) {
@@ -671,7 +671,7 @@ export default {
                     if (confirm("你确认删除该记录吗? \r\n 删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/bottomBar/deleteByRefSeq.action",
+                            url: "/admin/bottomBar/deleteByRefSeq",
                             data: { refSeq: refSeq },
                             dataType: "json",
                             success: function (json) {

src/views/app/AppUpdateView.vue

@@ -266,7 +266,7 @@ export default {
                     ajax: function (request) {                    //使用ajax请求
                         $.ajax({
                             type: "GET",
-                            url: '/admin/appUpdate/list.action',
+                            url: '/admin/appUpdate/list',
                             contentType: 'application/json;charset=utf-8',
                             dataType: 'json',
                             data: request.data,
@@ -310,7 +310,7 @@ export default {
                     if ($("#addModalForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/appUpdate/save.action",
+                            url: "/admin/appUpdate/save",
                             data: {
                                 name: $("#modal_name").val(),
                                 forceUpdate: $("#modal_forceUpdate").val(),
@@ -347,7 +347,7 @@ export default {
                     if ($("#editForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/appUpdate/save.action",
+                            url: "/admin/appUpdate/save",
                             data: {
                                 id: $("#id").val(),
                                 name: $("#name").val(),
@@ -386,7 +386,7 @@ export default {
                     console.log(id);
                     $.ajax({
                         type: "get",
-                        url: "/admin/appUpdate/get.action",
+                        url: "/admin/appUpdate/get",
                         data: { id: id },
                         dataType: "json",
                         success: function (ret) {

src/views/audiocard/AudioCardVerifyView.vue

@@ -163,7 +163,7 @@ export default {
                         };
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/audioCard/page.action',
+                    url: '/admin/audioCard/page',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -221,7 +221,7 @@ export default {
                     showLoading();
                     $.ajax({
                         type: 'post',
-                        url: "/admin/audioCard/verify.action",
+                        url: "/admin/audioCard/verify",
                         data: {
                             id: id,
                             status: status

src/views/auditaudio/AuditAudioView.vue

@@ -382,7 +382,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/audit/audio/list.action',
+                    url: '/admin/audit/audio/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -405,7 +405,7 @@ export default {
                     var id = $(this).attr("data-id");
                     $.ajax({
                         type: "post",
-                        url: "/admin/audit/audio/handle/pass.action",
+                        url: "/admin/audit/audio/handle/pass",
                         data: { recordId: id },
                         dataType: "json",
                         success: function (json) {
@@ -425,7 +425,7 @@ export default {
                     var id = $(this).attr("data-id");
                     $.ajax({
                         type: "post",
-                        url: "/admin/audit/audio/handle/unBlock.action",
+                        url: "/admin/audit/audio/handle/unBlock",
                         data: { recordId: id },
                         dataType: "json",
                         success: function (json) {
@@ -474,7 +474,7 @@ export default {
                     if ($("#modalLabel").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/audit/audio/handle/reject.action",
+                            url: "/admin/audit/audio/handle/reject",
                             data: {
                                 recordId: recordId,
                                 resultValue: resultValue,
@@ -508,7 +508,7 @@ export default {
                     if ($("#blockModalLabel").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/audit/audio/handle/reject.action",
+                            url: "/admin/audit/audio/handle/reject",
                             data: {
                                 recordId: recordId,
                                 resultValue: resultValue

src/views/auditaudio/MonitorRuleView.vue

@@ -92,7 +92,7 @@ export default {
                 function getRuleDetail() {
                     $.ajax({
                         type: "get",
-                        url: "/admin/audit/audio/get/rule.action",
+                        url: "/admin/audit/audio/get/rule",
                         dataType: "json",
                         success: function (json) {
                             if (json.code == 200) {
@@ -128,7 +128,7 @@ export default {
                     showLoading();
                     $.ajax({
                         type: "post",
-                        url: "/admin/audit/audio/rule/save.action",
+                        url: "/admin/audit/audio/rule/save",
                         data: {
                             type: type,
                             erbanNos: $("#erbanNos").val()

src/views/blinddate/BlindDateCapAdminView.vue

@@ -220,7 +220,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/blindDate/listCap.action',
+                    url: '/admin/blindDate/listCap',
                     onLoadSuccess: function (res) {  //加载成功时执行
                         console.log("load success");
                     },
@@ -280,7 +280,7 @@ export default {
                     console.log("id", $("#e_id").val());
                     $.ajax({
                         type: "post",
-                        url: "/admin/blindDate/addOrUpdateCap.action",
+                        url: "/admin/blindDate/addOrUpdateCap",
                         data: $('#updateForm').serialize(),
                         dataType: "json",
                         success: function (json) {
@@ -288,7 +288,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
-                                $("#updateItemModal").modal('hide');
+                                $("#updateCapModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');
@@ -305,7 +305,7 @@ export default {
                     if (confirm("你确认删除该帽子吗?")) {
                         $.ajax({
                             type: "get",
-                            url: "/admin/blindDate/delCap.action",
+                            url: "/admin/blindDate/delCap",
                             data: {
                                 id: capId,
                             },
@@ -326,7 +326,7 @@ export default {
                 $("#add-cap").click(function () {
                     $.ajax({
                         type: "post",
-                        url: "/admin/blindDate/addOrUpdateCap.action",
+                        url: "/admin/blindDate/addOrUpdateCap",
                         data: $('#addForm').serialize(),
                         dataType: "json",
                         success: function (json) {
@@ -334,6 +334,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
+                                $("#addCapModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');

src/views/blinddate/BlindDateJoinhandAdminView.vue

@@ -256,7 +256,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/blindDate/listJoinHand.action',
+                    url: '/admin/blindDate/listJoinHand',
                     onLoadSuccess: function (res) {  //加载成功时执行
                         console.log("load success");
                     },
@@ -333,7 +333,7 @@ export default {
                     console.log("id", $("#e_id").val());
                     $.ajax({
                         type: "post",
-                        url: "/admin/blindDate/addOrUpdateJoinHand.action",
+                        url: "/admin/blindDate/addOrUpdateJoinHand",
                         data: $('#updateForm').serialize(),
                         dataType: "json",
                         success: function (json) {
@@ -341,7 +341,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
-                                $("#updateItemModal").modal('hide');
+                                $("#updateJoinHandModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');
@@ -358,7 +358,7 @@ export default {
                     if (confirm("你确认删除该场景吗?")) {
                         $.ajax({
                             type: "get",
-                            url: "/admin/blindDate/delJoinHand.action",
+                            url: "/admin/blindDate/delJoinHand",
                             data: {
                                 id: JoinHandId,
                             },
@@ -379,7 +379,7 @@ export default {
                 $("#add-JoinHand").click(function () {
                     $.ajax({
                         type: "post",
-                        url: "/admin/blindDate/addOrUpdateJoinHand.action",
+                        url: "/admin/blindDate/addOrUpdateJoinHand",
                         data: $('#addForm').serialize(),
                         dataType: "json",
                         success: function (json) {
@@ -387,6 +387,7 @@ export default {
                                 $("#tipMsg").text("保存成功");
                                 $("#tipModal").modal('show');
                                 TableHelper.doRefresh("#table");
+                                $("#addJoinHandModal").modal('hide');
                             } else {
                                 $("#tipMsg").text("保存失败." + json.message);
                                 $("#tipModal").modal('show');

src/views/callbattle/ActCallBattleItemAdminView.vue

@@ -265,7 +265,7 @@ export default {
                 }
 
                 function getPageInfo() {
-                    $.get('/admin/callBattle/listItem.action', {
+                    $.get('/admin/callBattle/listItem', {
                     }, function (res) {
                         console.log(res);
                         const data = res;

src/views/callbattle/ActCallBattlePlatformAdminView.vue

@@ -108,7 +108,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/callBattle/listPlatformStat.action',
+                    url: '/admin/callBattle/listPlatformStat',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },

src/views/callbattle/ActCallBattleRecordAdminView.vue

@@ -14,7 +14,7 @@
                         <i class="glyphicon glyphicon-search"></i>查询
                     </button>
                     <div class="col-sm-12">
-                        当前库存 <span name="stock" id="stock" />金币
+                        当前库存 <span name="stock" id="stock" />钻石
                         <button id="editStock" class="btn btn-default">编辑库存</button>
                     </div>
                 </div>
@@ -58,7 +58,7 @@
                     <h4 class="modal-title" id="editStockModalTitle">编辑库存</h4>
                 </div>
                 <div class="modal-body">
-                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 金币
+                    设置库存为 <input type="text" name="editedStock" id="editedStock" class="input-sm"> 钻石
                 </div>
                 <div class="modal-footer">
                     <h4 id="editStockModalFooter"></h4>
@@ -164,7 +164,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/callBattle/listActRecord.action',
+                    url: '/admin/callBattle/listActRecord',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -229,7 +229,7 @@ export default {
                             };
                             return param;
                         },
-                        url: '/admin/callBattle/listRoundDrawDetail.action',
+                        url: '/admin/callBattle/listRoundDrawDetail',
                         onLoadSuccess: function () {  //加载成功时执行
                             $("#roundDetailModal").modal('show');
                         },
@@ -248,7 +248,7 @@ export default {
                 function getStock() {
                     $.ajax({
                         type: 'get',
-                        url: "/admin/callBattle/getStock.action",
+                        url: "/admin/callBattle/getStock",
                         success: function (json) {
                             if (json.success) {
                                 console.log('data', json.data)
@@ -269,7 +269,7 @@ export default {
                 $('#editStockModelBtn').on('click', function () {
                     $.ajax({
                         type: 'get',
-                        url: "/admin/callBattle/editStock.action",
+                        url: "/admin/callBattle/editStock",
                         data: {
                             stock: $("#editedStock").val(),
                         },

src/views/callbattle/ActCallBattleUserStatAdminView.vue

@@ -83,7 +83,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/callBattle/listUserDrawRecordList.action',
+                    url: '/admin/callBattle/listUserDrawRecordList',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },

src/views/car/CarAdminView.vue

@@ -168,7 +168,7 @@ export default {
                             return param;
                         },
                         toolbar: '#toolbar',
-                        url: '/admin/car/getUserCarPort.action',
+                        url: '/admin/car/getUserCarPort',
                         onLoadSuccess: function (data) {  //加载成功时执行
                             if (data.users) {
                                 var $user = $('#userMessage');

src/views/car/CarGoodsAdminView.vue

@@ -33,7 +33,12 @@
                                 </select>
                             </div>
                         </div>
-
+                        <div class="col-sm-12">
+                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
+                            <div class="col-sm-3">
+                                <select name="partitionId" id="partitionId" class="form-control"></select>
+                            </div>
+                        </div>
                         <div class="col-sm-12">
                             <button id="car-goods-refresh" class="btn btn-default">
                                 <i class="glyphicon glyphicon-search"></i>查询
@@ -59,6 +64,14 @@
                 <div class="modal-body">
                     <form class="form-horizontal" id="carGoodsForm">
                         <input type="hidden" name="id" id="id" />
+                        <div class="form-group">
+                            <label for="partitionFlag" class="col-sm-4 control-label">选择分区</label>
+                            <div class="col-sm-6">
+                                <input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
+                                <input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
+                                <input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="carGoodsType" class="col-sm-3 control-label">座驾类型:</label>
                             <div class="col-sm-9">
@@ -76,6 +89,18 @@
                                 <input type="text" class="form-control validate[required]" name="name" id="name">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="ar_name" class="col-sm-3 control-label">阿语座驾名称</label>
+                            <div class="col-sm-9">
+                                <input type="text" class="form-control validate[required]" name="name" id="ar_name">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="en_name" class="col-sm-3 control-label">英语座驾名称</label>
+                            <div class="col-sm-9">
+                                <input type="text" class="form-control validate[required]" name="name" id="en_name">
+                            </div>
+                        </div>
 
                         <div class="form-group">
                             <label class="col-sm-3 control-label">使用萝卜购买</label>
@@ -111,7 +136,7 @@
                         </div>
 
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">使用金币购买</label>
+                            <label class="col-sm-3 control-label">使用钻石购买</label>
                             <div class="col-sm-9">
                                 <label class="radio-inline"><input type="radio" name="goldSale" value="0">否</label>
                                 <label class="radio-inline"><input type="radio" name="goldSale" value="1" checked>是</label>
@@ -122,7 +147,7 @@
                             <div class="col-sm-6">
                                 <input type="text" class="form-control" name="price" id="price">
                             </div>
-                            <span class="col-sm-3">金币</span>
+                            <span class="col-sm-3">钻石</span>
                         </div>
 
                         <div class="form-group">
@@ -130,7 +155,7 @@
                             <div class="col-sm-6">
                                 <input type="text" class="form-control" name="renewPrice" id="renewPrice">
                             </div>
-                            <span class="col-sm-3">金币</span>
+                            <span class="col-sm-3">钻石</span>
                         </div>
                         <div class="form-group">
                             <label for="originalPrice" class="col-sm-3 control-label">原价:</label>
@@ -138,7 +163,7 @@
                                 <input type="number" class="form-control" placeholder="没有填0" value="0" name="originalPrice"
                                     id="originalPrice">
                             </div>
-                            <span class="col-sm-3">金币</span>
+                            <span class="col-sm-3">钻石</span>
                         </div>
 
                         <div class="form-group">
@@ -374,6 +399,8 @@
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
 import ComboboxHelper from '@/assets/plugins/bootstrap-combobox/js/bootstrap-combobox-helper';
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { buildSelectOption } from '@/utils/system-helper';
 
 export default {
     name: "CarGoodsAdminView",
@@ -382,6 +409,7 @@ export default {
     },
     created() {
         this.$nextTick(function () {
+            this.initPartition();
             this.initData();
         });
     },
@@ -407,7 +435,28 @@ export default {
                     columns: [
                         { field: 'tmp', title: 'id', align: 'center', checkbox: true, width: '5%' },
                         { field: 'id', title: '座驾ID', align: 'center', width: '5%' },
-                        { field: 'name', title: '座驾名称', align: 'center', width: '20%' },
+                        {field: 'name.zh', title: '座驾名称', align: 'center', width: '20%'},
+                        {field: 'name.ar', title: '阿语座驾名称', align: 'center', width: '20%'},
+                        {field: 'name.en', title: '英语座驾名称', align: 'center', width: '20%'},
+                        {
+                            field: 'partitionFlag', 
+                            title: '地区', 
+                            align: 'center', 
+                            width: '10%',
+                            formatter: function (val, row, index) {
+                                let value = '';
+                                if ((val & 1) != 0) {
+                                    value += '英语区<br>';
+                                }
+                                if ((val & 2) != 0) {
+                                    value += '阿拉伯语区<br>';
+                                }
+                                if ((val & 4) != 0) {
+                                    value += '华语区<br>';
+                                }
+                                return value;
+                            }
+                        },
                         {
                             field: 'carGoodsType', title: '座驾类型', align: 'center', width: '20%',
                             formatter: function (val) {
@@ -420,7 +469,7 @@ export default {
                         },
                         {
                             field: 'goldSale',
-                            title: '金币购买',
+                            title: '钻石购买',
                             align: 'center',
                             width: '3%',
                             formatter: function (val, row, index) {
@@ -448,9 +497,9 @@ export default {
                                 }
                             }
                         },
-                        { field: 'originalPrice', title: '原价（金币）', align: 'center', width: '5%' },
-                        { field: 'price', title: '购买价格（金币）', align: 'center', width: '5%' },
-                        { field: 'renewPrice', title: '续费价格（金币）', align: 'center', width: '5%' },
+                        { field: 'originalPrice', title: '原价（钻石）', align: 'center', width: '5%' },
+                        { field: 'price', title: '购买价格（钻石）', align: 'center', width: '5%' },
+                        { field: 'renewPrice', title: '续费价格（钻石）', align: 'center', width: '5%' },
                         { field: 'radishOriginalPrice', title: '原价（萝卜）', align: 'center', width: '5%' },
                         { field: 'radishPrice', title: '购买价格（萝卜）', align: 'center', width: '5%' },
                         { field: 'radishRenewPrice', title: '续费价格（萝卜）', align: 'center', width: '5%' },
@@ -523,12 +572,43 @@ export default {
                             searchText: params.searchText,
                             carGoodsName: $("#query_carGoodsName").val(),
                             carGoodsType: $("#query_carGoodsType").val(),
-                            enable: $("condition_type").val()
+                            enable: $("condition_type").val(),
+                            partitionId: $('#partitionId').val(),
                         };
                         return param;
                     },
+                    ajax:function(request){                    //使用ajax请求
+                        $.ajax({
+                            type:"GET",
+                            url:'/admin/car/goods?enable=' + ComboboxHelper.getSelected("#condition_type"),
+                            contentType:'application/json;charset=utf-8',
+                            dataType:'json',
+                            data: request.data,
+                            success:function (res) {
+                                console.log(res);
+                                request.success({
+                                    "rows": res.rows.map(i=>{
+                                        let value = i.name;
+                                        if (value.startsWith('{') && value.endsWith('}')) {
+                                            i.name = JSON.parse(value);
+                                        } else {
+                                            i.name = {
+                                                zh: value,
+                                                ar: value,
+                                                en: value,
+                                            };
+                                        }
+                                        return i;
+                                    }),
+                                    "total": res.total
+                                });
+                            },
+                            error:function(error){
+                                console.log(error);
+                            }
+                        })
+                    },
                     toolbar: '#toolbar',
-                    url: '/admin/car/goods.action',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -547,7 +627,7 @@ export default {
                     if (confirm("你确认删除该记录吗? \r\n 删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/car/goods/deletion.action",
+                            url: "/admin/car/goods/deletion",
                             data: {'ids': JSON.stringify([id])},
                             dataType: "json",
                             success: function (json) {
@@ -581,7 +661,12 @@ export default {
                     $("#viewFileInfo").html('');
 
                     $("#id").val('');
+                    $('#name').val('');
+                    $('#ar_name').val('');
+                    $('#en_name').val('');
                     $("#name").attr('readonly', false);
+                    $("#ar_name").attr('readonly', false);
+                    $("#en_name").attr('readonly', false);
                     // $("#price").attr('readonly', false);
                     // $("#renewPrice").attr('readonly', false);
                     $("#seq").val('');
@@ -602,7 +687,10 @@ export default {
                     $("input:radio[name='isMonsterLimit']")[0].checked = true;
                     $("input:radio[name='isWeekStarLimit']")[0].checked = true;
                     $("input:radio[name='isActivityLimit']")[0].checked = true;
-                    
+
+                    $('input[name="partitionFlag"]').each(function() {
+                        $(this).checked = false;
+                    });
                     $("#nobleId").btComboBox('disable');
                     ComboboxHelper.setDef("#nobleId", '0');
 
@@ -620,7 +708,7 @@ export default {
                 })
 
                 $("#car-goods-refresh").click(function () {
-                    $("#table").bootstrapTable('refresh', { url: '/admin/car/goods.action' });
+                    $("#table").bootstrapTable('refresh', { url: '/admin/car/goods' });
                 })
 
                 /*$("#car-goods-multiDel").click(function () {
@@ -639,7 +727,7 @@ export default {
                     if (confirm("你确认批量删除该记录吗?" + "\r\n删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/car/goods/deletion.action",
+                            url: "/admin/car/goods/deletion",
                             data: {'ids': JSON.stringify(idArr)},
                             dataType: "json",
                             success: function (json) {
@@ -756,7 +844,7 @@ export default {
                     var id = $(this).attr("data-id");
                     $.ajax({
                         type: "get",
-                        url: "/admin/car/goods/" + id + ".action",
+                        url: "/admin/car/goods/" + id + "",
                         data: { id: id },
                         dataType: "json",
                         success: function (json) {
@@ -770,7 +858,18 @@ export default {
                                 // $("#price").val(json.entity.price);
                                 // $("#renewPrice").val(json.entity.renewPrice);
                                 $("#days").val(json.entity.days);
-                                $("#name").val(json.entity.name);
+                                console.log(json.entity.name)
+                                let name = json.entity.name;
+                                if (name.startsWith('{') && name.endsWith('}')) {
+                                    var jsonName = JSON.parse(json.entity.name);
+                                    $("#name").val(jsonName.zh);
+                                    $("#ar_name").val(jsonName.ar);
+                                    $("#en_name").val(jsonName.en);
+                                } else {
+                                    $("#name").val(name);
+                                    $("#ar_name").val(name);
+                                    $("#en_name").val(name);
+                                }
                                 $("#price").val(json.entity.price);
                                 $("#renewPrice").val(json.entity.renewPrice);
                                 $("#seq").val(json.entity.seq);
@@ -881,6 +980,24 @@ export default {
                                     $("#viewFileInfo").html('未上传');
                                 }
 
+                                //分区
+                                let partitionFlag = json.entity.partitionFlag;
+                                if ((partitionFlag & 1) != 0) {
+                                    $("input:checkbox[name='partitionFlag']")[0].checked = true;
+                                } else {
+                                    $("input:checkbox[name='partitionFlag']")[0].checked = false; 
+                                }
+                                if ((partitionFlag & 2) != 0) {
+                                    $("input:checkbox[name='partitionFlag']")[1].checked = true;
+                                } else {
+                                    $("input:checkbox[name='partitionFlag']")[1].checked = false; 
+                                }
+                                if ((partitionFlag & 4) != 0) {
+                                    $("input:checkbox[name='partitionFlag']")[2].checked = true;
+                                } else {
+                                    $("input:checkbox[name='partitionFlag']")[2].checked = false; 
+                                }
+
                                 // 打开编辑弹窗
                                 $("#cardGoodsModal").modal('show');
                             } else {
@@ -916,7 +1033,7 @@ export default {
                             return;
                         }
                         if (goldSale == 1 && (!price || !renewPrice || !originalPrice)) {
-                            $("#tipMsg").text("请填写完整金币价格");
+                            $("#tipMsg").text("请填写完整钻石价格");
                             $("#tipModal").modal('show');
                             return;
                         } else if (radishSale == 1 && (!radishPrice || !radishRenewPrice || !radishOriginalPrice)) {
@@ -949,18 +1066,46 @@ export default {
                             $("#tipModal").modal('show');
                             return;
                         }
+                        // 获取序列化字符串并转换为对象
+                        let formData = $('#carGoodsForm').serializeArray().reduce(function(obj, item) {
+                            obj[item.name] = item.value;
+                            return obj;
+                        }, {});
+
+                        var name = $("#name").val();
+                        // 阿语名称
+                        var ar_name = $("#ar_name").val();
+                        // 英语名称
+                        var en_name = $("#en_name").val();
+                        // 国际化字段
+                        var jsonName = {"zh":name,"ar":ar_name,"en":en_name}
+                        const nameValue = JSON.stringify(jsonName);
+                        // 修改属性值
+                        formData.name = nameValue; // 将giftName修改为"newGiftName"
+                        //分区
+                        const partitionFlagArray = $("input:checkbox[name='partitionFlag']:checked").serializeArray();
+                        let partitionFlag = 0;
+                        for (let i = 0, len = partitionFlagArray.length; i < len; i++) {
+                            console.log(partitionFlagArray[i]);
+                            partitionFlag |= partitionFlagArray[i].value;
+                        }
+                        formData.partitionFlag = partitionFlag;
+                        // 将修改后的对象转换回序列化字符串
+                        let newSerializeStr = $.param(formData);
                         $.ajax({
                             type: "post",
-                            url: "/admin/car/goods.action",
-                            data: $('#carGoodsForm').serialize(),
+                            url: "/admin/car/goods",
+                            data: newSerializeStr,
                             dataType: "json",
                             success: function (json) {
-                                if (json.success == 'true') {
+                                if (json.code == 200) {
                                     $("#carGoodsModal").modal('hide');
                                     $("#tipMsg").text("保存成功");
                                     $("#tipModal").modal('show');
-                                    TableHelper.doRefresh("#table");
-                                    $("#cardGoodsModal").modal('hide');
+                                    setTimeout(function() {
+                                        TableHelper.doRefresh("#table");
+                                        $("#cardGoodsModal").modal('hide');
+                                    }, 1000); 
                                 } else {
                                     $("#tipMsg").text("保存失败." + json.msg);
                                     $("#tipModal").modal('show');
@@ -1033,9 +1178,26 @@ export default {
                 })
 
             });
-        }
+        },
+        initPartition() {
+            getPartitionInfoList().then(res => {
+                let data = res.data;
+                buildSelectOption(
+                    "#partitionId",
+                    null,
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
+                    return {
+                        value: v.id,
+                        text: v.desc,
+                    };
+                    }))
+                );
+            });
+        },
     },
-
 };
 </script>
 

src/views/car/CarRecordView.vue

@@ -81,7 +81,7 @@ export default {
                     ajax: function (request) {                    //使用ajax请求
                         $.ajax({
                             type: "GET",
-                            url: '/admin/carRecord/list.action',
+                            url: '/admin/carRecord/list',
                             contentType: 'application/json;charset=utf-8',
                             dataType: 'json',
                             data: request.data,

src/views/car/CarStatisticsView.vue

@@ -59,7 +59,7 @@ export default {
                         { field: 'createTime', title: '日期', align: 'center', width: '5%' },
                         { field: 'carId', title: '座驾ID', align: 'center', width: '5%' },
                         { field: 'carName', title: '座驾名称', align: 'center', width: '5%' },
-                        { field: 'carPrice', title: '座驾金额(金币)', align: 'center', width: '5%' },
+                        { field: 'carPrice', title: '座驾金额(钻石)', align: 'center', width: '5%' },
                         { field: 'carRadishPrice', title: '座驾金额(萝卜)', align: 'center', width: '5%' },
                         { field: 'carStatus', title: '座驾状态', align: 'center', width: '5%' },
                         { field: 'receivedCarNum', title: '用户收到数量', align: 'center', width: '5%' },
@@ -85,7 +85,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/car/statisticsCar.action',
+                    url: '/admin/car/statisticsCar',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },

src/views/channel/ChannelContentPartitionAdminView.vue

@@ -230,7 +230,7 @@ export default {
                         },
                         uniqueId: 'id',
                         toolbar: '#toolbar',
-                        url: '/admin/channel/content/queryList.action',
+                        url: '/admin/channel/content/queryList',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },
@@ -367,7 +367,7 @@ export default {
 
                         $.ajax({
                             type: "post",
-                            url: "/admin/channel/content/saveChannelContent.action",
+                            url: "/admin/channel/content/saveChannelContent",
                             data: {
                                 id: id,
                                 channel: channel,
@@ -409,7 +409,7 @@ export default {
                     var id = $(this).data('id');
                     $.ajax({
                         type: "get",
-                        url: "/admin/channel/content/getChannelContent.action",
+                        url: "/admin/channel/content/getChannelContent",
                         data: { id: id },
                         dataType: "json",
                         success: function (ret) {
@@ -450,7 +450,7 @@ export default {
                     var status = $(this).data('status');
                     $.ajax({
                         type: "post",
-                        url: "/admin/channel/content/toggleState.action",
+                        url: "/admin/channel/content/toggleState",
                         data: { id: id, status: status },
                         dataType: "json",
                         success: function (ret) {

src/views/charge/ChargeRegionView.vue

@@ -307,7 +307,24 @@ export default {
                 $('#channelTable').bootstrapTable('destroy');
                 $('#channelTable').bootstrapTable({
                     columns: [
-                        { field: 'desc', title: '渠道名称', align: 'center', width: '5%' },
+                        { field: 'payChannel', title: '合作方', align: 'center', width: '5%' },
+                        { 
+                            field: 'desc', 
+                            title: '渠道名称', 
+                            align: 'center',
+                            width: '5%',
+                            formatter: function (val, row, index) {
+                                let color = 'black';
+                                if (val == 'MyCard點數卡' || val == 'MyCard會員點數' || val == 'MyCard Paypal' || val == '信用卡' || val == '悠遊付' || val == 'ezPay 簡單付' || val == '台灣Pay' || val == 'icash Pay' || val == 'Pi 拍錢包' || val == '全支付' || val == 'LINE Pay') {
+                                    color = 'green';
+                                } else if (val == '電子支付' || val == '銀行轉賬') {
+                                    color = 'blue';
+                                } else if (val == '市內電話帳單' || val == '行動電話帳單' || val == '電信數據ADSL帳單') {
+                                    color = 'orange';
+                                }
+                                return '<span style="color:' + color + ';">' + val + '</span>';
+                            }
+                        },
                         {
                             field: 'logo',
                             title: '图标',
@@ -355,7 +372,7 @@ export default {
                                 if (row.chargeProds) {
                                     for (let i = 0, len = row.chargeProds.length; i < len; i++) {
                                         var chargeProd = row.chargeProds[i];
-                                        value += currency + ':' + (chargeProd.money / 100) + '手续费 ' + chargeProd.handlingRate + '% 到账钻石:' + chargeProd.chargeGoldNum + '<br/>';
+                                        value += currency + ':' + (chargeProd.money / 100) + '手续费 ' + chargeProd.handlingRate + '% 到账金币:' + chargeProd.chargeGoldNum + '<br/>';
                                     }
                                 }
                                 return value;
@@ -532,9 +549,9 @@ export default {
                                 $select.append($option);
                             }
                             $div.append($select);
-                            $div.append(' 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" value="' + handlingRate + '" style="width:41px;"/>% 到账钻石：<span id="chargeGoldNum' + i + '">' + chargeGoldNum + '</span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
+                            $div.append(' 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" value="' + handlingRate + '" style="width:41px;"/>% 到账金币：<span id="chargeGoldNum' + i + '">' + chargeGoldNum + '</span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
                         } else {
-                            $div.html(currency + ' <input type="text" data-index="' + i + '" id="amount' + i + '" oninput="calc(this)" value="' + amount + '" style="width:41px;"/> 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" value="' + handlingRate + '" style="width:41px;"/>% 到账钻石：<span id="chargeGoldNum' + i + '">' + chargeGoldNum + '</span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
+                            $div.html(currency + ' <input type="text" data-index="' + i + '" id="amount' + i + '" oninput="calc(this)" value="' + amount + '" style="width:41px;"/> 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" value="' + handlingRate + '" style="width:41px;"/>% 到账金币：<span id="chargeGoldNum' + i + '">' + chargeGoldNum + '</span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
                         }
                         $formGroup.append($div);
                         $form.append($formGroup);
@@ -569,9 +586,9 @@ export default {
                             $select.append($option);
                         }
                         $div.append($select);
-                        $div.append(' 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" style="width:41px;"/>% 到账钻石：<span id="chargeGoldNum' + i + '"></span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
+                        $div.append(' 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" style="width:41px;"/>% 到账金币：<span id="chargeGoldNum' + i + '"></span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
                     } else {
-                        $div.html(currency + ' <input type="text" data-index="' + i + '" id="amount' + i + '" oninput="calc(this)" style="width:41px;"/> 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" style="width:41px;"/>% 到账钻石：<span id="chargeGoldNum' + i + '"></span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
+                        $div.html(currency + ' <input type="text" data-index="' + i + '" id="amount' + i + '" oninput="calc(this)" style="width:41px;"/> 手续费 <input type="text" data-index="' + i + '" id="handlingRate' + i + '" oninput="calc(this)" style="width:41px;"/>% 到账金币：<span id="chargeGoldNum' + i + '"></span> <button class="btn btn-sm btn-default opt-del" data-index="' + i + '">删除</button>');
                     }
                     $formGroup.append($div);
                     $form.append($formGroup);

src/views/charge/FirstChargeRewardConfigView.vue

@@ -73,7 +73,7 @@
                                     <option value="2">铭牌</option>
                                     <option value="3">座驾</option>
                                     <option value="4">头饰</option>
-                                    <option value="5">额外钻石</option>
+                                    <option value="5">额外金币</option>
                                 </select>
                             </div>
                         </div>
@@ -97,7 +97,7 @@
                             <label for="modal_rewardNum" class="col-sm-3 control-label">奖励个数：</label>
                             <div class="col-sm-8">
                                 <input type="text" class="form-control validate[required,custom[integer]]" name="rewardNum"
-                                    id="modal_rewardNum" placeholder="礼物、额外钻石输入个数">
+                                    id="modal_rewardNum" placeholder="礼物、额外金币输入个数">
                             </div>
                         </div>
                         <div class="form-group">
@@ -260,7 +260,7 @@ export default {
                     },
                     uniqueId: 'id',
                     toolbar: '#toolbar',
-                    url: '/admin/first/charge/reward/list.action',
+                    url: '/admin/first/charge/reward/list',
                     onLoadSuccess: function (res) {
                         console.log(res)
                         $('.giveShowPrice').text(res.giveShowPrice);
@@ -290,7 +290,7 @@ export default {
                     var id = $(this).data('id');
                     $.ajax({
                         type: "get",
-                        url: "/admin/first/charge/reward/getId.action",
+                        url: "/admin/first/charge/reward/getId",
                         data: { id: id },
                         dataType: "json",
                         success: function (json) {
@@ -321,7 +321,7 @@ export default {
                     if (confirm("你确认删除该记录吗? \r\n 删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/first/charge/reward/delete.action",
+                            url: "/admin/first/charge/reward/delete",
                             data: { id: id },
                             dataType: "json",
                             success: function (json) {

src/views/charge/FirstChargeRewardRecordView.vue

@@ -114,7 +114,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/first/charge/reward/statistics.action',
+                    url: '/admin/first/charge/reward/statistics',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -196,7 +196,7 @@ export default {
                             };
                             return param;
                         },
-                        url: '/admin/first/charge/reward/record.action',
+                        url: '/admin/first/charge/reward/record',
                         onLoadSuccess: function () {  //加载成功时执行
                             $("#roundDetailModal").modal('show');
                         },
@@ -215,7 +215,7 @@ export default {
                 function getStock() {
                     $.ajax({
                         type: 'get',
-                        url: "/admin/luckySea/getStock.action",
+                        url: "/admin/luckySea/getStock",
                         success: function (json) {
                             if (json.success) {
                                 console.log('data', json.data)
@@ -236,7 +236,7 @@ export default {
                 $('#editStockModelBtn').on('click', function () {
                     $.ajax({
                         type: 'get',
-                        url: "/admin/luckySea/editStock.action",
+                        url: "/admin/luckySea/editStock",
                         data: {
                             stock: $("#editedStock").val(),
                         },

src/views/charge/RedeemcodeAdminView.vue

@@ -41,7 +41,7 @@
                                         </div>
                                     </div>
                                     <div class="form-group">
-                                        <label for="amount" class="col-sm-3 control-label">金币大小:</label>
+                                        <label for="amount" class="col-sm-3 control-label">钻石大小:</label>
                                         <div class="col-sm-8">
                                             <input type="text" class="form-control  validate[required]" name="amount"
                                                 id="amount" value=10>
@@ -92,7 +92,7 @@ export default {
                         {
                             field: 'amount', title: '金额', align: 'center', width: '10%',
                             formatter: function (val, row, index) {
-                                return val + "金币";
+                                return val + "钻石";
                             }
                         },
                         {
@@ -154,7 +154,7 @@ export default {
                     },
                     uniqueId: 'code',
                     toolbar: '#toolbar',
-                    url: '/admin/redeemcode/getlist.action',
+                    url: '/admin/redeemcode/getlist',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -176,7 +176,7 @@ export default {
                     if ($("#roleForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/redeemcode/gener.action",
+                            url: "/admin/redeemcode/gener",
                             data: $('#roleForm').serialize(),
                             dataType: "json",
                             success: function (json) {

src/views/chat/PublicChatTopRecordView.vue

@@ -0,0 +1,157 @@
+<template>
+    <section class="content">
+        <div class="box box-danger">
+            <div class="box-body">
+                <!-- Content Header (Page header) -->
+                <section class="content-header">
+                    <h1 id="itemTitle"></h1>
+                </section>
+                <!-- .content -->
+                <section class="content">
+                    <div id="table"></div>
+                    <div id="toolbar">
+                        <div class="col-sm-12">
+                            <label for="erbanNo" class="col-sm-1 control-label">ID:</label>
+                            <div class="col-sm-2">
+                                <input type="text" class="form-control" name="erbanNo" id="erbanNo">
+                            </div>
+                            <label for="startTime" class="col-sm-1 control-label">付费日期:</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="startTime" id="timeBegin" class="input-sm form-control" placeholder="起始时间">
+                            </div>
+                            <label for="endTime" class="col-sm-1 control-label">-</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="endTime" id="timeEnd" class="input-sm form-control" placeholder="结束时间">
+                            </div>
+                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
+                            <div class="col-sm-2">
+                                <select name="partitionId" id="partitionId" class="form-control"></select>
+                            </div>
+                        </div>
+                        <div class="col-sm-12">
+                            <button id="btnSearch" class="btn btn-default">
+                                <i class="glyphicon glyphicon-search"></i>查询
+                            </button>
+                        </div>
+                    </div>
+                </section><!-- .content -->
+            </div>
+        </div>
+    </section>
+</template>
+  
+<script>
+import TableHelper from '@/utils/bootstrap-table-helper';
+import { getPublicChatTopRecordPage } from '@/api/chat/publicChatTopRecord';
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { buildSelectOption } from '@/utils/system-helper';
+
+export default {
+    name: 'PublicChatTopRecordView',
+    data() {
+        return {
+            columns: [
+                { field: 'erbanNo', title: '用户ID', align: 'center', width: '5%' },
+                { field: 'nick', title: '用户昵称', align: 'center', width: '15%' },
+                { field: 'partitionDesc', title: '所属地区', align: 'center', width: '15%' },
+                { field: 'payMoneyNum', title: '付费金额（金币）', align: 'center', width: '15%' },
+                { field: 'createTime', title: '付费日期', align: 'center', width: '15%' },
+                { field: 'content', title: '头条内容', align: 'center', width: '15%' },
+            ],
+        };
+    },
+    created() {
+        this.initPartition();
+        this.init();
+    },
+    methods: {
+        init() {
+            this.$nextTick(function () {
+                let $this = this;
+                var picker1 = $("#timeBegin").datetimepicker({
+                    format: 'yyyy-mm-dd hh:ii:00',
+                    todayBtn: true,
+                    autoclose: true,
+                });
+                var picker2 = $("#timeEnd").datetimepicker({
+                    format: 'yyyy-mm-dd hh:ii:00',
+                    todayBtn: true,
+                    autoclose: true
+                });
+                picker1.on('changeDate', function () {
+                    var date = $('#timeBegin').datetimepicker('getDate');
+                    picker2.datetimepicker('setStartDate', date);
+                });
+                picker2.on('changeDate', function () {
+                    var date = $('#timeEnd').datetimepicker('getDate');
+                    picker1.datetimepicker('setEndDate', date);
+                });
+                $this.initTable();
+                $('#btnSearch').click(function () {
+                    $this.search();
+                });
+            });
+        },
+        initTable() {
+            let $this = this;
+            TableHelper.destroy('#table');
+            $('#table').bootstrapTable({
+                columns: $this.columns,
+                cache: false,
+                striped: true,
+                showRefresh: false,
+                pageSize: 10,
+                pagination: true,
+                pageList: [1, 10, 20, 30, 50],
+                search: false,
+                sidePagination: 'server',
+                queryParamsType: 'undefined',
+                queryParams: function queryParams(params) {
+                    var param = {
+                        erbanNo: $('#erbanNo').val(),
+                        startTime: $('#timeBegin').val(),
+                        endTime: $('#timeEnd').val(),
+                        partitionId: $('#partitionId').val(), 
+                        pageNum: params.pageNumber,
+                        pageSize: params.pageSize,
+                    };
+                    return param;
+                },
+                ajax: function(request) {
+                    getPublicChatTopRecordPage(request.data).then(res => {
+                        let data = res.data;
+                        request.success({
+                            'rows': data.records,
+                            'total': data.total
+                        });
+                    });
+                },
+                toolbar: '#toolbar',
+            });
+        },
+        search() {
+            TableHelper.doRefresh('#table');
+        },
+        initPartition() {
+            getPartitionInfoList().then(res => {
+                let data = res.data;
+                buildSelectOption(
+                    "#partitionId",
+                    null,
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
+                    return {
+                        value: v.id,
+                        text: v.desc,
+                    };
+                    }))
+                );
+            });
+        },
+    },
+}
+</script>
+  
+<style scoped></style>

src/views/chatbubble/ChatbubbleManageView.vue

@@ -23,7 +23,11 @@
 
                             <label for="name" class="col-sm-1 control-label">气泡名称:</label>
                             <div class="col-sm-2"><input type="text" class="form-control" name="name" id="name"></div>
-
+                            
+                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
+                            <div class="col-sm-2">
+                                <select name="partitionId" id="partitionId" class="form-control"></select>
+                            </div>
 
                         </div>
                     </form>
@@ -53,6 +57,14 @@
                 <div class="modal-body">
                     <form class="form-horizontal" id="addForm">
                         <input type="hidden" name="id" id="modal_id" />
+                        <div class="form-group">
+                            <label for="partitionFlag" class="col-sm-4 control-label">选择分区</label>
+                            <div class="col-sm-6">
+                                <input type="checkbox" name="partitionFlag" value="1"/>英语区<br>
+                                <input type="checkbox" name="partitionFlag" value="2"/>阿拉伯语区<br>
+                                <input type="checkbox" name="partitionFlag" value="4"/>华语区<br>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="modal_type" class="col-sm-4 control-label">装扮类型:</label>
                             <div class="col-sm-6">
@@ -69,6 +81,18 @@
                                     placeholder="请输入气泡名称">
                             </div>
                         </div>
+                        <div class="form-group">
+                            <label for="ar_modal_name" class="col-sm-4 control-label">阿语装扮名称:</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="form-control validate[required]" name="name" id="ar_modal_name" placeholder="请输入气泡名称">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label for="en_modal_name" class="col-sm-4 control-label">英语装扮名称:</label>
+                            <div class="col-sm-6">
+                                <input type="text" class="form-control validate[required]" name="name" id="en_modal_name" placeholder="请输入气泡名称">
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label class="col-sm-4 control-label">安卓图片:</label>
                             <div class="col-sm-6">
@@ -155,6 +179,8 @@
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { buildSelectOption } from '@/utils/system-helper';
 
 export default {
     name: "ChatbubbleManageView",
@@ -163,6 +189,7 @@ export default {
     },
     created() {
         this.$nextTick(function () {
+            this.initPartition();
             this.initData();
         });
     },
@@ -173,7 +200,28 @@ export default {
                 $('#table').bootstrapTable({
                     columns: [
                         { field: 'id', title: '装扮id', align: 'middle', width: '5%' },
-                        { field: 'name', title: '装扮名称', align: 'middle', width: '5%' },
+                        {
+                            field: 'partitionFlag', 
+                            title: '地区', 
+                            align: 'center', 
+                            width: '10%',
+                            formatter: function (val, row, index) {
+                                let value = '';
+                                if ((val & 1) != 0) {
+                                    value += '英语区<br>';
+                                }
+                                if ((val & 2) != 0) {
+                                    value += '阿拉伯语区<br>';
+                                }
+                                if ((val & 4) != 0) {
+                                    value += '华语区<br>';
+                                }
+                                return value;
+                            }
+                        },
+                        {field: 'name.zh', title: '装扮名称', align: 'middle', width: '5%'},
+                        {field: 'name.ar', title: '阿语装扮名称', align: 'middle', width: '5%'},
+                        {field: 'name.en', title: '英语装扮名称', align: 'middle', width: '5%'}, 
                         {
                             field: 'iosUrl',
                             title: '装扮图片',
@@ -261,11 +309,43 @@ export default {
                             type: $('#type').val(),
                             name: $('#name').val(),
                             id: $('#id').val(),
+                            partitionId: $('#partitionId').val(),
                         };
                         return param;
                     },
+                    ajax:function(request){                    //使用ajax请求
+                        $.ajax({
+                            type:"GET",
+                            url:'/admin/chatbubble/listByPage',
+                            contentType:'application/json;charset=utf-8',
+                            dataType:'json',
+                            data: request.data,
+                            success:function (res) {
+                                console.log(res);
+                                request.success({
+                                    "rows": res.rows.map(i=>{
+                                        let value = i.name;
+                                        if (value.startsWith('{') && value.endsWith('}')) {
+                                            i.name = JSON.parse(value);
+                                        } else {
+                                            i.name = {
+                                                zh: value,
+                                                ar: value,
+                                                en: value,
+                                            };
+                                        }
+                                        return i;
+                                    }),
+                                    "total": res.total
+                                });
+                            },
+                            error:function(error){
+                                console.log(error);
+                            }
+                        })
+                    },
                     toolbar: '#toolbar',
-                    url: '/admin/chatbubble/listByPage',
+                    // url: '/admin/chatbubble/listByPage',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -286,12 +366,43 @@ export default {
                     // 赋值
                     $("#addForm #modal_id").val(row.id);
                     $("#addForm #modal_type").val(row.type);
-                    $("#addForm #modal_name").val(row.name);
+                    console.log(row.name)
+                    let name = row.name;
+                    if (Object.prototype.hasOwnProperty.call(name, 'zh') || Object.prototype.hasOwnProperty.call(name, 'ar') || Object.prototype.hasOwnProperty.call(name, 'en')) {
+                        $("#modal_name").val(row.name.zh);
+                        // 阿语名称
+                        $("#ar_modal_name").val(row.name.ar);
+                        // 英语名称
+                        $("#en_modal_name").val(row.name.en);
+                    } else {
+                        $("#modal_name").val(name);
+                        // 阿语名称
+                        $("#ar_modal_name").val(name);
+                        // 英语名称
+                        $("#en_modal_name").val(name);
+                    }
                     $('#addAndroidIconPicUrl').attr("src", row.androidUrl);
                     $("#addForm #androidUrl").val(row.androidUrl);
                     $('#addIosIconPicUrl').attr("src", row.iosUrl);
                     $("#addForm #iosUrl").val(row.iosUrl);
                     $("#addForm #status").val(row.status);
+                    //分区
+                    let partitionFlag = row.partitionFlag;
+                    if ((partitionFlag & 1) != 0) {
+                        $("input:checkbox[name='partitionFlag']")[0].checked = true;
+                    } else {
+                        $("input:checkbox[name='partitionFlag']")[0].checked = false; 
+                    }
+                    if ((partitionFlag & 2) != 0) {
+                        $("input:checkbox[name='partitionFlag']")[1].checked = true;
+                    } else {
+                        $("input:checkbox[name='partitionFlag']")[1].checked = false; 
+                    }
+                    if ((partitionFlag & 4) != 0) {
+                        $("input:checkbox[name='partitionFlag']")[2].checked = true;
+                    } else {
+                        $("input:checkbox[name='partitionFlag']")[2].checked = false; 
+                    }
                     $("#addModal").modal('show');
                 });
 
@@ -332,13 +443,48 @@ export default {
                 $('#button-save').on('click', function () {
                     var androidUrl = $('#androidUrl').val();
                     var iosUrl = $('#iosUrl').val();
-                    var name = $('#modal_name').val();
+                    // 获取序列化字符串并转换为对象
+                    let formData = $('#addForm').serializeArray().reduce(function(obj, item) {
+                        obj[item.name] = item.value;
+                        return obj;
+                    }, {});
+
+                    var name = $("#modal_name").val();
+                    // 阿语名称
+                    var ar_name = $("#ar_modal_name").val();
+                    // 英语名称
+                    var en_name = $("#en_modal_name").val();
+                    // 国际化字段
+                    var jsonName = {"zh":name,"ar":ar_name,"en":en_name}
+                    const nameValue = JSON.stringify(jsonName);
+                    // 修改属性值
+                    formData.name = nameValue; // 将giftName修改为"newGiftName"
+                    //分区
+                    const partitionFlagArray = $("input:checkbox[name='partitionFlag']:checked").serializeArray();
+                    let partitionFlag = 0;
+                    for (let i = 0, len = partitionFlagArray.length; i < len; i++) {
+                        console.log(partitionFlagArray[i]);
+                        partitionFlag |= partitionFlagArray[i].value;
+                    }
+                    formData.partitionFlag = partitionFlag;
+                    // 将修改后的对象转换回序列化字符串
+                    let newSerializeStr = $.param(formData);
                     //做下数据校验
                     if (isEmpty(name)) {
                         $("#tipMsg").text("装扮名字不能为空");
                         $("#tipModal").modal('show');
                         return;
                     }
+                    if (isEmpty(ar_name)) {
+                        $("#tipMsg").text("阿语装扮名字不能为空");
+                        $("#tipModal").modal('show');
+                        return;
+                    }
+                    if (isEmpty(en_name)) {
+                        $("#tipMsg").text("英语装扮名字不能为空");
+                        $("#tipModal").modal('show');
+                        return;
+                    }
                     if (isEmpty(androidUrl) || isEmpty(iosUrl)) {
                         $("#tipMsg").text("图片不能为空");
                         $("#tipModal").modal('show');
@@ -349,14 +495,16 @@ export default {
                         $.ajax({
                             type: "post",
                             url: "/admin/chatbubble/saveOrUpdate",
-                            data: $("#addForm").serialize(),
+                            data: newSerializeStr,
                             dataType: "json",
                             success: function (json) {
                                 if (json.code === 200) {
                                     $("#tipMsg").text("保存成功");
                                     $("#tipModal").modal('show');
-                                    TableHelper.doRefresh("#table");
-                                    $("#addModal").modal('hide');
+                                    setTimeout(function() {
+                                        TableHelper.doRefresh("#table");
+                                        $("#addModal").modal('hide');
+                                    }, 1000); 
                                 } else {
                                     $("#tipMsg").text("保存失败，错误信息：" + json.message);
                                     $("#tipModal").modal('show');
@@ -378,6 +526,11 @@ export default {
                     $('#status').val('');
                     $('#modal_type').val('');
                     $('#modal_name').val('');
+                    $('#ar_modal_name').val('');
+                    $('#en_modal_name').val('');
+                    $('input[name="partitionFlag"]').each(function() {
+                        $(this).checked = false;
+                    });  
                 }
                 //判断空值
                 function isEmpty(data) {
@@ -405,7 +558,7 @@ export default {
                     var id = $(this).attr("data-id");
                     $.ajax({
                         type: "get",
-                        url: "/admin/nameplate/sync.action",
+                        url: "/admin/nameplate/sync",
                         data: {
                             id: id
                         },
@@ -469,9 +622,26 @@ export default {
                     }
                 });
             });
-        }
-    },
-
+        },
+        initPartition() {
+            getPartitionInfoList().then(res => {
+                let data = res.data;
+                buildSelectOption(
+                    "#partitionId",
+                    null,
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
+                    return {
+                        value: v.id,
+                        text: v.desc,
+                    };
+                    }))
+                );
+            });
+        },
+    }, 
 };
 </script>
 

src/views/chatbubble/ChatbubbleRecordView.vue

@@ -51,7 +51,19 @@ export default {
                     columns: [
                         { field: 'id', title: 'id', visible: false, align: 'center', width: '5%' },
                         { field: 'bubbleId', title: '装扮ID', align: 'center', width: '5%' },
-                        { field: 'bubbleName', title: '装扮名称', align: 'center', width: '5%' },
+                        { 
+                            field: 'bubbleName', 
+                            title: '装扮名称', 
+                            align: 'center', 
+                            width: '5%',
+                            formatter: function (val) {
+                                let value = val;
+                                if (val && val.startsWith('{') && val.endsWith('}')) {
+                                    value = JSON.parse(val).zh;
+                                }
+                                return value;
+                            } 
+                        },
                         { field: 'erbanNo', title: '获得用户ID', align: 'center', width: '5%' },
                         { field: 'nick', title: '用户昵称', align: 'center', width: '5%' },
                         {

src/views/discovery/DiscoveryAdminView.vue

@@ -381,7 +381,7 @@ export default {
                     if ($("#discoveryForm").validationEngine('validate')) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/discovery/saveOrUpdate.action',
+                            url: '/admin/discovery/saveOrUpdate',
                             data: {
                                 id: id,
                                 name: name,
@@ -428,7 +428,7 @@ export default {
                 var id = $(this).attr("data-id");
                 $.ajax({
                     type: "get",
-                    url: "/admin/discovery/getById.action",
+                    url: "/admin/discovery/getById",
                     data: { id: id },
                     dataType: "json",
                     success: function (json) {
@@ -527,7 +527,7 @@ export default {
                     "\r\n删除后再也不能找回，请谨慎操作！")) {
                     $.ajax({
                         type: 'post',
-                        url: "/admin/discovery/saveOrUpdate.action",
+                        url: "/admin/discovery/saveOrUpdate",
                         data: {
                             'id': id,
                             'status': '0'
@@ -564,7 +564,7 @@ function clearForm(formId) {
 function getGame() {
     $.ajax({
         type: 'get',
-        url: '/admin/discovery/queryGame.action',
+        url: '/admin/discovery/queryGame',
         data: {},
         dataType: 'json',
         success: function (json) {
@@ -755,7 +755,7 @@ function initTable() {
             return param;
         },
         toolbar: '#toolbar',
-        url: '/admin/discovery/list.action',
+        url: '/admin/discovery/list',
         onLoadSuccess: function () {  //加载成功时执行
             $(".bs-checkbox").css({ 'text-align': 'center', 'vertical-align': 'middle' });
             console.log("load success");

src/views/dressShop/DressShopAdminView.vue

@@ -119,7 +119,9 @@ export default {
                     columns: [
                         { field: 'id', title: 'ID', align: 'center', valign: 'middle', width: '10%' },
                         { field: 'dressId', title: '装扮id', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'name', title: '装扮名称', align: 'left', 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) {
@@ -206,15 +208,28 @@ export default {
                     ajax: function (request) {                    //使用ajax请求
                         $.ajax({
                             type: "GET",
-                            url: '/admin/dress/shop/list.action',
+                            url: '/admin/dress/shop/list',
                             contentType: 'application/json;charset=utf-8',
                             dataType: 'json',
                             data: request.data,
                             success: function (res) {
                                 apiResult(res);
+                                console.log(res)
                                 request.success({
-                                    rows: res.data.rows,
-                                    total: res.data.total,
+                                    "rows": res.data.rows.map(i=>{
+                                        let value = i.name;
+                                        if (value.startsWith('{') && value.endsWith('}')) {
+                                            i.name = JSON.parse(i.name);
+                                        } else {
+                                            i.name = {
+                                                zh: i.name,
+                                                ar: i.name,
+                                                en: i.name,
+                                            };
+                                        }
+                                        return i;
+                                    }),
+                                    "total": res.total
                                 });
                             },
                             error: function (req) {
@@ -256,7 +271,7 @@ export default {
                     if ($("#addForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/dress/shop/saveOrUpdate.action",
+                            url: "/admin/dress/shop/saveOrUpdate",
                             data: {
                                 id: id,
                                 dressId: dressId,
@@ -291,7 +306,7 @@ export default {
 
                     $.ajax({
                         type: "get",
-                        url: "/admin/dress/shop/getById.action",
+                        url: "/admin/dress/shop/getById",
                         data: { id: id },
                         dataType: "json",
                         success: function (res) {

src/views/face/FaceJsonAdminView.vue

@@ -296,7 +296,7 @@ export default {
             }
             $.ajax({
                 type: "POST",
-                url: "/admin/faceJson/updateImg.action",
+                url: "/admin/faceJson/updateImg",
                 data: data,
                 cache: false,
                 contentType: false,    //不可缺
@@ -311,7 +311,7 @@ export default {
                         for (var j = 0; j <= json.length - 1; j++) {
                             $("#tipMsg").text("上传成功");
                             $("#tipModal").modal('show');
-                            var path = '/admin/faceJson/getPicInputStream.action?type=1&picName=' + json[j];
+                            var path = '/admin/faceJson/getPicInputStream?type=1&picName=' + json[j];
                             var info = json[j].split('.');
                             var name = info[0];
                             var nameSuffix = info[1];
@@ -340,7 +340,7 @@ export default {
         function deleteImg(val, valRes) {
             $.ajax({
                 type: "post",
-                url: "/admin/faceJson/deleteFile.action",
+                url: "/admin/faceJson/deleteFile",
                 data: {
                     picName: val + '.' + valRes,
                     type: 1,
@@ -390,7 +390,7 @@ export default {
                             formatter: function (val, row, index) {
                                 var info = val.split('.');
                                 if (info.length > 1) {
-                                    var a = '/admin/faceJson/getPicInputStream.action?picName=' + val;
+                                    var a = '/admin/faceJson/getPicInputStream?picName=' + val;
                                     return "<img src='" + a + "' width='40' height='40'>";
 
                                 }
@@ -461,7 +461,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/faceJson/list.action',
+                    url: '/admin/faceJson/list',
                     onLoadSuccess: function (json) {  //加载成功时执行
                         if (json.code != 200) {
                             console.log(json.msg);
@@ -502,7 +502,7 @@ export default {
                         "\r\n删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/faceJson/deletePatch.action",
+                            url: "/admin/faceJson/deletePatch",
                             data: {
                                 ids: JSON.stringify(idArr),
                             },
@@ -526,7 +526,7 @@ export default {
                         $("#tipModal").modal('show');
                         $.ajax({
                             type: "post",
-                            url: "/admin/faceJson/updateFaceInfo.action",
+                            url: "/admin/faceJson/updateFaceInfo",
                             data: {},
                             dataType: "json",
                             success: function (json) {
@@ -548,7 +548,7 @@ export default {
                         $("#tipModal").modal('show');
                         $.ajax({
                             type: "post",
-                            url: "/admin/faceJson/restoreFaceInfo.action",
+                            url: "/admin/faceJson/restoreFaceInfo",
                             data: {},
                             dataType: "json",
                             success: function (json) {
@@ -587,7 +587,7 @@ export default {
                     var id = $(this).attr("data-id");
                     var info = id.split('.');
                     if (info.length > 1) {
-                        var path = '/admin/faceJson/getPicInputStream.action?picName=' + id;
+                        var path = '/admin/faceJson/getPicInputStream?picName=' + id;
                         $("#img").attr("src", path);
                         $("#beforeImgName").val(id);
                         $("#afterImgName").val("");
@@ -596,7 +596,7 @@ export default {
                     else {
                         $.ajax({
                             type: "post",
-                            url: "/admin/faceJson/getFaceJsonItem.action",
+                            url: "/admin/faceJson/getFaceJsonItem",
                             data: {
                                 picName: id,
                             },
@@ -657,7 +657,7 @@ export default {
                         if (confirm("确认删除表情图片吗?")) {
                             $.ajax({
                                 type: "post",
-                                url: "/admin/faceJson/deleteFile.action",
+                                url: "/admin/faceJson/deleteFile",
                                 data: {
                                     picName: id,
                                     type: 2,
@@ -680,7 +680,7 @@ export default {
                         if (confirm("确认删除表情json吗(相应表情图片也将删除)?")) {
                             $.ajax({
                                 type: "post",
-                                url: "/admin/faceJson/deleteFaceJsonItem.action",
+                                url: "/admin/faceJson/deleteFaceJsonItem",
                                 data: {
                                     picName: id,
                                 },
@@ -704,7 +704,7 @@ export default {
                 $("#addImg").click(function () {
                     $.ajax({
                         type: "post",
-                        url: "/admin/faceJson/addImg.action",
+                        url: "/admin/faceJson/addImg",
                         data: {},
                         dataType: "json",
                         success: function (json) {
@@ -726,7 +726,7 @@ export default {
                     var afterImgName = $("#afterImgName").val();
                     $.ajax({
                         type: "post",
-                        url: "/admin/faceJson/renameImg.action",
+                        url: "/admin/faceJson/renameImg",
                         data: {
                             beforeImgName: beforeImgName,
                             afterImgName: afterImgName,
@@ -773,7 +773,7 @@ export default {
                     if ($("#addForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/faceJson/configFaceJsonSingle.action?jsonConfigType=" + jsonConfigType,
+                            url: "/admin/faceJson/configFaceJsonSingle?jsonConfigType=" + jsonConfigType,
                             data: {
                                 id: addFaceId,
                                 name: addFaceName,

src/views/family/FamilyAdminView.vue

@@ -387,7 +387,7 @@ export default {
                     if ($("#addFamilyForm").validationEngine('validate')) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/family/saveOrUpdate.action',
+                            url: '/admin/family/saveOrUpdate',
                             data: {
                                 name: familyName,
                                 leader: leaderId,
@@ -518,7 +518,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/family/list.action',
+                    url: '/admin/family/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         $(".bs-checkbox").css({ 'text-align': 'center', 'vertical-align': 'middle' });
                         console.log("load success");
@@ -534,7 +534,7 @@ export default {
                 var id = $(this).attr("data-id");
                 $.ajax({
                     type: "get",
-                    url: "/admin/family/getById.action",
+                    url: "/admin/family/getById",
                     data: { familyId: id },
                     dataType: "json",
                     success: function (json) {
@@ -601,7 +601,7 @@ export default {
                 if ($("#editFamilyForm").validationEngine('validate')) {
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/saveOrUpdate.action',
+                        url: '/admin/family/saveOrUpdate',
                         data: {
                             id: familyId,
                             name: familyName,
@@ -647,7 +647,7 @@ export default {
                 if ($("#forbFamilyForm").validationEngine('validate')) {
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/saveOrUpdate.action',
+                        url: '/admin/family/saveOrUpdate',
                         data: {
                             id: familyId,
                             status: 2,
@@ -687,7 +687,7 @@ export default {
                 if ($("#recoverFamilyForm").validationEngine('validate')) {
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/saveOrUpdate.action',
+                        url: '/admin/family/saveOrUpdate',
                         data: {
                             id: familyId,
                             status: 1,
@@ -729,7 +729,7 @@ export default {
                 if ($("#dissFamilyForm").validationEngine('validate')) {
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/remove.action',
+                        url: '/admin/family/remove',
                         data: {
                             familyId: familyId
                         },

src/views/family/FamilyMemberAdminView.vue

@@ -94,7 +94,7 @@ export default {
                         "\r\n删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/family/member/del.action",
+                            url: "/admin/family/member/del",
                             data: {
                                 'ids': JSON.stringify(idArr),
                                 'familyIds': JSON.stringify(familyIdArr)
@@ -183,7 +183,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/family/member/list.action',
+                    url: '/admin/family/member/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         //复选框居中
                         $(".bs-checkbox").css({ 'text-align': 'center', 'vertical-align': 'middle' });

src/views/family/FamilyMoneyAdminView.vue

@@ -222,7 +222,7 @@ export default {
                     //TODO 权限密码校验目前没做
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/money/update.action',
+                        url: '/admin/family/money/update',
                         data: {
                             familyId: familyId,
                             targetId: targetId,
@@ -277,7 +277,7 @@ export default {
                     //TODO 权限密码校验目前没做
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/money/update.action',
+                        url: '/admin/family/money/update',
                         data: {
                             familyId: familyId,
                             targetId: targetId,
@@ -317,7 +317,7 @@ export default {
                     //TODO 权限教研暂时没做
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/saveOrUpdate.action',
+                        url: '/admin/family/saveOrUpdate',
                         data: {
                             id: familyId,
                             openMoney: 0,
@@ -354,7 +354,7 @@ export default {
                     //TODO 权限教研暂时没做
                     $.ajax({
                         type: 'post',
-                        url: '/admin/family/saveOrUpdate.action',
+                        url: '/admin/family/saveOrUpdate',
                         data: {
                             id: familyId,
                             openMoney: 1,
@@ -448,7 +448,7 @@ export default {
                             return param;
                         },
                         toolbar: '#toolbar',
-                        url: '/admin/family/money/list.action',
+                        url: '/admin/family/money/list',
                         onLoadSuccess: function () {  //加载成功时执行
                             //复选框居中
                             $(".bs-checkbox").css({ 'text-align': 'center', 'vertical-align': 'middle' });

src/views/family/FamilyStatisticsView.vue

@@ -100,7 +100,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/family/statistics/list.action',
+                    url: '/admin/family/statistics/list',
                     onLoadSuccess: function (json) {  //加载成功时执行
                         console.log("load success");
                     },

src/views/finance/FinanceStatisticsView.vue

@@ -79,12 +79,12 @@ export default {
                                 }
                             }
                         },
-                        { field: 'goldIncreaseNum', title: '金币增加', align: 'center', width: '5%' },
-                        { field: 'goldDecreaseNum', title: '金币减少', align: 'center', width: '5%' },
-                        { field: 'goldNum', title: '金币余额', align: 'center', width: '5%' },
-                        { field: 'diamondIncreaseNum', title: '钻石增加', align: 'center', width: '5%' },
-                        { field: 'diamondDecreaseNum', title: '钻石减少', align: 'center', width: '5%' },
-                        { field: 'diamondNum', title: '钻石余额', align: 'center', width: '5%' },
+                        { field: 'goldIncreaseNum', title: '钻石增加', align: 'center', width: '5%' },
+                        { field: 'goldDecreaseNum', title: '钻石减少', align: 'center', width: '5%' },
+                        { field: 'goldNum', title: '钻石余额', align: 'center', width: '5%' },
+                        { field: 'diamondIncreaseNum', title: '金币增加', align: 'center', width: '5%' },
+                        { field: 'diamondDecreaseNum', title: '金币减少', align: 'center', width: '5%' },
+                        { field: 'diamondNum', title: '金币余额', align: 'center', width: '5%' },
                         { field: 'totalNum', title: '总额', align: 'center', width: '5%' },
                     ],
                     cache: false,
@@ -107,7 +107,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/finance/statistics.action',
+                    url: '/admin/finance/statistics',
                     onLoadSuccess: function (json) {  //加载成功时执行
                         var updateTime = json.updateTime;
                         $("#version").html('财务数据' + '    ' + updateTime + '    更新');

src/views/findlove/FindLovePlatformPrizeDataAdminView.vue

@@ -36,7 +36,7 @@
                             <span id="countNum"></span>
                         </p>
                         <p>
-                            <span>用户投入钻石总数：</span>
+                            <span>用户投入金币总数：</span>
                             <span id="userInputDiamonds"></span>
                         </p>
                         <p>
@@ -193,7 +193,7 @@ export default {
                                 { field: 'date', title: '日期', align: 'center', valign: 'middle', width: '20%' },
                                 { field: 'peopleNum', title: '抽奖人数', align: 'center', valign: 'middle', width: '10%' },
                                 { field: 'countNum', title: '抽奖记录数', align: 'center', valign: 'middle', width: '10%' },
-                                { field: 'userInputDiamonds', title: '用户投入钻石数', align: 'center', valign: 'middle', width: '10%' },
+                                { field: 'userInputDiamonds', title: '用户投入金币数', align: 'center', valign: 'middle', width: '10%' },
                                 { field: 'giftOutputDiamonds', title: '平台产出价值数', align: 'center', valign: 'middle', width: '10%' }
                             ],
                             cache: false,

src/views/findlove/FindLovePoolItemAdminView.vue

@@ -627,9 +627,14 @@ export default {
                         if (res.code == 200) {
                             //console.log(res);
                             for (var i = 0; i < res.data.length; i++) {
+                                let item = res.data[i];
+                                let giftName = item.giftName;
+                                if (giftName.startsWith('{') && giftName.endsWith('}')) {
+                                    item.giftName = JSON.parse(giftName).zh;
+                                }
                                 // id对象存储
-                                var id = '' + res.data[i].giftId;
-                                giftMap[id] = res.data[i];
+                                var id = '' + item.giftId;
+                                giftMap[id] = item;
                             }
                             renderAwardOption()
                         }

src/views/findlove/FindLovePrizeDrawRecordAdminView.vue

@@ -10,7 +10,7 @@
                 <div id="toolbar">
                     <div class="col-sm-12">
                         <div class="pull-left">
-                            <form action="/admin/findLove/data/export.action" id="searchForm">
+                            <form action="/admin/findLove/data/export" id="searchForm">
                                 平台号：<input type="text" id="msNo" name="msNo" class="input-sm" placeholder="请输入平台号">
 
                                 奖品名称：<input type="text" id="prizeName" name="prizeName" class="input-sm"
@@ -100,7 +100,7 @@ export default {
                             }
                         },
                         { field: 'level', title: '礼物等级', align: 'center', valign: 'middle', width: '10%' },
-                        { field: 'diamonds', title: '钻石单价', align: 'center', valign: 'middle', width: '10%' },
+                        { field: 'diamonds', title: '金币单价', align: 'center', valign: 'middle', width: '10%' },
                         {
                             field: 'poolType', title: '礼物组类型', align: 'center', valign: 'middle', width: '10%', formatter: function (val, row, index) {
                                 switch (row.poolType) {

src/views/firstpage/FirstPageActivityBannerView.vue

@@ -8,24 +8,47 @@
                 <section class="content">
                     <div id="table"></div>
                     <div id="toolbar">
-                        跳转类型: <select name="skipType" id="skipType" class="input-m">
-                            <option value="0">--全部--</option>
-                            <option value="1">跳转app内部</option>
-                            <option value="2">跳转房间</option>
-                            <option value="3">跳转H5页面</option>
-                        </select>
-                        状态: <select name="status" id="status" class="input-m">
-                            <option value="0">--全部--</option>
-                            <option value="1">激活启用中</option>
-                            <option value="2">未激活</option>
-                        </select>
-                        app: <select name="app" id="app" class="input-m">
-                            <option value="">--全部--</option>
-                        </select>
-                        &nbsp;&nbsp;&nbsp;
-                        开始日期:&nbsp;&nbsp;<input type="text" name="timeBegin" id="beginTime" class="input-sm" value="">
-                        &nbsp;&nbsp;&nbsp;&nbsp;
-                        结束日期:&nbsp;&nbsp;<input type="text" name="timeEnd" id="endTime" class="input-sm" value="">
+                        <div class="col-sm-12">
+                            <label for="skipType" class="col-sm-1 control-label">跳转类型: </label>
+                            <div class="col-sm-2">
+                                <select name="skipType" id="skipType" class="input-m form-control">
+                                    <option value="0">--全部--</option>
+                                    <option value="1">跳转app内部</option>
+                                    <option value="2">跳转房间</option>
+                                    <option value="3">跳转H5页面</option>
+                                </select>
+                            </div>
+                            <label for="status" class="col-sm-1 control-label">状态:</label>
+                            <div class="col-sm-2">
+                                <select name="status" id="status" class="input-m form-control">
+                                    <option value="0">--全部--</option>
+                                    <option value="1">激活启用中</option>
+                                    <option value="2">未激活</option>
+                                </select>
+                            </div>
+                            <label for="app" class="col-sm-1 control-label">app:</label>
+                            <div class="col-sm-2">
+                                <select name="app" id="app" class="input-m form-control">
+                                    <option value="">--全部--</option>
+                                </select>
+                            </div>    
+                        </div>
+                        <div class="col-sm-12">
+                            <label for="beginTime" class="col-sm-1 control-label">开始日期:&nbsp;&nbsp;</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="timeBegin" id="beginTime" class="input-sm form-control" value="">
+                            </div>
+                            <label for="endTime" class="col-sm-1 control-label">结束日期:&nbsp;&nbsp;</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="timeEnd" id="endTime" class="input-sm form-control" value="">
+                            </div>
+                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
+                            <div class="col-sm-2">
+                                <select name="partitionId" id="partitionId" class="form-control"></select>
+                            </div>
+                            
+                        </div>
+
                         <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
 
                         <button id="add" class="btn btn-default">
@@ -50,6 +73,14 @@
                 </div>
                 <div class="modal-body">
                     <form class="form-horizontal" id="bannerForm">
+                        <div id="bannerPartitionDiv">
+                            <div class="form-group">
+                                <label name="partition" class="col-sm-3 control-label">选择地区*:</label>
+                                <div class="form-check" id = "partitionCheck">
+                                    <!--                                分区展示-->
+                                </div>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="name" class="col-sm-3 control-label">Banner名字:</label>
                             <div class="col-sm-8">
@@ -205,6 +236,14 @@
                 </div>
                 <div class="modal-body">
                     <form id="addBannerForm" class="form-horizontal">
+                        <div id="bannerAddPartitionDiv">
+                            <div class="form-group">
+                                <label name="partition" class="col-sm-3 control-label">选择地区*:</label>
+                                <div class="form-check" id = "partitionAddCheck">
+                                    <!--                                分区展示-->
+                                </div>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="addName" class="col-sm-3 control-label">Banner名字:</label>
                             <div class="col-sm-8">
@@ -354,6 +393,8 @@
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { buildSelectOption } from '@/utils/system-helper';
 
 var app = {};
 var validApp = {};
@@ -393,6 +434,7 @@ export default {
     },
     created() {
         this.$nextTick(function () {
+            this.initPartition();
             this.initData();
         });
     },
@@ -437,6 +479,7 @@ export default {
                     $('#table').bootstrapTable({
                         columns: [
                             { field: 'sel', title: 'ID', align: 'center', valign: 'middle', checkbox: true, width: '1%' },
+                            {field: 'partitionDesc', title: '地区', align: 'center', valign: 'middle', width: '5%'},
                             { field: 'bannerId', title: 'bannerID', align: 'center', valign: 'middle', width: '5%' },
                             { field: 'bannerName', title: '名称', align: 'center', valign: 'middle', width: '10%' },
                             {
@@ -618,14 +661,14 @@ export default {
                                 bannerStatus: parseInt($('#status').val()),
                                 skipType: parseInt($('#skipType').val()),
                                 bannerType: 9,
-                                // appId: ($('#app').val()) ? $('#app').val() : null
+                                partitionId: $('#partitionId').val(),
                             };
                             //                console.log(param);
                             return param;
                         },
                         uniqueId: 'code',
                         toolbar: '#toolbar',
-                        url: '/admin/banner/list.action',
+                        url: '/admin/banner/list',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },
@@ -646,39 +689,66 @@ export default {
                     $('.titleListDev').addClass("hidden");
                     var bannerId = parseInt($(this).data('id'));
                     isEdit = true;
-                    debugger
                     $.ajax({
-                        type: "get",
-                        url: "/admin/banner/get.action",
-                        data: { bannerId: bannerId },
-                        dataType: "json",
+                        type: 'get',
+                        url: '/partition/listPartitionInfo',
+                        dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
-                                var date = json.data.endTime ? new Date(json.data.endTime).format("yyyy-MM-dd hh:mm:ss") : '';
-                                var startDate = json.data.startTime ? new Date(json.data.startTime).format("yyyy-MM-dd hh:mm:ss") : '';
-                                $('#name').val(json.data.bannerName);
-                                $('#imgUrl').attr('src', json.data.bannerPic);
-                                $('#bannerPic').val(json.data.bannerPic);
-                                $('#skipUrlSort').val(json.data.skipType);
-                                $('#skipUrlContent').val(json.data.skipUri);
-                                $("#bannerType").val(json.data.bannerType);
-                                $('#seqNo').val(json.data.seqNo);
-                                //$("#appId").val(json.data.appId);
-                                $('#iosVersion').val(json.data.iosVersion);
-                                $('#androidVersion').val(json.data.androidVersion);
-                                $('#noShowChannels').val(json.data.noShowChannels);
-                                $('#bannerStatus').val(json.data.bannerStatus);
-                                $('#startDate').val(startDate);
-                                $('#endDate').val(date);
-                                $('#bannerId').val(json.data.bannerId);
-                                $('#platform').val(json.data.platform);
-                                $('#limitLevelExper').val(json.data.limitLevelExper);
-                                $('#showType').val(json.data.showType);
-                                $('#showRule').val(json.data.showRule);
-                                window.selectOnChange(json.data.bannerType, json.data.titleId);
-                                $('#titleList').val(json.data.titleId);
-                                $('#bannerModal').modal('show');
-                                // picker1.datetimepicker('setStartDate', startDate);
+                                var length = json.data.length;
+                                var partitionCheck = $("#partitionCheck");
+                                partitionCheck.empty();
+                                // 分区
+                                for (var i = 0; i < length; i++) {
+                                    var checkbox = $("<input>", {type: "checkbox", id: "checkbox" + json.data[i].id, name: "partitionIds", value: json.data[i].id});
+                                    var label = $("<label>", {class: "partition-checkbox-label", text: json.data[i].desc});
+
+                                    partitionCheck.append(checkbox,label);
+                                }
+                                $.ajax({
+                                    type: "get",
+                                    url: "/admin/banner/get",
+                                    data: { bannerId: bannerId },
+                                    dataType: "json",
+                                    success: function (json) {
+                                        if (json.code == 200) {
+                                            var date = json.data.endTime ? new Date(json.data.endTime).format("yyyy-MM-dd hh:mm:ss") : '';
+                                            var startDate = json.data.startTime ? new Date(json.data.startTime).format("yyyy-MM-dd hh:mm:ss") : '';
+                                            $('#name').val(json.data.bannerName);
+                                            $('#imgUrl').attr('src', json.data.bannerPic);
+                                            $('#bannerPic').val(json.data.bannerPic);
+                                            $('#skipUrlSort').val(json.data.skipType);
+                                            $('#skipUrlContent').val(json.data.skipUri);
+                                            $("#bannerType").val(json.data.bannerType);
+                                            $('#seqNo').val(json.data.seqNo);
+                                            //$("#appId").val(json.data.appId);
+                                            $('#iosVersion').val(json.data.iosVersion);
+                                            $('#androidVersion').val(json.data.androidVersion);
+                                            $('#noShowChannels').val(json.data.noShowChannels);
+                                            $('#bannerStatus').val(json.data.bannerStatus);
+                                            $('#startDate').val(startDate);
+                                            $('#endDate').val(date);
+                                            $('#bannerId').val(json.data.bannerId);
+                                            $('#platform').val(json.data.platform);
+                                            $('#limitLevelExper').val(json.data.limitLevelExper);
+                                            $('#showType').val(json.data.showType);
+                                            $('#showRule').val(json.data.showRule);
+                                            window.selectOnChange(json.data.bannerType, json.data.titleId);
+                                            $('#titleList').val(json.data.titleId);
+                                            // 分区信息
+                                            var partitionIds = json.data.partitionIds;
+                                            var length = partitionIds.length;
+                                            for (var i = 0; i < length; i++) {
+                                                $("#checkbox" + partitionIds[i]).prop('checked', true);
+                                            }
+                                            $('#bannerModal').modal('show');
+                                            // picker1.datetimepicker('setStartDate', startDate);
+                                        } else {
+                                            $("#tipMsg").text("获取信息出错");
+                                            $("#tipModal").modal('show');
+                                        }
+                                    }
+                                });
                             } else {
                                 $("#tipMsg").text("获取信息出错");
                                 $("#tipModal").modal('show');
@@ -732,7 +802,7 @@ export default {
                     if ($('#bannerForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/banner/save.action?startTimeString=" + $('#startDate').val()
+                            url: "/admin/banner/save?startTimeString=" + $('#startDate').val()
                                 + "&endTimeString=" + $('#endDate').val(),
                             data: $('#bannerForm').serialize(),
                             dataType: 'json',
@@ -756,6 +826,32 @@ export default {
                     $('#addStartDate').val('');
                     $('#addEndDate').val('');
 
+                    // 分区处理
+                    $.ajax({
+                        type: 'get',
+                        url: '/partition/listPartitionInfo',
+                        dataType: 'json',
+                        success: function (json) {
+                            if (json.code == 200) {
+                                var length = json.data.length;
+                                var partitionCheck = $("#partitionAddCheck");
+                                partitionCheck.empty();
+                                // 创建3个checkbox元素并添加到myDiv元素上
+                                for (var i = 0; i < length; i++) {
+                                    var checkbox = $("<input>", {
+                                        type: "checkbox",
+                                        id: "checkbox" + json.data[i].id,
+                                        name: "partitionIds",
+                                        value: json.data[i].id
+                                    });
+                                    var label = $("<label>", {class: "partition-checkbox-label", text: json.data[i].desc});
+
+                                    partitionCheck.append(checkbox, label);
+                                }
+                            }
+                        }
+                    });
+
                     // 处理appId
                     // $('#addAppId').empty();
                     // $('#addAppId').append('<option value="">请选择</option>');
@@ -780,7 +876,7 @@ export default {
                     if ($('#addBannerForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/banner/save.action?startTimeString=" + $('#addStartDate').val()
+                            url: "/admin/banner/save?startTimeString=" + $('#addStartDate').val()
                                 + "&endTimeString=" + $('#addEndDate').val(),
                             data: $('#addBannerForm').serialize(),
                             dataType: 'json',
@@ -835,7 +931,7 @@ export default {
                 $('#uploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/banner/upload.action',
+                        url: '/admin/banner/upload',
                         dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
@@ -852,7 +948,7 @@ export default {
                 $('#addUploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/banner/upload.action',
+                        url: '/admin/banner/upload',
                         dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
@@ -911,7 +1007,7 @@ export default {
                     if (confirm("你确认删除选中Banner吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/banner/delete.action",
+                            url: "/admin/banner/delete",
                             data: {
                                 'ids': JSON.stringify(idArr)
                             },
@@ -938,7 +1034,7 @@ export default {
                     if (confirm("你确认删除Banner吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/banner/delete.action",
+                            url: "/admin/banner/delete",
                             data: {
                                 'ids': JSON.stringify(idArr)
                             },
@@ -957,7 +1053,25 @@ export default {
                     }
                 })
             });
-        }
+        },
+        initPartition() {
+            getPartitionInfoList().then(res => {
+                let data = res.data;
+                buildSelectOption(
+                    "#partitionId",
+                    null,
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
+                    return {
+                        value: v.id,
+                        text: v.desc,
+                    };
+                    }))
+                );
+            });
+        },
     },
 
 };

src/views/firstpage/FirstPageBannerView.vue

@@ -8,31 +8,56 @@
                 <section class="content">
                     <div id="table"></div>
                     <div id="toolbar">
-                        跳转类型: <select name="skipType" id="skipType" class="input-m">
-                            <option value="0">--全部--</option>
-                            <option value="1">跳转app内部</option>
-                            <option value="2">跳转房间</option>
-                            <option value="3">跳转H5页面</option>
-                        </select>
-                        状态: <select name="status" id="status" class="input-m">
-                            <option value="0">--全部--</option>
-                            <option value="1">激活启用中</option>
-                            <option value="2">未激活</option>
-                        </select>
-                        app: <select name="app" id="app" class="input-m">
-                            <option value="">--全部--</option>
-                        </select>
-                        banner位置: <select name="bannerType" id="searchBannerType" class="input-m">
-                            <option value="">--全部--</option>
-                            <option value="1">首页</option>
-                            <option value="2">房间内</option>
-                            <option value="3">我的装扮</option>
-                            <option value="10">个人中心</option>
-                        </select>
-                        &nbsp;&nbsp;&nbsp;
-                        开始日期:&nbsp;&nbsp;<input type="text" name="timeBegin" id="beginTime" class="input-sm" value="">
-                        &nbsp;&nbsp;&nbsp;&nbsp;
-                        结束日期:&nbsp;&nbsp;<input type="text" name="timeEnd" id="endTime" class="input-sm" value="">
+                        <div class="col-sm-12">
+                            <label for="skipType" class="col-sm-1 control-label">跳转类型: </label>
+                            <div class="col-sm-2">
+                                <select name="skipType" id="skipType" class="input-m form-control">
+                                    <option value="0">--全部--</option>
+                                    <option value="1">跳转app内部</option>
+                                    <option value="2">跳转房间</option>
+                                    <option value="3">跳转H5页面</option>
+                                </select>
+                            </div>
+                            <label for="status" class="col-sm-1 control-label">状态:</label>
+                            <div class="col-sm-2">
+                                <select name="status" id="status" class="input-m form-control">
+                                    <option value="0">--全部--</option>
+                                    <option value="1">激活启用中</option>
+                                    <option value="2">未激活</option>
+                                </select>
+                            </div>
+                            <label for="app" class="col-sm-1 control-label">app:</label>
+                            <div class="col-sm-2">
+                                <select name="app" id="app" class="input-m form-control">
+                                    <option value="">--全部--</option>
+                                </select>
+                            </div>    
+                        </div>
+                        <div class="col-sm-12">
+                            <label for="bannerType" class="col-sm-1 control-label">banner位置:</label>
+                            <div class="col-sm-2">
+                                <select name="bannerType" id="searchBannerType" class="input-m form-control">
+                                    <option value="">--全部--</option>
+                                    <option value="1">首页</option>
+                                    <option value="2">房间内</option>
+                                    <option value="3">我的装扮</option>
+                                    <option value="10">个人中心</option>
+                                </select>
+                            </div>
+                            <label for="beginTime" class="col-sm-1 control-label">开始日期:&nbsp;&nbsp;</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="timeBegin" id="beginTime" class="input-sm form-control" value="">
+                            </div>
+                            <label for="endTime" class="col-sm-1 control-label">结束日期:&nbsp;&nbsp;</label>
+                            <div class="col-sm-2">
+                                <input type="text" name="timeEnd" id="endTime" class="input-sm form-control" value="">
+                            </div>
+                            <label for="partitionId" class="col-sm-1 control-label">地区:</label>
+                            <div class="col-sm-2">
+                                <select name="partitionId" id="partitionId" class="form-control"></select>
+                            </div>
+                            
+                        </div>
                         <button id="btnSearch" class="btn btn-sm btn-primary">查询</button>
 
                         <button id="add" class="btn btn-default">
@@ -57,6 +82,14 @@
                 </div>
                 <div class="modal-body">
                     <form class="form-horizontal" id="bannerForm">
+                        <div id="bannerPartitionDiv">
+                            <div class="form-group">
+                                <label name="partition" class="col-sm-3 control-label">选择地区*:</label>
+                                <div class="form-check" id = "partitionCheck">
+                                    <!--                                分区展示-->
+                                </div>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="name" class="col-sm-3 control-label">Banner名字:</label>
                             <div class="col-sm-8">
@@ -215,6 +248,14 @@
                 </div>
                 <div class="modal-body">
                     <form id="addBannerForm" class="form-horizontal">
+                        <div id="bannerAddPartitionDiv">
+                            <div class="form-group">
+                                <label name="partition" class="col-sm-3 control-label">选择地区*:</label>
+                                <div class="form-check" id = "partitionAddCheck">
+                                    <!--                                分区展示-->
+                                </div>
+                            </div>
+                        </div>
                         <div class="form-group">
                             <label for="addName" class="col-sm-3 control-label">Banner名字:</label>
                             <div class="col-sm-8">
@@ -367,6 +408,8 @@
 
 <script>
 import TableHelper from '@/utils/bootstrap-table-helper';
+import { getPartitionInfoList } from '@/api/partition/partitionInfo';
+import { buildSelectOption } from '@/utils/system-helper';
 
 var app = {};
 var validApp = {};
@@ -407,6 +450,7 @@ export default {
     },
     created() {
         this.$nextTick(function () {
+            this.initPartition();
             this.initData();
         });
     },
@@ -453,6 +497,7 @@ export default {
                         columns: [
                             { field: 'sel', title: 'ID', align: 'center', valign: 'middle', checkbox: true, width: '1%' },
                             { field: 'bannerId', title: 'bannerID', align: 'center', valign: 'middle', width: '5%' },
+                            {field: 'partitionDesc', title: '地区', align: 'center', valign: 'middle', width: '5%'},
                             { field: 'bannerName', title: '名称', align: 'center', valign: 'middle', width: '10%' },
                             {
                                 field: 'bannerType', title: 'banner位置', align: 'center', valign: 'middle', width: '10%',
@@ -632,6 +677,7 @@ export default {
                                 bannerStatus: parseInt($('#status').val()),
                                 skipType: parseInt($('#skipType').val()),
                                 bannerType: $('#searchBannerType').val(),
+                                partitionId: $('#partitionId').val(),
                                 // appId: ($('#app').val()) ? $('#app').val() : null
                             };
                             //                console.log(param);
@@ -639,7 +685,7 @@ export default {
                         },
                         uniqueId: 'code',
                         toolbar: '#toolbar',
-                        url: '/admin/banner/list.action',
+                        url: '/admin/banner/list',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },
@@ -665,36 +711,64 @@ export default {
                     // }
                     $.ajax({
                         type: 'get',
-                        url: '/admin/banner/get.action',
-                        data: { 'bannerId': id },
+                        url: '/partition/listPartitionInfo',
                         dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
-                                var date = json.data.endTime ? new Date(json.data.endTime).format("yyyy-MM-dd hh:mm:ss") : '';
-                                var startDate = json.data.startTime ? new Date(json.data.startTime).format("yyyy-MM-dd hh:mm:ss") : '';
-                                $('#name').val(json.data.bannerName);
-                                $('#imgUrl').attr('src', json.data.bannerPic);
-                                $('#bannerPic').val(json.data.bannerPic);
-                                $('#skipUrlSort').val(json.data.skipType);
-                                $('#skipUrlContent').val(json.data.skipUri);
-                                $("#bannerType").val(json.data.bannerType);
-                                $('#seqNo').val(json.data.seqNo);
-                                //$("#appId").val(json.data.appId);
-                                $('#iosVersion').val(json.data.iosVersion);
-                                $('#androidVersion').val(json.data.androidVersion);
-                                $('#noShowChannels').val(json.data.noShowChannels);
-                                $('#bannerStatus').val(json.data.bannerStatus);
-                                $('#startDate').val(startDate);
-                                $('#endDate').val(date);
-                                $('#bannerId').val(json.data.bannerId);
-                                $('#platform').val(json.data.platform);
-                                $('#limitLevelExper').val(json.data.limitLevelExper);
-                                $('#showType').val(json.data.showType);
-                                $('#showRule').val(json.data.showRule);
-                                window.selectOnChange(json.data.bannerType, json.data.titleId);
-                                $('#titleList').val(json.data.titleId);
-                                $('#bannerModal').modal('show');
-                                // picker1.datetimepicker('setStartDate', startDate);
+                                var length = json.data.length;
+                                var partitionCheck = $("#partitionCheck");
+                                partitionCheck.empty();
+                                // 分区
+                                for (var i = 0; i < length; i++) {
+                                    var checkbox = $("<input>", {type: "checkbox", id: "checkbox" + json.data[i].id, name: "partitionIds", value: json.data[i].id});
+                                    var label = $("<label>", {class: "partition-checkbox-label", text: json.data[i].desc});
+
+                                    partitionCheck.append(checkbox,label);
+                                }
+                                $.ajax({
+                                    type: 'get',
+                                    url: '/admin/banner/get',
+                                    data: {'bannerId': id},
+                                    dataType: 'json',
+                                    success: function (json) {
+                                        if (json.code == 200) {
+                                            var date = json.data.endTime ? new Date(json.data.endTime).format("yyyy-MM-dd hh:mm:ss") : '';
+                                            var startDate = json.data.startTime ? new Date(json.data.startTime).format("yyyy-MM-dd hh:mm:ss") : '';
+                                            $('#name').val(json.data.bannerName);
+                                            $('#imgUrl').attr('src', json.data.bannerPic);
+                                            $('#bannerPic').val(json.data.bannerPic);
+                                            $('#skipUrlSort').val(json.data.skipType);
+                                            $('#skipUrlContent').val(json.data.skipUri);
+                                            $("#bannerType").val(json.data.bannerType);
+                                            $('#seqNo').val(json.data.seqNo);
+                                            //$("#appId").val(json.data.appId);
+                                            $('#iosVersion').val(json.data.iosVersion);
+                                            $('#androidVersion').val(json.data.androidVersion);
+                                            $('#noShowChannels').val(json.data.noShowChannels);
+                                            $('#bannerStatus').val(json.data.bannerStatus);
+                                            $('#startDate').val(startDate);
+                                            $('#endDate').val(date);
+                                            $('#bannerId').val(json.data.bannerId);
+                                            $('#platform').val(json.data.platform);
+                                            $('#limitLevelExper').val(json.data.limitLevelExper);
+                                            $('#showType').val(json.data.showType);
+                                            $('#showRule').val(json.data.showRule);
+                                            window.selectOnChange(json.data.bannerType, json.data.titleId);
+                                            $('#titleList').val(json.data.titleId);
+                                            // 分区信息
+                                            var partitionIds = json.data.partitionIds;
+                                            var length = partitionIds.length;
+                                            for (var i = 0; i < length; i++) {
+                                                $("#checkbox" + partitionIds[i]).prop('checked', true);
+                                            }
+                                            $('#bannerModal').modal('show');
+                                            // picker1.datetimepicker('setStartDate', startDate);
+                                        } else {
+                                            $("#tipMsg").text("获取信息出错");
+                                            $("#tipModal").modal('show');
+                                        }
+                                    }
+                                })
                             } else {
                                 $("#tipMsg").text("获取信息出错");
                                 $("#tipModal").modal('show');
@@ -746,7 +820,7 @@ export default {
                     if ($('#bannerForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/banner/save.action?startTimeString=" + $('#startDate').val()
+                            url: "/admin/banner/save?startTimeString=" + $('#startDate').val()
                                 + "&endTimeString=" + $('#endDate').val(),
                             data: $('#bannerForm').serialize(),
                             dataType: 'json',
@@ -770,6 +844,32 @@ export default {
                     $('#addStartDate').val('');
                     $('#addEndDate').val('');
 
+                    // 分区处理
+                    $.ajax({
+                        type: 'get',
+                        url: '/partition/listPartitionInfo',
+                        dataType: 'json',
+                        success: function (json) {
+                            if (json.code == 200) {
+                                var length = json.data.length;
+                                var partitionCheck = $("#partitionAddCheck");
+                                partitionCheck.empty();
+                                // 创建3个checkbox元素并添加到myDiv元素上
+                                for (var i = 0; i < length; i++) {
+                                    var checkbox = $("<input>", {
+                                        type: "checkbox",
+                                        id: "checkbox" + json.data[i].id,
+                                        name: "partitionIds",
+                                        value: json.data[i].id
+                                    });
+                                    var label = $("<label>", {class: "partition-checkbox-label", text: json.data[i].desc});
+
+                                    partitionCheck.append(checkbox, label);
+                                }
+                            }
+                        }
+                    })
+
                     // 处理appId
                     // $('#addAppId').empty();
                     // $('#addAppId').append('<option value="">请选择</option>');
@@ -798,7 +898,7 @@ export default {
                     if ($('#addBannerForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/banner/save.action?startTimeString=" + $('#addStartDate').val()
+                            url: "/admin/banner/save?startTimeString=" + $('#addStartDate').val()
                                 + "&endTimeString=" + $('#addEndDate').val(),
                             data: $('#addBannerForm').serialize(),
                             dataType: 'json',
@@ -853,7 +953,7 @@ export default {
                 $('#uploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/banner/upload.action',
+                        url: '/admin/banner/upload',
                         dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
@@ -870,7 +970,7 @@ export default {
                 $('#addUploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/banner/upload.action',
+                        url: '/admin/banner/upload',
                         dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
@@ -929,7 +1029,7 @@ export default {
                     if (confirm("你确认删除选中Banner吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/banner/delete.action",
+                            url: "/admin/banner/delete",
                             data: {
                                 'ids': JSON.stringify(idArr)
                             },
@@ -956,7 +1056,7 @@ export default {
                     if (confirm("你确认删除Banner吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/banner/delete.action",
+                            url: "/admin/banner/delete",
                             data: {
                                 'ids': JSON.stringify(idArr)
                             },
@@ -975,7 +1075,25 @@ export default {
                     }
                 })
             });
-        }
+        },
+        initPartition() {
+            getPartitionInfoList().then(res => {
+                let data = res.data;
+                buildSelectOption(
+                    "#partitionId",
+                    null,
+                    [{
+                        value: '',
+                        text: '全部',
+                    }].concat(data.map((v) => {
+                    return {
+                        value: v.id,
+                        text: v.desc,
+                    };
+                    }))
+                );
+            });
+        },
     },
 
 };
@@ -1027,4 +1145,10 @@ export default {
     height: 100%;
     vertical-align: top;
 }
+
+.partition-checkbox-label {    
+    margin-right: 10px;    
+    margin-left: 5px;
+}
+
 </style>

src/views/firstpage/FirstPageOptView.vue

@@ -148,7 +148,7 @@ export default {
                     if ($('#actForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/firstpageopt/add.action",
+                            url: "/admin/firstpageopt/add",
                             data: $('#actForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -169,7 +169,7 @@ export default {
                     if ($('#editForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/firstpageopt/update.action",
+                            url: "/admin/firstpageopt/update",
                             data: $('#editForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -196,7 +196,7 @@ export default {
                     if (confirm("你确认删除吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/firstpageopt/delete.action',
+                            url: '/admin/firstpageopt/delete',
                             data: { 'id': id },
                             dataType: 'json',
                             success: function (json) {
@@ -330,7 +330,7 @@ export default {
                         },
                         uniqueId: 'name',
                         toolbar: '#toolbar',
-                        url: '/admin/firstpageopt/list.action',
+                        url: '/admin/firstpageopt/list',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },

src/views/firstpage/FirstPageTabRoomView.vue

@@ -235,7 +235,7 @@ export default {
                     },
                     uniqueId: 'id',
                     toolbar: '#toolbar',
-                    url: '/admin/firstpagetabroom/list.action',
+                    url: '/admin/firstpagetabroom/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -335,7 +335,7 @@ export default {
                     if (confirm("你确认删除吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/firstpagetabroom/delete.action',
+                            url: '/admin/firstpagetabroom/delete',
                             data: { 'id': id },
                             dataType: 'json',
                             success: function (json) {
@@ -379,7 +379,7 @@ export default {
                     var status = (data.status == false) ? 1 : 0;
                     $.ajax({
                         type: 'post',
-                        url: '/admin/firstpagetabroom/changeRoomStatus.action',
+                        url: '/admin/firstpagetabroom/changeRoomStatus',
                         data: {
                             status: status,
                             id: id
@@ -421,7 +421,7 @@ export default {
                     if ($('#editTab').validationEngine('validate')) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/firstpagetabroom/update.action',
+                            url: '/admin/firstpagetabroom/update',
                             dataType: 'json',
                             data: {
                                 id: $('#id').val(),
@@ -457,7 +457,7 @@ export default {
                     if ($('#addTabRoom').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/firstpagetabroom/add.action?tabId=" + $('#tabName').val()
+                            url: "/admin/firstpagetabroom/add?tabId=" + $('#tabName').val()
                                 + "&tabName=" + $("#tabName").find("option:selected").text(),
                             dataType: 'json',
                             data: $('#addTabRoom').serialize(),
@@ -479,7 +479,7 @@ export default {
                 $('#addUploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/firstpagebanner/headimg.action',
+                        url: '/admin/firstpagebanner/headimg',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
@@ -497,7 +497,7 @@ export default {
                 $('#uploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/firstpagebanner/headimg.action',
+                        url: '/admin/firstpagebanner/headimg',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
@@ -548,7 +548,7 @@ export default {
                     if (confirm("你确认删除选中房间吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/firstpagetabroom/delete.action",
+                            url: "/admin/firstpagetabroom/delete",
                             data: {
                                 'ids': JSON.stringify(idArr),
                                 'moduleIds': moduleIdArr,

src/views/firstpage/FirstPageTabView.vue

@@ -269,7 +269,7 @@ export default {
                     if ($('#actForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/firstpagetab/add.action",
+                            url: "/admin/firstpagetab/add",
                             data: $('#actForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -295,7 +295,7 @@ export default {
                     if ($('#editForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/firstpagetab/update.action",
+                            url: "/admin/firstpagetab/update",
                             data: $('#editForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -322,7 +322,7 @@ export default {
                     if (confirm("你确认删除吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/firstpagetab/delete.action',
+                            url: '/admin/firstpagetab/delete',
                             data: { 'tabId': tabId },
                             dataType: 'json',
                             success: function (json) {
@@ -464,7 +464,7 @@ export default {
                         },
                         uniqueId: 'tabId',
                         toolbar: '#toolbar',
-                        url: '/admin/firstpagetab/list.action',
+                        url: '/admin/firstpagetab/list',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },

src/views/firstpage/RecommendResourceAdminView.vue

@@ -34,6 +34,16 @@
                 <div class="modal-body">
                     <form class="form-horizontal" id="addForm">
                         <input type="hidden" name="id" id="id" />
+                        <div class="form-group">
+                            <label for="partitionId" class="col-sm-3 control-label">选择地区：</label>
+                            <div class="col-sm-9">
+                                <select name="partitionId" id="partitionId" class="col-sm-3 form-control">
+                                    <option value="1">英语区</option>
+                                    <option value="2">阿拉伯语区</option>
+                                    <option value="4">华语区</option>
+                                </select>
+                            </div>
+                        </div>
                         <!--A策略-->
                         <div class="form-group">
                             <label for="resourceA" class="col-sm-3 control-label">A策略<font color="red">*</font>：</label>
@@ -169,6 +179,25 @@ export default {
                 $('#table').bootstrapTable({
                     columns: [
                         { field: 'id', title: '序号', align: 'center', width: '5%' },
+                        {
+                            field: 'partitionId', 
+                            title: '地区', 
+                            align: 'center', 
+                            width: '10%',
+                            formatter: function (val, row, index) {
+                                let value = '';
+                                if ((val & 1) != 0) {
+                                    value += '英语区<br>';
+                                }
+                                if ((val & 2) != 0) {
+                                    value += '阿拉伯语区<br>';
+                                }
+                                if ((val & 4) != 0) {
+                                    value += '华语区<br>';
+                                }
+                                return value;
+                            }
+                        },
                         {
                             field: 'resourceA',
                             title: 'A',
@@ -216,10 +245,10 @@ export default {
                             width: '10%',
                             formatter: function (val, row, index) {
                                 if (row.isDefault) return '';
-                                return '<button id="btnEdit" name="btnEdit" class="btn btn-sm btn-success opt-edit" data-id=' + val + '>' +
+                                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>' +
-                                    '&nbsp;&nbsp;<button class="btn btn-sm btn-danger opt-remove" data-id=' + val +
-                                    '><i class="glyphicon glyphicon-remove"></i>删除</button>';
+                                    '&nbsp;&nbsp;<button class="btn btn-sm btn-danger opt-remove" data-id="' + val +
+                                    '" data-index="' + index + '"><i class="glyphicon glyphicon-remove"></i>删除</button>';
                             }
                         }
                     ],
@@ -243,7 +272,7 @@ export default {
                     ajax: function (request) {                    //使用ajax请求
                         $.ajax({
                             type: "GET",
-                            url: '/admin/home/resource/list.action',
+                            url: '/admin/home/resource/list',
                             contentType: 'application/json;charset=utf-8',
                             dataType: 'json',
                             data: request.data,
@@ -295,6 +324,7 @@ export default {
 
                     var beginTime = $("#beginTime").val();
                     var endTime = $("#endTime").val();
+                    var partitionId = $('#partitionId').val();
 
                     if (iconA == null || iconA == '') {
                         $("#tipMsg").text("保存失败，请先上传图片！");
@@ -311,7 +341,7 @@ export default {
                     if ($("#addForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/home/resource/saveResource.action",
+                            url: "/admin/home/resource/saveResource",
                             data: {
                                 strategySeq: strategySeq,
                                 resourceA: resourceA,
@@ -321,7 +351,8 @@ export default {
                                 contentA: contentA,
                                 contentB: contentB,
                                 beginTime: beginTime,
-                                endTime: endTime
+                                endTime: endTime,
+                                partitionId: partitionId,
                             },
                             dataType: "json",
                             success: function (json) {
@@ -343,13 +374,18 @@ export default {
                 });
 
                 $("#table").on("click", '.opt-edit', function () {
+                    const currentData = $('#table').bootstrapTable('getData')[$(this).data('index')];
+                    let partitionId = currentData.partitionId;
                     var seq = $(this).attr("data-id");
                     clearModal();
 
                     $.ajax({
                         type: "get",
-                        url: "/admin/home/resource/getResourceByStrategySeq.action",
-                        data: { seq: seq },
+                        url: "/admin/home/resource/getResourceByStrategySeq",
+                        data: { 
+                            seq: seq,
+                            partitionId: partitionId,
+                        },
                         dataType: "json",
                         success: function (res) {
                             var json = res.data;
@@ -383,6 +419,8 @@ export default {
                                 $('#iconUrlB').val(json.iconB);
                                 $('#iconImgUrlB').attr('src', json.iconB);
 
+                                $('#partitionId').val(json.partitionId);
+
                                 // 打开编辑弹窗
                                 $("#roomTagModal").modal('show');
                                 $("#modalLabel").text("编辑房间标签");
@@ -395,6 +433,8 @@ export default {
                 });
 
                 $("#table").on("click", '.opt-remove', function () {
+                    const currentData = $('#table').bootstrapTable('getData')[$(this).data('index')];
+                    let partitionId = currentData.partitionId;
                     var seq = $(this).attr("data-id");
                     if (seq == 'undefined') {
                         $("#tipMsg").text("id参数有误");
@@ -404,8 +444,11 @@ export default {
                     if (confirm("你确认删除该记录吗? \r\n 删除后再也不能找回，请谨慎操作！")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/home/resource/deleteByStrategySeq.action",
-                            data: { seq: seq },
+                            url: "/admin/home/resource/deleteByStrategySeq",
+                            data: { 
+                                seq: seq, 
+                                partitionId: partitionId,
+                            },
                             dataType: "json",
                             success: function (json) {
                                 if (json.code == 200) {

src/views/firstpage/RecommendRoomAdminView.vue

@@ -216,7 +216,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/firstpage/room/recommend/list.action',
+                    url: '/admin/firstpage/room/recommend/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -272,7 +272,7 @@ export default {
                     if ($("#addForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/firstpage/room/recommend/add.action",
+                            url: "/admin/firstpage/room/recommend/add",
                             data: {
                                 erbanNo: erbanNo,
                                 seqNo: seqNo,
@@ -309,7 +309,7 @@ export default {
                     if (confirm("你确认下线该房间吗？")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/firstpage/room/recommend/offline.action",
+                            url: "/admin/firstpage/room/recommend/offline",
                             data: { id: id },
                             dataType: "json",
                             success: function (json) {

src/views/flowteam/FlowTeamInvitecodeManageView.vue

@@ -109,7 +109,7 @@ export default {
             options.push('<option value="">选择小组</option>')
             $.ajax({
                 type: "get",
-                url: "/admin/flowTeam/listTeamByGroupId.action",
+                url: "/admin/flowTeam/listTeamByGroupId",
                 data: {
                     groupId: groupId
                 },
@@ -196,7 +196,7 @@ export default {
             // 加载流量团队配置
             $.ajax({
                 type: "get",
-                url: "/admin/flowTeam/listTeam.action",
+                url: "/admin/flowTeam/listTeam",
                 dataType: "json",
                 async: false,
                 success: function (json) {

src/views/flowteam/FlowTeamMemberAdminView.vue

@@ -143,7 +143,7 @@ export default {
             const options = [];
             $.ajax({
                 type: "get",
-                url: "/admin/flowTeam/listTeamByGroupId.action",
+                url: "/admin/flowTeam/listTeamByGroupId",
                 data: {
                     groupId: groupId
                 },
@@ -183,7 +183,7 @@ export default {
                 // 加载流量团队配置
                 $.ajax({
                     type: "get",
-                    url: "/admin/flowTeam/listTeam.action",
+                    url: "/admin/flowTeam/listTeam",
                     dataType: "json",
                     async: false,
                     success: function (json) {
@@ -341,7 +341,7 @@ export default {
                             return param;
                         },
                         toolbar: '#toolbar',
-                        url: '/admin/flowTeam/listFlowMembersByPage.action',
+                        url: '/admin/flowTeam/listFlowMembersByPage',
                         onLoadSuccess: function (data) {  //加载成功时执行
                             console.log("load success", data);
                             memberList = data.rows;
@@ -392,7 +392,7 @@ export default {
 
                         $.ajax({
                             type: "post",
-                            url: "/admin/flowTeam/saveMember.action",
+                            url: "/admin/flowTeam/saveMember",
                             data: JSON.stringify(requestParam),
                             dataType: "json",
                             contentType: 'application/json',
@@ -434,7 +434,7 @@ export default {
 
                         $.ajax({
                             type: "post",
-                            url: "/admin/flowTeam/changeMemberStatus.action",
+                            url: "/admin/flowTeam/changeMemberStatus",
                             data: JSON.stringify(requestParam),
                             dataType: "json",
                             contentType: 'application/json',

src/views/flowteam/FlowTeamSettlementView.vue

@@ -90,7 +90,7 @@ export default {
             const options = ['<option value="">全部</option>'];
             $.ajax({
                 type: "get",
-                url: "/admin/flowTeam/listTeamByGroupId.action",
+                url: "/admin/flowTeam/listTeamByGroupId",
                 data: {
                     groupId: groupId
                 },
@@ -126,7 +126,7 @@ export default {
                 // 加载流量团队配置
                 $.ajax({
                     type: "get",
-                    url: "/admin/flowTeam/listTeam.action",
+                    url: "/admin/flowTeam/listTeam",
                     dataType: "json",
                     async: false,
                     success: function (json) {
@@ -244,7 +244,7 @@ export default {
                         return param;
                     },
                     toolbar: '#toolbar',
-                    url: '/admin/flowteamSettlement/listTeamSettlementData.action',
+                    url: '/admin/flowteamSettlement/listTeamSettlementData',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -316,7 +316,7 @@ export default {
                             teamDetailQueryParams = param;
                             return param;
                         },
-                        url: '/admin/flowteamSettlement/listTeamSettlementDataDetail.action',
+                        url: '/admin/flowteamSettlement/listTeamSettlementDataDetail',
                         onLoadSuccess: function () {  //加载成功时执行
                             $("#teamDetailModal").modal('show');
                         },

src/views/flowteam/FlowTeamStatisticView.vue

@@ -191,7 +191,7 @@ export default {
             const options = ['<option value="">全部</option>'];
             $.ajax({
                 type: "get",
-                url: "/admin/flowTeam/listTeamByGroupId.action",
+                url: "/admin/flowTeam/listTeamByGroupId",
                 data: {
                     groupId: groupId
                 },
@@ -227,7 +227,7 @@ export default {
                 // 加载流量团队配置
                 $.ajax({
                     type: "get",
-                    url: "/admin/flowTeam/listTeam.action",
+                    url: "/admin/flowTeam/listTeam",
                     dataType: "json",
                     async: false,
                     success: function (json) {
@@ -358,7 +358,7 @@ export default {
                             { field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', },
                             { field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', },
                             { field: 'chargeMoney', title: '充值金额(美元)', align: 'center', width: '5%', },
-                            { field: 'sendGiftMony', title: '送礼钻石数', align: 'center', width: '5%', },
+                            { field: 'sendGiftMony', title: '送礼金币数', align: 'center', width: '5%', },
                             { field: 'giveCount', title: '累计收到转赠次数', align: 'center', width: '5%', },
                             { field: 'giveMoney', title: '累计收到转赠金额', align: 'center', width: '5%', },
                             { field: 'arpu', title: 'Arpu', align: 'center', width: '5%', },
@@ -418,7 +418,7 @@ export default {
                             return param;
                         },
                         // toolbar: '#toolbar',
-                        url: '/admin/flowTeam/listStatisticSummary.action',
+                        url: '/admin/flowTeam/listStatisticSummary',
                         onLoadSuccess: function (json) {  //加载成功时执行
                             console.log("table load success");
                             if ($('#query-groupSelector').val() && !$('#query-teamSelector').val()) {
@@ -507,7 +507,7 @@ export default {
                             { field: 'tchargeRate', title: '付费转化', align: 'center', width: '5%', },
                             { field: 'tchargeCount', title: '充值次数', align: 'center', width: '5%', },
                             { field: 'tchargeMoney', title: '充值金额(美元)', align: 'center', width: '5%', },
-                            { field: 'tsendGiftMony', title: '送礼钻石数', align: 'center', width: '5%', },
+                            { field: 'tsendGiftMony', title: '送礼金币数', align: 'center', width: '5%', },
                             { field: 'tgiveCount', title: '累计收到转赠次数', align: 'center', width: '5%', },
                             { field: 'tgiveMoney', title: '累计收到转赠金额', align: 'center', width: '5%', },
                             { field: 'tarpu', title: 'Arpu', align: 'center', width: '5%', },
@@ -601,7 +601,7 @@ export default {
                     if ($("#addForm").validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/roomtag/saveRoomTag.action",
+                            url: "/admin/roomtag/saveRoomTag",
                             data: {
                                 id: id,
                                 name: name,
@@ -666,7 +666,7 @@ export default {
                             { field: 'chargeRate', title: '付费转化', align: 'center', width: '5%', },
                             { field: 'chargeCount', title: '充值次数', align: 'center', width: '5%', },
                             { field: 'chargeMoney', title: '充值金额(美元)', align: 'center', width: '5%', },
-                            { field: 'sendGiftMony', title: '送礼钻石数', align: 'center', width: '5%', },
+                            { field: 'sendGiftMony', title: '送礼金币数', align: 'center', width: '5%', },
                             { field: 'arpu', title: 'Arpu', align: 'center', width: '5%', },
                             {
                                 field: 'memberId',
@@ -699,7 +699,7 @@ export default {
                             detailTeamId = teamId;
                             return param;
                         },
-                        url: '/admin/flowTeam/listFlowTeamStatisticDetails.action',
+                        url: '/admin/flowTeam/listFlowTeamStatisticDetails',
                         onLoadSuccess: function () {  //加载成功时执行
                             $("#teamDetailModal").modal('show');
                         },
@@ -726,9 +726,9 @@ export default {
                             { field: 'signUpTime', title: '新增日期', align: 'center', width: '5%' },
                             { field: 'chargeCount', title: '充值次数', align: 'center', width: '5%' },
                             { field: 'chargeMoney', title: '充值金额（美元）', align: 'center', width: '5%' },
-                            { field: 'totalSendGiftMoney', title: '送礼钻石数', align: 'center', width: '5%' },
-                            { field: 'totalBackbagSendGiftMoney', title: '送礼背包钻石数', align: 'center', width: '5%' },
-                            { field: 'totalNoBackbagSendGiftMoney', title: '送礼非背包钻石数', align: 'center', width: '5%' },
+                            { field: 'totalSendGiftMoney', title: '送礼金币数', align: 'center', width: '5%' },
+                            { field: 'totalBackbagSendGiftMoney', title: '送礼背包金币数', align: 'center', width: '5%' },
+                            { field: 'totalNoBackbagSendGiftMoney', title: '送礼非背包金币数', align: 'center', width: '5%' },
                         ],
                         undefinedText: 0,
                         cache: false,
@@ -750,7 +750,7 @@ export default {
                             userDetailQueryParams = param;
                             return param;
                         },
-                        url: '/admin/flowTeam/listUserStatisticDetails.action',
+                        url: '/admin/flowTeam/listUserStatisticDetails',
                         onLoadSuccess: function () {  //加载成功时执行
                             $("#userDetailModal").modal('show');
                         },

src/views/flowteam/RefillInviteCodeView.vue

@@ -85,7 +85,7 @@ export default {
                 // 加载流量团队配置
                 $.ajax({
                     type: "get",
-                    url: "/admin/flowTeam/listTeam.action",
+                    url: "/admin/flowTeam/listTeam",
                     dataType: "json",
                     async: false,
                     success: function (json) {
@@ -149,7 +149,7 @@ export default {
                     },
                     uniqueId: 'code',
                     toolbar: '#toolbar',
-                    url: '/admin/flowTeam/listUsers.action',
+                    url: '/admin/flowTeam/listUsers',
                     onLoadSuccess: function (data) {  //加载成功时执行
                         tableData = data;
                     },
@@ -232,7 +232,7 @@ export default {
 
                         $.ajax({
                             type: "post",
-                            url: "/admin/flowTeam/refillUserInviteCode.action",
+                            url: "/admin/flowTeam/refillUserInviteCode",
                             data: JSON.stringify(requestParam),
                             dataType: "json",
                             contentType: 'application/json',

src/views/game/GameAccessUrlView.vue

@@ -150,7 +150,7 @@ export default {
                     if ($('#actForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gameAccessUrl/add.action",
+                            url: "/admin/gameAccessUrl/add",
                             data: $('#actForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -171,7 +171,7 @@ export default {
                     if ($('#editForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gameAccessUrl/update.action",
+                            url: "/admin/gameAccessUrl/update",
                             data: $('#editForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -198,7 +198,7 @@ export default {
                     if (confirm("你确认删除吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/gameAccessUrl/delete.action',
+                            url: '/admin/gameAccessUrl/delete',
                             data: { 'id': id },
                             dataType: 'json',
                             success: function (json) {
@@ -294,7 +294,7 @@ export default {
                         },
                         uniqueId: 'accessUrl',
                         toolbar: '#toolbar',
-                        url: '/admin/gameAccessUrl/list.action',
+                        url: '/admin/gameAccessUrl/list',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },

src/views/game/GameActivityRankView.vue

@@ -383,7 +383,7 @@ export default {
                     var id = $(this).attr("data-id");
                     $.ajax({
                         type: "get",
-                        url: "/admin/gameActivityRank/getById.action",
+                        url: "/admin/gameActivityRank/getById",
                         data: { "id": id },
                         dataType: "json",
                         success: function (json) {
@@ -426,7 +426,7 @@ export default {
                     if ($('#actForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gameActivityRank/add.action",
+                            url: "/admin/gameActivityRank/add",
                             data: $('#actForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -447,7 +447,7 @@ export default {
                     if ($('#editForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gameActivityRank/update.action",
+                            url: "/admin/gameActivityRank/update",
                             data: $('#editForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -474,7 +474,7 @@ export default {
                     if (confirm("你确认删除吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/gameActivityRank/delete.action',
+                            url: '/admin/gameActivityRank/delete',
                             data: { 'id': id },
                             dataType: 'json',
                             success: function (json) {
@@ -756,7 +756,7 @@ export default {
                         },
                         uniqueId: 'id',
                         toolbar: '#toolbar',
-                        url: '/admin/gameActivityRank/list.action',
+                        url: '/admin/gameActivityRank/list',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },

src/views/game/GameChannelView.vue

@@ -175,7 +175,7 @@ export default {
                     if ($('#actForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gamechannel/add.action",
+                            url: "/admin/gamechannel/add",
                             data: $('#actForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -196,7 +196,7 @@ export default {
                     if ($('#editForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gamechannel/update.action",
+                            url: "/admin/gamechannel/update",
                             data: $('#editForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -223,7 +223,7 @@ export default {
                     if (confirm("你确认删除吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/gamechannel/delete.action',
+                            url: '/admin/gamechannel/delete',
                             data: { 'channelId': id },
                             dataType: 'json',
                             success: function (json) {
@@ -321,7 +321,7 @@ export default {
                         },
                         uniqueId: 'channelId',
                         toolbar: '#toolbar',
-                        url: '/admin/gamechannel/list.action',
+                        url: '/admin/gamechannel/list',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },

src/views/game/GameFaceView.vue

@@ -150,7 +150,7 @@ export default {
                 $('#uploadGameBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/gameFace/headimg.action',
+                        url: '/admin/gameFace/headimg',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
@@ -168,7 +168,7 @@ export default {
                 $('#addGameUploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/gameFace/headimg.action',
+                        url: '/admin/gameFace/headimg',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
@@ -187,7 +187,7 @@ export default {
                     if ($('#actForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gameFace/add.action",
+                            url: "/admin/gameFace/add",
                             data: $('#actForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -208,7 +208,7 @@ export default {
                     if ($('#editForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gameFace/update.action",
+                            url: "/admin/gameFace/update",
                             data: $('#editForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -235,7 +235,7 @@ export default {
                     if (confirm("你确认删除吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/gameFace/delete.action',
+                            url: '/admin/gameFace/delete',
                             data: { 'id': id },
                             dataType: 'json',
                             success: function (json) {
@@ -352,7 +352,7 @@ export default {
                         },
                         uniqueId: 'type',
                         toolbar: '#toolbar',
-                        url: '/admin/gameFace/list.action',
+                        url: '/admin/gameFace/list',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },

src/views/game/GameInfoView.vue

@@ -414,7 +414,7 @@ export default {
                     var gameId = $(this).attr("data-id");
                     $.ajax({
                         type: "get",
-                        url: "/admin/gameinfo/getByGameId.action",
+                        url: "/admin/gameinfo/getByGameId",
                         data: { "gameId": gameId },
                         dataType: "json",
                         success: function (json) {
@@ -451,7 +451,7 @@ export default {
                     if ($('#actForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gameinfo/add.action",
+                            url: "/admin/gameinfo/add",
                             data: $('#actForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -472,7 +472,7 @@ export default {
                     if ($('#editForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gameinfo/update.action",
+                            url: "/admin/gameinfo/update",
                             data: $('#editForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -500,7 +500,7 @@ export default {
                     if (confirm("你确认删除吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/gameinfo/delete.action',
+                            url: '/admin/gameinfo/delete',
                             data: { 'gameId': id },
                             dataType: 'json',
                             success: function (json) {
@@ -553,7 +553,7 @@ export default {
                     var gameId = $(this).attr("data-id");
                     $.ajax({
                         type: "get",
-                        url: "/admin/gameinfo/getByGameId.action",
+                        url: "/admin/gameinfo/getByGameId",
                         data: { "gameId": gameId },
                         dataType: "json",
                         success: function (json) {
@@ -590,7 +590,7 @@ export default {
                     if ($('#actForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gameinfo/add.action",
+                            url: "/admin/gameinfo/add",
                             data: $('#actForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -611,7 +611,7 @@ export default {
                     if ($('#editForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gameinfo/update.action",
+                            url: "/admin/gameinfo/update",
                             data: $('#editForm').serialize(),
                             dataType: 'json',
                             success: function (json) {
@@ -639,7 +639,7 @@ export default {
                     if (confirm("你确认删除吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: '/admin/gameinfo/delete.action',
+                            url: '/admin/gameinfo/delete',
                             data: { 'gameId': id },
                             dataType: 'json',
                             success: function (json) {
@@ -673,7 +673,7 @@ export default {
                 $('#addGameUploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/gameinfo/headimg.action',
+                        url: '/admin/gameinfo/headimg',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
@@ -691,7 +691,7 @@ export default {
                 $('#addPicUploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/gameinfo/headimgforpicture.action',
+                        url: '/admin/gameinfo/headimgforpicture',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
@@ -710,7 +710,7 @@ export default {
                 $('#addTagUploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/gameinfo/headimgfortag.action',
+                        url: '/admin/gameinfo/headimgfortag',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
@@ -729,7 +729,7 @@ export default {
                 $('#uploadGameBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/gameinfo/headimg.action',
+                        url: '/admin/gameinfo/headimg',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
@@ -747,7 +747,7 @@ export default {
                 $('#uploadPicBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/gameinfo/headimgforpicture.action',
+                        url: '/admin/gameinfo/headimgforpicture',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
@@ -766,7 +766,7 @@ export default {
                 $('#uploadTagBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/gameinfo/headimgfortag.action',
+                        url: '/admin/gameinfo/headimgfortag',
                         dataType: 'json',
                         success: function (json) {
                             if (json.path) {
@@ -1014,7 +1014,7 @@ function initTable() {
         },
         uniqueId: 'gameId',
         toolbar: '#toolbar',
-        url: '/admin/gameinfo/list.action',
+        url: '/admin/gameinfo/list',
         onLoadSuccess: function () {  //加载成功时执行
             console.log("load success");
         },

src/views/gamemanage/GameBillRecordAdminView.vue

@@ -90,7 +90,7 @@ export default {
                 },
                 uniqueId: 'code',
                 toolbar: '#toolbar',
-                url: '/admin/gameManage/billRecord/getList.action',
+                url: '/admin/gameManage/billRecord/getList',
                 onLoadSuccess: function () {  //加载成功时执行
                     console.log("load success");
                     tableLoaded = true;
@@ -157,7 +157,7 @@ export default {
                     return;
                 }
                 var form = $("#form");
-                form.attr("action", "/admin/gameManage/billRecord/exportList.action");
+                form.attr("action", "/admin/gameManage/billRecord/exportList");
                 $('#exportplatformNo').val($('#platformNo').val());
                 $('#exportBillType').val($('#billType').val());
                 $('#exportStartTime').val($('#startDate').val());
@@ -168,7 +168,7 @@ export default {
             // 通过接口获取所有账单类型
             function getObjTypes() {
                 $.ajax({
-                    url: "/admin/gameManage/billRecord/objTypeList.action",
+                    url: "/admin/gameManage/billRecord/objTypeList",
                     type: 'GET',
                     async: false,
                     datatype: 'json',

src/views/gamemanage/GameManageBannerView.vue

@@ -632,7 +632,7 @@ export default {
                         },
                         uniqueId: 'code',
                         toolbar: '#toolbar',
-                        url: '/admin/gameManage/banner/list.action',
+                        url: '/admin/gameManage/banner/list',
                         onLoadSuccess: function () {  //加载成功时执行
                             console.log("load success");
                         },
@@ -658,7 +658,7 @@ export default {
                     // }
                     $.ajax({
                         type: 'get',
-                        url: '/admin/gameManage/banner/get.action',
+                        url: '/admin/gameManage/banner/get',
                         data: { 'bannerId': id },
                         dataType: 'json',
                         success: function (json) {
@@ -739,7 +739,7 @@ export default {
                     if ($('#bannerForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gameManage/banner/save.action?startTimeString=" + $('#startDate').val()
+                            url: "/admin/gameManage/banner/save?startTimeString=" + $('#startDate').val()
                                 + "&endTimeString=" + $('#endDate').val(),
                             data: $('#bannerForm').serialize(),
                             dataType: 'json',
@@ -791,7 +791,7 @@ export default {
                     if ($('#addBannerForm').validationEngine('validate')) {
                         $.ajax({
                             type: "post",
-                            url: "/admin/gameManage/banner/save.action?startTimeString=" + $('#addStartDate').val()
+                            url: "/admin/gameManage/banner/save?startTimeString=" + $('#addStartDate').val()
                                 + "&endTimeString=" + $('#addEndDate').val(),
                             data: $('#addBannerForm').serialize(),
                             dataType: 'json',
@@ -846,7 +846,7 @@ export default {
                 $('#uploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/gameManage/banner/upload.action',
+                        url: '/admin/gameManage/banner/upload',
                         dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
@@ -863,7 +863,7 @@ export default {
                 $('#addUploadBtn').on('click', function () {
                     var options = {
                         type: 'post',
-                        url: '/admin/gameManage/banner/upload.action',
+                        url: '/admin/gameManage/banner/upload',
                         dataType: 'json',
                         success: function (json) {
                             if (json.code == 200) {
@@ -922,7 +922,7 @@ export default {
                     if (confirm("你确认删除选中Banner吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/gameManage/banner/delete.action",
+                            url: "/admin/gameManage/banner/delete",
                             data: {
                                 'ids': JSON.stringify(idArr)
                             },
@@ -949,7 +949,7 @@ export default {
                     if (confirm("你确认删除Banner吗?")) {
                         $.ajax({
                             type: 'post',
-                            url: "/admin/gameManage/banner/delete.action",
+                            url: "/admin/gameManage/banner/delete",
                             data: {
                                 'ids': JSON.stringify(idArr)
                             },