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

src/components/Question/drawer.vue

         <el-form ref="form" :model="form" :rules="rules" style="margin:20px">
           <el-form-item label="答案：" prop="content" :label-width="formLabelWidth">
             <el-input v-model="form.content" placeholder="请输入答案（必填）">
-              <el-select slot="prepend" v-model="form.option" filterable allow-create default-first-option style="width:100px" placeholder="请选择">
+              <el-select
+                slot="prepend"
+                v-model="form.option"
+                filterable
+                allow-create
+                default-first-option
+                style="width:100px"
+                placeholder="请选择"
+              >
                 <el-option
                   v-for="item in options"
                   :key="item.value"
   data() {
     return {
       rules: {
-        content: [{ required: true, message: '请输入答案内容', trigger: 'blur' }]
+        content: [
+          { required: true, message: '请输入答案内容', trigger: 'blur' }
+        ]
       },
       form: {
         option: undefined,
           this.form = res.data
           if (res.data.characterList) {
             const list = []
-            res.data.characterList.map(item => {
+            res.data.characterList.map((item) => {
               list.push(item.characterId)
             })
             this.form.characterList = list
       this.$refs[form].validate((valid) => {
         if (valid) {
           if (this.form.option) {
-            const list = this.wordList.filter(item => this.form.characterList.includes(item.characterId))
+            const list = this.wordList.filter((item) =>
+              this.form.characterList.includes(item.characterId)
+            )
             const data = { ...this.form }
             if (list) {
-              list.map(item => {
+              list.map((item) => {
                 item.gameId = this.gameId
               })
               data.characterList = list
             }
             switch (data.option) {
-              case 'A':data.sortNo = 1; break
-              case 'B':data.sortNo = 2; break
-              case 'C':data.sortNo = 3; break
-              case 'D':data.sortNo = 4; break
-              case 'E':data.sortNo = 5; break
-              case 'F':data.sortNo = 6; break
-              case 'G':data.sortNo = 7; break
-              case 'H':data.sortNo = 8; break
-              case 'I':data.sortNo = 9; break
-              case 'J':data.sortNo = 10; break
-              case 'true':data.sortNo = 1; break
-              case 'false':data.sortNo = 2; break
-              default:break
+              case 'A':
+                data.sortNo = 1
+                break
+              case 'B':
+                data.sortNo = 2
+                break
+              case 'C':
+                data.sortNo = 3
+                break
+              case 'D':
+                data.sortNo = 4
+                break
+              case 'E':
+                data.sortNo = 5
+                break
+              case 'F':
+                data.sortNo = 6
+                break
+              case 'G':
+                data.sortNo = 7
+                break
+              case 'H':
+                data.sortNo = 8
+                break
+              case 'I':
+                data.sortNo = 9
+                break
+              case 'J':
+                data.sortNo = 10
+                break
+              case 'true':
+                data.sortNo = 1
+                break
+              case 'false':
+                data.sortNo = 2
+                break
+              default:
+                break
             }
             if (this.answerId) {
               UpdateAnswer(data, this.answerId).then((res) => {

src/layout/components/Navbar.vue

 <template>
   <div class="navbar">
-    <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+    <hamburger
+      :is-active="sidebar.opened"
+      class="hamburger-container"
+      @toggleClick="toggleSideBar"
+    />
 
     <breadcrumb class="breadcrumb-container" />
 
     <div class="right-menu">
       <el-dropdown class="avatar-container" trigger="click">
         <div class="avatar-wrapper">
+<<<<<<< HEAD
           <img src="../../icons/logo.jpg" class="user-avatar">
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item @click.native="logout">
             <span>安全退出</span>
+=======
+          <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar" />
+          <i class="el-icon-caret-bottom" />
+        </div>
+        <el-dropdown-menu slot="dropdown" class="user-dropdown">
+          <router-link to="/">
+            <el-dropdown-item>Home</el-dropdown-item>
+          </router-link>
+          <a target="_blank" href="https://github.com/PanJiaChen/vue-admin-template/">
+            <el-dropdown-item>Github</el-dropdown-item>
+          </a>
+          <a target="_blank" href="https://panjiachen.github.io/vue-element-admin-site/#/">
+            <el-dropdown-item>Docs</el-dropdown-item>
+          </a>
+          <el-dropdown-item divided @click.native="logout">
+            <span style="display:block;">Log Out</span>
+>>>>>>> 6631f595310cb3fe0ac452d947697c17413808d2
           </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
     Hamburger
   },
   computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar'
-    ])
+    ...mapGetters(['sidebar', 'avatar'])
   },
   methods: {
     toggleSideBar() {
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
   .hamburger-container {
     line-height: 46px;
     height: 100%;
     float: left;
     cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    transition: background 0.3s;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
-      background: rgba(0, 0, 0, .025)
+      background: rgba(0, 0, 0, 0.025);
     }
   }
 
 
       &.hover-effect {
         cursor: pointer;
-        transition: background .3s;
+        transition: background 0.3s;
 
         &:hover {
-          background: rgba(0, 0, 0, .025)
+          background: rgba(0, 0, 0, 0.025);
         }
       }
     }