blackteay/vant
1
0
Fork 0
mirror of https://gitee.com/vant-contrib/vant.git synced 2025-04-06 03:57:59 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #187 from chenjiahan/dev

Browse Source 
[bugfix] AddressEdit correct name key
This commit is contained in:
neverland 2017-10-10 21:10:04 -05:00 committed by GitHub
commit d4c70e824c
3 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/examples-docs/zh-CN/address-edit.md
View File

@ -12,9 +12,6 @@ export default {
methods: {
onSave() {
this.test = {
user_name: 'b'
};
Toast('save');
},
onDelete() {

14
packages/address-edit/index.vue
View File

@ -5,9 +5,9 @@
maxlength="15"
placeholder="名字"
:label="addressText + '人'"
v-model="currentInfo.user_name"
:error="errorInfo.user_name"
@focus="onFocus('user_name')"
v-model="currentInfo.name"
:error="errorInfo.name"
@focus="onFocus('name')"
/>
<van-field
type="tel"
@ -106,7 +106,7 @@ export default {
addressInfo: {
type: Object,
default: () => ({
user_name: '',
name: '',
tel: '',
province: '',
city: '',
@ -130,7 +130,7 @@ export default {
isEdit: !!this.addressInfo.id,
detailFocused: false,
errorInfo: {
user_name: false,
name: false,
tel: false,
address_detail: false,
postal_code: false
@ -185,7 +185,7 @@ export default {
onSaveAddress() {
const items = [
'user_name',
'name',
'tel',
'area_code',
'address_detail'
@ -213,7 +213,7 @@ export default {
const value = this.currentInfo[key];
switch (key) {
case 'user_name':
case 'name':
return value ? value.length <= 15 ? '' : '名字过长，请重新输入' : '请填写名字';
case 'tel':
return validateMobile(value) ? '' : '请填写正确的手机号码或电话号码';

24
test/unit/specs/address-edit.spec.js
View File

@ -22,7 +22,7 @@ describe('AddressEdit', () => {
it('create a AddressEdit with props', () => {
const addressInfo = {
user_name: '测试',
name: '测试',
tel: '123123213',
province: '浙江省',
city: '杭州市',
@ -43,7 +43,7 @@ describe('AddressEdit', () => {
}
});
expect(wrapper.find('.van-field__control')[0].element.value).to.equal(addressInfo.user_name);
expect(wrapper.find('.van-field__control')[0].element.value).to.equal(addressInfo.name);
expect(wrapper.find('.van-field__control')[1].element.value).to.equal(addressInfo.tel);
expect(wrapper.find('.van-field__control')[2].element.value).to.equal(addressInfo.address_detail);
expect(wrapper.find('.van-field__control')[3].element.value).to.equal(addressInfo.postal_code);
@ -55,7 +55,7 @@ describe('AddressEdit', () => {
it('save AddressInfo', () => {
const addressInfo = {
user_name: '',
name: '',
tel: '123123213',
province: '浙江省',
city: '杭州市',
@ -79,21 +79,21 @@ describe('AddressEdit', () => {
const saveButton = wrapper.find('.van-button')[0];
// name empty
wrapper.vm.addressInfo.user_name = '';
wrapper.vm.addressInfo.name = '';
saveButton.trigger('click');
expect(wrapper.vm.errorInfo['user_name']).to.be.true;
expect(wrapper.vm.errorInfo['name']).to.be.true;
wrapper.find('.van-field__control')[0].trigger('focus');
expect(wrapper.vm.errorInfo['user_name']).to.be.false;
expect(wrapper.vm.errorInfo['name']).to.be.false;
// name too long
wrapper.vm.addressInfo.user_name = '111111111111111111111111111';
wrapper.vm.addressInfo.name = '111111111111111111111111111';
saveButton.trigger('click');
expect(wrapper.vm.errorInfo['user_name']).to.be.true;
expect(wrapper.vm.errorInfo['name']).to.be.true;
wrapper.find('.van-field__control')[0].trigger('focus');
expect(wrapper.vm.errorInfo['user_name']).to.be.false;
expect(wrapper.vm.errorInfo['name']).to.be.false;
// tel empty
wrapper.vm.addressInfo.user_name = '123';
wrapper.vm.addressInfo.name = '123';
wrapper.vm.addressInfo.tel = '';
saveButton.trigger('click');
expect(wrapper.vm.errorInfo['tel']).to.be.true;
@ -307,7 +307,7 @@ describe('AddressEdit', () => {
it('watch address info', done => {
const addressInfo = {
user_name: '123'
name: '123'
};
wrapper = mount(AddressEdit, {
@ -318,7 +318,7 @@ describe('AddressEdit', () => {
wrapper.setProps({ addressInfo });
wrapper.vm.$nextTick(() => {
expect(wrapper.vm.currentInfo.user_name).to.equal('123');
expect(wrapper.vm.currentInfo.name).to.equal('123');
done();
});
});