加上城市限制分享直接成功回调

assets/llewan-weixin-sdk/sdk.js

@@ -328,7 +328,16 @@ var sdk = {
 
                 // }.bind(self),100);
 
-                
+                if(self.getConfig4().cityLimit==1)
+                {
+                    if(self.shareInfo.successCallback)
+                    {
+                        //分享成功 调用api记录分享数据
+                        self.shareInfo.successCallback();
+                        console.log("sdk 限制城市分享成功回调");
+                    }
+                }else
+                {
                     var shareTime = (nowTime/1000)-self.shareStartTime;
 
                     if(shareTime>=sdk_conf.share_time_limit)
@@ -367,6 +376,8 @@ var sdk = {
                       
                     }
                     
+                }
+                
                 //重置分享数据
                 self.shareStartTime = -1;
                 self.shareInfo =null;
@@ -966,7 +977,7 @@ var sdk = {
                 }
 
                 if(obj.cancel){
-                    shareInfo.cancel = function(){
+                    shareInfo.cancelCallback = function(){
                         self.shareCancelCallback=true;
                         obj.cancel();
                         console.log("分享取消了");
@@ -1041,7 +1052,7 @@ var sdk = {
             shareInfo.failCallback = obj.fail;
         }
         if(obj.cancel){
-            shareInfo.cancel = function(){
+            shareInfo.cancelCallback = function(){
                 self.shareCancelCallback=true;
                 obj.cancel();
                 console.log("分享取消了");
@@ -2202,7 +2213,7 @@ var sdk = {
         {
             var data = {};
             data.url = url;
-            //data.user_action_set_id = sdk.getConfig4().useActionSetId;
+            data.user_action_set_id = sdk.getConfig4().useActionSetId;
 
             data.action_type = at;
             data.action_time = new Date().getTime()/1000;