From 9254fe4885dd47c62f4525c04109b60ee1dbb5f0 Mon Sep 17 00:00:00 2001
From: yulixing <yulixing@kingsome.cn>
Date: Fri, 31 May 2019 11:35:39 +0800
Subject: [PATCH] test

---
 src/components/GameCard/index.vue             | 13 ++++---
 src/store/modules/user.js                     |  1 -
 src/utils/request.js                          |  4 +--
 src/views/games/details/doll/cards/index.vue  | 10 ------
 src/views/games/details/doll/dolls/index.vue  | 10 ------
 src/views/games/details/doll/exchange.vue     | 10 ------
 src/views/games/details/doll/points.vue       | 10 ------
 src/views/games/details/info.del.vue          |  1 -
 src/views/games/details/info.vue              | 14 ++++----
 .../games/details/settings/SettingPanel.vue   | 11 +++---
 src/views/games/list.del.vue                  |  2 --
 src/views/games/settings.vue                  |  1 -
 src/views/login/index.vue                     |  1 -
 src/views/personal/index.vue                  |  4 +--
 src/views/sys/permission.vue                  | 35 ++++++++++---------
 15 files changed, 42 insertions(+), 85 deletions(-)

diff --git a/src/components/GameCard/index.vue b/src/components/GameCard/index.vue
index fe053a8..a1bdb9c 100644
--- a/src/components/GameCard/index.vue
+++ b/src/components/GameCard/index.vue
@@ -2,7 +2,7 @@
   <div class="game-card">
     <div class="content clearfix">
       <div class="l fl mgr-20">
-        <router-link  :to="`/games/details/${info._id}/info`" class="dis-b icon-box">
+        <router-link :to="`/games/details/${info._id}/info`" class="dis-b icon-box">
           <img :src="info.game_icon" class="icon img-fit">
         </router-link>
       </div>
@@ -29,19 +29,22 @@
 
 <script>
 import { delGame } from '@/api/games'
