Merge branch 'dev' into next

src/address-edit/index.js

@@ -4,13 +4,14 @@ import { isMobile } from '../utils/validate/mobile';
 
 // Components
 import Area from '../area';
+import Cell from '../cell';
 import Field from '../field';
 import Popup from '../popup';
 import Toast from '../toast';
 import Button from '../button';
 import Dialog from '../dialog';
 import Detail from './Detail';
-import SwitchCell from '../switch-cell';
+import Switch from '../switch';
 
 const [createComponent, bem, t] = createNamespace('address-edit');
 
@@ -258,6 +259,34 @@ export default createComponent({
         this.detailFocused = false;
       });
     },
+
+    genSetDefaultCell(h) {
+      if (this.showSetDefault) {
+        const slots = {
+          'right-icon': () => (
+            <Switch
+              vModel={this.data.isDefault}
+              size="24"
+              onChange={(event) => {
+                this.$emit('change-default', event);
+              }}
+            />
+          ),
+        };
+
+        return (
+          <Cell
+            vShow={!this.hideBottomFields}
+            center
+            title={t('defaultAddress')}
+            class={bem('default')}
+            scopedSlots={slots}
+          />
+        );
+      }
+
+      return h();
+    },
   },
 
   render(h) {
@@ -334,19 +363,7 @@ export default createComponent({
           )}
           {this.slots()}
         </div>
-        {this.showSetDefault ? (
+        {this.genSetDefaultCell(h)}
-          <SwitchCell
-            class={bem('default')}
-            vModel={data.isDefault}
-            vShow={!hideBottomFields}
-            title={t('defaultAddress')}
-            onChange={(event) => {
-              this.$emit('change-default', event);
-            }}
-          />
-        ) : (
-          h()
-        )}
         <div vShow={!hideBottomFields} class={bem('buttons')}>
           <Button
             block

src/address-edit/test/__snapshots__/demo.spec.js.snap

@@ -43,12 +43,10 @@ exports[`renders demo correctly 1`] = `
           </div>
         </div>
       </div>
-      <div class="van-cell van-cell--center van-switch-cell van-address-edit__default">
+      <div class="van-cell van-cell--center van-address-edit__default">
         <div class="van-cell__title"><span>设为默认收货地址</span></div>
-        <div class="van-cell__value">
+        <div role="switch" aria-checked="false" class="van-switch" style="font-size: 24px;">
-          <div role="switch" aria-checked="false" class="van-switch" style="font-size: 24px;">
+          <div class="van-switch__node"></div>
-            <div class="van-switch__node"></div>
-          </div>
         </div>
       </div>
       <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round">

src/address-edit/test/__snapshots__/index.spec.js.snap

@@ -83,12 +83,10 @@ exports[`create a AddressEdit with props 1`] = `
       </div>
     </div>
   </div>
-  <div class="van-cell van-cell--center van-switch-cell van-address-edit__default">
+  <div class="van-cell van-cell--center van-address-edit__default">
     <div class="van-cell__title"><span>设为默认收货地址</span></div>
-    <div class="van-cell__value">
+    <div role="switch" aria-checked="true" class="van-switch van-switch--on" style="font-size: 24px;">
-      <div role="switch" aria-checked="true" class="van-switch van-switch--on" style="font-size: 24px;">
+      <div class="van-switch__node"></div>
-        <div class="van-switch__node"></div>
-      </div>
     </div>
   </div>
   <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round">
@@ -138,12 +136,10 @@ exports[`set-default 1`] = `
       </div>
     </div>
   </div>
-  <div class="van-cell van-cell--center van-switch-cell van-address-edit__default">
+  <div class="van-cell van-cell--center van-address-edit__default">
     <div class="van-cell__title"><span>设为默认收货地址</span></div>
-    <div class="van-cell__value">
+    <div role="switch" aria-checked="false" class="van-switch" style="font-size: 24px;">
-      <div role="switch" aria-checked="false" class="van-switch" style="font-size: 24px;">
+      <div class="van-switch__node"></div>
-        <div class="van-switch__node"></div>
-      </div>
     </div>
   </div>
   <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round">
@@ -193,12 +189,10 @@ exports[`show area component 1`] = `
       </div>
     </div>
   </div>
-  <div class="van-cell van-cell--center van-switch-cell van-address-edit__default">
+  <div class="van-cell van-cell--center van-address-edit__default">
     <div class="van-cell__title"><span>设为默认收货地址</span></div>
-    <div class="van-cell__value">
+    <div role="switch" aria-checked="true" class="van-switch van-switch--on" style="font-size: 24px;">
-      <div role="switch" aria-checked="true" class="van-switch van-switch--on" style="font-size: 24px;">
+      <div class="van-switch__node"></div>
-        <div class="van-switch__node"></div>
-      </div>
     </div>
   </div>
   <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round">
@@ -248,12 +242,10 @@ exports[`show area component 2`] = `
       </div>
     </div>
   </div>
-  <div class="van-cell van-cell--center van-switch-cell van-address-edit__default">
+  <div class="van-cell van-cell--center van-address-edit__default">
     <div class="van-cell__title"><span>设为默认收货地址</span></div>
-    <div class="van-cell__value">
+    <div role="switch" aria-checked="true" class="van-switch van-switch--on" style="font-size: 24px;">
-      <div role="switch" aria-checked="true" class="van-switch van-switch--on" style="font-size: 24px;">
+      <div class="van-switch__node"></div>
-        <div class="van-switch__node"></div>
-      </div>
     </div>
   </div>
   <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round">