[Improvement] AddressEdit: optimize style (#1676)

packages/address-edit/index.vue

@@ -4,8 +4,8 @@
       <field
         v-model="data.name"
         maxlength="15"
-        :placeholder="$t('name')"
-        :label="$t('receiver')"
+        :label="$t('name')"
+        :placeholder="$t('namePlaceholder')"
         :error="errorInfo.name"
         @focus="onFocus('name')"
       />
@@ -20,7 +20,7 @@
       <field
         readonly
         :label="$t('area')"
-        :placeholder="$t('area')"
+        :placeholder="$t('areaPlaceholder')"
         :value="areaText"
         @click="showArea = true"
       />
@@ -57,7 +57,7 @@
     </cell-group>
 
     <div v-show="!hideBottomFields" :class="b('buttons')">
-      <van-button block :loading="isSaving" @click="onSave" type="primary">
+      <van-button block :loading="isSaving" @click="onSave" type="danger">
         {{ saveButtonText || $t('save') }}
       </van-button>
       <van-button block :loading="isDeleting" @click="onDelete" v-if="showDelete">

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

@@ -5,14 +5,14 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-address-edit">
       <div class="van-cell-group van-hairline--top-bottom">
-        <div maxlength="15" placeholder="名字" class="van-cell van-hairline van-field">
+        <div maxlength="15" placeholder="收货人姓名" class="van-cell van-hairline van-field">
           <!---->
-          <div class="van-cell__title"><span>收货人</span>
+          <div class="van-cell__title"><span>姓名</span>
             <!---->
           </div>
           <div class="van-cell__value">
             <div class="van-field__body">
-              <input type="text" maxlength="15" placeholder="名字" value="" class="van-field__control">
+              <input type="text" maxlength="15" placeholder="收货人姓名" value="" class="van-field__control">
               <!---->
               <!---->
               <!---->
@@ -21,14 +21,14 @@ exports[`renders demo correctly 1`] = `
           </div>
           <!---->
         </div>
-        <div placeholder="手机或固定电话" class="van-cell van-hairline van-field">
+        <div placeholder="收货人手机号" class="van-cell van-hairline van-field">
           <!---->
-          <div class="van-cell__title"><span>联系电话</span>
+          <div class="van-cell__title"><span>电话</span>
             <!---->
           </div>
           <div class="van-cell__value">
             <div class="van-field__body">
-              <input type="tel" placeholder="手机或固定电话" value="" class="van-field__control">
+              <input type="tel" placeholder="收货人手机号" value="" class="van-field__control">
               <!---->
               <!---->
               <!---->
@@ -37,14 +37,14 @@ exports[`renders demo correctly 1`] = `
           </div>
           <!---->
         </div>
-        <div placeholder="收件地区" class="van-cell van-hairline van-field">
+        <div placeholder="选择省 / 市 / 区" class="van-cell van-hairline van-field">
           <!---->
-          <div class="van-cell__title"><span>收件地区</span>
+          <div class="van-cell__title"><span>地区</span>
             <!---->
           </div>
           <div class="van-cell__value">
             <div class="van-field__body">
-              <input type="text" readonly="readonly" placeholder="收件地区" value="" class="van-field__control">
+              <input type="text" readonly="readonly" placeholder="选择省 / 市 / 区" value="" class="van-field__control">
               <!---->
               <!---->
               <!---->
@@ -54,14 +54,14 @@ exports[`renders demo correctly 1`] = `
           <!---->
         </div>
         <div>
-          <div rows="1" maxlength="200" placeholder="如街道、楼层、门牌号等" class="van-cell van-hairline van-field">
+          <div rows="1" maxlength="200" placeholder="街道门牌、楼层房间号等信息" class="van-cell van-hairline van-field">
             <!---->
             <div class="van-cell__title"><span>详细地址</span>
               <!---->
             </div>
             <div class="van-cell__value">
               <div class="van-field__body">
-                <textarea rows="1" maxlength="200" placeholder="如街道、楼层、门牌号等" class="van-field__control"></textarea>
+                <textarea rows="1" maxlength="200" placeholder="街道门牌、楼层房间号等信息" class="van-field__control"></textarea>
                 <!---->
                 <!---->
                 <!---->
@@ -103,7 +103,7 @@ exports[`renders demo correctly 1`] = `
         </div>
       </div>
       <div class="van-address-edit__buttons">
-        <button class="van-button van-button--primary van-button--normal van-button--block">
+        <button class="van-button van-button--danger van-button--normal van-button--block">
           <!----><span class="van-button__text">
       保存
     </span></button>

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

@@ -3,14 +3,14 @@
 exports[`create a AddressEdit 1`] = `
 <div class="van-address-edit">
   <div class="van-cell-group van-hairline--top-bottom">
-    <div maxlength="15" placeholder="名字" class="van-cell van-hairline van-field">
+    <div maxlength="15" placeholder="收货人姓名" class="van-cell van-hairline van-field">
       <!---->
-      <div class="van-cell__title"><span>收货人</span>
+      <div class="van-cell__title"><span>姓名</span>
         <!---->
       </div>
       <div class="van-cell__value">
         <div class="van-field__body">
-          <input type="text" maxlength="15" placeholder="名字" value="" class="van-field__control">
+          <input type="text" maxlength="15" placeholder="收货人姓名" value="" class="van-field__control">
           <!---->
           <!---->
           <!---->
@@ -19,14 +19,14 @@ exports[`create a AddressEdit 1`] = `
       </div>
       <!---->
     </div>
-    <div placeholder="手机或固定电话" class="van-cell van-hairline van-field">
+    <div placeholder="收货人手机号" class="van-cell van-hairline van-field">
       <!---->
-      <div class="van-cell__title"><span>联系电话</span>
+      <div class="van-cell__title"><span>电话</span>
         <!---->
       </div>
       <div class="van-cell__value">
         <div class="van-field__body">
-          <input type="tel" placeholder="手机或固定电话" value="" class="van-field__control">
+          <input type="tel" placeholder="收货人手机号" value="" class="van-field__control">
           <!---->
           <!---->
           <!---->
@@ -35,14 +35,14 @@ exports[`create a AddressEdit 1`] = `
       </div>
       <!---->
     </div>
-    <div placeholder="收件地区" class="van-cell van-hairline van-field">
+    <div placeholder="选择省 / 市 / 区" class="van-cell van-hairline van-field">
       <!---->
-      <div class="van-cell__title"><span>收件地区</span>
+      <div class="van-cell__title"><span>地区</span>
         <!---->
       </div>
       <div class="van-cell__value">
         <div class="van-field__body">
-          <input type="text" readonly="readonly" placeholder="收件地区" value="" class="van-field__control">
+          <input type="text" readonly="readonly" placeholder="选择省 / 市 / 区" value="" class="van-field__control">
           <!---->
           <!---->
           <!---->
@@ -52,14 +52,14 @@ exports[`create a AddressEdit 1`] = `
       <!---->
     </div>
     <div>
-      <div rows="1" maxlength="200" placeholder="如街道、楼层、门牌号等" class="van-cell van-hairline van-field">
+      <div rows="1" maxlength="200" placeholder="街道门牌、楼层房间号等信息" class="van-cell van-hairline van-field">
         <!---->
         <div class="van-cell__title"><span>详细地址</span>
           <!---->
         </div>
         <div class="van-cell__value">
           <div class="van-field__body">
-            <textarea rows="1" maxlength="200" placeholder="如街道、楼层、门牌号等" class="van-field__control"></textarea>
+            <textarea rows="1" maxlength="200" placeholder="街道门牌、楼层房间号等信息" class="van-field__control"></textarea>
             <!---->
             <!---->
             <!---->
@@ -73,7 +73,7 @@ exports[`create a AddressEdit 1`] = `
     <!---->
   </div>
   <div class="van-address-edit__buttons">
-    <button class="van-button van-button--primary van-button--normal van-button--block">
+    <button class="van-button van-button--danger van-button--normal van-button--block">
       <!----><span class="van-button__text">
       保存
     </span></button>
@@ -109,14 +109,14 @@ exports[`create a AddressEdit 1`] = `
 exports[`create a AddressEdit with props 1`] = `
 <div class="van-address-edit">
   <div class="van-cell-group van-hairline--top-bottom">
-    <div maxlength="15" placeholder="名字" class="van-cell van-hairline van-field">
+    <div maxlength="15" placeholder="收货人姓名" class="van-cell van-hairline van-field">
       <!---->
-      <div class="van-cell__title"><span>收货人</span>
+      <div class="van-cell__title"><span>姓名</span>
         <!---->
       </div>
       <div class="van-cell__value">
         <div class="van-field__body">
-          <input type="text" maxlength="15" placeholder="名字" value="测试" class="van-field__control">
+          <input type="text" maxlength="15" placeholder="收货人姓名" value="测试" class="van-field__control">
           <!---->
           <!---->
           <!---->
@@ -125,14 +125,14 @@ exports[`create a AddressEdit with props 1`] = `
       </div>
       <!---->
     </div>
-    <div placeholder="手机或固定电话" class="van-cell van-hairline van-field">
+    <div placeholder="收货人手机号" class="van-cell van-hairline van-field">
       <!---->
-      <div class="van-cell__title"><span>联系电话</span>
+      <div class="van-cell__title"><span>电话</span>
         <!---->
       </div>
       <div class="van-cell__value">
         <div class="van-field__body">
-          <input type="tel" placeholder="手机或固定电话" value="13000000000" class="van-field__control">
+          <input type="tel" placeholder="收货人手机号" value="13000000000" class="van-field__control">
           <!---->
           <!---->
           <!---->
@@ -141,14 +141,14 @@ exports[`create a AddressEdit with props 1`] = `
       </div>
       <!---->
     </div>
-    <div placeholder="收件地区" class="van-cell van-hairline van-field">
+    <div placeholder="选择省 / 市 / 区" class="van-cell van-hairline van-field">
       <!---->
-      <div class="van-cell__title"><span>收件地区</span>
+      <div class="van-cell__title"><span>地区</span>
         <!---->
       </div>
       <div class="van-cell__value">
         <div class="van-field__body">
-          <input type="text" readonly="readonly" placeholder="收件地区" value="北京市 北京市 朝阳区" class="van-field__control">
+          <input type="text" readonly="readonly" placeholder="选择省 / 市 / 区" value="北京市 北京市 朝阳区" class="van-field__control">
           <!---->
           <!---->
           <!---->
@@ -158,14 +158,14 @@ exports[`create a AddressEdit with props 1`] = `
       <!---->
     </div>
     <div>
-      <div rows="1" maxlength="200" placeholder="如街道、楼层、门牌号等" class="van-cell van-hairline van-field">
+      <div rows="1" maxlength="200" placeholder="街道门牌、楼层房间号等信息" class="van-cell van-hairline van-field">
         <!---->
         <div class="van-cell__title"><span>详细地址</span>
           <!---->
         </div>
         <div class="van-cell__value">
           <div class="van-field__body">
-            <textarea rows="1" maxlength="200" placeholder="如街道、楼层、门牌号等" class="van-field__control">详细地址</textarea>
+            <textarea rows="1" maxlength="200" placeholder="街道门牌、楼层房间号等信息" class="van-field__control">详细地址</textarea>
             <!---->
             <!---->
             <!---->
@@ -207,7 +207,7 @@ exports[`create a AddressEdit with props 1`] = `
     </div>
   </div>
   <div class="van-address-edit__buttons">
-    <button class="van-button van-button--primary van-button--normal van-button--block">
+    <button class="van-button van-button--danger van-button--normal van-button--block">
       <!----><span class="van-button__text">
       保存
     </span></button>

packages/contact-card/test/__snapshots__/demo.spec.js.snap

@@ -22,7 +22,7 @@ exports[`renders demo correctly 1`] = `
               <!---->
               <!---->
               <div class="van-cell__value van-cell__value--alone">
-                <div class="van-radio"><span class="van-radio__input"><input type="radio" value="0" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label"><p class="van-contact-list__text">联系人：张三</p> <p class="van-contact-list__text">联系电话：13000000000</p></span></div>
+                <div class="van-radio"><span class="van-radio__input"><input type="radio" value="0" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label"><p class="van-contact-list__text">联系人：张三</p> <p class="van-contact-list__text">电话：13000000000</p></span></div>
               </div>
               <i class="van-icon van-icon-edit van-contact-list__edit" style="color:undefined;font-size:undefined;">
                 <!---->
@@ -65,7 +65,7 @@ exports[`renders demo correctly 1`] = `
           </div>
           <div placeholder="手机或固定电话" class="van-cell van-hairline van-field">
             <!---->
-            <div class="van-cell__title"><span>联系电话</span>
+            <div class="van-cell__title"><span>电话</span>
               <!---->
             </div>
             <div class="van-cell__value">
@@ -96,7 +96,7 @@ exports[`renders demo correctly 1`] = `
         </i>
         <div class="van-contact-card__text">
           <div>联系人：张三</div>
-          <div>联系电话：13000000000</div>
+          <div>电话：13000000000</div>
         </div>
       </div>
       <!---->

packages/coupon-list/index.vue

@@ -135,7 +135,7 @@ export default create({
     buttonDisabled() {
       return (
         !this.exchangeButtonLoading &&
-        (this.exchangeButtonDisabled ||
+        (this.exchangeButtonDisabled || !this.currentCode ||
           this.currentCode.length < this.exchangeMinLength)
       );
     },

packages/locale/lang/en-US.js

@@ -9,6 +9,7 @@ export default {
   contact: 'Name',
   loadingTip: 'Loading...',
   nameEmpty: 'Name can not be empty',
+  confirmDelete: 'Are you sure you want to delete?',
   telInvalid: 'Malformed phone number',
   telPlaceholder: 'Phone',
   vanContactCard: {
@@ -17,9 +18,6 @@ export default {
   vanContactList: {
     addText: 'Add new contact'
   },
-  vanContactEdit: {
-    confirmDelete: 'Are you sure you want to delete this contact?'
-  },
   vanPagination: {
     prev: 'Previous',
     next: 'Next'
@@ -52,13 +50,14 @@ export default {
   },
   vanAddressEdit: {
     area: 'Area',
-    receiver: 'Receiver',
     postal: 'Postal',
     areaEmpty: 'Please select a receiving area',
     addressEmpty: 'Address can not be empty',
     postalEmpty: 'Wrong postal code',
     defaultAddress: 'Set as the default address',
-    confirmDelete: 'Are you sure you want to delete this address?'
+    telPlaceholder: 'Phone',
+    namePlaceholder: 'Name',
+    areaPlaceholder: 'Area'
   },
   vanAddressEditDetail: {
     label: 'Address',

packages/locale/lang/zh-CN.js

@@ -1,6 +1,6 @@
 export default {
-  name: '名字',
-  tel: '联系电话',
+  name: '姓名',
+  tel: '电话',
   save: '保存',
   confirm: '确认',
   cancel: '取消',
@@ -8,9 +8,9 @@ export default {
   complete: '完成',
   contact: '联系人',
   loadingTip: '加载中...',
-  nameEmpty: '请填写名字',
+  nameEmpty: '请填写姓名',
   confirmDelete: '确定要删除么',
-  telInvalid: '请填写正确的联系电话',
+  telInvalid: '请填写正确的电话',
   telPlaceholder: '手机或固定电话',
   vanContactCard: {
     addText: '添加订单联系人信息'
@@ -49,17 +49,19 @@ export default {
     condition: (condition) => `满${condition}元可用`
   },
   vanAddressEdit: {
-    area: '收件地区',
-    receiver: '收货人',
+    area: '地区',
     postal: '邮政编码',
-    areaEmpty: '请选择收件地区',
+    areaEmpty: '请选择地区',
     addressEmpty: '请填写详细地址',
     postalEmpty: '邮政编码格式不正确',
-    defaultAddress: '设为默认收货地址'
+    defaultAddress: '设为默认收货地址',
+    telPlaceholder: '收货人手机号',
+    namePlaceholder: '收货人姓名',
+    areaPlaceholder: '选择省 / 市 / 区'
   },
   vanAddressEditDetail: {
     label: '详细地址',
-    placeholder: '如街道、楼层、门牌号等'
+    placeholder: '街道门牌、楼层房间号等信息'
   },
   vanAddressList: {
     address: '收货地址',

packages/locale/lang/zh-HK.js

@@ -1,24 +1,22 @@
 export default {
   name: '姓名',
-  tel: '聯絡電話',
-  save: '儲存',
+  tel: '電話',
+  save: '保存',
   confirm: '確認',
   cancel: '取消',
   delete: '刪除',
   complete: '完成',
-  contact: '聯絡人',
+  contact: '聯系人',
   loadingTip: '加載中...',
   nameEmpty: '請填寫姓名',
-  telInvalid: '請填寫正確的電話號碼',
-  telPlaceholder: '電話號碼',
+  confirmDelete: '確定要刪除麽',
+  telInvalid: '請填寫正確的電話',
+  telPlaceholder: '手機或固定電話',
   vanContactCard: {
-    addText: '添加訂單聯絡人信息'
+    addText: '添加訂單聯系人信息'
   },
   vanContactList: {
-    addText: '新增聯絡人'
-  },
-  vanContactEdit: {
-    confirmDelete: '確定要刪除這個聯絡人嗎'
+    addText: '新建聯系人'
   },
   vanPagination: {
     prev: '上一頁',
@@ -39,6 +37,7 @@ export default {
   vanCouponList: {
     empty: '暫無優惠券',
     exchange: '兌換',
+    close: '不使用優惠',
     enable: '可使用優惠券',
     disabled: '不可使用優惠券',
     placeholder: '請輸入優惠碼'
@@ -50,22 +49,23 @@ export default {
     condition: (condition) => `滿${condition}元可用`
   },
   vanAddressEdit: {
-    area: '收件地區',
-    receiver: '收貨人',
+    area: '地區',
     postal: '郵政編碼',
-    areaEmpty: '請選擇收件地區',
+    areaEmpty: '請選擇地區',
     addressEmpty: '請填寫詳細地址',
     postalEmpty: '郵政編碼格式不正確',
     defaultAddress: '設為默認收貨地址',
-    confirmDelete: '確定要刪除這個收貨地址麼'
+    telPlaceholder: '收貨人手機號',
+    namePlaceholder: '收貨人姓名',
+    areaPlaceholder: '選擇省 / 市 / 區'
   },
   vanAddressEditDetail: {
     label: '詳細地址',
-    placeholder: '如街道、樓層、門牌號等'
+    placeholder: '街道門牌、樓層房間號等信息'
   },
   vanAddressList: {
     address: '收貨地址',
-    add: '新增收貨地址'
+    add: '新增地址'
   },
   vanSku: {
     unavailable: '商品已經無法購買啦',
@@ -83,14 +83,14 @@ export default {
     fill: '請填寫',
     upload: '請上傳',
     number: '請填寫正確的數字格式留言',
-    email: '請填寫正確的電郵地址',
+    email: '請填寫正確的郵箱',
     id_no: '請填寫正確的身份證號碼',
     onePic: '僅限一張',
     placeholder: {
       id_no: '輸入身份證號碼',
       text: '輸入文本',
       tel: '輸入數字',
-      email: '輸入電郵地址',
+      email: '輸入郵箱',
       date: '點擊選擇日期',
       time: '點擊選擇時間',
       textarea: '點擊填寫段落文本'
@@ -107,7 +107,7 @@ export default {
   },
   vanSkuStepper: {
     title: '購買數量',
-    remain: count => `剩餘${count}件`,
+    remain: count => `剩余${count}件`,
     quota: quota => `每人限購${quota}件`
   }
 };

packages/mixins/popup/index.js

@@ -83,7 +83,7 @@ export default {
 
   beforeDestroy() {
     this.close();
-    
+
     if (this.getContainer) {
       this.$parent.$el.appendChild(this.$el);
     }