소스 검색

Merge branch 'master' of http://git.ycjcjy.com/yz-question/pc-admin

李志伟 3 년 전
부모
커밋
5bdc8f0c03
3개의 변경된 파일23개의 추가작업 그리고 28개의 파일을 삭제
  1. 4
    4
      src/views/WeChatConfig/index.vue
  2. 1
    3
      src/views/dashboard/index.vue
  3. 18
    21
      src/views/gameManage/edit.vue

+ 4
- 4
src/views/WeChatConfig/index.vue 파일 보기

@@ -1,17 +1,17 @@
1 1
 <template>
2 2
   <div class="body">
3 3
     <el-card class="box-card" shadow="never">
4
+      <div slot="header" class="clearfix">
5
+        <el-button type="primary" style="float: right" icon="el-icon-plus" @click="handleAdd">新建配置</el-button>
6
+      </div>
4 7
       <div class="text item">
5
-        <div slot="header" class="clearfix">
6
-          <el-button type="primary" style="float: right" icon="el-icon-plus" @click="handleAdd">新建配置</el-button>
7
-        </div>
8 8
         <el-table stripe :data="tableData" border style="width: 100%">
9 9
           <el-table-column prop="appName" label="配置名称" />
10 10
 
11 11
           <el-table-column prop="picture" label="二维码" align="center">
12 12
             <template slot-scope="scope">
13 13
               <!-- :src="scope.row.qrCode" -->
14
-              <el-popover placement="right" title="二维码" trigger="hover">
14
+              <el-popover placement="right" trigger="hover" style="cursor: pointer;">
15 15
                 <el-image
16 16
                   slot="reference"
17 17
                   src="https://cdn4.buysellads.net/uu/1/41334/1550855401-cc_light.png"

+ 1
- 3
src/views/dashboard/index.vue 파일 보기

@@ -10,9 +10,7 @@ import { mapGetters } from 'vuex'
10 10
 export default {
11 11
   name: 'Dashboard',
12 12
   computed: {
13
-    ...mapGetters([
14
-      'name'
15
-    ])
13
+    ...mapGetters(['name'])
16 14
   }
17 15
 }
18 16
 </script>

+ 18
- 21
src/views/gameManage/edit.vue 파일 보기

@@ -8,7 +8,11 @@
8 8
             <el-input v-model="gameForm.title" />
9 9
           </el-form-item>
10 10
           <el-form-item label="游戏图标:">
11
-            <UploadImage :icon="gameForm.gameImage" @handleChange="handleChange" @handleDeleteIcon="handleDeleteIcon" />
11
+            <UploadImage
12
+              :icon="gameForm.gameImage"
13
+              @handleChange="handleChange"
14
+              @handleDeleteIcon="handleDeleteIcon"
15
+            />
12 16
           </el-form-item>
13 17
           <el-form-item label="游戏类型:" prop="resultMode">
14 18
             <el-select
@@ -33,16 +37,12 @@
33 37
           </el-form-item>
34 38
         </el-form>
35 39
       </el-tab-pane>
36
-      <el-tab-pane
37
-        label="关联特征"
38
-        name="game-character"
39
-        :disabled="gameId ? false : true"
40
-      >
40
+      <el-tab-pane label="关联特征" name="game-character" :disabled="gameId ? false : true">
41 41
         <el-row :gutter="20" style="padding-top: 20px">
42 42
           <el-col :span="12">
43 43
             <GameCharacter
44 44
               ref="GameCharacter"
45
-              :gameId='gameId'
45
+              :gameId="gameId"
46 46
               @handleAddGameCharacter="characterId = undefined"
47 47
               @handleCloseGameCharacter="characterId = undefined"
48 48
               @handleEditGameCharacter="handleEditGameCharacter"
@@ -50,24 +50,20 @@
50 50
           </el-col>
51 51
           <el-col :span="12">
52 52
             <GameCharacterEdit
53
-              :characterId='characterId'
54
-              :gameId='gameId'
53
+              :characterId="characterId"
54
+              :gameId="gameId"
55 55
               @handleRefreshGameCharacter="handleRefreshGameCharacter"
56 56
               @handleEditGameCharacter="handleEditGameCharacter"
57 57
             />
58 58
           </el-col>
59 59
         </el-row>
60 60
       </el-tab-pane>
61
-      <el-tab-pane
62
-        label="游戏题库"
63
-        name="question"
64
-        :disabled="gameId ? false : true"
65
-      >
61
+      <el-tab-pane label="游戏题库" name="question" :disabled="gameId ? false : true">
66 62
         <el-row :gutter="20" style="padding-top: 20px">
67 63
           <el-col :span="12">
68 64
             <Question
69 65
               ref="Question"
70
-              :gameId='gameId'
66
+              :gameId="gameId"
71 67
               @handleAddQuestion="questionId = undefined"
72 68
               @handleCloseQuestion="questionId = undefined"
73 69
               @handleEditQuestion="handleEditQuestion"
@@ -106,10 +102,10 @@ export default {
106 102
   data() {
107 103
     return {
108 104
       rules: {
109
-        title: [
110
-          { required: true, message: '请输入游戏名称', trigger: 'blur' }
111
-        ],
112
-        resultMode: [{ required: true, message: '请选择游戏类型', trigger: 'blur' }]
105
+        title: [{ required: true, message: '请输入游戏名称', trigger: 'blur' }],
106
+        resultMode: [
107
+          { required: true, message: '请选择游戏类型', trigger: 'blur' }
108
+        ]
113 109
       },
114 110
       gameForm: {
115 111
         title: undefined,
@@ -135,7 +131,8 @@ export default {
135 131
   watch: {
136 132
     '$route.query.id': {
137 133
       handler(val) {
138
-        if (val) { // 有值代表是编辑状态 查询详情  没有值就是新增
134
+        if (val) {
135
+          // 有值代表是编辑状态 查询详情  没有值就是新增
139 136
           this.gameId = val
140 137
           getGameDetail(val).then((res) => {
141 138
             this.gameForm = res.data
@@ -200,7 +197,7 @@ export default {
200 197
 }
201 198
 </script>
202 199
 <style scoped>
203
-.gameForm{
200
+.gameForm {
204 201
   width: 700px;
205 202
 }
206 203
 .editBottomItem > div {