q-koa 10.6.1 → 10.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -121,3 +121,15 @@ exports.is_control = {
|
|
|
121
121
|
controlInline: true,
|
|
122
122
|
},
|
|
123
123
|
}
|
|
124
|
+
|
|
125
|
+
exports.extra = {
|
|
126
|
+
type: Sequelize.JSON,
|
|
127
|
+
comment: 'extra',
|
|
128
|
+
allowNull: false,
|
|
129
|
+
is_mock: false,
|
|
130
|
+
defaultValue: {},
|
|
131
|
+
sortOrder: 9,
|
|
132
|
+
extra: {
|
|
133
|
+
type: 'json-editor',
|
|
134
|
+
},
|
|
135
|
+
}
|
|
@@ -909,14 +909,6 @@ exports.mp_pay = async (ctx) => {
|
|
|
909
909
|
partner_key: key.length > 10 ? key : partner_key, // 微信商户平台API密钥
|
|
910
910
|
})
|
|
911
911
|
|
|
912
|
-
const pay = (options) =>
|
|
913
|
-
new Promise((resolve, reject) => {
|
|
914
|
-
wxpay.getBrandWCPayRequestParams(options, (err, result) => {
|
|
915
|
-
if (err) return reject(err)
|
|
916
|
-
return resolve(result)
|
|
917
|
-
})
|
|
918
|
-
})
|
|
919
|
-
|
|
920
912
|
const userDetail =
|
|
921
913
|
type === 'H5-WEIXIN'
|
|
922
914
|
? ctx.request[`${appName}-user`].h5_user
|
|
@@ -931,7 +923,8 @@ exports.mp_pay = async (ctx) => {
|
|
|
931
923
|
const notify_url = `https://${
|
|
932
924
|
site_host || 'api.kuashou.com'
|
|
933
925
|
}/${appName}/weixin/notify`
|
|
934
|
-
|
|
926
|
+
|
|
927
|
+
const prePayResult = await wxpay.getBrandWCPayRequestParamsSync({
|
|
935
928
|
openid: userDetail.openid,
|
|
936
929
|
body: name,
|
|
937
930
|
detail: '公众号支付测试',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "q-koa",
|
|
3
|
-
"version": "10.6.
|
|
3
|
+
"version": "10.6.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"sequelize": "^5.21.3",
|
|
53
53
|
"static-koa-router": "^1.0.3",
|
|
54
54
|
"wechat-oauth": "^1.5.0",
|
|
55
|
-
"weixin-pay-fork": "^1.0.
|
|
55
|
+
"weixin-pay-fork": "^1.0.4",
|
|
56
56
|
"node-uuid": "^1.4.8",
|
|
57
57
|
"sha1": "^1.1.1",
|
|
58
58
|
"redis": "^4.0.3",
|