Merge branch 'master' of http://121.4.85.2:3000/liujq/fpsys

dist/static/js/chunk-72792626.27f66adb.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-72792626"],{"26fc":function(t,s,a){t.exports=a.p+"static/img/404_cloud.0f4bc32b.png"},"6d07":function(t,s,a){"use strict";a("7aa6")},"7aa6":function(t,s,a){},"8cdb":function(t,s,a){"use strict";a.r(s);var i=function(){var t=this,s=t.$createElement,a=t._self._c||s;return a("div",{staticClass:"wscn-http404-container"},[a("div",{staticClass:"wscn-http404"},[t._m(0),a("div",{staticClass:"bullshit"},[a("div",{staticClass:"bullshit__oops"},[t._v("哎呀!")]),a("div",{staticClass:"bullshit__headline"},[t._v(t._s(t.message)+t._s(t.count)+"秒后自动跳回首页")]),a("div",{staticClass:"bullshit__info"},[t._v("请检查您输入的网址是否正确，或单击下面的按钮返回首页。")]),a("a",{staticClass:"bullshit__return-home",attrs:{href:"/"}},[t._v("返回首页")])])])])},c=[function(){var t=this,s=t.$createElement,i=t._self._c||s;return i("div",{staticClass:"pic-404"},[i("img",{staticClass:"pic-404__parent",attrs:{src:a("a36b"),alt:"404"}}),i("img",{staticClass:"pic-404__child left",attrs:{src:a("26fc"),alt:"404"}}),i("img",{staticClass:"pic-404__child mid",attrs:{src:a("26fc"),alt:"404"}}),i("img",{staticClass:"pic-404__child right",attrs:{src:a("26fc"),alt:"404"}})])}],n={name:"Page404",data:function(){return{count:5}},created:function(){var t=this,s=window.setInterval((function(){t.count--,t.count<1&&(window.clearInterval(s),t.$router.push("/"))}),1e3)},computed:{message:function(){return"老板说你不能进入这个页面。。。"}}},e=n,l=(a("6d07"),a("2877")),r=Object(l["a"])(e,i,c,!1,null,"e9e54ed8",null);s["default"]=r.exports},a36b:function(t,s,a){t.exports=a.p+"static/img/404.a57b6f31.png"}}]);

dist/static/js/chunk-77c90766.6c7d57b6.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-77c90766"],{"26fc":function(t,s,c){t.exports=c.p+"static/img/404_cloud.0f4bc32b.png"},"36f7":function(t,s,c){},7908:function(t,s,c){"use strict";c("36f7")},"8cdb":function(t,s,c){"use strict";c.r(s);var i=function(){var t=this,s=t.$createElement,c=t._self._c||s;return c("div",{staticClass:"wscn-http404-container"},[c("div",{staticClass:"wscn-http404"},[t._m(0),c("div",{staticClass:"bullshit"},[c("div",{staticClass:"bullshit__oops"},[t._v("哎呀!")]),c("div",{staticClass:"bullshit__headline"},[t._v(t._s(t.message)+t._s(t.count)+"秒后自动跳回首页")]),c("div",{staticClass:"bullshit__info"},[t._v("请检查您输入的网址是否正确，或单击下面的按钮返回首页。")]),c("a",{staticClass:"bullshit__return-home",attrs:{href:"/"}},[t._v("返回首页")])])])])},a=[function(){var t=this,s=t.$createElement,i=t._self._c||s;return i("div",{staticClass:"pic-404"},[i("img",{staticClass:"pic-404__parent",attrs:{src:c("a36b"),alt:"404"}}),i("img",{staticClass:"pic-404__child left",attrs:{src:c("26fc"),alt:"404"}}),i("img",{staticClass:"pic-404__child mid",attrs:{src:c("26fc"),alt:"404"}}),i("img",{staticClass:"pic-404__child right",attrs:{src:c("26fc"),alt:"404"}})])}],n={name:"Page404",data:function(){return{count:5}},created:function(){var t=this,s=window.setInterval((function(){t.count--,t.count<1&&(window.clearInterval(s),t.$router.push("/"))}),1e3)},computed:{message:function(){return"老板说你不能进入这个页面。。。"}}},e=n,l=(c("7908"),c("2877")),r=Object(l["a"])(e,i,a,!1,null,"e9e54ed8",null);s["default"]=r.exports},a36b:function(t,s,c){t.exports=c.p+"static/img/404.a57b6f31.png"}}]);

src/components/Common/BaseForm.vue

