diff --git a/sourcecode/alipay/default/app.js b/sourcecode/alipay/default/app.js index 1f4dbd8d5..d4f76716e 100644 --- a/sourcecode/alipay/default/app.js +++ b/sourcecode/alipay/default/app.js @@ -718,7 +718,7 @@ App({ // 拨打电话 call_tel(value) { if ((value || null) != null) { - my.makePhoneCall({ number: value }); + my.makePhoneCall({ number: value.toString() }); } }, diff --git a/sourcecode/alipay/default/pages/common/copyright.axml b/sourcecode/alipay/default/pages/common/copyright.axml index 384e8fe85..c82ecc345 100644 --- a/sourcecode/alipay/default/pages/common/copyright.axml +++ b/sourcecode/alipay/default/pages/common/copyright.axml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml b/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml index 37b6bbe5e..3ba23f8ed 100644 --- a/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml +++ b/sourcecode/alipay/default/pages/goods-detail/goods-detail.axml @@ -190,7 +190,7 @@ - + diff --git a/sourcecode/alipay/default/pages/goods-detail/goods-detail.js b/sourcecode/alipay/default/pages/goods-detail/goods-detail.js index fca4600ce..fe4c8e289 100644 --- a/sourcecode/alipay/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/alipay/default/pages/goods-detail/goods-detail.js @@ -258,11 +258,12 @@ Page({ // 导航购买按钮事件 nav_buy_submit_event(e) { var type = e.currentTarget.dataset.type || 'buy'; + var value = e.currentTarget.dataset.value || null; switch(type) { // 展示型、拨打电话 case 'show' : - app.call_tel(this.data.common_app_customer_service_tel); + app.call_tel(value || this.data.common_app_customer_service_tel); break; // 购买、加入购物车 diff --git a/sourcecode/baidu/default/app.js b/sourcecode/baidu/default/app.js index 113df6368..e9ca4db0c 100755 --- a/sourcecode/baidu/default/app.js +++ b/sourcecode/baidu/default/app.js @@ -658,7 +658,7 @@ App({ // 拨打电话 call_tel(value) { if ((value || null) != null) { - swan.makePhoneCall({ phoneNumber: value }); + swan.makePhoneCall({ phoneNumber: value.toString() }); } }, diff --git a/sourcecode/baidu/default/pages/common/copyright.swan b/sourcecode/baidu/default/pages/common/copyright.swan index 384e8fe85..c82ecc345 100755 --- a/sourcecode/baidu/default/pages/common/copyright.swan +++ b/sourcecode/baidu/default/pages/common/copyright.swan @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/sourcecode/baidu/default/pages/goods-detail/goods-detail.js b/sourcecode/baidu/default/pages/goods-detail/goods-detail.js index 10bcf7c8a..fcef7b825 100755 --- a/sourcecode/baidu/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/baidu/default/pages/goods-detail/goods-detail.js @@ -227,11 +227,12 @@ Page({ // 导航购买按钮事件 nav_buy_submit_event(e) { var type = e.currentTarget.dataset.type || 'buy'; + var value = e.currentTarget.dataset.value || null; switch(type) { // 展示型、拨打电话 case 'show' : - app.call_tel(this.data.common_app_customer_service_tel); + app.call_tel(value || this.data.common_app_customer_service_tel); break; // 购买、加入购物车 diff --git a/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan b/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan index 796c1adf6..9b17d95b4 100755 --- a/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan +++ b/sourcecode/baidu/default/pages/goods-detail/goods-detail.swan @@ -175,7 +175,7 @@ - + diff --git a/sourcecode/qq/default/app.js b/sourcecode/qq/default/app.js index 8e2ae4a75..919c92d84 100755 --- a/sourcecode/qq/default/app.js +++ b/sourcecode/qq/default/app.js @@ -663,7 +663,7 @@ App({ // 拨打电话 call_tel(value) { if ((value || null) != null) { - qq.makePhoneCall({ phoneNumber: value }); + qq.makePhoneCall({ phoneNumber: value.toString() }); } }, diff --git a/sourcecode/qq/default/pages/common/copyright.qml b/sourcecode/qq/default/pages/common/copyright.qml index 384e8fe85..c82ecc345 100755 --- a/sourcecode/qq/default/pages/common/copyright.qml +++ b/sourcecode/qq/default/pages/common/copyright.qml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/sourcecode/qq/default/pages/goods-detail/goods-detail.js b/sourcecode/qq/default/pages/goods-detail/goods-detail.js index 7e1888aec..cfef7e2b4 100755 --- a/sourcecode/qq/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/qq/default/pages/goods-detail/goods-detail.js @@ -239,11 +239,12 @@ Page({ // 导航购买按钮事件 nav_buy_submit_event(e) { var type = e.currentTarget.dataset.type || 'buy'; + var value = e.currentTarget.dataset.value || null; switch(type) { // 展示型、拨打电话 case 'show' : - app.call_tel(this.data.common_app_customer_service_tel); + app.call_tel(value || this.data.common_app_customer_service_tel); break; // 购买、加入购物车 diff --git a/sourcecode/qq/default/pages/goods-detail/goods-detail.qml b/sourcecode/qq/default/pages/goods-detail/goods-detail.qml index 8fd3ac07d..7367f5d3d 100755 --- a/sourcecode/qq/default/pages/goods-detail/goods-detail.qml +++ b/sourcecode/qq/default/pages/goods-detail/goods-detail.qml @@ -181,7 +181,7 @@ - + diff --git a/sourcecode/toutiao/default/app.js b/sourcecode/toutiao/default/app.js index 8a46c68f1..a4cb30daa 100755 --- a/sourcecode/toutiao/default/app.js +++ b/sourcecode/toutiao/default/app.js @@ -781,7 +781,7 @@ App({ // 拨打电话 call_tel(value) { if ((value || null) != null) { - tt.makePhoneCall({ phoneNumber: value }); + tt.makePhoneCall({ phoneNumber: value.toString() }); } }, diff --git a/sourcecode/toutiao/default/pages/common/copyright.ttml b/sourcecode/toutiao/default/pages/common/copyright.ttml index 384e8fe85..c82ecc345 100755 --- a/sourcecode/toutiao/default/pages/common/copyright.ttml +++ b/sourcecode/toutiao/default/pages/common/copyright.ttml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js index d16d8d2c5..d0743e7c1 100755 --- a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.js @@ -239,11 +239,12 @@ Page({ // 导航购买按钮事件 nav_buy_submit_event(e) { var type = e.currentTarget.dataset.type || 'buy'; + var value = e.currentTarget.dataset.value || null; switch(type) { // 展示型、拨打电话 case 'show' : - app.call_tel(this.data.common_app_customer_service_tel); + app.call_tel(value || this.data.common_app_customer_service_tel); break; // 购买、加入购物车 diff --git a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml index 526ee1629..4737e4f4d 100755 --- a/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml +++ b/sourcecode/toutiao/default/pages/goods-detail/goods-detail.ttml @@ -181,7 +181,7 @@ - + diff --git a/sourcecode/weixin/default/app.js b/sourcecode/weixin/default/app.js index 42a8c949e..3829ebd38 100755 --- a/sourcecode/weixin/default/app.js +++ b/sourcecode/weixin/default/app.js @@ -667,7 +667,7 @@ App({ // 拨打电话 call_tel(value) { if ((value || null) != null) { - wx.makePhoneCall({ phoneNumber: value }); + wx.makePhoneCall({ phoneNumber: value.toString() }); } }, diff --git a/sourcecode/weixin/default/pages/common/copyright.wxml b/sourcecode/weixin/default/pages/common/copyright.wxml index 384e8fe85..c82ecc345 100755 --- a/sourcecode/weixin/default/pages/common/copyright.wxml +++ b/sourcecode/weixin/default/pages/common/copyright.wxml @@ -1,5 +1,5 @@ \ No newline at end of file diff --git a/sourcecode/weixin/default/pages/goods-detail/goods-detail.js b/sourcecode/weixin/default/pages/goods-detail/goods-detail.js index 107fe2113..3cf5856e4 100755 --- a/sourcecode/weixin/default/pages/goods-detail/goods-detail.js +++ b/sourcecode/weixin/default/pages/goods-detail/goods-detail.js @@ -258,11 +258,12 @@ Page({ // 导航购买按钮事件 nav_buy_submit_event(e) { var type = e.currentTarget.dataset.type || 'buy'; + var value = e.currentTarget.dataset.value || null; switch(type) { // 展示型、拨打电话 case 'show' : - app.call_tel(this.data.common_app_customer_service_tel); + app.call_tel(value || this.data.common_app_customer_service_tel); break; // 购买、加入购物车 @@ -870,11 +871,6 @@ Page({ } }, - // 拨打电话 - tel_event(e) { - app.call_tel(this.data.common_app_customer_service_tel); - }, - // 自定义分享 onShareAppMessage() { var user_id = app.get_user_cache_info('id', 0) || 0; diff --git a/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml b/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml index 8d0ee1239..2ed58c81f 100755 --- a/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml +++ b/sourcecode/weixin/default/pages/goods-detail/goods-detail.wxml @@ -179,7 +179,7 @@ - +