lmm45037/wagoo-douy3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
初心
2026-04-09 10:12:23 +08:00
parent 124beb0666
commit 72e481c6c5
7 changed files with 68 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/login.js
View File

@ -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({

4
src/api/url.js
View File

@ -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'

4
src/constants/app.config.js
View File

@ -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",

6
src/page-reser/reservation/index.vue
View File

@ -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) => {

4
src/pages/client/order/components/OrderItem.vue
View File

@ -117,12 +117,12 @@
联系客服
</view> -->
<view
<!-- <view
class="flex-center fs-24 app-fc-main status-btn"
@click.stop="$emit('afterSale', data)"
>
申请售后
</view>
</view> -->
<!-- 随车订单不显示物流 -->
<!-- <view v-if="data.pay_type !== pay_type_BYCAR" class="flex-center fs-24 app-fc-main status-btn"
@click.stop="$emit('checkSliver', data)">

78
src/pages/client/order/details.vue
View File

@ -339,7 +339,7 @@
<view class="handle-btn" @click.stop="showCancelModal = true">
<text class="fs-32 btnColor" style="color: #ff19a0">取消订单</text>
</view>
<view class="handle-btn" @click.stop="pay">
<view class="handle-btn" @click.stop="pay(orderData)">
<text class="fs-32 btnColor">立即支付</text>
</view>
</template>
@ -479,6 +479,7 @@ import {
walletTransaction,
cancelPetOrderRefund,
cancelPetOrderMall,
cancelUnpaid
} from "../../../api/login";
import { getConfig } from "../../../api/config";
@ -743,9 +744,9 @@ export default {
mask: true,
});
const data = {
order_id: Number(this.orderId),
id: Number(this.orderId),
};
cancelPetOrderMall(data).then((res) => {
cancelUnpaid(data).then((res) => {
uni.hideLoading();
this.showCancelModal = false;
this.getOrderDetail();
@ -764,48 +765,35 @@ export default {
});
},
// 立即支付
pay() {
// if (this.WeChat === undefined && this.wallet === undefined) {
// uni.showToast({
// title: '请选择支付方式',
// icon: "none",
// });
// return
// }
uni.showLoading({
icon: "none",
title: "支付中",
mask: true,
});
payOrder({
type: 4,
total_fee: Number(this.orderData.actual_price),
order_id: this.orderData.order_id,
order_no: this.orderData.order_no,
}).then((res) => {
tt.pay({
orderInfo: {
order_id: res.data.orderInfo.order_id,
order_token: res.data.orderInfo.order_token,
},
service: 5,
success: (res) => {
uni.hideLoading();
uni.showToast({
title: "支付成功",
icon: "none",
});
this.getOrderDetail();
},
fail: (err) => {
uni.hideLoading();
uni.showToast({
title: err?.msg || "支付失败",
icon: "none",
});
},
});
});
pay(data) {
// uni.showLoading({
// icon: "none",
// title: "支付中",
// mask: true,
// });
// console.log(data,'-?')
const plugin = tt.requirePlugin('lifeServicePlugin');
plugin.continueToPay({
orderId:data.douyin_order_id, // 内部订单号
// outOrderNo: "outOrderNo", // 外部订单号 2个订单号必填一个
success: (res) => {
const { orderId, outOrderNo } = res;
console.log("success res", res);
console.log("orderId", orderId, "outOrderNo", outOrderNo);
},
fail: (res) => {
uni.hideLoading();
const { orderId, outOrderNo, errNo, errMsg, errLogId } = res;
if (errLogId) {
console.log("查询订单信息失败", errNo, errMsg, errLogId);
}
if (orderId || outOrderNo) {
console.log("支付失败", errNo, errMsg, orderId, outOrderNo);
}
},
});
},
// 提醒发货
remindSliver() {

27
src/pages/client/order/list.vue
View File

@ -10,7 +10,7 @@
class="flex-column-start news-item">
<order-item :data="data" @disableScroll="disableScrollAction" @cancelOrder="cancelOrderAction"
@refund="handleRefundFromItem" @concactService="jumpToWeChat" @confirmSliver="confirmSliver" @remindSilver="remindSliver" @pay="pay"
@afterSale="afterSale" @checkSliver="checkSliver" @remark="remark" @remarkDetails="remarkDetails"
@checkSliver="checkSliver" @remark="remark" @remarkDetails="remarkDetails"
@jumpToDetails="jumpToDetails" />
</view>
<uni-load-more v-if="isLoading || (!isLoading && total && total === list.length)"
@ -101,7 +101,7 @@ import ContactModal from "@/components/ContactModal.vue";
import SliverInfo from "./components/SliverInfo.vue";
import WeChatCopyModal from "@/components/WeChatCopyModal.vue";
import DraggableContact from "@/components/DraggableContact.vue";
import { walletTransaction, cancelPetOrderRefund, cancelPetOrderMall } from "../../../api/login";
import { walletTransaction, cancelPetOrderRefund, cancelPetOrderMall,cancelUnpaid } from "../../../api/login";
import {
@ -250,14 +250,14 @@ export default {
mask: true,
});
const data = {
id: this.orderInfo.order_id,
id: Number(this.orderInfo.order_id),
// business_type:1
}
// 判断是取消订单还是退款
const apiPromise = this.cancelModalContent.includes('退款')
? cancelPetOrderRefund(data)
: cancelPetOrderMall(data);
? cancelUnpaid(data)
: cancelUnpaid(data);
apiPromise.then((res) => {
uni.hideLoading();
@ -303,16 +303,17 @@ export default {
},
// 支付
pay(data) {
uni.showLoading({
icon: "none",
title: "支付中",
mask: true,
});
// uni.showLoading({
// icon: "none",
// title: "支付中",
// mask: true,
// });
console.log(data,'-?')
const plugin = tt.requirePlugin('tta5a3d31e3aecfb9b11');
const plugin = tt.requirePlugin('lifeServicePlugin');
plugin.continueToPay({
orderId: "orderId", // 内部订单号
outOrderNo: "outOrderNo", // 外部订单号 2个订单号必填一个
orderId:data.douyin_order_id, // 内部订单号
// outOrderNo: "outOrderNo", // 外部订单号 2个订单号必填一个
success: (res) => {
const { orderId, outOrderNo } = res;
console.log("success res", res);