@@ -574,25 +574,25 @@ export default {
     },
     uploadGifBefore(file) {
       const isJPGPNG = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif'
-      const isLt2M = file.size / 1024 / 1024 < 30
+      const isLtM = file.size / 1024 / 1024 < 30
       if (!isJPGPNG) {
         this.$message.error('上传图片只能是 JPG PNG GIF 格式!')
       }
-      if (!isLt2M) {
+      if (!isLtM) {
         this.$message.error('上传图片大小不能超过 30M!')
       }
-      return isJPGPNG && isLt2M
+      return isJPGPNG && isLtM
     },
     uploadBefore(file) {
       const isJPGPNG = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif'
-      const isLt2M = file.size / 1024 / 1024 < 2
+      const isLtM = file.size / 1024 / 1024 < 10
       if (!isJPGPNG) {
         this.$message.error('上传图片只能是 JPG PNG GIF 格式!')
       }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 2M!')
+      if (!isLtM) {
+        this.$message.error('上传图片大小不能超过 10M!')
       }
-      return isJPGPNG && isLt2M
+      return isJPGPNG && isLtM
     },
     uploadBefore2(file) {
       // console.log(file.type)

src/views/facillity/components/popup/IndexEdit.vue

@@ -103,12 +103,12 @@ export default {
     },
     roomAreaUploadBefore(file) {
       const isJPGPNG = file.type === 'image/jpeg' || file.type === 'image/png'
-      const isLt2M = file.size / 1024 / 1024 < 2
+      const isLtM = file.size / 1024 / 1024 < 10
       if (!isJPGPNG) {
-        this.$message.error('上传图片只能是 JPG PNG 格式!')
+        this.$message.error('上传图片只能是 JPG PNG GIF 格式!')
       }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 2M!')
+      if (!isLtM) {
+        this.$message.error('上传图片大小不能超过 10M!')
       }
       return isJPGPNG && isLt2M
     },

src/views/house/components/popup/IndexEdit.vue

@@ -296,12 +296,12 @@ export default {
     },
     roomAreaUploadBefore(file) {
       const isJPGPNG = file.type === 'image/jpeg' || file.type === 'image/png'
-      const isLt2M = file.size / 1024 / 1024 < 2
+      const isLtM = file.size / 1024 / 1024 < 10
       if (!isJPGPNG) {
-        this.$message.error('上传图片只能是 JPG PNG 格式!')
+        this.$message.error('上传图片只能是 JPG PNG GIF 格式!')
       }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 2M!')
+      if (!isLtM) {
+        this.$message.error('上传图片大小不能超过 10M!')
       }
       return isJPGPNG && isLt2M
     },

src/views/house/components/popup/NewsEdit.vue

@@ -80,12 +80,12 @@ export default {
     },
     roomAreaUploadBefore(file) {
       const isJPGPNG = file.type === 'image/jpeg' || file.type === 'image/png'
-      const isLt2M = file.size / 1024 / 1024 < 2
+      const isLtM = file.size / 1024 / 1024 < 10
       if (!isJPGPNG) {
-        this.$message.error('上传图片只能是 JPG PNG 格式!')
+        this.$message.error('上传图片只能是 JPG PNG GIF 格式!')
       }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 2M!')
+      if (!isLtM) {
+        this.$message.error('上传图片大小不能超过 10M!')
       }
       return isJPGPNG && isLt2M
     },

src/views/house/components/popup/PhotoEdit.vue

@@ -104,12 +104,12 @@ export default {
     },
     roomAreaUploadBefore(file) {
       const isJPGPNG = file.type === 'image/jpeg' || file.type === 'image/png'
-      const isLt2M = file.size / 1024 / 1024 < 2
+      const isLtM = file.size / 1024 / 1024 < 10
       if (!isJPGPNG) {
-        this.$message.error('上传图片只能是 JPG PNG 格式!')
+        this.$message.error('上传图片只能是 JPG PNG GIF 格式!')
       }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 2M!')
+      if (!isLtM) {
+        this.$message.error('上传图片大小不能超过 10M!')
       }
       return isJPGPNG && isLt2M
     },

src/views/house/components/popup/PhotoEdit2.vue

@@ -104,12 +104,12 @@ export default {
     },
     roomAreaUploadBefore(file) {
       const isJPGPNG = file.type === 'image/jpeg' || file.type === 'image/png'
-      const isLt2M = file.size / 1024 / 1024 < 2
+      const isLtM = file.size / 1024 / 1024 < 10
       if (!isJPGPNG) {
-        this.$message.error('上传图片只能是 JPG PNG 格式!')
+        this.$message.error('上传图片只能是 JPG PNG GIF 格式!')
       }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 2M!')
+      if (!isLtM) {
+        this.$message.error('上传图片大小不能超过 10M!')
       }
       return isJPGPNG && isLt2M
     },

src/views/room/components/popup/IndexEdit.vue

@@ -155,12 +155,12 @@ export default {
     },
     roomAreaUploadBefore(file) {
       const isJPGPNG = file.type === 'image/jpeg' || file.type === 'image/png'
-      const isLt2M = file.size / 1024 / 1024 < 2
+      const isLtM = file.size / 1024 / 1024 < 10
       if (!isJPGPNG) {
-        this.$message.error('上传图片只能是 JPG PNG 格式!')
+        this.$message.error('上传图片只能是 JPG PNG GIF 格式!')
       }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 2M!')
+      if (!isLtM) {
+        this.$message.error('上传图片大小不能超过 10M!')
       }
       return isJPGPNG && isLt2M
     },

src/views/room/components/popup/RentEdit.vue

@@ -103,12 +103,12 @@ export default {
     },
     roomAreaUploadBefore(file) {
       const isJPGPNG = file.type === 'image/jpeg' || file.type === 'image/png'
-      const isLt2M = file.size / 1024 / 1024 < 2
+      const isLtM = file.size / 1024 / 1024 < 10
       if (!isJPGPNG) {
-        this.$message.error('上传图片只能是 JPG PNG 格式!')
+        this.$message.error('上传图片只能是 JPG PNG GIF 格式!')
       }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 2M!')
+      if (!isLtM) {
+        this.$message.error('上传图片大小不能超过 10M!')
       }
       return isJPGPNG && isLt2M
     },

src/views/school/components/popup/IndexEdit.vue

@@ -103,12 +103,12 @@ export default {
     },
     roomAreaUploadBefore(file) {
       const isJPGPNG = file.type === 'image/jpeg' || file.type === 'image/png'
-      const isLt2M = file.size / 1024 / 1024 < 2
+      const isLtM = file.size / 1024 / 1024 < 10
       if (!isJPGPNG) {
-        this.$message.error('上传图片只能是 JPG PNG 格式!')
+        this.$message.error('上传图片只能是 JPG PNG GIF 格式!')
       }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 2M!')
+      if (!isLtM) {
+        this.$message.error('上传图片大小不能超过 10M!')
       }
       return isJPGPNG && isLt2M
     },