Merge branch 'dev' into alpha

pages/component/button/button.uvue

@@ -30,7 +30,12 @@
       change_default_style(checked : boolean) { this.default_style = checked },
       radio_change_size_enum(checked : number) { this.size_enum_current = checked },
       radio_change_type_enum(checked : number) { this.type_enum_current = checked },
-      confirm_text_input(value : string) { this.text = value }
+      confirm_text_input(value : string) { this.text = value },
+      navigateToChild() {
+        uni.navigateTo({
+          url: 'buttonstatus',
+        })
+      },
     }
   }
 </script>
@@ -52,7 +57,9 @@
       <boolean-data :defaultValue="false" title="修改默认样式和点击效果(高优先)" @change="change_default_style"></boolean-data>
       <enum-data :items="size_enum" title="按钮的大小" @change="radio_change_size_enum"></enum-data>
       <enum-data :items="type_enum" title="按钮的类型" @change="radio_change_type_enum"></enum-data>
-      <input-data :defaultValue="text" title="按钮的文案" type="text" @confirm="confirm_text_input"></input-data>
+      <input-data :defaultValue="text" title="按钮的文案" type="text" @confirm="confirm_text_input"></input-data>
+      <view style="height: 10px;"></view>
+      <button @click="navigateToChild">更多示例</button>
     </view>
   </scroll-view>
 </template>

pages/component/button/buttonstatus.uvue

@@ -44,7 +44,7 @@
         @touchmove="button_touchmove" @touchcancel="button_touchcancel" @touchend="button_touchend" @tap="button_tap"
         @longpress="button_longpress" class="btn" :class="default_style ? 'custom-btn' : ''"
         :hover-class="default_style ? 'is-hover' : 'button-hover'">
-        {{ text }}
+        type-default
       </button>
     </view>
     <view class="container">
@@ -53,7 +53,7 @@
         @touchmove="button_touchmove" @touchcancel="button_touchcancel" @touchend="button_touchend" @tap="button_tap"
         @longpress="button_longpress" class="btn" :class="default_style ? 'custom-btn' : ''"
         :hover-class="default_style ? 'is-hover' : 'button-hover'">
-        {{ text }}
+        type-primary
       </button>
     </view>
     <view class="container">
@@ -62,7 +62,7 @@
         @touchmove="button_touchmove" @touchcancel="button_touchcancel" @touchend="button_touchend" @tap="button_tap"
         @longpress="button_longpress" class="btn" :class="default_style ? 'custom-btn' : ''"
         :hover-class="default_style ? 'is-hover' : 'button-hover'">
-        {{ text }}
+         type-warn
       </button>
     </view>
     <!--size-->
@@ -72,7 +72,7 @@
         @touchstart="button_touchstart" @touchmove="button_touchmove" @touchcancel="button_touchcancel"
         @touchend="button_touchend" @tap="button_tap" @longpress="button_longpress" class="btn"
         :class="default_style ? 'custom-btn' : ''" :hover-class="default_style ? 'is-hover' : 'button-hover'">
-        {{ text }}
+        size-default
       </button>
     </view>
     <view class="container">
@@ -81,7 +81,7 @@
         @touchstart="button_touchstart" @touchmove="button_touchmove" @touchcancel="button_touchcancel"
         @touchend="button_touchend" @tap="button_tap" @longpress="button_longpress" class="btn"
         :class="default_style ? 'custom-btn' : ''" :hover-class="default_style ? 'is-hover' : 'button-hover'">
-        {{ text }}
+        size-mini
       </button>
     </view>
     <!--plain-->
@@ -91,7 +91,7 @@
         @touchmove="button_touchmove" @touchcancel="button_touchcancel" @touchend="button_touchend" @tap="button_tap"
         @longpress="button_longpress" class="btn" :class="default_style ? 'custom-btn' : ''"
         :hover-class="default_style ? 'is-hover' : 'button-hover'">
-        {{ text }}
+        plain-true
       </button>
     </view>
     <view class="container">
@@ -100,7 +100,7 @@
         @touchmove="button_touchmove" @touchcancel="button_touchcancel" @touchend="button_touchend" @tap="button_tap"
         @longpress="button_longpress" class="btn" :class="default_style ? 'custom-btn' : ''"
         :hover-class="default_style ? 'is-hover' : 'button-hover'">
-        {{ text }}
+        plain-false
       </button>
     </view>
     <!--disable-->
@@ -110,7 +110,7 @@
         @touchstart="button_touchstart" @touchmove="button_touchmove" @touchcancel="button_touchcancel"
         @touchend="button_touchend" @tap="button_tap" @longpress="button_longpress" class="btn"
         :class="default_style ? 'custom-btn' : ''" :hover-class="default_style ? 'is-hover' : 'button-hover'">
-        {{ text }}
+        disable-false
       </button>
     </view>
     <view class="container">
@@ -119,9 +119,21 @@
         @touchstart="button_touchstart" @touchmove="button_touchmove" @touchcancel="button_touchcancel"
         @touchend="button_touchend" @tap="button_tap" @longpress="button_longpress" class="btn"
         :class="default_style ? 'custom-btn' : ''" :hover-class="default_style ? 'is-hover' : 'button-hover'">
-        {{ text }}
+        disable-true
       </button>
     </view>
+    <view class="container">
+       <button style="margin: 10px;position: relative;text-align:left;padding:5px;color: #ffffff;background-color: #1AAD19;
+        font-size: 10px;line-height: 2;">
+         custom-btn
+       </button>
+     </view>
+      <view class="container">
+         <button style="margin: 10px;
+           font-size: 15px;color: red;" type="warn" plain="true">
+           custom-btn-plain-warn
+         </button>
+       </view>
   </view>
 </template>