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

src/App.vue

@@ -11,14 +11,17 @@ export default {
 </script>
 <style>
 .body_edit {
-  padding: 20px;
-  font-size: 14px
+  padding: 24px;
+  font-size: 14px;
+  background: white;
+  height: 100%;
 }
 .box-card {
-  margin-bottom: 20px;
+  margin-bottom: 16px;
+  box-shadow: none !important;
 }
 .body {
-  padding: 20px;
+  padding: 24px;
 }
 .el-form-item__content .el-input-group{
   vertical-align: middle;

src/components/GameCharacter/index.vue

@@ -1,42 +1,52 @@
 <template>
   <div class="body" style="font-size:14px">
-    <el-button type="primary" style="float: right; margin-bottom: 20px;" @click="handleAdd">添加特征</el-button>
-    <el-table stripe :data="tableData" border style="width: 100%">
-      <el-table-column prop="name" label="实例名称" />
-      <el-table-column prop="thumb" label="实例图片">
-        <template slot-scope="scope">
-          <el-image :src="scope.row.thumb" style="width: 100px; height: 100px" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="createDate" label="创建时间">
-        <template slot-scope="scope">{{
-          scope.row.createDate.substr(0, 10)
-        }}</template>
-      </el-table-column>
-      <el-table-column fixed="right" label="操作">
-        <template slot-scope="scope">
-          <el-button style="margin-right:1em" type="primary" @click="handleEdit(scope.row)">编辑</el-button>
-          <el-popconfirm
-            icon="el-icon-info"
-            icon-color="red"
-            title="确定删除这个特征吗？"
-            @onConfirm="handleDelete(scope.row)"
-          >
-            <el-button slot="reference" type="danger">删除</el-button>
-          </el-popconfirm>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      v-show="characterTotal!==0"
-      style="float:right; margin:20px 0"
-      :total="characterTotal"
-      :current-page="currentPage"
-      :page-size="pageSize"
-      layout="total, prev, pager, next, sizes"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <el-button
+          type="primary"
+          style="float: right"
+          icon="el-icon-plus"
+          @click="handleAdd"
+        >添加特征</el-button>
+      </div>
+      <!-- <el-button type="primary" style="float: right; margin-bottom: 20px;" icon="el-icon-plus" @click="handleAdd">添加特征</el-button> -->
+      <el-table stripe :data="tableData" border style="width: 100%">
+        <el-table-column prop="name" label="实例名称" />
+        <el-table-column prop="thumb" label="实例图片">
+          <template slot-scope="scope">
+            <el-image :src="scope.row.thumb" style="width: 100px; height: 100px" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="createDate" label="创建时间">
+          <template slot-scope="scope">{{
+            scope.row.createDate.substr(0, 10)
+          }}</template>
+        </el-table-column>
+        <el-table-column fixed="right" label="操作">
+          <template slot-scope="scope">
+            <el-button style="margin-right:1em" type="text" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-popconfirm
+              icon="el-icon-info"
+              icon-color="red"
+              title="确定删除这个特征吗？"
+              @onConfirm="handleDelete(scope.row)"
+            >
+              <el-button slot="reference" type="text" style="color:red">删除</el-button>
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        v-show="characterTotal!==0"
+        style="float:right; margin:20px 0"
+        :total="characterTotal"
+        :current-page="currentPage"
+        :page-size="pageSize"
+        layout="total, prev, pager, next, sizes"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </el-card>
   </div>
 </template>
 <script>

src/components/Question/edit.vue

@@ -14,7 +14,6 @@
         </el-input>
       </el-form-item>
       <el-form-item v-if="questionId!==undefined && resultMode === 'examination'" label="正确选项：">
-        <!-- <el-input v-model="form.option"></el-input> -->
         <!-- filterable可搜索 multiple可多选 default-first-option回车可选-->
         <el-select
           v-model="form.rightAnswer"
@@ -32,38 +31,45 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item style="text-align:center">
+      <el-form-item>
         <el-button type="primary" @click="onSubmit('form')">确定</el-button>
         <el-button @click="$router.go(-1)">返回</el-button>
       </el-form-item>
-      <el-form-item v-if="questionId!==undefined" label="答案：">
-        <el-button type="primary" @click="onAddAnswer">添加答案</el-button>
-      </el-form-item>
     </el-form>
-
-    <ul style="list-style-type: none;margin:10px 0 10px -2px">
-      <li v-for="answer in answerList" :key="answer.answerId" class="answerli">
-        <div style="flex:1;width: 100%;overflow: hidden;display: flex;" @click="handleEdit(answer)">
-          <span style="width:45px">{{ answer.option }}</span>
-          <span style="flex:1">{{ answer.content }}</span>
-        </div>
-        <el-popconfirm
-          style="width:15px"
-          icon="el-icon-info"
-          icon-color="red"
-          title="确定删除这个答案吗？"
-          @onConfirm="handleDelete(answer)"
-        >
-          <el-button slot="reference" type="text" class="deleteQuestion" style="color:red">×</el-button>
-        </el-popconfirm>
-      </li>
-    </ul>
+    <el-card v-if="questionId!==undefined" class="box-card">
+      <div slot="header" class="clearfix">
+        <h3 style="float:left">答案列表</h3>
+        <el-button
+          type="primary"
+          style="float: right"
+          icon="el-icon-plus"
+          @click="onAddAnswer"
+        >添加特征</el-button>
+      </div>
+      <ul style="list-style-type: none;margin:10px 0 10px -40px">
+        <li v-for="answer in answerList" :key="answer.answerId" class="answerli">
+          <div style="flex:1;width: 100%;overflow: hidden;display: flex;" @click="handleEdit(answer)">
+            <span style="width:45px">{{ answer.option }}</span>
+            <span style="flex:1">{{ answer.content }}</span>
+          </div>
+          <el-popconfirm
+            style="width:30px"
+            icon="el-icon-info"
+            icon-color="red"
+            title="确定删除这个答案吗？"
+            @onConfirm="handleDelete(answer)"
+          >
+            <el-button slot="reference" type="text" class="deleteQuestion" style="color:red">删除</el-button>
+          </el-popconfirm>
+        </li>
+      </ul>
+    </el-card>
     <QuestionDrawer
       :dialog="dialog"
       :question-id="questionId"
       :answer-id="answerId"
       :game-id="gameId"
-      :resultMode="resultMode"
+      :result-mode="resultMode"
       @handleCloseDrawer="handleCloseDrawer"
       @handleEditDrawer="handleEditDrawer"
     />
@@ -216,14 +222,12 @@ export default {
   display: flex;
   line-height:40px;
   background-color: white;
-  .deleteQuestion{
-    display: none;
-  }
+  border: 1px solid #f0f2f5;
 }
 .answerli:hover {
   background-color: rgb(230, 247, 255);
 }
-.answerli:hover .deleteQuestion{
-    display: block
-  }
+.answerli:nth-of-type(even) {
+  background: #f0f2f5;
+}
 </style>

src/components/Question/index.vue

@@ -1,35 +1,42 @@
 <template>
   <div class="body">
-    <div style="line-height:30px; height:30px">
-      题库列表
-      <el-button type="primary" style="float: right; margin-bottom: 20px;" @click="handleAdd">添加问题</el-button>
-    </div>
-    <ul style="list-style-type: none;margin:10px 0 10px -40px">
-      <li v-for="item,index in tableData" :key="index" class="questionli" @click="handleEdit(item)">
-        <span style="width:45px">第{{ index+1 }}题</span>
-        <span style="width:45px">{{ item.optType === '1'?'单选题':item.optType==='2'?'多选题':'判断题' }}</span>
-        <span style="flex:1">{{ item.title }}</span>
-        <el-popconfirm
-          style="width:15px"
-          icon="el-icon-info"
-          icon-color="red"
-          title="确定删除这个问题吗？"
-          @onConfirm="handleDelete(item)"
-        >
-          <el-button slot="reference" type="text" class="deleteQuestion" style="color:red">×</el-button>
-        </el-popconfirm>
-      </li>
-    </ul>
-    <el-pagination
-      v-show="questionTotal!==0"
-      style="float:right; margin:20px 0"
-      :total="questionTotal"
-      :current-page="currentPage"
-      :page-size="pageSize"
-      layout="total, prev, pager, next, sizes"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <h3 style="float:left">题库列表</h3>
+        <el-button
+          type="primary"
+          style="float: right"
+          icon="el-icon-plus"
+          @click="handleAdd"
+        >添加特征</el-button>
+      </div>
+      <ul style="list-style-type: none;margin:10px 0 10px -40px">
+        <li v-for="item,index in tableData" :key="index" class="questionli" @click="handleEdit(item)">
+          <span style="width:45px">第{{ index+1 }}题</span>
+          <span style="width:45px">{{ item.optType === '1'?'单选题':item.optType==='2'?'多选题':'判断题' }}</span>
+          <span style="flex:1">{{ item.title }}</span>
+          <el-popconfirm
+            style="width:30px"
+            icon="el-icon-info"
+            icon-color="red"
+            title="确定删除这个问题吗？"
+            @onConfirm="handleDelete(item)"
+          >
+            <el-button slot="reference" type="text" style="color:red">删除</el-button>
+          </el-popconfirm>
+        </li>
+      </ul>
+      <el-pagination
+        v-show="questionTotal!==0"
+        style="float:right; margin:20px 0"
+        :total="questionTotal"
+        :current-page="currentPage"
+        :page-size="pageSize"
+        layout="total, prev, pager, next, sizes"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </el-card>
   </div>
 </template>
 <script>
@@ -108,14 +115,12 @@ export default {
   display: flex;
   line-height:40px;
   background-color: white;
-  .deleteQuestion{
-    display: none;
-  }
+  border: 1px solid #f0f2f5;
+}
+.questionli:nth-of-type(even) {
+  background: #f0f2f5;
 }
 .questionli:hover {
   background-color: rgb(230, 247, 255);
 }
-.questionli:hover .deleteQuestion{
-    display: block
-  }
 </style>

src/views/AppController/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="body">
-    <el-card class="box-card" style="box-shadow: none;">
+    <el-card class="box-card">
       <div slot="header" class="clearfix">
         <el-button
           type="primary"

src/views/WeChatConfig/Edit.vue

@@ -189,7 +189,4 @@ export default {
 </style>
 
 <style lang="scss" scoped>
-.box-card {
-  box-shadow: none;
-}
 </style>

src/views/WeChatConfig/index.vue

@@ -142,7 +142,4 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.box-card {
-  box-shadow: none;
-}
 </style>

src/views/gameManage/edit.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="body_edit">
+    <!-- <h3 style="width:100%; margin:auto">游戏{{ gameId ? "编辑" : "新增" }}</h3> -->
     <el-tabs v-model="activeName">
       <el-tab-pane label="游戏详情" name="game">
-        <h2 style="text-align: center">游戏{{ gameId ? "编辑" : "新增" }}</h2>
-        <el-form ref="form" :rules="rules" class="gameForm" :model="gameForm" label-width="150px">
+        <el-form ref="form" :rules="rules" class="gameForm" :model="gameForm" label-width="100px">
           <el-form-item label="游戏名称：" prop="title">
             <el-input v-model="gameForm.title" />
           </el-form-item>
@@ -18,6 +18,7 @@
             <el-select
               v-model="gameForm.resultMode"
               filterable
+              style="width:100%"
               default-first-option
               placeholder="请选择"
               :disabled="gameId ? true : false"
@@ -198,7 +199,6 @@ export default {
 <style scoped>
 .gameForm {
   width: 700px;
-  margin: auto;
 }
 .editBottomItem > div {
   margin: 0 !important;

src/views/gameManage/index.vue

@@ -16,7 +16,7 @@
       <div style="float:right">
         <el-button type="primary" @click="onSearch">查询</el-button>
         <el-button @click="onReset">重置</el-button>
-        <el-button type="primary" @click="handleAdd">添加游戏</el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添加游戏</el-button>
       </div>
     </el-card>
     <el-table stripe :data="tableData" border style="width: 100%">
@@ -35,14 +35,18 @@
       </el-table-column>
       <el-table-column fixed="right" label="操作">
         <template slot-scope="scope">
-          <el-button type="primary" style="margin-right:1em" @click="handleEdit(scope.row)">编辑</el-button>
+          <el-link :underline="false" style="margin-right:1em" type="primary">
+            <router-link
+              :to="{name: 'gameEdit', query: { id: scope.row.gameId }}"
+            >编辑</router-link>
+          </el-link>
           <el-popconfirm
             icon="el-icon-info"
             icon-color="red"
             title="确定删除这个游戏吗？"
             @onConfirm="handleDelete(scope.row)"
           >
-            <el-button slot="reference" type="danger">删除</el-button>
+            <el-button slot="reference" type="text" style="color:red">删除</el-button>
           </el-popconfirm>
         </template>
       </el-table-column>
@@ -107,12 +111,6 @@ export default {
     handleAdd() {
       this.$router.push({ name: 'gameEdit' })
     },
-    handleEdit(row) {
-      this.$router.push({
-        name: 'gameEdit',
-        query: { id: row.gameId }
-      })
-    },
     handleDelete(row) {
       deleteGame(row.gameId).then(() => {
         this.onSearch()