diff --git a/assets/img/account/home/bkg-user-info.png b/assets/img/account/home/bkg-user-info.png new file mode 100644 index 0000000..0fd4705 Binary files /dev/null and b/assets/img/account/home/bkg-user-info.png differ diff --git a/assets/img/account/home/icon-order1.png b/assets/img/account/home/icon-order1.png new file mode 100644 index 0000000..0df426c Binary files /dev/null and b/assets/img/account/home/icon-order1.png differ diff --git a/assets/img/account/home/icon-order2.png b/assets/img/account/home/icon-order2.png new file mode 100644 index 0000000..00fdd3a Binary files /dev/null and b/assets/img/account/home/icon-order2.png differ diff --git a/assets/img/account/home/icon-order3.png b/assets/img/account/home/icon-order3.png new file mode 100644 index 0000000..4863dd8 Binary files /dev/null and b/assets/img/account/home/icon-order3.png differ diff --git a/assets/img/account/home/icon-order4.png b/assets/img/account/home/icon-order4.png new file mode 100644 index 0000000..4d12a07 Binary files /dev/null and b/assets/img/account/home/icon-order4.png differ diff --git a/assets/img/account/home/icon-order5.png b/assets/img/account/home/icon-order5.png new file mode 100644 index 0000000..c9d9c43 Binary files /dev/null and b/assets/img/account/home/icon-order5.png differ diff --git a/assets/img/account/home/logisitcs-empty.png b/assets/img/account/home/logisitcs-empty.png new file mode 100644 index 0000000..01c8ba7 Binary files /dev/null and b/assets/img/account/home/logisitcs-empty.png differ diff --git a/assets/img/common/icon-warning.png b/assets/img/common/icon-warning.png new file mode 100644 index 0000000..27507d6 Binary files /dev/null and b/assets/img/common/icon-warning.png differ diff --git a/assets/img/sckill/bkg-large.png b/assets/img/sckill/bkg-large.png new file mode 100644 index 0000000..bbb8f65 Binary files /dev/null and b/assets/img/sckill/bkg-large.png differ diff --git a/assets/img/sckill/bkg-small.png b/assets/img/sckill/bkg-small.png new file mode 100644 index 0000000..15bc66e Binary files /dev/null and b/assets/img/sckill/bkg-small.png differ diff --git a/assets/img/sckill/icon-swiper.png b/assets/img/sckill/icon-swiper.png new file mode 100644 index 0000000..0f61d04 Binary files /dev/null and b/assets/img/sckill/icon-swiper.png differ diff --git a/assets/scss/element-variables.scss b/assets/scss/element-variables.scss new file mode 100644 index 0000000..be4a857 --- /dev/null +++ b/assets/scss/element-variables.scss @@ -0,0 +1,7 @@ +/* 改变主题色变量 */ +$--color-primary: #FF512B; + +/* 改变 icon 字体路径变量,必需 */ +$--font-path: '~element-ui/lib/theme-chalk/fonts'; + +@import "~element-ui/packages/theme-chalk/src/index"; \ No newline at end of file diff --git a/assets/scss/util.scss b/assets/scss/util.scss index 7f5eba8..aaf6b55 100644 --- a/assets/scss/util.scss +++ b/assets/scss/util.scss @@ -91,4 +91,20 @@ $baseFontSize: 100 !default; @mixin layout-box { width: 1200px; margin: 0 auto; +} + +/*单行溢出*/ +@mixin ellipsis { + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap +} + +/*多行溢出*/ +@mixin ellipses($line) { + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: $line; + -webkit-box-orient: vertical; } \ No newline at end of file diff --git a/components/BsAddress.vue b/components/BsAddress.vue index fc59b8c..6704e87 100644 --- a/components/BsAddress.vue +++ b/components/BsAddress.vue @@ -1,6 +1,6 @@ + diff --git a/pages/index/module/Seckill.vue b/pages/index/module/Seckill.vue index 3c85476..1cdc910 100644 --- a/pages/index/module/Seckill.vue +++ b/pages/index/module/Seckill.vue @@ -7,18 +7,226 @@ --> \ No newline at end of file +.home-sckill { + height: 260px; + cursor: pointer; + .home-sckill-bar { + width: 190px; + height: 100%; + padding: 45px 0 28px 0; + text-align: center; + color: #ffffff; + background-size: 100% 100%; + .home-sckill-title { + display: block; + font-size: 28px; + margin-bottom: 90px; + } + .home-sckill-wrap { + margin-bottom: 10px; + .home-sckill-wrap__tip { + font-size: 0; + strong { + font-size: 18px; + } + span { + font-size: 14px; + } + } + .home-sckill-wrap__countdown { + margin-top: 10px; + .sckill-wrap-countdown__time { + width: 30px; + height: 30px; + line-height: 30px; + text-align: center; + color: #ffffff; + font-size: 18px; + font-weight: bold; + background: #2f3430; + } + .sckill-wrap-countdown--mark { + display: block; + font-size: 20px; + margin: 0 8px; + } + } + } + } + .home-sckill-carousel { + /deep/.el-carousel { + width: 1010px; + .el-carousel__container { + padding: 0 10px; + background: #ffffff; + .el-carousel__arrow { + i { + font-size: 14px; + font-weight: bold; + } + &--left { + left: -11px; + } + &--right { + right: -11px; + } + } + } + .carousel-goods { + height: 100%; + .carousel-goods-box { + .carousel-goods-box--line { + height: 160px; + width: 1px; + background: #eeeeee; + } + .carousel-goods-box__item { + width: 198px; + padding: 20px 24px; + .goods-box-item__cover { + width: 150px; + height: 150px; + object-fit: productMainPicture; + margin-bottom: 14px; + } + .goods-box-item__wrap { + font-size: 14px; + color: #333333; + text-align: center; + .box-item-wrap__title { + @include ellipsis; + margin-bottom: 8px; + } + .box-item-wrap__price { + color: #ff512b; + text-align: center; + } + } + } + } + } + } + } +} + diff --git a/pages/sckill/index.vue b/pages/sckill/index.vue deleted file mode 100644 index 65e42e8..0000000 --- a/pages/sckill/index.vue +++ /dev/null @@ -1,22 +0,0 @@ - - - - \ No newline at end of file diff --git a/pages/seckill/index.vue b/pages/seckill/index.vue new file mode 100644 index 0000000..3b82556 --- /dev/null +++ b/pages/seckill/index.vue @@ -0,0 +1,329 @@ + + + + diff --git a/plugins/api/order.js b/plugins/api/order.js index 1401d7e..ade221d 100644 --- a/plugins/api/order.js +++ b/plugins/api/order.js @@ -56,13 +56,21 @@ export const ApiGetOrderProductDetail = ({orderProductId}) => export const ApiGetOrderPaySatus = ({orderId}) => ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/tradeOrder/payResult/${orderId}`)); - + /** * 获取物流信息 * @param {*} orderId */ export const ApiGetOrderLogistics = ({orderId}) => ToAsyncAwait(axiosTk.get(`${BASE_URL}/app/tradeOrder/logistics/${orderId}`)); + + /** + * 获取物流列表 + * @param {*} params + */ +export const ApiGetOrderLogisticsList = (params) => + ToAsyncAwait(axiosTk.get('http://yapi.smart-xwork.cn/mock/148902/logisitcs/list'), { params }); + /** * 确认收货 * @param {*} orderId @@ -142,6 +150,11 @@ export const ApiGetLogisticsCompanylist = (params) => */ export const ApiPutLogisticsInfo = (data) => ToAsyncAwait(axiosTk.put(`${BASE_URL}/app/refundOrder/completeRefund`, data)); +/** + * 退款订单统计 + */ + export const ApiGetRefundStatistisc= (data) => + ToAsyncAwait(axiosTk.put(`${BASE_URL}/app/refundOrder/statistics`, data)); diff --git a/plugins/api/seckill.js b/plugins/api/seckill.js index f21783b..b81e283 100644 --- a/plugins/api/seckill.js +++ b/plugins/api/seckill.js @@ -23,5 +23,5 @@ const BASE_URL = `${ENV.base_url}/mall/marketing`; * 获取当天秒杀时段 */ export const ApiGetSeckillGoods = (params) => - ToAsyncAwait(axios.get(`${BASE_URL}/app/activity/product`, params)); + ToAsyncAwait(axios.get(`${BASE_URL}/app/activity/product`, { params })); diff --git a/plugins/element-ui.js b/plugins/element-ui.js index ff3dbc9..e94e5cd 100644 --- a/plugins/element-ui.js +++ b/plugins/element-ui.js @@ -1,5 +1,6 @@ import Vue from 'vue' import Element from 'element-ui' import locale from 'element-ui/lib/locale/lang/zh-CN' +import '@/assets/scss/element-variables.scss' Vue.use(Element, { locale })