Merge branch 'master' of gitee.com:elunez/eladmin-qt

src/layout/feedback.vue

 <template>
   <div>
-    <el-dialog data-html2canvas-ignore="true" title="意见反馈" :visible.sync="show" class="" @open="init" width="60%" @close="close" center>
+    <el-dialog
+      data-html2canvas-ignore="true"
+      title="意见反馈"
+      :visible.sync="show"
+      class
+      @open="init"
+      width="60%"
+      @close="close"
+      center
+    >
       <el-form :model="feedback" ref="form" label-width="0px" class="feedback-add-form">
-        <el-form-item label="" prop="info">
+        <el-form-item label prop="info">
           <el-input v-model="feedback.info" :rows="2" type="textarea" placeholder="告诉我们你的建议或遇到的问题。"></el-input>
         </el-form-item>
-        <el-form-item label="">
+        <el-form-item label>
           <span>屏幕截图 (可选)：</span>
         </el-form-item>
-        <el-form-item label="" v-show="submitScreenshot" v-loading="dataLoading">
-          <div id="screenshot">
-          </div>
+        <el-form-item label v-show="submitScreenshot" v-loading="dataLoading">
+          <div id="screenshot"></div>
         </el-form-item>
-        <el-form-item label="">
+        <el-form-item label>
           <el-checkbox v-model="submitScreenshot">提交屏幕截图</el-checkbox>
         </el-form-item>
       </el-form>
-      <el-button slot="footer" class="confirm-btn" type="primary" @click="submit" :loading="confirmLoading">提交</el-button>
+      <el-button
+        slot="footer"
+        class="confirm-btn"
+        type="primary"
+        @click="submit"
+        :loading="confirmLoading"
+      >提交</el-button>
     </el-dialog>
   </div>
 </template>
@@ -25,8 +39,12 @@
 import SimpleDrawingBoard from 'simple-drawing-board'
 import html2canvas from 'html2canvas'
 export default {
-  props: ['showDialog'],
-
+  props: {
+    showDialog: {
+      type: Boolean,
+      required: true
+    }
+  },
   data() {
     return {
       feedback: {
@@ -50,10 +68,10 @@ export default {
   },
 
   methods: {
-    async loadLibrary () {
+    async loadLibrary() {
       if (typeof html2canvas === 'undefined') {
         try {
-          console.error('html2canvas not import', e.toString())
+          console.error('html2canvas not import')
         } catch (e) {
           console.error('html2canvas.min.js is missing', e.toString())
           return null
@@ -71,20 +89,23 @@ export default {
           modals[i].setAttribute('data-html2canvas-ignore', 'true')
         }
 
-      html2canvas(document.body, { logging: false })
+        html2canvas(document.body, { logging: false })
           .then(canvas => {
             let screenshot = document.getElementById('screenshot')
             canvas.setAttribute('style', 'width:100%')
             screenshot.appendChild(canvas)
             this.dataLoading = false
-            window.sdb = new SimpleDrawingBoard(screenshot.getElementsByTagName('canvas')[0], {
-              lineColor: '#ff0000',
-              lineSize: 4
-            })
+            window.sdb = new SimpleDrawingBoard(
+              screenshot.getElementsByTagName('canvas')[0],
+              {
+                lineColor: '#ff0000',
+                lineSize: 4
+              }
+            )
           })
           .catch(e => {
             this.dataLoading = false
-            util.showErrorMessageBox(e)
+            console.log(e.toString())
           })
       })
     },
@@ -106,21 +127,27 @@ export default {
           }
           formData.append('feedback', this.feedback.info)
         }
-        let res = await axios.post('http://', formData, {
-          headers: {
-            'Origin': window.location.origin,
-            'Content-Type': 'multipart/form-data'
-          },
-          changeOrigin: true
-        })
+        // let res = await axios.post('http://', formData, {
+        //   headers: {
+        //     'Origin': window.location.origin,
+        //     'Content-Type': 'multipart/form-data'
+        //   },
+        //   changeOrigin: true
+        // })
         this.confirmLoading = false
 
-        util.showResponseMessage(res.data.data)
-        if (res.data.data.status === 1) {
-          this.show = false
-        }
+        this.$notify({
+          title: '反馈成功',
+          type: 'success',
+          duration: 2500
+        })
+        this.show = false
       } catch (e) {
-        util.showErrorMessageBox(e)
+        this.$notify({
+          title: '提交失败',
+          type: 'error',
+          duration: 2500
+        })
         this.confirmLoading = false
       }
     }
@@ -130,7 +157,8 @@ export default {
 
 <style scoped>
 #screenshot {
-  cursor: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABGdBTUEAALGPC/xhBQAAARpJREFUOBGdkr1KA0EUhTcxEkSQQIpAihQWPoedD2BnIVsZQiBVEkiR7SwtBDsJqXwBLQwEgoWNjY2FjYUQ38Ei5Oc7sBeGLTKze+Djzsyecxh2N4ryq0zkHpYQQ2H1SW5TNsxukaZzQsewACvTvIBg3eFUaABHMEv3OruBIN3icm8wZl+FZ3iBQ/AqweGW2FrlKlChV0McFsxOvaegm/T2lLzzTC/dqzaO7A1s/8GzE28Dhhj0f1jQnZ+c18CrKxxrcMO2/uK87m3AcAkrsKA7vzlvQJAmuNywrX84bwY1YBrBATyCFWj+QguCJKNCU1DZQ7r/Y55CsK5x2i2eWFcggTPIJd3Eiv5Zd3KlU3OJOQd9lVd4A5Xl1g4YG2GGhwRfegAAAABJRU5ErkJggg==) 0 17,
+  cursor: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABIAAAASCAYAAABWzo5XAAAABGdBTUEAALGPC/xhBQAAARpJREFUOBGdkr1KA0EUhTcxEkSQQIpAihQWPoedD2BnIVsZQiBVEkiR7SwtBDsJqXwBLQwEgoWNjY2FjYUQ38Ei5Oc7sBeGLTKze+Djzsyecxh2N4ryq0zkHpYQQ2H1SW5TNsxukaZzQsewACvTvIBg3eFUaABHMEv3OruBIN3icm8wZl+FZ3iBQ/AqweGW2FrlKlChV0McFsxOvaegm/T2lLzzTC/dqzaO7A1s/8GzE28Dhhj0f1jQnZ+c18CrKxxrcMO2/uK87m3AcAkrsKA7vzlvQJAmuNywrX84bwY1YBrBATyCFWj+QguCJKNCU1DZQ7r/Y55CsK5x2i2eWFcggTPIJd3Eiv5Zd3KlU3OJOQd9lVd4A5Xl1g4YG2GGhwRfegAAAABJRU5ErkJggg==)
+      0 17,
     default;
 }
 .confirm-btn {