diff --git a/api/order.js b/api/order.js index 7d5d3e2..ef0dbbb 100644 --- a/api/order.js +++ b/api/order.js @@ -160,4 +160,22 @@ export function orderVerific(verifyCode, isConfirm) { // 延迟收货 export function orderDelay(uni) { return request.post("/order/extendedDelivery", {uni}) +} + +/** + * 再买一单 + * @param {*} params + * @returns + */ +export function aginConfirm(params) { + return request.post('/order/buyAgainConfirm', params) +} + +/** + * 修改地址 + * @param {*} params + * @returns + */ +export function editAddress(params) { + return request.post('/order/editAddress', params) } \ No newline at end of file diff --git a/api/user.js b/api/user.js index 62e18f0..ebfe155 100644 --- a/api/user.js +++ b/api/user.js @@ -568,3 +568,21 @@ export function getUserPointBill(param) { export function getUserSpreadRule(param) { return request.get('/userSpreadRule', param, { login: false }) } + +/** + * 我的足迹 + * @param {*} params + * @returns + */ +export function getHistory(params) { + return request.get('/history/list', params) +} + +/** + * 购物车猜你喜欢 + * @param {*} params + * @returns + */ +export function getUserLike(params) { + return request.get('/cart/guessYouLike',params) +} \ No newline at end of file diff --git a/assets/css/style.less b/assets/css/style.less index 78275cd..1cf7285 100644 --- a/assets/css/style.less +++ b/assets/css/style.less @@ -3461,10 +3461,10 @@ page { } .order-details .footer .bnt { - width: 1.76*100rpx; - height: 0.6*100rpx; + width: 1.36*100rpx; + height: 0.5*100rpx; text-align: center; - line-height: 0.6*100rpx; + line-height: 0.5*100rpx; border-radius: 0.5*100rpx; color: #fff; font-size: 0.27*100rpx; diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less index 94dc2f5..a5a4b62 100644 --- a/assets/css/v12-style.less +++ b/assets/css/v12-style.less @@ -3,8 +3,8 @@ @dark-color: #333333; @white-color: #fff; -@colors: #C52733, #333333, #fff, #666, #F0F0F0; -@classnames: primary, dark, white, secondary-dark, grey; +@colors: #C52733, #333333, #fff, #666, #F0F0F0, #999999, #E92727, #FFC543; +@classnames: primary, dark, white, secondary-dark, grey, dark1, red, yellow; /*=====================================*/ each(@colors, { @@ -59,13 +59,18 @@ each(@colors, { margin-bottom: @baseNum; } .v12-ma-@{i} { - margin: @baseNum; + margin-left: @baseNum; + margin-right: @baseNum; + margin-bottom: @baseNum; + margin-top: @baseNum; } .v12-mx-@{i} { - margin: 0 @baseNum; + margin-left: @baseNum; + margin-right: @baseNum; } .v12-my-@{i} { - margin: @baseNum 0; + margin-bottom: @baseNum; + margin-top: @baseNum; } .v12-pt-@{i} { padding-top: @baseNum; @@ -80,13 +85,18 @@ each(@colors, { padding-bottom: @baseNum; } .v12-pa-@{i} { - padding: @baseNum; + padding-top: @baseNum; + padding-bottom: @baseNum; + padding-right: @baseNum; + padding-left: @baseNum; } .v12-px-@{i} { - padding: 0 @baseNum + padding-right: @baseNum; + padding-left: @baseNum; } .v12-py-@{i} { - padding: @baseNum 0 + padding-top: @baseNum; + padding-bottom: @baseNum; } .generateMarginAndPadding(@n, (@i + 1)) } @@ -96,13 +106,21 @@ each(@colors, { .generateRadius(@n, @i: 0) when (@i <= @n) { @baseRadius: @i * 1rpx; .v12-radius-@{i} { - border-radius: @baseRadius + border-radius: @baseRadius !important; } .generateRadius(@n, (@i + 1)) } .generateRadius(100); /*=========================================*/ +.generateSpacing(@n, @i: 0) when(@i <= @n) { + @baseSpacing:@i * 1rpx; + .v12-spacing-@{i} { + letter-spacing: @baseSpacing !important; + } + .generateSpacing(@n, (@i + 1)) +} +.generateSpacing(100); /*====================flex 函数表达式=====================*/ .v12-d-flex{ @@ -123,21 +141,57 @@ each(@colors, { display: flex; align-items: end; } +.v12-align-baseline{ + display: flex; + align-items: baseline; +} .v12-justify-center{ display: flex; justify-content: center; } +.v12-justify-around{ + display: flex; + justify-content: space-around; +} .v12-justify-between{ display: flex; justify-content: space-between; } +.v12-justify-start{ + display: flex; + justify-content: flex-start; +} +.v12-justify-end{ + display: flex; + justify-content: flex-end; +} .v12-d-grid-columns-2 { display: grid; grid-template-columns: 1fr 1fr; } - +.v12-text-right{ + text-align: right; +} +.v12-text-left{ + text-align: left; +} +.v12-text-center{ + text-align: center; +} +.v12-btn{ + width: 136rpx; + height: 50rpx; + text-align: center; + line-height: 50rpx; + border-radius: 50rpx; + color: #fff; + font-size: 27rpx; +} +.v12-full-width{ + width: 100%; +} diff --git a/assets/script/global.js b/assets/script/global.js index 0f263e9..5f4d9f5 100644 --- a/assets/script/global.js +++ b/assets/script/global.js @@ -63,6 +63,7 @@ export default { date = date.replace(/-/g, '/'); let timestamp = new Date(date).getTime(); let now = new Date().getTime(); + return timestamp - now; }, diff --git a/components/Coupons.vue b/components/Coupons.vue index fbe4d2c..d64046c 100644 --- a/components/Coupons.vue +++ b/components/Coupons.vue @@ -1,41 +1,46 @@ \ No newline at end of file diff --git a/pages/cloud/components/HotelItem.vue b/pages/cloud/components/HotelItem.vue index f63f17b..08a3381 100644 --- a/pages/cloud/components/HotelItem.vue +++ b/pages/cloud/components/HotelItem.vue @@ -55,14 +55,14 @@ export default { margin: 20rpx 0 0 0; .cover-box { position: relative; - width: 328rpx; + width: 338rpx; height: auto; border-radius: 14rpx; overflow: hidden; } .cover { - width: 328rpx; - height: 328rpx; + width: 338rpx; + height: 338rpx; vertical-align: middle; } .icon { diff --git a/pages/cloud/haveFun.vue b/pages/cloud/haveFun.vue index ec388e6..c24f83e 100644 --- a/pages/cloud/haveFun.vue +++ b/pages/cloud/haveFun.vue @@ -1,20 +1,30 @@