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

src/packages/searchbar/demo.vue

@@ -12,11 +12,11 @@
 
     <h4>自定义右侧按钮</h4>
     <div class="demo1">
-      <nut-searchbar placeText="右侧默认图标" @submit="submitFun"></nut-searchbar>
+      <nut-searchbar placeText="右侧默认图标" @submit="searchIcon"></nut-searchbar>
     </div>
 
     <div class="demo1">
-      <nut-searchbar placeText="右侧图标自定义" @submit="submitFun" :searchBtnIcon="require('../../assets/svg/qr.svg')"></nut-searchbar>
+      <nut-searchbar placeText="右侧图标自定义" @submit="searchQR" :searchBtnIcon="require('../../assets/svg/qr.svg')"></nut-searchbar>
     </div>
 
     <div class="demo1">
@@ -24,7 +24,7 @@
     </div>
     
     <div class="demo1">
-      <nut-searchbar placeText="右侧文字自定义" :hasIcon="true" :hasTextButton="true" textInfo="取消" @submit="submitFun"></nut-searchbar>
+      <nut-searchbar placeText="右侧文字自定义" :hasIcon="true" :hasTextButton="true" textInfo="取消" @submit="cancel"></nut-searchbar>
     </div>
 
     <h4>自定义搜索框右侧按钮</h4>
@@ -71,16 +71,29 @@ export default {
       console.log('您已失去焦点！');
     },
     submitFun(value) {
+      this.$toast.text('您点击了搜索按钮');
       console.log('您输入的内容为：'+value);
       console.log('您触发了右侧按钮的事件，默认提交操作！');
     },
-
+    searchIcon(value){
+      this.$toast.text('您点击了搜索按钮');
+      console.log('您输入的内容为：'+value);
+    },
+    searchQR(value){
+      this.$toast.text('您点击了二维码按钮');
+      console.log('您输入的内容为：'+value);
+    },
+    cancel(value){
+      this.$toast.text('您点击了取消按钮');
+      console.log('您输入的内容为：'+value);
+    },
     search(value) {
       this.$refs.myInput.blur();
       console.log('搜索');
     },
 
     handleAction(value){
+      this.$toast.text('您点击了input搜索框右侧的图标');
       console.log('您输入的内容为：'+value);
       console.log('您点击了input搜索框右侧的图标')
     }
@@ -93,7 +106,7 @@ h4{
   color: #323232;
 }
 .demo1 {
-	padding: 10px;
+	padding: 10px 15px;
 	background: #fff;
 }
 </style>

src/packages/searchbar/doc.md

@@ -27,23 +27,36 @@
 ```html
 
 // 默认图标
-<nut-searchbar placeText="右侧默认图标" @submit="submitFun"></nut-searchbar>
+<nut-searchbar placeText="右侧默认图标" @submit="searchIcon"></nut-searchbar>
 
 // 自定义图标
-<nut-searchbar placeText="右侧图标自定义" @submit="submitFun" :searchButtonIcon="require('../../assets/svg/qr.svg')"></nut-searchbar>
+<nut-searchbar placeText="右侧图标自定义" @submit="searchQR" :searchButtonIcon="require('../../assets/svg/qr.svg')"></nut-searchbar>
 
 // 默认文案
 <nut-searchbar placeText="右侧默认文字" :hasTextButton="true" @submit="submitFun"></nut-searchbar>
 
 // 自定义文案
-<nut-searchbar placeText="右侧文字自定义" :hasIcon="true" :hasTextButton="true" textInfo="取消" @submit="submitFun"></nut-searchbar>
+<nut-searchbar placeText="右侧文字自定义" :hasIcon="true" :hasTextButton="true" textInfo="取消" @submit="cancel"></nut-searchbar>
 
 export default {
     methods:{
         submitFun(value) {
+            this.$toast.text('您点击了搜索按钮');
             console.log('您输入的内容为：'+value);
             console.log('您触发了右侧按钮的事件，默认提交操作！');
-        }
+        },
+        searchIcon(value){
+            this.$toast.text('您点击了搜索按钮');
+            console.log('您输入的内容为：'+value);
+        },
+        searchQR(value){
+            this.$toast.text('您点击了二维码按钮');
+            console.log('您输入的内容为：'+value);
+        },
+        cancel(value){
+            this.$toast.text('您点击了取消按钮');
+            console.log('您输入的内容为：'+value);
+        },
     }
 }
 ```
@@ -61,6 +74,7 @@ export default {
 export default {
     methods:{
         handleAction(value){
+            this.$toast.text('您点击了input搜索框右侧的图标');
             console.log('您输入的内容为：'+value);
             console.log('您点击了input搜索框右侧的图标')
         }