-import {mapGetters} from 'vuex'
+import { mapGetters } from 'vuex'
 export default {
   name: 'GameCard',
   props: ['info'],
   data() {
     return {
-      permEdit: false,
+      permEdit: false
     }
   },
   mounted() {
-    this.permEdit = this.userInfo.permissions.includes(`${this.info._id}-edit`) || this.userInfo.permissions.includes(`${this.info._id}-publish`)
+    this.permEdit =
+      this.userInfo.permissions.includes(`${this.info._id}-edit`) ||
+      this.userInfo.permissions.includes(`${this.info._id}-publish`) ||
+      this.userInfo.permissions.includes(`games-writeable`)
   },
-  computed:{
+  computed: {
     ...mapGetters(['userInfo'])
   },
   methods: {
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 67663de..b9d7854 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -43,7 +43,6 @@ const actions = {
       getInfo(state.token)
         .then(response => {
           const { data } = response
-          console.log(data)
           if (!data || data.errcode !== 0) {
             reject('验证失败，请重新登录！')
           }
diff --git a/src/utils/request.js b/src/utils/request.js
index f1e6096..e73209f 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -47,7 +47,7 @@ service.interceptors.response.use(
       Message({
         message: data.errmsg || 'error',
         type: 'error',
-        duration: 5 * 1000
+        duration: 10 * 1000
       })
       return Promise.reject(data.errmsg || 'error')
     } else {
@@ -87,7 +87,7 @@ service.interceptors.response.use(
     // }
   },
   error => {
-    console.log('err' + error) // for debug
+    console.log(error) // for debug
     Message({
       message: error.message,
       type: 'error',
diff --git a/src/views/games/details/doll/cards/index.vue b/src/views/games/details/doll/cards/index.vue
index de37ac1..cc19e56 100644
--- a/src/views/games/details/doll/cards/index.vue
+++ b/src/views/games/details/doll/cards/index.vue
@@ -112,41 +112,31 @@ export default {
   methods: {
     // filter
     search() {
-      console.log('搜索')
     },
     reset(formName) {
       this.$refs[formName].resetFields()
-      console.log('重置')
     },
     // toolbar
     addGame() {
       this.$router.push('/games/details/info')
-      console.log('添加游戏')
     },
     batchDel() {
-      console.log('批量删除游戏')
     },
     batchOpt() {
       this.batch.show = !this.batch.show
       this.batch.txt = this.batch.show ? '关闭' : '批量操作'
-      console.log('批量操作')
     },
     // table
     viewGame(row) {
-      console.log('查看游戏')
     },
     editGame(row) {
-      console.log('编辑游戏')
     },
     delGame(row) {
-      console.log('删除游戏')
     },
     // pagination
     sizeChange(val) {
-      console.log(`每页 ${val} 条`)
     },
     pageChange(val) {
-      console.log(`当前页: ${val}`)
     }
   }
 }
diff --git a/src/views/games/details/doll/dolls/index.vue b/src/views/games/details/doll/dolls/index.vue
index 8f90a72..502d445 100644
--- a/src/views/games/details/doll/dolls/index.vue
+++ b/src/views/games/details/doll/dolls/index.vue
@@ -112,41 +112,31 @@ export default {
   methods: {
     // filter
     search() {
-      console.log('搜索')
     },
     reset(formName) {
       this.$refs[formName].resetFields()
-      console.log('重置')
     },
     // toolbar
     addGame() {
       this.$router.push('/games/details/info')
-      console.log('添加游戏')
     },
     batchDel() {
-      console.log('批量删除游戏')
     },
     batchOpt() {
       this.batch.show = !this.batch.show
       this.batch.txt = this.batch.show ? '关闭' : '批量操作'
-      console.log('批量操作')
     },
     // table
     viewGame(row) {
-      console.log('查看游戏')
     },
     editGame(row) {
-      console.log('编辑游戏')
     },
     delGame(row) {
-      console.log('删除游戏')
     },
     // pagination
     sizeChange(val) {
-      console.log(`每页 ${val} 条`)
     },
     pageChange(val) {
-      console.log(`当前页: ${val}`)
     }
   }
 }
diff --git a/src/views/games/details/doll/exchange.vue b/src/views/games/details/doll/exchange.vue
index c5924e2..723a505 100644
--- a/src/views/games/details/doll/exchange.vue
+++ b/src/views/games/details/doll/exchange.vue
@@ -229,41 +229,31 @@ export default {
   methods: {
     // filter
     search() {
-      console.log('搜索')
     },
     reset(formName) {
       this.$refs[formName].resetFields()
-      console.log('重置')
     },
     // toolbar
     addGame() {
       this.$router.push('/games/details/info')
-      console.log('添加游戏')
     },
     batchDel() {
-      console.log('批量删除游戏')
     },
     batchOpt() {
       this.batch.show = !this.batch.show
       this.batch.txt = this.batch.show ? '关闭' : '批量操作'
-      console.log('批量操作')
     },
     // table
     viewGame(row) {
-      console.log('查看游戏')
     },
     editGame(row) {
-      console.log('编辑游戏')
     },
     delGame(row) {
-      console.log('删除游戏')
     },
     // pagination
     sizeChange(val) {
-      console.log(`每页 ${val} 条`)
     },
     pageChange(val) {
-      console.log(`当前页: ${val}`)
     }
   }
 }
diff --git a/src/views/games/details/doll/points.vue b/src/views/games/details/doll/points.vue
index af325ec..db721fe 100644
--- a/src/views/games/details/doll/points.vue
+++ b/src/views/games/details/doll/points.vue
@@ -189,41 +189,31 @@ export default {
   methods: {
     // filter
     search() {
-      console.log('搜索')
     },
     reset(formName) {
       this.$refs[formName].resetFields()
-      console.log('重置')
     },
     // toolbar
     addGame() {
       this.$router.push('/games/details/info')
-      console.log('添加游戏')
     },
     batchDel() {
-      console.log('批量删除游戏')
     },
     batchOpt() {
       this.batch.show = !this.batch.show
       this.batch.txt = this.batch.show ? '关闭' : '批量操作'
-      console.log('批量操作')
     },
     // table
     viewGame(row) {
-      console.log('查看游戏')
     },
     editGame(row) {
-      console.log('编辑游戏')
     },
     delGame(row) {
-      console.log('删除游戏')
     },
     // pagination
     sizeChange(val) {
-      console.log(`每页 ${val} 条`)
     },
     pageChange(val) {
-      console.log(`当前页: ${val}`)
     }
   }
 }
diff --git a/src/views/games/details/info.del.vue b/src/views/games/details/info.del.vue
index b59125d..77f1b2c 100644
--- a/src/views/games/details/info.del.vue
+++ b/src/views/games/details/info.del.vue
@@ -267,7 +267,6 @@ export default {
       this.$refs[formName].validate(valid => {
         if (valid) {
           this.saveEdit()
-          console.log(this.gameForm)
         } else {
           this.$message.error('请按要求填写游戏信息！')
           return false
diff --git a/src/views/games/details/info.vue b/src/views/games/details/info.vue
index 17de04c..926c9fd 100644
--- a/src/views/games/details/info.vue
+++ b/src/views/games/details/info.vue
@@ -257,14 +257,11 @@ export default {
   mounted() {
     this.uid = this.$route.params.uid
     this.token = getToken()
-    if (this.uid && this.uid === 'new') {
-      this.permEdit =
-        this.userInfo.permissions.includes(`games-writeable`)
-    } else {
-      this.permEdit =
-        this.userInfo.permissions.includes(`${this.uid}-edit`) ||
-        this.userInfo.permissions.includes(`${this.uid}-publish`)
-    }
+
+    this.permEdit =
+      this.userInfo.permissions.includes(`${this.uid}-edit`) ||
+      this.userInfo.permissions.includes(`${this.uid}-publish`) ||
+      this.userInfo.permissions.includes(`games-writeable`)
 
     getPlatformList()
       .then(res => {
@@ -443,6 +440,7 @@ export default {
         })
     },
     createFtp(index) {
+      this.$message.success('请求已发送，请耐心等待！')
       createFtp({
         uid: this.uid,
         game_name_en: this.baseForm.game_name_en,
diff --git a/src/views/games/details/settings/SettingPanel.vue b/src/views/games/details/settings/SettingPanel.vue
index 4e4eddb..8826ce2 100644
--- a/src/views/games/details/settings/SettingPanel.vue
+++ b/src/views/games/details/settings/SettingPanel.vue
@@ -190,13 +190,13 @@ export default {
   },
   mounted() {
     this.uid = this.$route.params.uid
-    console.log(this.uid)
     this.permissionEdit =
       this.userInfo.permissions.includes(`${this.uid}-edit`) ||
-      this.userInfo.permissions.includes(`${this.uid}-publish`)
-    this.permissionPublish = this.userInfo.permissions.includes(
-      `${this.uid}-publish`
-    )
+      this.userInfo.permissions.includes(`${this.uid}-publish`) ||
+      this.userInfo.permissions.includes(`games-writeable`)
+    this.permissionPublish =
+      this.userInfo.permissions.includes(`${this.uid}-publish`) ||
+      this.userInfo.permissions.includes(`games-writeable`)
     this.getGameInfo(this.getGameSettings)
     this.getSettingsList()
   },
@@ -205,7 +205,6 @@ export default {
       this.$emit('change', changed)
     },
     // left
-
     getGameInfo(cb) {
       getGame({ uid: this.uid })
         .then(res => {
diff --git a/src/views/games/list.del.vue b/src/views/games/list.del.vue
index 9172cb0..718bd94 100644
--- a/src/views/games/list.del.vue
+++ b/src/views/games/list.del.vue
@@ -161,13 +161,11 @@ export default {
         })
       }
       if (this.filterForm.game_type) {
-        console.log(this.filterForm.game_type)
         result = result.filter(game => {
           return game.game_type + '' === this.filterForm.game_type
         })
       }
       this.dataCount = result.length
-      console.log(result)
       return result
     },
     search() {
diff --git a/src/views/games/settings.vue b/src/views/games/settings.vue
index 91ead8d..4aa95dc 100644
--- a/src/views/games/settings.vue
+++ b/src/views/games/settings.vue
@@ -126,7 +126,6 @@ export default {
     },
     editSetting(row) {
       this.openModal(false, row)
-      console.log('查看游戏')
     },
     // modal
     openModal(isNew, data) {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3ae2397..860095c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -104,7 +104,6 @@ export default {
             .dispatch('user/login', this.loginForm)
             .then(data => {
               if (data.errcode === 0) {
-                console.log('/登录成功')
                 this.$router.push({ path: this.redirect || '/' })
               } else {
                 this.$message.error(data.errmsg)
diff --git a/src/views/personal/index.vue b/src/views/personal/index.vue
index ccffac7..a067163 100644
--- a/src/views/personal/index.vue
+++ b/src/views/personal/index.vue
@@ -34,8 +34,8 @@
             <el-button @click="editPwd" v-if="!editPassword" size="mini">修改密码</el-button>
           </el-form-item>
           <el-form-item label="角色">
-            <div class="w100" style="overflow: hidden;" v-if="userForm.roles.length > 0">
-              <el-tag v-for="item in userForm.roles" :key="item" class="mgr-20">{{item}}</el-tag>
+            <div class="w100" style="overflow: hidden;" v-if="userInfo.roles.length > 0">
+              <el-tag v-for="item in userInfo.roles" :key="item" class="mgr-20">{{item}}</el-tag>
             </div>
             <div class="w100" style="overflow: hidden;" v-else>
               <el-tag class="mgr-20">普通用户</el-tag>
diff --git a/src/views/sys/permission.vue b/src/views/sys/permission.vue
index 449dad6..2b074e4 100644
--- a/src/views/sys/permission.vue
+++ b/src/views/sys/permission.vue
@@ -19,6 +19,7 @@
       class="table mgt-20 mgb-20"
       @selection-change="tableSelectionChange"
       v-loading="isLoaded"
+      @row-click="rowClick"
     >
       <el-table-column v-if="batch.show" type="selection" width="55"/>
       <el-table-column prop="name" label="角色" show-overflow-tooltip sortable/>
@@ -168,23 +169,23 @@ export default {
         permission: {
           name: 'permission',
           label: '权限管理',
-          permission: 'readable'
+          permission: 'hidden'
         },
         logs: {
           name: 'logs',
           label: '操作日志',
-          permission: 'readable'
-        },
-        dics: {
-          name: 'dics',
-          label: '字典',
-          permission: 'readable'
-        },
-        data: {
-          name: 'data',
-          label: '数据查询',
-          permission: 'readable'
+          permission: 'hidden'
         }
+        // dics: {
+        //   name: 'dics',
+        //   label: '字典',
+        //   permission: 'readable'
+        // },
+        // data: {
+        //   name: 'data',
+        //   label: '数据查询',
+        //   permission: 'readable'
+        // }
       },
       basePermissionArr: [],
       gamePermissionTable: {},
@@ -195,7 +196,9 @@ export default {
   mounted() {
     this.getData()
     this.getGameList()
-    this.permWriteable = this.userInfo.permissions.includes('permission-writeable')
+    this.permWriteable = this.userInfo.permissions.includes(
+      'permission-writeable'
+    )
   },
   computed: {
     ...mapGetters(['userInfo'])
@@ -253,6 +256,9 @@ export default {
       this.getData()
     },
     // table
+    rowClick(row, column, event) {
+      this.openModal(false, row)
+    },
     getData() {
       this.isLoaded = true
       request({
@@ -267,7 +273,6 @@ export default {
           })
           return
         }
-        console.log('refresh')
         this.tableData = data.roleList
         this.isLoaded = false
       })
@@ -343,7 +348,6 @@ export default {
         .then(res => {
           const { data } = res
           if (data.errcode === 0) {
-            console.log(data)
             const obj = {}
             data.gameList.map(game => {
               obj[game._id] = {
@@ -353,7 +357,6 @@ export default {
                 permission: 'hidden'
               }
             })
-            console.log(obj)
             this.gamePermissionTable = obj
           }
         })