diff --git a/api/request.ts b/api/request.ts index 391010b..aa8d37c 100644 --- a/api/request.ts +++ b/api/request.ts @@ -4,4 +4,4 @@ export const suiUrl = 'http://154.8.193.216:9092/api' //隋宇霏的接口地 export const domain = 'https://www.carboner.cn/api' export const myIp = 'http://8.130.119.119:9092/api' -export const baseUrl = Url +export const baseUrl = testUrl diff --git a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue index b5b3cf1..d4ac4b1 100644 --- a/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue +++ b/pages/book/photoProductsOrderDetail/photoProductsOrderDetail.vue @@ -308,7 +308,7 @@ import { getFonts } from '../../../common/globalFont'; // 给订单创建时间加上30分钟 const add30Minutes = (createdTime) => { const date = parseDate(createdTime); - date.setMinutes(date.getMinutes() + 31); // 加上30分钟 + date.setMinutes(date.getMinutes() + 2); // 加上30分钟 return Math.floor(date.getTime() / 1000); // 返回时间戳(秒) }; diff --git a/pages/mine/mineorders/mineorders.vue b/pages/mine/mineorders/mineorders.vue index ade9f88..0f915dd 100644 --- a/pages/mine/mineorders/mineorders.vue +++ b/pages/mine/mineorders/mineorders.vue @@ -413,7 +413,7 @@ const confirm =()=> { //确认收货方法 // 给订单创建时间加上30分钟 const add30Minutes = (createdTime) => { const date = parseDate(createdTime); - date.setMinutes(date.getMinutes() + 31); // 加上30分钟 + date.setMinutes(date.getMinutes() + 2); // 加上30分钟 return Math.floor(date.getTime() / 1000); // 返回时间戳(秒) }; diff --git a/pages/order/singleServiceWait/singleServiceWait.vue b/pages/order/singleServiceWait/singleServiceWait.vue index 95ff827..b5e3c05 100644 --- a/pages/order/singleServiceWait/singleServiceWait.vue +++ b/pages/order/singleServiceWait/singleServiceWait.vue @@ -281,7 +281,7 @@ orderType: 'service', userName: userInfo.userName, contactsId: contactRealInfo.value.id, //联系人信息id - couponId: null, //优惠卷id + couponId: useCouponId.value, //优惠卷id note: note.value, orderItemMainInfoAddRequestList: toRaw(postCartArr.value) }