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

assets/llewan-weixin-sdk/sdk.js

@@ -328,43 +328,54 @@ var sdk = {
 
                 // }.bind(self),100);
 
-                
-                var shareTime = (nowTime/1000)-self.shareStartTime;
-
-                if(shareTime>=sdk_conf.share_time_limit)
+                if(self.getConfig4().cityLimit==1)
                 {
-
-                    console.log("sdk 分享成功");
                     if(self.shareInfo.successCallback)
                     {
                         //分享成功 调用api记录分享数据
                         self.shareInfo.successCallback();
-                        console.log("sdk 分享成功回调");
+                        console.log("sdk 限制城市分享成功回调");
                     }
-
-                    //分享成功记录到服务器
-                    var option = {'uid': sdk.userid, 'share_id': self.shareInfo.sysid };
-
-                    self.Get(self.ip3 + self.Logcommon, { log_type: "ShareClick", data: JSON.stringify(option) }, function (d) {
-                        console.log("sdk 分享成功记录到服务器");
-                    });
-
-                    
                 }else
                 {
-                    console.log("sdk 分享失败");
-                    //分享失败 回调失败
-                    if(self.shareInfo.failCallback)
+                    var shareTime = (nowTime/1000)-self.shareStartTime;
+
+                    if(shareTime>=sdk_conf.share_time_limit)
                     {
-                        self.shareInfo.failCallback();
-                        console.log("sdk 分享失败回调");
-                    }else if(self.shareInfo.cancelCallback)
+    
+                        console.log("sdk 分享成功");
+                        if(self.shareInfo.successCallback)
+                        {
+                            //分享成功 调用api记录分享数据
+                            self.shareInfo.successCallback();
+                            console.log("sdk 分享成功回调");
+                        }
+    
+                        //分享成功记录到服务器
+                        var option = {'uid': sdk.userid, 'share_id': self.shareInfo.sysid };
+    
+                        self.Get(self.ip3 + self.Logcommon, { log_type: "ShareClick", data: JSON.stringify(option) }, function (d) {
+                            console.log("sdk 分享成功记录到服务器");
+                        });
+    
+                        
+                    }else
                     {
-                        self.shareInfo.cancelCallback();
-                        console.log("sdk 分享取消回调");
+                        console.log("sdk 分享失败");
+                        //分享失败 回调失败
+                        if(self.shareInfo.failCallback)
+                        {
+                            self.shareInfo.failCallback();
+                            console.log("sdk 分享失败回调");
+                        }else if(self.shareInfo.cancelCallback)
+                        {
+                            self.shareInfo.cancelCallback();
+                            console.log("sdk 分享取消回调");
+                        }
+    
+                      
                     }
-
-                  
+                    
                 }
                 
                 //重置分享数据
@@ -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;