|
|
@@ -1381,6 +1381,7 @@
|
|
|
});
|
|
|
})
|
|
|
.then(function (res) {
|
|
|
+ alert("123",res,signPageUrl);
|
|
|
if (res && res.code != null) {
|
|
|
var c = Number(res.code);
|
|
|
if (c !== 200 && c !== 0 && res.success !== true) {
|
|
|
@@ -1388,28 +1389,35 @@
|
|
|
}
|
|
|
}
|
|
|
var pack = normalizeWxJssdkSignPayload(res, signPageUrl);
|
|
|
- if (!pack) throw new Error('getWxConfig 缺少 appId/timestamp/nonceStr/signature');
|
|
|
+ if (!pack) {
|
|
|
+ console.warn('[wx] getWxConfig 响应字段不全', res, 'signUrl=', signPageUrl);
|
|
|
+ throw new Error(
|
|
|
+ 'getWxConfig 缺少 appId/timestamp/nonceStr/signature(见控制台原始响应)'
|
|
|
+ );
|
|
|
+ }
|
|
|
+ console.log('[wx] getWxConfig OK', {
|
|
|
+ appId: pack.appId,
|
|
|
+ signUrl: pack.signUrl || signPageUrl
|
|
|
+ });
|
|
|
return pack;
|
|
|
});
|
|
|
}
|
|
|
|
|
|
function applyWxConfig(sign, signPageUrl) {
|
|
|
- // alert("123",sign,signPageUrl);
|
|
|
var urlForWx =
|
|
|
sign.signUrl && String(sign.signUrl).trim() !== ''
|
|
|
? String(sign.signUrl).trim()
|
|
|
: signPageUrl;
|
|
|
syncBrowserUrlForWxSign(urlForWx);
|
|
|
return new Promise(function (resolve) {
|
|
|
-
|
|
|
wx.config({
|
|
|
- debug: true,
|
|
|
+ debug: isWxDebugOn(),
|
|
|
appId: sign.appId,
|
|
|
timestamp: sign.timestamp,
|
|
|
nonceStr: sign.nonceStr,
|
|
|
signature: sign.signature,
|
|
|
- // jsApiList: [],
|
|
|
- // openTagList: ['wx-open-launch-app']
|
|
|
+ jsApiList: [],
|
|
|
+ openTagList: ['wx-open-launch-app']
|
|
|
});
|
|
|
wx.ready(function () {
|
|
|
weChatJssdkConfigured = true;
|
|
|
@@ -1515,7 +1523,6 @@
|
|
|
bindWeChatLaunchTagEvents();
|
|
|
wxJssdkInitPromise = fetchWeChatJssdkSign(signPageUrl)
|
|
|
.then(function (sign) {
|
|
|
- alert('sign',sign);
|
|
|
if (!sign) {
|
|
|
setWxInitError('getWxConfig 返回为空');
|
|
|
return false;
|
|
|
@@ -1541,8 +1548,10 @@
|
|
|
});
|
|
|
})
|
|
|
.catch(function (e) {
|
|
|
- setWxInitError(e && e.message ? e.message : 'getWxConfig 请求失败');
|
|
|
- console.warn('[wx] init failed', e);
|
|
|
+ var msg = e && e.message ? e.message : 'getWxConfig 请求失败';
|
|
|
+ setWxInitError(msg);
|
|
|
+ console.warn('[wx] fetchWeChatJssdkSign failed', msg, 'signUrl=', signPageUrl);
|
|
|
+ if (isWeChatInAppBrowser() && isWxDebugOn()) window.alert(msg);
|
|
|
return false;
|
|
|
})
|
|
|
.finally(function () {
|