From 948f3993f571155457e5cfc9dfa4adba170273f3 Mon Sep 17 00:00:00 2001 From: ch Date: Sun, 24 Apr 2022 18:29:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=92=E6=9D=80=E8=AF=A6=E6=83=85=E8=B0=83?= =?UTF-8?q?=E6=95=B4,=E7=A6=85=E9=81=93Bug=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/utils/utils.js | 50 ++++++- components/UiPageHeader.vue | 4 +- h5/index.html | 2 +- h5/static/goods/seckill.png | Bin 11154 -> 1836 bytes h5/static/goods/seckill_start.png | Bin 7207 -> 6950 bytes h5/static/img/seckill.d9f37c24.png | Bin 11154 -> 0 bytes h5/static/img/seckill_start.b74bac11.png | Bin 7207 -> 0 bytes h5/static/img/seckill_start.fd9b3d6d.png | Bin 0 -> 6950 bytes .../{index.6ab2a97e.js => index.05ec0e3f.js} | 2 +- ...etUserInfo~pages-orde~bbb2dfdd.04ec1b19.js | 1 + ...etUserInfo~pages-orde~bbb2dfdd.40fb6625.js | 1 - ...tegory~pages-goods-li~44ded30c.0946143b.js | 1 + ...tegory~pages-goods-li~44ded30c.318f8a38.js | 1 - h5/static/js/pages-account-index.303048c6.js | 1 + h5/static/js/pages-account-index.85950ed1.js | 1 - .../pages-account-setting-setName.a5c8463b.js | 1 - .../pages-account-setting-setName.eb59bbc6.js | 1 + ...-list-index~pages-goods-search.0da7b43e.js | 1 + ...-list-index~pages-goods-search.c80fc749.js | 1 - ...art-cart~pages-cart-tabBarCart.401dafe7.js | 1 - ...art-cart~pages-cart-tabBarCart.60b27213.js | 1 + .../js/pages-goods-detail-index.4d4a96f8.js | 1 - .../js/pages-goods-detail-index.eb1dbfab.js | 1 + .../js/pages-goods-list-index.669815ab.js | 1 - .../js/pages-goods-list-index.a1347716.js | 1 + h5/static/js/pages-goods-search.6cbe6454.js | 1 + h5/static/js/pages-goods-search.cf167fc7.js | 1 - h5/static/js/pages-login.65be14f8.js | 1 - h5/static/js/pages-login.a6e626d9.js | 1 + .../js/pages-order-detail-index.2dc08924.js | 1 + .../js/pages-order-detail-index.6ae55774.js | 1 - .../js/pages-order-logisitcsInfo.2781c40a.js | 1 - .../js/pages-order-logisitcsInfo.60943f4c.js | 1 + ...order-saleAfter-saleAfterApply.0234f754.js | 1 - ...order-saleAfter-saleAfterApply.3ef037cf.js | 1 + ...aleAfter-saleAfterDetail-index.6b2e6f4b.js | 1 - ...aleAfter-saleAfterDetail-index.da0a2fca.js | 1 + ...-order-saleAfter-saleAfterEdit.3fc1b208.js | 1 + ...-order-saleAfter-saleAfterEdit.e965d9e5.js | 1 - ...rder-saleAfter-saleAfterSelect.3f3aede7.js | 1 + ...rder-saleAfter-saleAfterSelect.9d24bd7c.js | 1 - h5/static/js/pages-order-submit.b409769b.js | 1 - h5/static/js/pages-order-submit.d49695e4.js | 1 + h5/static/js/pages-seckill.55cd4fce.js | 1 - h5/static/js/pages-seckill.f114534d.js | 1 + pages/account/setting/setName.vue | 3 +- .../goods/detail/components/SeckillPrice.vue | 122 +++++++++++------- pages/goods/detail/components/SkuPopup.vue | 21 ++- pages/goods/detail/index.vue | 11 +- pages/goods/list/components/Sort.vue | 6 +- pages/goods/list/index.vue | 8 +- pages/goods/search.vue | 26 ++-- pages/order/submit.vue | 6 +- pages/seckill.vue | 73 +++++------ static/goods/seckill.png | Bin 11154 -> 1836 bytes static/goods/seckill_start.png | Bin 7207 -> 6950 bytes 56 files changed, 225 insertions(+), 145 deletions(-) delete mode 100644 h5/static/img/seckill.d9f37c24.png delete mode 100644 h5/static/img/seckill_start.b74bac11.png create mode 100644 h5/static/img/seckill_start.fd9b3d6d.png rename h5/static/js/{index.6ab2a97e.js => index.05ec0e3f.js} (98%) create mode 100644 h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.04ec1b19.js delete mode 100644 h5/static/js/pages-account-address-create~pages-account-address-edit~pages-account-setting-setUserInfo~pages-orde~bbb2dfdd.40fb6625.js create mode 100644 h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.0946143b.js delete mode 100644 h5/static/js/pages-account-address-list~pages-cart-cart~pages-cart-tabBarCart~pages-goods-category~pages-goods-li~44ded30c.318f8a38.js create mode 100644 h5/static/js/pages-account-index.303048c6.js delete mode 100644 h5/static/js/pages-account-index.85950ed1.js delete mode 100644 h5/static/js/pages-account-setting-setName.a5c8463b.js create mode 100644 h5/static/js/pages-account-setting-setName.eb59bbc6.js create mode 100644 h5/static/js/pages-account-setting-setName~pages-goods-category~pages-goods-list-index~pages-goods-search.0da7b43e.js delete mode 100644 h5/static/js/pages-account-setting-setName~pages-goods-category~pages-goods-list-index~pages-goods-search.c80fc749.js delete mode 100644 h5/static/js/pages-cart-cart~pages-cart-tabBarCart.401dafe7.js create mode 100644 h5/static/js/pages-cart-cart~pages-cart-tabBarCart.60b27213.js delete mode 100644 h5/static/js/pages-goods-detail-index.4d4a96f8.js create mode 100644 h5/static/js/pages-goods-detail-index.eb1dbfab.js delete mode 100644 h5/static/js/pages-goods-list-index.669815ab.js create mode 100644 h5/static/js/pages-goods-list-index.a1347716.js create mode 100644 h5/static/js/pages-goods-search.6cbe6454.js delete mode 100644 h5/static/js/pages-goods-search.cf167fc7.js delete mode 100644 h5/static/js/pages-login.65be14f8.js create mode 100644 h5/static/js/pages-login.a6e626d9.js create mode 100644 h5/static/js/pages-order-detail-index.2dc08924.js delete mode 100644 h5/static/js/pages-order-detail-index.6ae55774.js delete mode 100644 h5/static/js/pages-order-logisitcsInfo.2781c40a.js create mode 100644 h5/static/js/pages-order-logisitcsInfo.60943f4c.js delete mode 100644 h5/static/js/pages-order-saleAfter-saleAfterApply.0234f754.js create mode 100644 h5/static/js/pages-order-saleAfter-saleAfterApply.3ef037cf.js delete mode 100644 h5/static/js/pages-order-saleAfter-saleAfterDetail-index.6b2e6f4b.js create mode 100644 h5/static/js/pages-order-saleAfter-saleAfterDetail-index.da0a2fca.js create mode 100644 h5/static/js/pages-order-saleAfter-saleAfterEdit.3fc1b208.js delete mode 100644 h5/static/js/pages-order-saleAfter-saleAfterEdit.e965d9e5.js create mode 100644 h5/static/js/pages-order-saleAfter-saleAfterSelect.3f3aede7.js delete mode 100644 h5/static/js/pages-order-saleAfter-saleAfterSelect.9d24bd7c.js delete mode 100644 h5/static/js/pages-order-submit.b409769b.js create mode 100644 h5/static/js/pages-order-submit.d49695e4.js delete mode 100644 h5/static/js/pages-seckill.55cd4fce.js create mode 100644 h5/static/js/pages-seckill.f114534d.js diff --git a/common/utils/utils.js b/common/utils/utils.js index 07ae857..a90bbaa 100644 --- a/common/utils/utils.js +++ b/common/utils/utils.js @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-03-17 19:15:10 * @LastEditors: ch - * @LastEditTime: 2022-03-22 17:30:38 + * @LastEditTime: 2022-04-24 18:15:27 * @Description: 一些无法归类的公共方法容器 */ @@ -73,7 +73,51 @@ const IsDouble = (str) => { if (result == null) return false return true } +/** + * + * 时间格式化 + * @param {number|string|Date} d 时间参数能被new Date识别的数字,字符串,日期 + * @param {string} fmt 时间格式参数 字符串类型 默认'yyyy/mm/dd' + */ +const formatDate = (date, fmt = 'yyyy/mm/dd' ) =>{ + // 处理不识别的时间表示字符串,如2020年01月01日00时00分00秒 + const dateType = getVarType(date); + if(dateType === 'string'){ + date = date.replace(/\D+/ig,'/'); + let arr = date.split('/'); + // 长度大于3说明带了时分秒信息 特殊时间处理格式 + if(arr.length > 3){ + let time = ` ${arr[3]}:${arr[4]}:${arr[5]}` + arr.length = 3; + date = arr.join('/') + time; + } + }; + try{ + date = date ? dateType === 'date' ? date : new Date(date) : new Date(); + } catch(e){ + throw new Error('不能识别的时间格式'); + } + const o = { + 'm+': date.getMonth() + 1, //月份 + 'd+': date.getDate(), //日 + 'h+': date.getHours(), //小时 + 'i+': date.getMinutes(), //分 + 's+': date.getSeconds(), //秒ji“ + 'q+': Math.floor((date.getMonth() + 3) / 3), //季度 + 'l+': date.getMilliseconds() //毫秒 + }; + if (/(y+)/i.test(fmt)) { + fmt = fmt.replace(RegExp.$1, (date.getFullYear().toString()).substr(4 - RegExp.$1.length)); + } + for (let k in o) { + if (new RegExp(`(${k})`, 'i').test(fmt)) { + const str = o[k].toString(); + fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? str : (`0${str}`).substr(str.length-1)); + } + } + return fmt; +} // 工具类的文件需要把文件提供的工具类统一放最下方做一个统一输出 export { // async await 标识结果处理 @@ -87,5 +131,7 @@ export { // 判断是否为整数 IsInteger, // 判断是否double或float - IsDouble + IsDouble, + // 时间格式化 + formatDate } \ No newline at end of file diff --git a/components/UiPageHeader.vue b/components/UiPageHeader.vue index 248995c..51befdc 100644 --- a/components/UiPageHeader.vue +++ b/components/UiPageHeader.vue @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-03-25 10:11:37 * @LastEditors: ch - * @LastEditTime: 2022-04-22 14:16:14 + * @LastEditTime: 2022-04-24 15:36:57 * @Description: file content -->