Merge remote-tracking branch 'origin/dev' into dev

src/utils/watermark.js

@@ -11,12 +11,12 @@ let setWatermark = (str) => {
     }
 
     let can = document.createElement('canvas')
-    can.width = 290
-    can.height = 310
+    can.width = 600
+    can.height = 600
 
     let cans = can.getContext('2d')
     cans.rotate(-15 * Math.PI / 150)
-    cans.font = '50px Vedana'
+    cans.font = '40px Vedana'
     cans.fillStyle = 'rgba(17, 17, 17, 0.10)'
     cans.textAlign = 'left'
     cans.textBaseline = 'Middle'

src/views/wel/index.vue

@@ -93,7 +93,7 @@
         <img class="rigth2" src="./static/rigth.png" />
         <img class="rigth3" src="./static/rigth.png" />
         <img class="rigth4" src="./static/rigth.png" />
-        <img class="rigthall" src="./static/rigthall.png" />
+        <img class="rigthall" src="./static/rigthall2.png" />
         <img class="leftall" src="./static/leftall.png" />
       </div>
     </div>
@@ -372,7 +372,7 @@
         z-index: 99;
       }
       .rigthall {
-        width: 40px;
+        width: 165px;
         height: 270px;
         position: absolute;
         left: 250px;
@@ -468,3 +468,23 @@
   user-select: none;
 }
 </style>
+<script>
+import { mapGetters } from 'vuex';
+export default {
+  name: 'wel',
+  data() {
+    return {
+      activeNames: ['1', '2', '3', '5'],
+      logActiveNames: ['29'],
+    };
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+  },
+  methods: {
+    handleChange(val) {
+      window.console.log(val);
+    },
+  },
+};
+</script>