支付宝兼容
This commit is contained in:
@@ -9,12 +9,14 @@ export const getCouponsByPosition = (positionId) => {
|
||||
}
|
||||
|
||||
// 创建优惠券支付订单
|
||||
export const createCouponPayment = (couponId) => {
|
||||
export const createCouponPayment = (couponId, paymentPlatform) => {
|
||||
return request({
|
||||
url: '/app/coupon/pay',
|
||||
method: 'post',
|
||||
data: {
|
||||
couponId
|
||||
couponId,
|
||||
// 支付平台类型:WECHAT / ALIPAY / ANTOM(不传则后端默认 WECHAT)
|
||||
...(paymentPlatform ? { paymentPlatform } : {})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
import request from '../http'
|
||||
|
||||
// 创建会员卡支付订单
|
||||
export const createMemberCardPayment = (memberCardId) => {
|
||||
export const createMemberCardPayment = (memberCardId, paymentPlatform) => {
|
||||
return request({
|
||||
url: '/app/member/pay',
|
||||
method: 'post',
|
||||
data: {
|
||||
memberCardId
|
||||
memberCardId,
|
||||
// 支付平台类型:WECHAT / ALIPAY / ANTOM(不传则后端默认 WECHAT)
|
||||
...(paymentPlatform ? { paymentPlatform } : {})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -126,6 +126,15 @@ export const createWxPayment = (orderNo) => {
|
||||
})
|
||||
}
|
||||
|
||||
// 创建支付宝支付订单(租借押金 H5 支付)
|
||||
// 对应文档《支付宝接口文档》:GET /app/ali-payment/create/{orderNo}
|
||||
export const createAliPayment = (orderNo) => {
|
||||
return request({
|
||||
url: `/app/ali-payment/create/${orderNo}`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 获取正在使用中的订单
|
||||
export const getInUseOrder = () => {
|
||||
return request({
|
||||
@@ -150,6 +159,15 @@ export const getWxPaymentStatus = (orderNo) => {
|
||||
})
|
||||
}
|
||||
|
||||
// 查询支付宝支付状态
|
||||
// 对应文档:GET /app/ali-payment/status/{orderNo}
|
||||
export const getAliPaymentStatus = (orderNo) => {
|
||||
return request({
|
||||
url: `/app/ali-payment/status/${orderNo}`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// ==================== Antom 支付相关接口 ====================
|
||||
|
||||
// 创建 Antom H5 支付订单
|
||||
|
||||
@@ -33,14 +33,10 @@ export const getProductDetail = (id) => {
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建商品支付订单
|
||||
* @param {Object} data - 订单数据
|
||||
* @param {Array} data.items - 订单项列表 [{skuId, quantity}]
|
||||
* @param {string} data.receiverName - 收件人姓名
|
||||
* @param {string} data.receiverPhone - 收件人手机号
|
||||
* @param {string} data.receiverAddress - 收件人详细地址
|
||||
* @param {string} data.remark - 用户备注(可选)
|
||||
* @returns {Promise} 微信支付参数
|
||||
* 创建商品支付订单(多支付平台)
|
||||
* 对应《商品购买多支付平台方案》:
|
||||
* paymentPlatform: WECHAT / ALIPAY / ANTOM
|
||||
* 其他字段见文档
|
||||
*/
|
||||
export const createProductOrder = (data) => {
|
||||
return request({
|
||||
|
||||
+27
-1
@@ -1,7 +1,7 @@
|
||||
import request from '../http'
|
||||
import { URL, appid } from '../url'
|
||||
|
||||
// 用户登录
|
||||
// 旧登录接口(兼容保留,后端将逐步废弃)
|
||||
export const login = (data) => {
|
||||
return request({
|
||||
url: '/app/user/login',
|
||||
@@ -10,6 +10,22 @@ export const login = (data) => {
|
||||
})
|
||||
}
|
||||
|
||||
// 统一快捷登录接口 /app/user/quickLogin
|
||||
// 对应文档《快捷登录最终方案》中的 QuickLoginDto:
|
||||
// loginType: WECHAT / ALIPAY / SMS
|
||||
// appid: 平台应用ID
|
||||
// openId: 第三方 openId(微信必传)
|
||||
// code: 授权码(微信手机号授权码 / 支付宝 authCode)
|
||||
// phonenumber: 短信登录手机号
|
||||
// smsCode: 短信验证码
|
||||
export const quickLogin = (data) => {
|
||||
return request({
|
||||
url: '/app/user/quickLogin',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
// 发送验证码
|
||||
export const sendVerifyCode = (phonenumber) => {
|
||||
return request({
|
||||
@@ -144,3 +160,13 @@ export const getWxUserPhoneNumber = (data) => {
|
||||
})
|
||||
}
|
||||
|
||||
// 获取支付宝用户手机号(复用同一后端接口,由后端按 appid / 参数结构区分平台)
|
||||
// 期望后端返回:{ code:200, data:{ phoneNumber: 'xxx' } }
|
||||
export const getAliUserPhoneNumber = (data) => {
|
||||
return request({
|
||||
url: '/app/user/alipay/getPhone',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
// 配置项:true 表示打印日志,false 表示不打印日志
|
||||
export const CONSOLE_CONFIG = {
|
||||
// 是否启用 console.log
|
||||
enableLog: false,
|
||||
enableLog: true,
|
||||
// 是否启用 console.warn
|
||||
enableWarn: false,
|
||||
// 是否启用 console.error
|
||||
|
||||
+9
-2
@@ -1,8 +1,15 @@
|
||||
import {
|
||||
URL,
|
||||
appid
|
||||
appid,
|
||||
ZFBappid
|
||||
} from './url'
|
||||
|
||||
// 根据运行平台选择正确的小程序 appid(后端通常依赖该 header 做平台识别)
|
||||
let platformAppid = appid
|
||||
// #ifdef MP-ALIPAY
|
||||
platformAppid = ZFBappid
|
||||
// #endif
|
||||
|
||||
// 获取多语言翻译文本
|
||||
const getLoadingText = () => {
|
||||
try {
|
||||
@@ -31,7 +38,7 @@ const request = (option) => {
|
||||
header: {
|
||||
"Content-Type": option.headers && option.headers["Content-Type"] ? option.headers["Content-Type"] : (option.method && option.method.toUpperCase() === 'POST' ? 'application/json' : 'application/x-www-form-urlencoded'),
|
||||
...option.headers,
|
||||
'appid': appid,
|
||||
'appid': platformAppid,
|
||||
'Authorization': "Bearer " + uni.getStorageSync('token'),
|
||||
'Clientid': uni.getStorageSync('client_id'),
|
||||
'Content-Language': (uni.getStorageSync('language') || 'zh-CN').replace(/-/g, '_')
|
||||
|
||||
+1
-1
@@ -1,7 +1,7 @@
|
||||
// export const URL = "https://my.gxfs123.com/api" //正式服务器-弃用
|
||||
// export const URL = "https://manager.fdzpower.com/api" //正式服务器
|
||||
export const URL = "https://fansdev.gxfs123.com/api" //测试服务器
|
||||
// export const URL = "http://192.168.5.123:8080" //本地调试
|
||||
// export const URL = "http://192.168.5.64:8080" //本地调试
|
||||
// export const URL = "http://127.0.0.1:8080" //本地调试
|
||||
|
||||
export const appid = "wx2165f0be356ae7a9" //微信小程序appid
|
||||
|
||||
Reference in New Issue
Block a user