diff --git a/apis/orderApi.js b/apis/orderApi.js
index 470932f..4248ede 100644
--- a/apis/orderApi.js
+++ b/apis/orderApi.js
@@ -137,3 +137,18 @@ export function getReciptCode(data) {
data
})
}
+
+/**
+ * 提交微信直付单,返回微信支付参数
+ * @param {object} data
+ * @property {string} data.customerOrderId
+ * @property {string} data.wxAppid
+ * @property {string} data.openid
+ * @property {string} data.apiType
+ */
+export function makeSupplierPay(data) {
+ return http.post({
+ url: '/base-paper-trading/submit/wx/straight/pay',
+ data
+ })
+}
diff --git a/enums/index.js b/enums/index.js
index 786e93e..b8df507 100644
--- a/enums/index.js
+++ b/enums/index.js
@@ -3,11 +3,14 @@ const urlEnv = env === 'production' ? '' : `-${env}`
export const XAPPID = '503258978847966404'
+export const WX_APPID = 'wxbdd9c878b33e451d'
// 统一支付接口
export const PAY_URL = `https://api-client-psc${urlEnv}.qniao.cn/payment-settlement-center/pay-for-service-account`
// 当前支付页面地址
export const VIP_URL = `https://shopkeeper${urlEnv}.qniao.cn/#/pages/vip-center/index`
+// 订单详情页面
+export const ORDER_URL = `https://shopkeeper${urlEnv}.qniao.cn/#/pages/order-detail/index`
// 千鸟云工厂公众号appid
export const QN_APPID = 'wxa1bf402cebec98ed'
/**
@@ -177,7 +180,7 @@ export const orderStatusMap = {
}
/**
- * 供应商订单状态 待客户确认订单/30202,待供应商确认订单/30205,待发货/30106,已发货/30107 已发货在H5客户端显示 待收货/30107 ,待客户借款/30207,支付中/30208,待客户支付/30214,付款失败/30211,已完成/30213,待客户还款/30217,已取消/30212,还款中/30216
+ * 供应商订单状态 待客户确认订单/30202,待供应商确认订单/30205,待发货/30106,已发货/30107 已发货在H5客户端显示 待收货/30107 ,待客户借款/30207,支付中/30208,待客户支付/30214,微信服务商支付/30215,付款失败/30211,已完成/30213,待客户还款/30217,已取消/30212,还款中/30216
*/
export const supplierOrderStatusEnum = {
WAIT_CLIENT_CONFIRM: 30202,
@@ -187,6 +190,7 @@ export const supplierOrderStatusEnum = {
WAIT_CLIENT_LOAN: 30207,
PAYING: 30208,
WAIT_CLIENT_PAY: 30214,
+ WX_PAY_SUPPLIER: 30215,
PAY_FAIL: 30211,
FINISHED: 30213,
WAIT_CLIENT_REPAY: 30217,
@@ -204,6 +208,7 @@ export const supplierOrderStatusMap = {
[supplierOrderStatusEnum.WAIT_CLIENT_LOAN]: '待借款',
[supplierOrderStatusEnum.PAYING]: '支付中',
[supplierOrderStatusEnum.WAIT_CLIENT_PAY]: '待支付',
+ [supplierOrderStatusEnum.WX_PAY_SUPPLIER]: '待支付',
[supplierOrderStatusEnum.PAY_FAIL]: '付款失败',
[supplierOrderStatusEnum.FINISHED]: '已完成',
[supplierOrderStatusEnum.WAIT_CLIENT_REPAY]: '待还款',
diff --git a/env/index.js b/env/index.js
index bcf6a22..a0bfcb1 100644
--- a/env/index.js
+++ b/env/index.js
@@ -1,8 +1,8 @@
/**
* @description 唯一环境变量
*/
-// const env = 'test'
+const env = 'test'
// const env = 'dev'
-const env = 'production'
+// const env = 'production'
export default env
diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue
index 9e7c47e..b713b91 100644
--- a/pages/order-detail/index.vue
+++ b/pages/order-detail/index.vue
@@ -28,6 +28,8 @@
去付款
+
+ 去付款
确认收货
@@ -154,9 +156,19 @@