diff --git a/common/styles/iconfont.css b/common/styles/iconfont.css index ac8aeef..cc3e19b 100644 --- a/common/styles/iconfont.css +++ b/common/styles/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "lf-iconfont"; /* Project id 2779107 */ - src: url('//at.alicdn.com/t/font_2779107_gbe0eg36e0e.woff2?t=1632969325882') format('woff2'), - url('//at.alicdn.com/t/font_2779107_gbe0eg36e0e.woff?t=1632969325882') format('woff'), - url('//at.alicdn.com/t/font_2779107_gbe0eg36e0e.ttf?t=1632969325882') format('truetype'); + src: url('//at.alicdn.com/t/font_2779107_6h2ufg0uxnx.woff2?t=1632991726658') format('woff2'), + url('//at.alicdn.com/t/font_2779107_6h2ufg0uxnx.woff?t=1632991726658') format('woff'), + url('//at.alicdn.com/t/font_2779107_6h2ufg0uxnx.ttf?t=1632991726658') format('truetype'); } .lf-iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.icon-kefufenxiermaikefu:before { + content: "\e889"; +} + .icon-dianshangjiashangcheng-xianxing:before { content: "\e79d"; } diff --git a/components/uni-countdown/i18n/en.json b/components/uni-countdown/i18n/en.json new file mode 100644 index 0000000..06309cb --- /dev/null +++ b/components/uni-countdown/i18n/en.json @@ -0,0 +1,6 @@ +{ + "uni-countdown.day": "day", + "uni-countdown.h": "h", + "uni-countdown.m": "m", + "uni-countdown.s": "s" +} diff --git a/components/uni-countdown/i18n/index.js b/components/uni-countdown/i18n/index.js new file mode 100644 index 0000000..de7509c --- /dev/null +++ b/components/uni-countdown/i18n/index.js @@ -0,0 +1,8 @@ +import en from './en.json' +import zhHans from './zh-Hans.json' +import zhHant from './zh-Hant.json' +export default { + en, + 'zh-Hans': zhHans, + 'zh-Hant': zhHant +} diff --git a/components/uni-countdown/i18n/zh-Hans.json b/components/uni-countdown/i18n/zh-Hans.json new file mode 100644 index 0000000..358cdd1 --- /dev/null +++ b/components/uni-countdown/i18n/zh-Hans.json @@ -0,0 +1,6 @@ +{ + "uni-countdown.day": "天", + "uni-countdown.h": "时", + "uni-countdown.m": "分", + "uni-countdown.s": "秒" +} diff --git a/components/uni-countdown/i18n/zh-Hant.json b/components/uni-countdown/i18n/zh-Hant.json new file mode 100644 index 0000000..e5a63de --- /dev/null +++ b/components/uni-countdown/i18n/zh-Hant.json @@ -0,0 +1,6 @@ +{ + "uni-countdown.day": "天", + "uni-countdown.h": "時", + "uni-countdown.m": "分", + "uni-countdown.s": "秒" +} diff --git a/components/uni-countdown/uni-countdown.vue b/components/uni-countdown/uni-countdown.vue new file mode 100644 index 0000000..3597e5c --- /dev/null +++ b/components/uni-countdown/uni-countdown.vue @@ -0,0 +1,260 @@ + + + diff --git a/pages/order/confirm/confirm.vue b/pages/order/confirm/confirm.vue index 172eda9..d00a0c9 100644 --- a/pages/order/confirm/confirm.vue +++ b/pages/order/confirm/confirm.vue @@ -81,7 +81,7 @@ 运费 - +¥{{ order_detail.order.payable_freight }} + +¥{{ order_detail.order.payable_freight_yuan }} 优惠 diff --git a/pages/shop/seckillList.vue b/pages/shop/seckillList.vue index 4d7a5da..d524393 100644 --- a/pages/shop/seckillList.vue +++ b/pages/shop/seckillList.vue @@ -19,8 +19,9 @@ 距离结束还剩余 {{item.seckill.end_left_time[0]}}天{{item.seckill.end_left_time[1]}}时{{item.seckill.end_left_time[2]}}分{{item.seckill.end_left_time[3]}}秒 --> - 距离结束还剩余 - + + + + 距离开始还剩余 + + + + + + 距离结束还剩余 + + @@ -74,6 +86,7 @@