diff --git a/src/api/login.js b/src/api/login.js index 44c45c1..c019b7d 100644 --- a/src/api/login.js +++ b/src/api/login.js @@ -2,7 +2,7 @@ import request from "../utils/request"; import { LOGIN, GET_PHONE, USER_SHARE,USER_WALLET,RECHARGE_WALLET,USER_WXPAY,USER_TRANSACTION,USER_ADDITIONAL,MEMBER_TYPES, USER_RECHARGE,USER_REDEEM,USER_HolderList,USER_MEMBERSHIP,USER_BINDPETS,USER_PETBINDING,USER_DISCOUNTFEE,USER_COUPONLIST,CANCEL_PET_ORDER, GET_VIP_PRICE,POINTS_RECHARGE_LIST,POINTS_DONATE,POINTS_RECORDS,POINTS_RANK,OSS_STS,DONATION_SUMMARY, - USER_DISPATCHFEE,CANCEL_MALL_ORDER,DOUY_REVIEW + USER_DISPATCHFEE,CANCEL_MALL_ORDER,DOUY_REVIEW,CANCEL_NOMO_ORDER } from "./url"; // 微信登陆 export const getCodeByWxLogin = () => { @@ -226,6 +226,15 @@ export const cancelPetOrderMall = (data) => { }); }; +// 未支付取消商城订单 +export const cancelUnpaid = (data) => { + return request({ + url: CANCEL_NOMO_ORDER, + method: "POST", + data: data + }); +}; + // 绑定宠物列表 export const bindPets = (data) => { return request({ diff --git a/src/api/url.js b/src/api/url.js index 46e732f..d3a8712 100644 --- a/src/api/url.js +++ b/src/api/url.js @@ -56,6 +56,10 @@ export const CANCEL_PET_ORDER = '/order/pet/cancel' // 抖音审核接口 export const DOUY_REVIEW = '/douyin/goods/order/appointment' +// 抖音未支付订单取消接口 +export const CANCEL_NOMO_ORDER = '/douyin/goods/order/cancel' + + // 取消商城接口 export const CANCEL_MALL_ORDER = '/douyin/goods/order/refund' diff --git a/src/constants/app.config.js b/src/constants/app.config.js index 8c2f940..4546295 100644 --- a/src/constants/app.config.js +++ b/src/constants/app.config.js @@ -3,8 +3,8 @@ export default { appName: "Wagoo", appShareName: "Wagoo", appId: "wx00e2dcdc7c02b23a", - apiBaseUrl: "https://api.wagoo.me/api/v1", // 服务端测试地址 - // apiBaseUrl: "https://api.wagoo.pet/api/v1", // 服务端生产地址 + // apiBaseUrl: "https://api.wagoo.me/api/v1", // 服务端测试地址 + apiBaseUrl: "https://api.wagoo.pet/api/v1", // 服务端生产地址 // apiBaseUrl: "http:192.168.30.79", //本地接口 tencentMapKey: "WSBBZ-7OXK4-46QUC-KFB7B-4N3W7-M2BXM", tencentSecret: "vb7D0PGj7xUvmOLuJz2Jd7ykTMpjiWRJ", diff --git a/src/page-reser/reservation/index.vue b/src/page-reser/reservation/index.vue index 246dd2c..7fc3ccf 100644 --- a/src/page-reser/reservation/index.vue +++ b/src/page-reser/reservation/index.vue @@ -250,13 +250,13 @@ export default { address_id: Number(this.address.id), //地址id(整数) recipient_name: this.address.name || '用户姓名', //用户姓名 phone: this.address.phone || '', //用户手机 - park_desc: this.otherParkState || this.parkState || '', //停车描述 - note: '' // 备注 + park_desc: this.parkState || '', //停车描述 + note: this.otherParkState || '' // 备注 }; uni.showLoading({ title: "处理中", - mask: true, + mask: true, }); getdouyReview(data).then((res) => { diff --git a/src/pages/client/order/components/OrderItem.vue b/src/pages/client/order/components/OrderItem.vue index 410bb3a..64926f5 100644 --- a/src/pages/client/order/components/OrderItem.vue +++ b/src/pages/client/order/components/OrderItem.vue @@ -117,12 +117,12 @@ 联系客服 --> - 申请售后 - + -->