客服切支付增加返回值2

20190514/SDK.ts → 20190627/SDK.ts

@@ -4,7 +4,7 @@
  * @time: 2018-09-19
  */
 class WechatSDK {
-    private sdkVersion: string = '2.0'
+    private sdkVersion: string = '2.1'
     public constructor() {
         this.sdkInit()
         this.timerInit();
@@ -36,7 +36,7 @@ class WechatSDK {
         const options = _selt.getOptionsInfo();  // 返回参数对象
         _selt.ReportParams.from = options.from || 0;
         _selt.ReportParams.tag = options.tag || 0;
-        _selt.ReportParams.passthroughParams = options.tag || '';
+        _selt.ReportParams.passthroughParams = options.passthroughParams || '';
         _selt.ReportParams.fromOpenId = options.fromOpenId || '';
         _selt.actId = options.actId || '';
         await _selt.getNetworkType();
@@ -176,6 +176,7 @@ class WechatSDK {
                     }
                 }
                 _selt.showModal(params);
+                return 2;
             } else {
                 // 根据返回的用户订单状态判断是新订单还是未完成订单
                 if (res.data.order_type == 1) {  // 新订单
@@ -251,7 +252,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;
@@ -820,8 +821,9 @@ class WechatSDK {
                 },
                 success: function (res) {
                     let ShareParams = {
-                        title: shareInfo.share_title ? shareInfo.share_title : SDKConfig.shareTitle,
-                        imageUrl: shareInfo.share_image ? shareInfo.share_image : SDKConfig.shareImageUrl,
+                        title: shareInfo.title ? shareInfo.title : SDKConfig.shareTitle,
+                        imageUrl: shareInfo.image ? shareInfo.image : SDKConfig.shareImageUrl,
+                        imageId: shareInfo.imageId ? shareInfo.imageId : SDKConfig.shareImageId,
                         query: 'fromOpenId=' + _self.ReportParams.openId + '&from=share&tag=0&actId=' + actId
                     }
                     console.log("^^SDK::ShareParams", ShareParams);
@@ -835,7 +837,7 @@ class WechatSDK {
     }
     private shareInit() {
         (wx as any).showShareMenu({
-            withShareTicket: 'true',
+            withShareTicket: true,
             success: () => { },
             fail: () => { },
             complete: () => { }
@@ -849,6 +851,7 @@ class WechatSDK {
             const ShareParams = {
                 title: shareInfo.title ? shareInfo.title : SDKConfig.shareTitle,
                 imageUrl: shareInfo.image ? shareInfo.image : SDKConfig.shareImageUrl,
+                imageUrlId: shareInfo.imageId ? shareInfo.imageId : SDKConfig.shareImageId,
                 query: 'fromOpenId=' + that.ReportParams.openId + '&from=share&tag=0&' + (shareInfo.query ? shareInfo.query : ''),
                 withShareTicket: true,
                 success: shareInfo.success,
@@ -865,17 +868,19 @@ class WechatSDK {
         const ShareParams = {
             title: SDKConfig.shareTitle,
             imageUrl: SDKConfig.shareImageUrl,
+            imageId: SDKConfig.shareImageId,
             query: 'fromOpenId=' + that.ReportParams.openId + '&from=share&tag=0&' + (params ? params : '')
         }
         return this.share(ShareParams)
     }
-    public ShareGameInfo(shareObj?) {
+    public ShareGameInfo(shareInfo?) {
         const that = this
         // 参数，记录分享的用户openid
         const ShareParams = {
-            title: shareObj && shareObj.title ? shareObj.title : SDKConfig.shareTitle,
-            imageUrl: shareObj && shareObj.image ? shareObj.image : SDKConfig.shareImageUrl,
-            query: 'fromOpenId=' + that.ReportParams.openId + '&from=share&tag=0&' + (shareObj.extraData ? shareObj.extraData : '')
+            title: shareInfo && shareInfo.title ? shareInfo.title : SDKConfig.shareTitle,
+            imageUrl: shareInfo && shareInfo.image ? shareInfo.image : SDKConfig.shareImageUrl,
+            imageId: shareInfo && shareInfo.imageId ? shareInfo.imageId : SDKConfig.shareImageId,
+            query: 'fromOpenId=' + that.ReportParams.openId + '&from=share&tag=0&' + (shareInfo.extraData ? shareInfo.extraData : '')
         }
         return this.share(ShareParams)
     }
@@ -943,6 +948,7 @@ const Links = {
 class shareInfo {
     title?: string
     image?: string
+    imageId? : string
     query?: string
     success: any
     fail: any