diff --git a/.env.development b/.env.development
index 47dafbc..bc3c2aa 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://localhost:8201/'
+VITE_API_URL = 'http://localhost:4111/'
diff --git a/.env.production b/.env.production
index 1070f26..b1afda7 100644
--- a/.env.production
+++ b/.env.production
@@ -2,9 +2,9 @@
 ENV = 'production'
 
 # public path 配置线上环境路径（打包）、本地通过 http-server 访问时，请置空即可
-VITE_PUBLIC_PATH = /sys/
+VITE_PUBLIC_PATH =
 
 # 线上环境接口地址
-VITE_API_URL = '/'
+VITE_API_URL = 'http://1.116.242.236:4111/'
 
 
diff --git a/public/favicon.ico b/public/favicon.ico
index 130d94b..f1513eb 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/favicon2.ico b/public/favicon2.ico
new file mode 100644
index 0000000..130d94b
Binary files /dev/null and b/public/favicon2.ico differ
diff --git a/src/assets/logo-mini1.ico b/src/assets/logo-mini1.ico
new file mode 100644
index 0000000..130d94b
Binary files /dev/null and b/src/assets/logo-mini1.ico differ
diff --git a/src/views/gameCustom/feedback/index.vue b/src/views/gameCustom/feedback/index.vue
index 75403b2..5418c6e 100644
--- a/src/views/gameCustom/feedback/index.vue
+++ b/src/views/gameCustom/feedback/index.vue
@@ -13,10 +13,8 @@
             </el-form-item>
           </el-form>
           <el-form-item label="状态">
-            <el-select size="default" placeholder="请选择状态" class="w-50 m-2" v-model="tableData.param.state" clearable>
-              <el-option label="全部"  value="0" />
-              <el-option label="未处理"  value="1" />
-              <el-option label="已处理"  value="2" />
+            <el-select size="default" placeholder="请选择状态" class="w-50 m-2" v-model="tableData.param.state" >
+              <el-option  v-for="item in states"  :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
           <el-form-item>
@@ -37,10 +35,15 @@
 				<el-table-column prop="tel" label="联系电话" show-overflow-tooltip></el-table-column>
         <el-table-column prop="bug" label="问题描述" show-overflow-tooltip></el-table-column>
         <el-table-column prop="occurrenceTime" label="发生时间" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="state" label="状态" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="state" label="状态" show-overflow-tooltip>
+          <template #default="scope">
+            <el-tag type="success" v-if="scope.row.state===0">未处理</el-tag>
+            <el-tag type="info" v-else>已处理</el-tag>
+          </template>
+        </el-table-column>
 				<el-table-column label="操作" width="100">
 					<template #default="scope">
