Merge branch 'master' of codeup.aliyun.com:6417d67de477e2050c6497df/gm_front

src/api/systemapi/game.js

@@ -427,6 +427,12 @@ export function delBlackList(id) {
     method: 'post'
   })
 }
+export function delSingleBlackList(id) {
+  return request({
+    url: `/system/game/delsingleblacklist/${id}`,
+    method: 'post'
+  })
+}
 
 export function getNoticeInfo(data) {
   return request({

src/views/sysmanage/game/blacklist.vue

@@ -159,6 +159,12 @@
                   @click="() => addOrUpdateSingle(scope.row)"
                 >编辑
                 </el-button>
+                <el-button
+                  size="small"
+                  type="danger"
+                  @click="() => delSingle(scope.row)"
+                >删除
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -187,7 +193,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="封禁时长" :label-width="formLabelWidth" prop="time">
-              <el-input-number v-model="form.time"  :min="-1" placeholder="单位：分钟，-1表示永久封禁" style="width:300px;"></el-input-number>
+              <el-input-number v-model="singleServerForm.time"  :min="-1" placeholder="单位：分钟，-1表示永久封禁" style="width:300px;"></el-input-number>
             </el-form-item>
           </el-form>
           <div slot="footer" class="dialog-footer">
@@ -202,7 +208,15 @@
 
 <script>
 import Pagination from '@/components/Pagination/index'
-import {getBlackList, saveBlackList, delBlackList, getServer, getSingleBlackList, saveSingleBlackList} from '@/api/systemapi/game'
+import {
+  getBlackList,
+  saveBlackList,
+  delBlackList,
+  getServer,
+  getSingleBlackList,
+  saveSingleBlackList,
+  delSingleBlackList
+} from '@/api/systemapi/game'
 import { pageParams } from '@/settings'
 
 export default {
@@ -348,7 +362,6 @@ export default {
         this.activeTitle = '编辑黑名单信息'
         this.singleServerForm.id = data.id
         this.singleServerForm.uid = data.uid
-        this.singleServerForm.serverId = data.serverId
       }
       this.singleServerDialogFormVisible = true
     },
@@ -377,7 +390,6 @@ export default {
       })
     },
     singleSave() {
-      this.singleServerForm.serverName =
       saveSingleBlackList(this.singleServerForm).then(response => {
         if (response.code === 0) {
           this.$message({
@@ -408,6 +420,34 @@ export default {
               type: 'success'
             })
             this.dialogFormVisible = false
+            this.querySingle()
+          } else {
+            this.$message({
+              message: response.msg,
+              type: 'error'
+            })
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    delSingle(data) {
+      this.$confirm('确定要删除 ‘' + data.uid + '’吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        delSingleBlackList(data.id).then(response => {
+          if (response.code === 0) {
+            this.$message({
+              message: '删除成功',
+              type: 'success'
+            })
+            this.singleServerDialogFormVisible = false
             this.fetchData()
           } else {
             this.$message({

src/views/sysmanage/game/rechargeflow.vue

@@ -130,7 +130,7 @@
       <el-tab-pane label="充值排行" name="second">
         <div class="search-form" style="margin-bottom:15px;">
           <span>服务器：</span>
-          <el-select v-model="searchForm1.serverid" size="small" clearable filterable placeholder="请选择服务器" @change="selectServer">
+          <el-select v-model="searchForm1.serverid" size="small" clearable filterable placeholder="请选择服务器">
             <el-option
               v-for="item in serverMaps"
               :key="item.serverid"
@@ -157,9 +157,15 @@
             <el-table-column label="排名" width="50">
               <template slot-scope="scope">{{ scope.$index + 1 }}</template>
             </el-table-column>
-            <el-table-column label="openId">
+            <el-table-column label="渠道账号" width="300">
               <template slot-scope="scope">{{ scope.row.id }}</template>
             </el-table-column>
+            <el-table-column label="openId">
+              <template slot-scope="scope">{{ scope.row.openId }}</template>
+            </el-table-column>
+            <el-table-column label="uid">
+              <template slot-scope="scope">{{ scope.row.uid}}</template>
+            </el-table-column>
             <el-table-column label="充值金额">
               <template slot-scope="scope">{{ scope.row.totalMoney }}</template>
             </el-table-column>

src/views/sysmanage/game/userinfo.vue

@@ -63,6 +63,15 @@
       </el-tab-pane>
       <el-tab-pane label="渠道账号查询" name="second">
         <el-form ref="form" :model="searchForm1" label-width="80px" :inline="true">
+          <el-form-item label="渠道账号">
+            <el-input
+              v-model="searchForm1.id"
+              clearable
+              placeholder="渠道账号"
+              style="width:200px;"
+              label="渠道账号"
+            />
+          </el-form-item>
           <el-form-item label="openId">
             <el-input
               v-model="searchForm1.openid"