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

fix(Sku): change code style

Browse Source
This commit is contained in:
songweite 2020-07-07 13:36:23 +08:00 committed by neverland
parent 2472a647a4
commit ba16c6bff5
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/sku/components/SkuDateTimeFiled.js
View File

@ -1,6 +1,6 @@
// Utils
import { createNamespace } from '../../utils';
import { string2Date, date2String } from '../utils/time-helper';
import { stringToDate, dateToString } from '../utils/time-helper';
// Components
import Popup from '../../popup';
@ -36,7 +36,7 @@ export default createComponent({
break;
case 'date':
case 'datetime':
this.currentDate = string2Date(val) || new Date();
this.currentDate = stringToDate(val) || new Date();
break;
}
},
@ -49,7 +49,7 @@ export default createComponent({
onConfirm(val) {
let data = val;
if (this.type !== 'time') {
data = date2String(val, this.type);
data = dateToString(val, this.type);
}
this.$emit('input', data);
this.showDatePicker = false;
@ -73,6 +73,7 @@ export default createComponent({
>
<Popup
vModel={this.showDatePicker}
round
slot="extra"
position="bottom"
getContainer="body"

4
src/sku/components/SkuImgUploader.js
View File

@ -35,7 +35,7 @@ export default createComponent({
methods: {
afterReadFile(file) {
file.status = 'uploading';
file.message = '上传中...';
file.message = t('uploading');
this.uploadImg(file.file, file.content)
.then((img) => {
file.status = 'done';
@ -43,7 +43,7 @@ export default createComponent({
})
.catch(() => {
file.status = 'failed';
file.message = '上传失败';
file.message = t('fail');
});
},

3
src/sku/lang.ts
View File

@ -26,7 +26,8 @@ export default {
vanSkuImgUploader: {
oversize: (maxSize: number) =>
`最大可上传图片为${maxSize}MB，请尝试压缩图片尺寸`,
fail: '上传失败<br />重新上传',
fail: '上传失败',
uploading: '上传中...',
},
vanSkuStepper: {
quotaLimit: (quota: number) => `限购${quota}件`,

12
src/sku/test/index.spec.js
View File

@ -1,7 +1,7 @@
import { mount } from '../../../test';
import Sku from '..';
import { getSkuData, initialSku } from '../demo/data';
import { string2Date, date2String } from '../utils/time-helper';
import { stringToDate, dateToString } from '../utils/time-helper';
const skuData = getSkuData();
@ -32,13 +32,13 @@ test('resetSelectedSku method', () => {
expect(wrapper.emitted('buy-clicked').length).toEqual(1);
});
test('string2Date', () => {
expect(date2String(string2Date(''))).toEqual('');
expect(date2String(string2Date('2020-07-01'))).toEqual('2020-07-01');
expect(date2String(string2Date('2020-07-01 22:44'), 'datetime')).toEqual(
test('stringToDate', () => {
expect(dateToString(stringToDate(''))).toEqual('');
expect(dateToString(stringToDate('2020-07-01'))).toEqual('2020-07-01');
expect(dateToString(stringToDate('2020-07-01 22:44'), 'datetime')).toEqual(
'2020-07-01 22:44'
);
expect(date2String(string2Date('2020-12-31 23:59'), 'datetime')).toEqual(
expect(dateToString(stringToDate('2020-12-31 23:59'), 'datetime')).toEqual(
'2020-12-31 23:59'
);
});

12
src/sku/utils/time-helper.js
View File

@ -1,10 +1,8 @@
function length2(int) {
return int > 9 ? `${int}` : `0${int}`;
}
import { padZero } from '../../utils/format/string';
// 字符串转 Date
// 只处理 YYYY-MM-DD 或者 YYYY-MM-DD HH:MM 格式
export function string2Date(timeString) {
export function stringToDate(timeString) {
if (!timeString) {
return null;
}
@ -13,18 +11,18 @@ export function string2Date(timeString) {
// Date 转字符串
// type: date or datetime
export function date2String(date, type = 'date') {
export function dateToString(date, type = 'date') {
if (!date) {
return '';
}
const year = date.getFullYear();
const month = date.getMonth() + 1;
const day = date.getDate();
let timeString = `${year}-${length2(month)}-${length2(day)}`;
let timeString = `${year}-${padZero(month)}-${padZero(day)}`;
if (type === 'datetime') {
const hours = date.getHours();
const minute = date.getMinutes();
timeString += ` ${length2(hours)}:${length2(minute)}`;
timeString += ` ${padZero(hours)}:${padZero(minute)}`;
}
return timeString;
}