1.0 wyj

demo/pages/Switch/index.acss → demo/pages/Switch/index.less

@@ -1,8 +1,10 @@
+@import "../../../src/style/themes/color.less";
 .line {
   display: flex;
   align-items: center;
   padding: 12rpx 0;
 }
 .line > view:nth-of-type(1) {
   flex-basis: 80px;
+  color: @COLOR_TEXT_PRIMARY;
 }

demo/pages/Toast/index.axml

@@ -84,30 +84,28 @@
 </container>
 
 <toast 
-  content="{{content1}}" 
+  content="最少字符" 
   visible="{{toast1Show}}" 
   duration="{{0}}" 
   showMask="{{true}}" 
   maskCloseable="{{true}}" 
   onClose="handleCloseToast" 
-  data-index="1" 
-  class="toastWrapper" 
+  data-index="1"
 />
 
 <toast 
-  content="{{content4}}" 
+  content="最长文案不超过2行，最多可以显示24个字符" 
   visible="{{toast4Show}}" 
   data-index="4" 
   duration="{{0}}" 
   showMask="{{true}}" 
   maskCloseable="{{true}}" 
-  onClose="handleCloseToast" 
-  class="toastWrapper" 
+  onClose="handleCloseToast"
 />
 
 <toast 
-  content="{{content5}}" 
-  icon="{{icon2}}" 
+  content="欢迎使用新版本" 
+  icon="LikeOutline" 
   visible="{{toast2Show}}" 
   duration="{{0}}" 
   showMask="{{true}}" 
@@ -118,32 +116,29 @@
 />
 
 <toast 
-  content="{{content2}}" 
-  image="{{image1}}" 
+  content="自定义图片" 
+  image="https://gw.alipayobjects.com/mdn/rms_5118be/afts/img/A*4NPGQ66arP0AAAAAAAAAAAAAARQnAQ" 
   visible="{{toast5Show}}"
   duration="{{0}}" 
   showMask="{{true}}" 
   maskCloseable="{{true}}" 
   onClose="handleCloseToast" 
-  data-index="5" 
-  class="toastWrapper" 
+  data-index="5"
 />
 
 <toast 
-  content="{{content3}}"
+  content="这个提示持续时间3s"
   visible="{{toast3Show}}" 
-  duration="{{3000}}" 
-  class="toastWrapper" 
+  duration="{{3000}}"
   data-index="3" 
   onClose="handleCloseToast" 
   showMask="{{true}}" 
   maskCloseable="{{true}}"
 />
 
 <toast 
-  content="{{content2}}" 
-  visible="{{toast6Show}}" 
-  class="toastWrapper" 
+  content="加载状态" 
+  visible="{{toast6Show}}"
   data-index="6" 
   type="loading" 
   onClose="handleCloseToast" 
@@ -153,9 +148,8 @@
 />
 
 <toast 
-  content="{{content5}}" 
-  visible="{{toast7Show}}" 
-  class="toastWrapper" 
+  content="操作成功" 
+  visible="{{toast7Show}}"
   data-index="7" 
   type="success" 
   onClose="handleCloseToast" 
@@ -164,9 +158,8 @@
   maskCloseable="{{true}}" 
 />
 <toast 
-  content="{{content5}}" 
-  visible="{{toast8Show}}" 
-  class="toastWrapper" 
+  content="失败提示" 
+  visible="{{toast8Show}}"
   data-index="8" 
   type="error" 
   onClose="handleCloseToast" 
@@ -175,9 +168,8 @@
   maskCloseable="{{true}}" 
 />
 <toast 
-  content="{{content5}}" 
-  visible="{{toast9Show}}" 
-  class="toastWrapper" 
+  content="警示信息" 
+  visible="{{toast9Show}}"
   data-index="9" 
   type="warning" 
   onClose="handleCloseToast" 

demo/pages/Toast/index.js

@@ -1,11 +1,5 @@
 Page({
   data: {
-    toastShow: false,
-    content1: "最长文案超过2行，最多可以显示24个字符。",
-    content2: "加载中",
-    content3: "这个提示持续时间3s",
-    content4: "这是一个很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长很长的文案",
-    content5: "欢迎使用新版本",
     toast1Show: false,
     toast2Show: false,
     toast3Show: false,
@@ -15,8 +9,6 @@ Page({
     toast7Show: false,
     toast8Show: false,
     toast9Show: false,
-    icon2: "LikeOutline",
-    image1: 'https://gw.alipayobjects.com/mdn/rms_5118be/afts/img/A*4NPGQ66arP0AAAAAAAAAAAAAARQnAQ'
   },
 
   handleShowToast(e) {

src/Popover/index.less

@@ -15,7 +15,7 @@
     position: relative;
     border-radius: 16 * @rpx;
     overflow: hidden;
-    font-size: 26 * @rpx;
+    font-size: 30 * @rpx;
     background-color: @COLOR_BACKGROUND_POPOVER;
     color: @COLOR_WHITE_DEFAULT;
     padding: 16 * @rpx 24 * @rpx;

src/Slider/index.less

@@ -150,10 +150,4 @@
     }
 
   }
-
-  &-tooltip-content {
-    font-size: 30 * @rpx;
-    padding: 0 24 * @rpx;
-    text-align: center;
-  }
 }