Browse Source

Merge branch 'v3-dev' of https://github.com/jdf2e/nutui into v3-dev

suzigang 5 years ago
parent
commit
967ebfe9e3

File diff suppressed because it is too large
+ 26 - 15
src/assets/svg/qr.svg


+ 0 - 1
src/assets/svg/qrcode.svg

@@ -1 +0,0 @@
-<svg width="40" height="39" xmlns="http://www.w3.org/2000/svg"><g fill="#2E2D2D" fill-rule="evenodd"><path d="M34 39a6 6 0 0 0 6-6v-3.5a1.5 1.5 0 1 0-3 0V33a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3v-3.5a1.5 1.5 0 1 0-3 0V33a6 6 0 0 0 6 6h28M38.5 18a1.5 1.5 0 1 1 0 3h-5a1.5 1.5 0 1 1 0-3h5M26.5 18a1.5 1.5 0 1 1 0 3h-25a1.5 1.5 0 1 1 0-3h25M40 6a6 6 0 0 0-6-6H6a6 6 0 0 0-6 6v3.5a1.5 1.5 0 1 0 3 0V6a3 3 0 0 1 3-3h28a3 3 0 0 1 3 3v3.5a1.5 1.5 0 1 0 3 0V6"/></g></svg>

+ 3 - 0
src/packages/searchbar/demo.vue

@@ -102,6 +102,9 @@ export default {
 </script>
 </script>
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 h4{
 h4{
+  
+  padding: 11px 20px;
+  margin: 0;
   font-size: 15px;
   font-size: 15px;
   color: #323232;
   color: #323232;
 }
 }

+ 1 - 1
src/packages/uploader/uploader.vue

@@ -88,7 +88,7 @@ export default {
         },
         },
         limitError: {
         limitError: {
             type: String,
             type: String,
-            default: "对不起,您的浏览器不支持本组件"
+            default: "对不起,文件大小超出了限制"
         },
         },
         withCredentials: {
         withCredentials: {
             type: Boolean,
             type: Boolean,