|
|
@@ -77,7 +77,6 @@ function Connect() {
|
|
77
|
77
|
RetrieveBack();
|
|
78
|
78
|
break; //接回
|
|
79
|
79
|
case "incoming":
|
|
80
|
|
- console.log("123123123",data);
|
|
81
|
80
|
IncomingBack(data);
|
|
82
|
81
|
break; //来电
|
|
83
|
82
|
case "subscribe":
|
|
|
@@ -414,14 +413,14 @@ function MakeCallBack(data) {
|
|
414
|
413
|
$(".DropCall").addClass("active");
|
|
415
|
414
|
|
|
416
|
415
|
// 外呼弹屏
|
|
417
|
|
- var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID=' + data.CallID + '">外呼弹屏' + makeCallPhone + ' <i class="fa fa-times-circle"></i></a>';
|
|
|
416
|
+ var timestamp = Date.parse(new Date());
|
|
|
417
|
+ var p = '<a href="javascript:;" class="active J_menuTab" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID='+timestamp+'">来电弹屏' + makeCallPhone + ' <i class="fa fa-times-circle"></i></a>';
|
|
418
|
418
|
$(".J_menuTab").removeClass("active");
|
|
419
|
|
- var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+ data.CallID +'" width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + makeCallPhone + '&CallID=' + data.CallID + '&ActionID=' + data.ActionID + '" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + data.Number + '&CallID=' + data.CallID + '" seamless></iframe>';
|
|
|
419
|
+ var nif = '<iframe class="J_iframe J_iframeNew" name="iframe'+timestamp+'" width="100%" height="100%" src="./callScreen/callScreen.html?Number=' + makeCallPhone + '&CallID='+timestamp+'" frameborder="0" data-id="./callScreen/callScreen.html?tel=' + makeCallPhone + '&CallID='+timestamp+'" seamless></iframe>';
|
|
420
|
420
|
$(".J_mainContent").find("iframe.J_iframe").hide().parents(".J_mainContent").append(nif);
|
|
421
|
421
|
$(".J_menuTabs .page-tabs-content").append(p);
|
|
422
|
|
- hidTel= makeCallPhone;
|
|
423
|
|
- hidCallID=data.CallID;
|
|
424
|
|
- hidActionID=data.ActionID;
|
|
|
422
|
+ hidTel=makeCallPhone;
|
|
|
423
|
+ hidCallID=timestamp;
|
|
425
|
424
|
|
|
426
|
425
|
window.frames['iframe'+ hidCallID +''].window.onload = function(){
|
|
427
|
426
|
var callingFun = window.frames['iframe'+ hidCallID +''].window.calling;
|