Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/wechat into dev

src/pages/user/calendar/making.vue

@@ -217,8 +217,8 @@ export default {
     onRead (file) {
       let that = this
       this.isLoading = true
-      let reg = /^[0-9a-zA-Z.]+$/
-      if (!reg.test(file.file.name)) {
+      let reg = new RegExp("[`/?%#&=:\s\+]")
+      if (reg.test(file.file.name)) {
         this.$toast('图片名称中包含非法字符')
         this.isLoading = false
         return
@@ -233,6 +233,11 @@ export default {
         image.onload = function () {
           let width = image.width;
           let height = image.height;
+          // if (!/.(jpg|jpeg)$/.test(image.src)) {
+          //   that.isLoading = false
+          //   that.$toast('只允许JPG/JPEG格式的图片')
+          //   return
+          // }
           if (width / height > 2.5) {
             that.isLoading = false
             that.$toast('该图片长度过长，请重新选择')