增加角色跳转功能，二维码支付功能

SDK.ts

@@ -38,9 +38,8 @@ class WechatSDK {
         _selt.ReportParams.from = options.from || 0;
         _selt.ReportParams.tag = options.tag || 0;
         _selt.ReportParams.passthroughParams = options.passthroughParams || '';
-        _selt.ReportParams.fromOpenId = options.fromOpenId || '';
         _selt.actId = options.actId || '';
-        _selt.sdkParams.from_openid = options.from_openid || '';
+        _selt.ReportParams.fromOpenId = _selt.sdkParams.from_openid = options.from_openid || '';
         _selt.sdkParams.from_product = options.from_product || '';
         _selt.sdkParams.from_uid = options.from_uid || '';
         await _selt.getNetworkType();
@@ -128,7 +127,8 @@ class WechatSDK {
             _selt.ReportParams.userId = _selt.heartParams.userid = data.uid  // 记录用户ID
             LoginCallBack = _selt.deepCopy(LoginCallBack, data, {
                 os: _selt.sdkParams.os,  // 返回系统类型IOS或者android
-                session_key: _selt.sdkParams.session_key  // 返回session_key
+                session_key: _selt.sdkParams.session_key,  // 返回session_key
+                fromOpenid: _selt.ReportParams.fromOpenId // 跳转用户来源openid
             })
         } else {
             const params = {
@@ -177,7 +177,7 @@ class WechatSDK {
                     complete: () => { _selt.LoadingOff(); }
                 }
                 _selt.navigateToMiniProgram(params);
-                return 2; // 切支付状态
+                return { order_code: 2 }; // 切支付状态
             } else if (res.data.open_customer_service) {  // 客服切支付
                 let order = {
                     sessionFrom: 'order_id=' + res.data.order_num || '',
@@ -195,7 +195,7 @@ class WechatSDK {
                     }
                 }
                 _selt.showModal(params);
-                return 2;
+                return { order_code: 2 };
             } else {
                 // 根据返回的用户订单状态判断是新订单还是未完成订单
                 if (res.data.order_type == 1) {  // 新订单
@@ -263,7 +263,15 @@ class WechatSDK {
                             }
                         }));
                     });
-                } else {  // 已有未完成订单，弹窗提示
+                } else if(res.data.order_type == 103) {  // 二维码支付
+                    let payback = {
+                        order_code: res.data.order_type,
+                        order_num: res.data.order_num,
+                        payload: res.data.payload
+                    }
+                    return payback;
+                }
+                else {  // 已有未完成订单，弹窗提示
                     const params = {
                         title: SDKConfig.shareTitle,
                         content: '订单发货中，请稍候下单..'
@@ -277,7 +285,7 @@ class WechatSDK {
                 content: res.msg
             }
             if (res.dialog == 1) _selt.showModal(params);
-            return 3023;
+            return { order_code: 3023 };
         } else {  // 输出订单失败消息
             const errmsg = res.msg || '支付失败..'
             if (showSDKAlert) {
@@ -288,7 +296,7 @@ class WechatSDK {
                 }
                 _selt.showModal(params);
             }
-            return 0;
+            return { order_code: 0 };
         }
     }
     private async getCoins(orderParams) {  // 通知服务端扣费