-						<el-button size="small" type="text" v-if="scope.state===1" @click="onOperate(scope.row.id)">处理</el-button>
+						<el-button size="small" type="text" v-if="scope.row.state===0" @click="onOperate(scope.row.id)">处理</el-button>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -90,6 +93,20 @@ interface TableDataState {
 export default defineComponent({
 	name: 'apiV1SystemRoleList',
 	setup() {
+    const states = [
+      {
+        value: 0,
+        label: '全部',
+      },
+      {
+        value: 1,
+        label: '未处理',
+      },
+      {
+        value: 2,
+        label: '处理完',
+      }
+  ]
 		const state = reactive<TableDataState>({
 			tableData: {
 				data: [],
@@ -121,7 +138,7 @@ export default defineComponent({
             qq:item.qq,
             tel:item.tel,
             bug:item.bug,
-            occurrenceTime:item.occurrenceTime,
+            occurrenceTime:new Date(Number(item.occurrenceTime)*1000).toLocaleString(),
             state:item.state,
             createTime:item.createTime
 
@@ -132,9 +149,10 @@ export default defineComponent({
       })
     };
 
-		const onOperate = (uid:number) => {
-          gameOperateBug({"uid":uid}).then(()=>{
+		const onOperate = (id:number) => {
+          gameOperateBug({"id":id}).then(()=>{
             ElMessage.success('操作成功');
+            bugList()
           }).finally(()=>{
             // state.loading = false;
           })
@@ -154,6 +172,7 @@ export default defineComponent({
 			initTableData();
 		});
 		return {
+      states,
       onOperate,
 			onHandleSizeChange,
 			onHandleCurrentChange,
diff --git a/src/views/gameMail/mailList/index.vue b/src/views/gameMail/mailList/index.vue
index b048f23..1b6388c 100644
--- a/src/views/gameMail/mailList/index.vue
+++ b/src/views/gameMail/mailList/index.vue
@@ -7,7 +7,9 @@
             <el-input size="default" v-model="tableData.param.uid" placeholder="请输入玩家uid" class="w-50 m-2" clearable/>
           </el-form-item>
           <el-form-item label="区服">
-            <el-input size="default" v-model="tableData.param.serverId" placeholder="请输入区服" class="w-50 m-2" clearable/>
+            <el-select v-model="tableData.param.serverId" class="m-2" placeholder="选择服务器" size="large">
+              <el-option  v-for="item in servers"  :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
           </el-form-item>
 
           <el-form-item>
@@ -60,6 +62,7 @@
 import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
 //import { ElMessageBox, ElMessage } from 'element-plus';
 import EditRole from '/@/views/system/role/component/editRole.vue';
+import {ServerList} from "/@/utils/game";
 import { gameMailList} from "/@/api/game/index";
 // 定义接口来定义对象的类型
 interface TableData {
@@ -90,7 +93,9 @@ interface TableDataState {
       lowTime:number;
 			UpperTime: number;
 		};
+
 	};
+  servers:object
 }
 
 export default defineComponent({
@@ -110,7 +115,9 @@ export default defineComponent({
           lowTime:0,
           UpperTime: 0,
 				},
+
 			},
+      servers:ServerList
 		});
 		// 初始化表格数据
 		// const initTableData = () => {
diff --git a/src/views/gameNotice/login/index.vue b/src/views/gameNotice/login/index.vue
index 48ce451..a3e3ffb 100644
--- a/src/views/gameNotice/login/index.vue
+++ b/src/views/gameNotice/login/index.vue
@@ -5,9 +5,13 @@
         <el-form    label-position="right"
                     :model="formLabelAlign"
                     >
-
+          <el-form-item label="选择渠道" prop="serverId">
+            <el-select v-model="tableData.param.channel" class="m-2" placeholder="选择渠道" size="large" @change="getNotice">
+              <el-option  v-for="item in channels"  :key="item.value" :label="item.label" :value="item.value" />
+            </el-select>
+          </el-form-item>
           <el-form-item label="内容：">
-            <el-input  v-model="tableData.param.content" placeholder="" type="textarea" class="w-50 m-2"  rows="5" clearable/>
+            <el-input  v-model="tableData.param.content" placeholder="" type="textarea" class="w-50 m-2"  rows="25" clearable/>
           </el-form-item>
           <el-form-item>
             <el-button size="large" type="primary" class="ml10" @click="noticeMaintenance">
@@ -30,6 +34,7 @@ import {toRefs, reactive, onMounted,  defineComponent, } from 'vue';
 import {gameGetNoticeLogin, gameNoticeLogin} from "/@/api/game";
 
 import {ElMessage} from "element-plus/es";
+import {AllChannelList} from "/@/utils/game";
 
 
 interface TableDataState {
@@ -38,12 +43,12 @@ interface TableDataState {
       content:string
       status:number
       noticeType:number
-      channel:number
+      channel:string
       id:number
     };
 
   };
-
+  channels:object
 }
 
 export default defineComponent({
@@ -57,11 +62,11 @@ export default defineComponent({
           status: 0,
           content: "",
           noticeType:2,
-          channel:0,
+          channel:"0",
           id:0,
         },
-      }
-
+      },
+      channels:AllChannelList
     });
     const noticeMaintenance=()=>{
       gameNoticeLogin(state.tableData.param).then(()=>{
@@ -104,6 +109,7 @@ export default defineComponent({
       initTableData();
     });
     return {
+      getNotice,
       noticeMaintenance,
       ...toRefs(state),
     };
diff --git a/src/views/gameNotice/maintenance/index.vue b/src/views/gameNotice/maintenance/index.vue
index bdf91dc..8d1899b 100644
--- a/src/views/gameNotice/maintenance/index.vue
+++ b/src/views/gameNotice/maintenance/index.vue
@@ -6,7 +6,7 @@
                     :model="formLabelAlign"
                     >
           <el-form-item label="选择渠道" prop="serverId">
-            <el-select v-model="tableData.param.channel" class="m-2" placeholder="选择渠道" size="large">
+            <el-select v-model="tableData.param.channel" class="m-2" placeholder="选择渠道" size="large" @change="getNotice">
               <el-option  v-for="item in channels"  :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </el-form-item>
@@ -14,19 +14,17 @@
           <el-radio-group v-model="tableData.param.status">
             <el-radio :label=1>正常</el-radio>
             <el-radio :label=2>白名单</el-radio>
-            <el-radio :label=0>维护</el-radio>
+            <el-radio :label=3>维护</el-radio>
           </el-radio-group>
           </el-form-item>
           <el-form-item label="内容：">
-            <el-input  v-model="tableData.param.content" placeholder="" type="textarea" class="w-50 m-2"  rows="5" clearable/>
+            <el-input  v-model="tableData.param.content" placeholder="" type="textarea" class="w-50 m-2"  rows="25" clearable/>
           </el-form-item>
           <el-form-item>
             <el-button size="large" type="primary" class="ml10" @click="noticeMaintenance">
               发送公告
             </el-button>
-            <el-button size="large" type="primary" class="ml10" @click="getNotice">
-              查询公告
-            </el-button>
+
           </el-form-item>
         </el-form>
 
@@ -83,6 +81,7 @@ export default defineComponent({
     });
     const noticeMaintenance=()=>{
       gameNoticeMaintenance(state.tableData.param).then(()=>{
+        getNotice()
         ElMessage.success('发送成功');
       }).finally(()=>{
         // state.loading = false;
diff --git a/src/views/gameRole/account/index.vue b/src/views/gameRole/account/index.vue
index 7c03a2e..1a21048 100644
--- a/src/views/gameRole/account/index.vue
+++ b/src/views/gameRole/account/index.vue
@@ -30,6 +30,7 @@
         <el-table-column type="index" label="序号" width="60" />
         <el-table-column prop="account" label="账号" show-overflow-tooltip></el-table-column>
         <el-table-column prop="trueName" label="名字" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="identityCard" label="身份证" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="tel" label="手机号" show-overflow-tooltip></el-table-column>
 				<el-table-column prop="leftPlayTime" label="剩余游戏时间" show-overflow-tooltip></el-table-column>
         <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
@@ -40,10 +41,9 @@
           :total="tableData.total"
           v-model:page="tableData.param.pageNum"
           v-model:limit="tableData.param.pageSize"
-          @pagination="onlineList"
+          @pagination="accountList"
       />
 		</el-card>
-		<EditRole ref="editRoleRef" @getRoleList="roleList"/>
 	</div>
 </template>
 
diff --git a/src/views/gameRole/online/index.vue b/src/views/gameRole/online/index.vue
index a107ed7..1c65324 100644
--- a/src/views/gameRole/online/index.vue
+++ b/src/views/gameRole/online/index.vue
@@ -34,7 +34,6 @@
           @pagination="onlineList"
       />
 		</el-card>
-		<EditRole ref="editRoleRef" @getRoleList="roleList"/>
 	</div>
 </template>
 
@@ -64,7 +63,6 @@ interface TableDataState {
 
 export default defineComponent({
 	name: 'apiV1SystemRoleList',
-	components: {EditRole},
 	setup() {
    // const {proxy} = getCurrentInstance() as any;
 		const addRoleRef = ref();
diff --git a/src/views/gameRole/role/index.vue b/src/views/gameRole/role/index.vue
index 0ef23be..21b8362 100644
--- a/src/views/gameRole/role/index.vue
+++ b/src/views/gameRole/role/index.vue
@@ -2,51 +2,12 @@
 	<div class="game-order-container">
 		<el-card shadow="hover">
 			<div class="game-order-search mb15">
-        <el-form>
-        <el-form-item  label="查询类型:" prop="type">
-          <el-radio-group v-model="tableData.param.searchType">
-            <el-radio :label=1>账号查询</el-radio>
-            <el-radio :label=2>桃谷uid查询</el-radio>
-            <el-radio :label=3>时间段查询</el-radio>
-            <el-radio :label=4>渠道订单号查询</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        </el-form>
-        <el-form :inline="true" v-if="tableData.param.searchType==1">
+
+        <el-form :inline="true">
           <el-form-item label="账号">
             <el-input size="default" v-model="tableData.param.account" placeholder="请输入账号" class="w-50 m-2" clearable/>
           </el-form-item>
-          <el-form-item label="选择渠道" prop="serverId">
-            <el-select v-model="tableData.param.channel" class="m-2" placeholder="选择渠道" size="large">
-              <el-option  v-for="item in channels"  :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true" v-if="tableData.param.searchType==2" >
-          <el-form-item label="桃谷uid" >
-            <el-input size="default" v-model="tableData.param.uid" placeholder="请输入桃谷UID" class="w-50 m-2" clearable/>
-          </el-form-item>
-          <el-form-item label="选择区服" prop="serverId">
-            <el-select v-model="tableData.param.serverId" class="m-2" placeholder="选择区服" size="large">
-              <el-option  v-for="item in servers"  :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true" v-if="tableData.param.searchType==3">
-          <el-form-item   label="起始时间" prop="lowTime">
-            <el-date-picker type="datetime" size="large" v-model="tableData.param.lowTime"    format="YYYY/MM/DD HH:mm:ss" value-format="x" />
-          </el-form-item>
 
-          <el-form-item   label="终止时间" prop="time">
-            <el-date-picker   type="datetime" v-model="tableData.param.uptime"      format="YYYY/MM/DD HH:mm:ss" value-format="x" />
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true" v-if="tableData.param.searchType==4">
-          <el-form-item label="渠道订单id">
-            <el-input size="default" v-model="tableData.param.orderId" placeholder="请输入渠道订单id" class="w-50 m-2" clearable/>
-          </el-form-item>
-          </el-form>
-          <el-form>
           <el-form-item>
             <el-button size="default" type="primary" class="ml10" @click="roleList">
               <el-icon>
@@ -59,14 +20,13 @@
 			</div>
 			<el-table :data="tableData.data" style="width: 100%">
         <el-table-column type="index" label="id" width="60" />
-        <el-table-column prop="uid" label="桃谷uid" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="server" label="区服" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="money" label="充值数额" show-overflow-tooltip></el-table-column>
-				<el-table-column prop="timestampStr" label="充值时间" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="rechargeId" label="商品id" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="region" label="区服" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="name" label="桃谷uid" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="uid" label="桃谷名字" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="totalTime" label="总在线时间" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="rechargeTotal" label="累计充值" show-overflow-tooltip></el-table-column>
         <el-table-column prop="createTime" label="创建时间" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="orderId" label="订单id(渠道产生)" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="stateStr" label="订单状态" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="lastLeaveTime" label="离线时间" show-overflow-tooltip></el-table-column>
 <!--				<el-table-column label="操作" width="100">-->
 <!--					<template #default="scope">-->
 <!--						<el-button size="small" type="text" @click="onOpenEditRole(scope.row)">修改名字</el-button>-->
@@ -89,36 +49,25 @@
 <script lang="ts">
 import {toRefs, reactive, onMounted,  defineComponent, } from 'vue';
 //import { ElMessageBox, ElMessage } from 'element-plus';
-import {gameOrderList} from "/@/api/game";
+import { gameRoleList} from "/@/api/game";
 import {ServerList} from "/@/utils/game";
 import {ChannelList} from "/@/utils/game";
 // 定义接口来定义对象的类型
 interface TableData {
-  id:string
   uid:number;
-	server: number;
-	money: number;
-  timestamp: number; //订单时间
-  rechargeId: number;
+  name:string;
+	region: number;
+  totalTime: number;
+  rechargeTotal: number;
   createTime:string;
-  orderId: string;
-  state:number;
-  stateStr:string;
-  timestampStr:string;
+  lastLeaveTime: string;
+
 }
 interface TableDataState {
 	tableData: {
 		data: Array<TableData>;
     param: {
-      searchType:number
-      id:string;
-      orderId:string
-      serverId:number
-      uid:number
-      account: string;
-      channel:string
-      lowTime:number
-      uptime:number
+      account:string
     };
 
 	};
@@ -135,16 +84,7 @@ export default defineComponent({
 			tableData: {
 				data: [],
         param:{
-          searchType:0,
-          id:"",
-          orderId:"",
-          serverId:0,
-          uid:0,
           account:"",
-          channel:"",
-          lowTime:0,
-          uptime:0
-
         },
 
 			},
@@ -157,34 +97,24 @@ export default defineComponent({
 		// };
     const roleList = ()=>{
       const data: Array<TableData> = [];
-      gameOrderList(state.tableData.param).then(res=>{
+      gameRoleList(state.tableData.param).then(res=>{
         const list = res.data.list??[]
         list.map((item:TableData)=>{
-
           data.push({
-            id:item.id,
             uid:item.uid,
-            server: item.server,
-            money: item.money,
-            timestamp: item.timestamp,
-            rechargeId: item.rechargeId,
+            name:item.name,
+            region: item.region,
+            totalTime: item.totalTime,
+            rechargeTotal: item.rechargeTotal,
             createTime:new Date(item.createTime).toLocaleString(),
-            orderId:item.orderId,
-            state:item.state,
-            stateStr:GetStateStr(item.state),
-            timestampStr:new Date(item.timestamp*1000).toLocaleString()
+            lastLeaveTime:new Date(item.lastLeaveTime).toLocaleString(),
           });
         })
         state.tableData.data = data;
       })
     };
 
-    function GetStateStr(s:number){
-      if (s==2){
-        return "成功"
-      }
-      return "失败(错误id="+s+")"
-    }
+
 
 		// // 分页改变
 		// const onHandleSizeChange = (val: number) => {
diff --git a/src/views/login/component/account.vue b/src/views/login/component/account.vue
index 6440b52..7fabfb2 100644
--- a/src/views/login/component/account.vue
+++ b/src/views/login/component/account.vue
@@ -92,8 +92,8 @@ export default defineComponent({
     const state = reactive({
       isShowPassword: false,
       ruleForm: {
-        username: 'demo',
-        password: '123456',
+        username: 'admin',
+        password: '123',
         verifyCode: '',
         verifyKey:''
       },