fix(switch): resolve label and icon (#1809)

Tencent · Mar 18, 2023 · 7826aed · 7826aed
1 parent cba42b0
commit 7826aed
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/switch/__test__/__snapshots__/demo.test.js.snap b/src/switch/__test__/__snapshots__/demo.test.js.snap
@@ -40,8 +40,8 @@ exports[`Switch Switch label demo works fine 1`] = `
     <t-switch
       label="{{
         Array [
-          "关",
           "开",
+          "关",
         ]
       }}"
       slot="note"
@@ -57,8 +57,8 @@ exports[`Switch Switch label demo works fine 1`] = `
       defaultValue="{{true}}"
       icon="{{
         Array [
-          "close",
           "check",
+          "close",
         ]
       }}"
       slot="note"

diff --git a/src/switch/__test__/index.test.js b/src/switch/__test__/index.test.js
@@ -83,7 +83,7 @@ describe('switch', () => {
           't-switch': switchComp,
         },
         data: {
-          label: ['关', '开'],
+          label: ['开', '关'],
         },
       });
       const comp = simulate.render(id);

diff --git a/src/switch/_example/label/index.wxml b/src/switch/_example/label/index.wxml
@@ -1,7 +1,7 @@
 <t-cell title="带文字开关">
-  <t-switch bindchange="handleChange" value="{{defaultVal}}" label="{{['关', '开']}}" slot="note" />
+  <t-switch bindchange="handleChange" value="{{defaultVal}}" label="{{['开', '关']}}" slot="note" />
 </t-cell>
 
 <t-cell title="带图标开关" bordered="{{false}}">
-  <t-switch defaultValue="{{true}}" icon="{{['close', 'check']}}" slot="note" />
+  <t-switch defaultValue="{{true}}" icon="{{['check', 'close']}}" slot="note" />
 </t-cell>
diff --git a/src/switch/switch.wxml b/src/switch/switch.wxml
@@ -20,10 +20,10 @@
         class="{{_.cls(classPrefix + '__label', [['checked', checked], ['disabled', disabled], size])}} {{prefix}}-class-label"
       >
         <t-loading wx:if="{{loading}}" inherit-color size="32rpx" />
-        <text wx:elif="{{label.length == 2}}">{{checked ? label[1] : label[0]}}</text>
+        <text wx:elif="{{label.length == 2}}">{{checked ? label[0] : label[1]}}</text>
         <t-icon
           wx:elif="{{icon.length == 2}}"
-          name="{{checked ? icon[1] : icon[0]}}"
+          name="{{checked ? icon[0] : icon[1]}}"
           t-class="{{_.cls(classPrefix + '__icon', [['checked', checked], size])}}"
         />
       </view>