还原未增加启动参数之前的版本

20190402/SDK.ts → 20181218/SDK.ts

@@ -34,7 +34,7 @@ class WechatSDK {
         _selt.sdkParams.appid = SDKConfig.appid;
         _selt.sdkParams.version = _selt.sdkVersion;
         const options = _selt.getOptionsInfo();  // 返回参数对象
-        _selt.ReportParams.from = options.newFrom;
+        _selt.ReportParams.from = options.from || 0;
         _selt.ReportParams.tag = options.tag || 0;
         _selt.ReportParams.passthroughParams = options.tag || '';
         _selt.ReportParams.fromOpenId = options.fromOpenId || '';
@@ -217,7 +217,6 @@ class WechatSDK {
                                         msg = '用户操作系统支付状态异常';
                                         break;
                                 }
-                                console.log('##支付错误码', err);
                                 if (showSDKAlert) _selt.sdkAlert(msg);
                                 resolve(err.errCode);
                             }
@@ -238,7 +237,7 @@ class WechatSDK {
             }
             if (res.dialog == 1) _selt.showModal(params);
             return 3023;
-        } else {  // 输出订单失败消息
+        } else {  // 输出订单失败消息                
             const errmsg = res.msg || '支付失败..'
             if (showSDKAlert) _selt.sdkAlert(errmsg);
             return 0;
@@ -407,23 +406,18 @@ class WechatSDK {
     public getOptionsInfo(all?) {
         const _selt = this
         const options = (wx as any).getLaunchOptionsSync()
-        console.log("@@启动参数--->", options);
-        let queryObj;
-        if (all) return options;
+        console.log("@@启动参数--->", options)
+        if (all) return options
         if (options.query && Object.keys(options.query).length > 0) {
             if (options.query.scene && options.query.scene != '') {  // 扫码参数
-                queryObj = _selt.toJson(decodeURIComponent(options.query.scene));
-            } else queryObj = options.query  // 普通url参数
+                const scene = _selt.toJson(decodeURIComponent(options.query.scene))
+                return scene
+            } else return options.query  // 普通url参数
         } else if (options.referrerInfo && Object.keys(options.referrerInfo).length > 0 && options.referrerInfo.extraData && Object.keys(options.referrerInfo.extraData).length > 0) {
-            queryObj = options.referrerInfo.extraData  // 小程序跳转附带参数
+            return options.referrerInfo.extraData  // 小程序跳转附带参数
         } else {
-            queryObj = {}
+            return {}
         }
-        if (Object.keys(queryObj).length != 0) {
-            queryObj.newFrom = queryObj.from || 0;
-            queryObj.from = queryObj.purchase ? queryObj.newFrom : 0;
-        }
-        return queryObj;
     }
     public getLaunchOptions() {
         return (wx as any).getLaunchOptionsSync()