efront 3.21.5 → 3.21.6
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.
- package/apps/pay/alipay.jsp +1 -1
- package/coms/basic/BigNumber.js +22 -0
- package/coms/basic/BigNumber_test.js +1 -0
- package/coms/frame/payment.js +0 -3
- package/package.json +1 -1
- package/public/efront.js +1 -1
package/apps/pay/alipay.jsp
CHANGED
|
@@ -76,7 +76,7 @@ ACQ.MERCHANT_PERM_RECEIPT_DAY_LIMIT 超过单日累计收款额度 联系支付
|
|
|
76
76
|
sign_type: "RSA2",
|
|
77
77
|
version: "1.0",
|
|
78
78
|
charset: "utf-8",
|
|
79
|
-
return_url: `${req.protocol}//${req.headers.host}${req.url.replace(/[\.\:][\s\S]*$/, '')}-callback`,
|
|
79
|
+
return_url: `${req.protocol}//${req.headers[":authority"] || req.headers.host}${req.url.replace(/[\.\:][\s\S]*$/, '')}-callback`,
|
|
80
80
|
biz_content: JSON.stringify(biz_content)
|
|
81
81
|
};
|
|
82
82
|
await _runtask("alipay-sign", params);
|
package/coms/basic/BigNumber.js
CHANGED
|
@@ -46,7 +46,9 @@ var fixde = function (numstr, fractionDigits, compare) {
|
|
|
46
46
|
}
|
|
47
47
|
var res = s1 + s2;
|
|
48
48
|
if (frag) {
|
|
49
|
+
var res_length = res.length;
|
|
49
50
|
res = BigNumber.add(res, 1);
|
|
51
|
+
if (res.length < res_length) res = repeat0(res_length - res.length) + res;
|
|
50
52
|
}
|
|
51
53
|
if (fractionDigits > 0) res = res.slice(0, res.length - fractionDigits) + '.' + res.slice(res.length - fractionDigits);
|
|
52
54
|
if (/^\./.test(res)) res = "0" + res;
|
|
@@ -181,4 +183,24 @@ class BigNumber {
|
|
|
181
183
|
res = res.reverse().join('');
|
|
182
184
|
return fixme(neg1 ^ neg2, res, d);
|
|
183
185
|
}
|
|
186
|
+
static sub(numstr1, numstr2) {
|
|
187
|
+
numstr2 = trim(numstr2);
|
|
188
|
+
if (/^\-/.test(numstr2)) numstr2 = numstr2.slice(1);
|
|
189
|
+
else numstr2 = '-' + numstr2;
|
|
190
|
+
return BigNumber.add(numstr1, numstr2);
|
|
191
|
+
}
|
|
192
|
+
// 按整数除法,超出输入的数字的位数之和
|
|
193
|
+
static div(numstr1, numstr2, decimal) {
|
|
194
|
+
if (isEmpty(decimal)) throw new Error("请输入保留小数的位数!");
|
|
195
|
+
var [neg1, s11, s12] = prepare(numstr1);
|
|
196
|
+
var [neg2, s21, s22] = prepare(numstr2);
|
|
197
|
+
var d = s12.length - s22.length;
|
|
198
|
+
numstr1 = s11 + s12;
|
|
199
|
+
numstr2 = s21 + s22;
|
|
200
|
+
|
|
201
|
+
if (d < 0) {
|
|
202
|
+
numstr2 += repeat0(0, -d);
|
|
203
|
+
}
|
|
204
|
+
numstr1 += repeat0(0);
|
|
205
|
+
}
|
|
184
206
|
}
|
|
@@ -38,6 +38,7 @@ assert(BigNumber.fix(2.235, 2), '2.24');
|
|
|
38
38
|
assert(BigNumber.fix(2.234, 2), '2.23');
|
|
39
39
|
assert(BigNumber.fix(2.2351, 2), '2.24');
|
|
40
40
|
assert(BigNumber.fix(2.2349, 2), '2.23');
|
|
41
|
+
assert(BigNumber.fix(0.00807703432, 2), '0.01');
|
|
41
42
|
assert(BigNumber.round(2.2349), '2');
|
|
42
43
|
assert(BigNumber.round(2.4999), '2');
|
|
43
44
|
assert(BigNumber.round(2.5000), '3');
|
package/coms/frame/payment.js
CHANGED
|
@@ -36,9 +36,6 @@ function main(paytypes, price, subject = '网站扫码支付') {
|
|
|
36
36
|
});
|
|
37
37
|
drag.on(page.firstChild, page);
|
|
38
38
|
resize.on(page);
|
|
39
|
-
data.bindInstance("paytype", function (type) {
|
|
40
|
-
console.log(type)
|
|
41
|
-
});
|
|
42
39
|
var frame = page.querySelector("iframe");
|
|
43
40
|
bind("message")(frame, function (e) {
|
|
44
41
|
var id = e.data;
|