From 9a996d1fd204f7fcd7d2df4ffd10a44e3c3965f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= Date: Tue, 21 Mar 2023 10:02:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=A8=E6=89=93=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/customer/detail/index.js | 22 ++++++++++++++++++++-- pages/customer/detail/index.wxml | 17 +++++++++++++++++ pages/customer/filterList/index.js | 21 +++++++++++++++++++-- pages/customer/filterList/index.wxml | 19 ++++++++++++++++++- pages/customer/index.js | 22 ++++++++++++++++++++-- pages/customer/index.wxml | 19 ++++++++++++++++++- pages/order/detail/index.js | 22 ++++++++++++++++++++-- pages/order/detail/index.wxml | 17 +++++++++++++++++ pages/order/detail/index2.js | 12 ------------ pages/order/filterList/index.js | 12 ------------ pages/order/filterList/index2.js | 12 ------------ pages/order/index.js | 12 ------------ 12 files changed, 149 insertions(+), 58 deletions(-) diff --git a/pages/customer/detail/index.js b/pages/customer/detail/index.js index 1de239b..619a7a6 100644 --- a/pages/customer/detail/index.js +++ b/pages/customer/detail/index.js @@ -55,6 +55,9 @@ Page({ wxgrimg:'',//个微 wxgrimg_url:'',//个微 + + isShowCall:false,//是否显示拨打电话确认弹框 + phoneNumber:'',//拨打的电话号码 }, onLoad(options) { for (let key in options) { @@ -578,8 +581,9 @@ Page({ params['id'] = e.currentTarget.dataset.id; params['type'] = 0; _.apiQuery.getAppXz(params).then(res=>{ - wx.makePhoneCall({ - phoneNumber: res.data.mobile, + this.setData({ + isShowCall:true, + phoneNumber:res.data.mobile, }) }) }, @@ -1206,6 +1210,20 @@ Page({ }) }, + //隐藏电话弹框 + hideCall(){ + this.setData({ + isShowCall:false, + }) + }, + + //拨打电话 + makePhoneCall(){ + wx.makePhoneCall({ + phoneNumber: this.data.phoneNumber, + }) + }, + //页面相关事件处理函数--监听用户下拉动作 onPullDownRefresh(){ this.setData({ diff --git a/pages/customer/detail/index.wxml b/pages/customer/detail/index.wxml index fb9cda0..0419a4d 100644 --- a/pages/customer/detail/index.wxml +++ b/pages/customer/detail/index.wxml @@ -521,4 +521,21 @@ + + + + + + + 现在呼叫 {{phoneNumber}} ？ + + + + + + \ No newline at end of file diff --git a/pages/customer/filterList/index.js b/pages/customer/filterList/index.js index 834b6a0..6941233 100644 --- a/pages/customer/filterList/index.js +++ b/pages/customer/filterList/index.js @@ -39,6 +39,9 @@ Page({ distBiz_id:'', bizArray: [], bizobj: [], + + isShowCall:false,//是否显示拨打电话确认弹框 + phoneNumber:'',//拨打的电话号码 }, onLoad(options) { for (let key in options) { @@ -183,8 +186,9 @@ Page({ params['id'] = e.currentTarget.dataset.id; params['type'] = 0; _.apiQuery.getAppXz(params).then(res=>{ - wx.makePhoneCall({ - phoneNumber: res.data.mobile, + this.setData({ + isShowCall:true, + phoneNumber:res.data.mobile, }) }) }, @@ -523,6 +527,19 @@ Page({ }) }, + //隐藏电话弹框 + hideCall(){ + this.setData({ + isShowCall:false, + }) + }, + + //拨打电话 + makePhoneCall(){ + wx.makePhoneCall({ + phoneNumber: this.data.phoneNumber, + }) + }, //页面相关事件处理函数--监听用户下拉动作 onPullDownRefresh(){ diff --git a/pages/customer/filterList/index.wxml b/pages/customer/filterList/index.wxml index dd53e7d..b2dd814 100644 --- a/pages/customer/filterList/index.wxml +++ b/pages/customer/filterList/index.wxml @@ -188,4 +188,21 @@ - \ No newline at end of file + + + + + + + 现在呼叫 {{phoneNumber}} ？ + + + + + + + \ No newline at end of file diff --git a/pages/customer/index.js b/pages/customer/index.js index b0494b0..59de81e 100644 --- a/pages/customer/index.js +++ b/pages/customer/index.js @@ -93,6 +93,9 @@ Page({ city_id:'', countyIndex:-1, county_id:'', + + isShowCall:false,//是否显示拨打电话确认弹框 + phoneNumber:'',//拨打的电话号码 }, onLoad(options) { for (let key in options) { @@ -392,8 +395,9 @@ Page({ params['id'] = e.currentTarget.dataset.id; params['type'] = 0; _.apiQuery.getAppXz(params).then(res=>{ - wx.makePhoneCall({ - phoneNumber: res.data.mobile, + this.setData({ + isShowCall:true, + phoneNumber:res.data.mobile, }) }) }, @@ -1062,6 +1066,20 @@ Page({ } }, + //隐藏电话弹框 + hideCall(){ + this.setData({ + isShowCall:false, + }) + }, + + //拨打电话 + makePhoneCall(){ + wx.makePhoneCall({ + phoneNumber: this.data.phoneNumber, + }) + }, + //页面相关事件处理函数--监听用户下拉动作 onPullDownRefresh(){ this.setData({ diff --git a/pages/customer/index.wxml b/pages/customer/index.wxml index 007aebc..2bc91e2 100644 --- a/pages/customer/index.wxml +++ b/pages/customer/index.wxml @@ -414,4 +414,21 @@ - \ No newline at end of file + + + + + + + 现在呼叫 {{phoneNumber}} ？ + + + + + + + \ No newline at end of file diff --git a/pages/order/detail/index.js b/pages/order/detail/index.js index 9ffd33a..8fff92e 100644 --- a/pages/order/detail/index.js +++ b/pages/order/detail/index.js @@ -50,6 +50,9 @@ Page({ register_img:{}, car_img:{}, + isShowCall:false,//是否显示拨打电话确认弹框 + phoneNumber:'',//拨打的电话号码 + }, onLoad: function (options) { for (let key in options) { @@ -835,8 +838,9 @@ Page({ params['id'] = e.currentTarget.dataset.id; params['type'] = 1; _.apiQuery.getAppXz(params).then(res=>{ - wx.makePhoneCall({ - phoneNumber: res.data.mobile, + this.setData({ + isShowCall:true, + phoneNumber:res.data.mobile, }) }) }, @@ -875,6 +879,20 @@ Page({ }) }, + //隐藏电话弹框 + hideCall(){ + this.setData({ + isShowCall:false, + }) + }, + + //拨打电话 + makePhoneCall(){ + wx.makePhoneCall({ + phoneNumber: this.data.phoneNumber, + }) + }, + //随车工具 changeTool(e) { let carToolList = this.data.carToolList diff --git a/pages/order/detail/index.wxml b/pages/order/detail/index.wxml index a454cd8..57756d3 100644 --- a/pages/order/detail/index.wxml +++ b/pages/order/detail/index.wxml @@ -386,4 +386,21 @@ + + + + + + + 现在呼叫 {{phoneNumber}} ？ + + + + + + \ No newline at end of file diff --git a/pages/order/detail/index2.js b/pages/order/detail/index2.js index b48d485..46bbb28 100644 --- a/pages/order/detail/index2.js +++ b/pages/order/detail/index2.js @@ -685,18 +685,6 @@ Page({ }) }, - //拨打客户电话xz - call(e) { - let params = {}; - params['id'] = e.currentTarget.dataset.id; - params['type'] = 1; - _.apiQuery.getAppXz(params).then(res=>{ - wx.makePhoneCall({ - phoneNumber: res.data.mobile, - }) - }) - }, - //查看图片 previewImage: function (e) { if(e.currentTarget.dataset.type=='bill_img'){ diff --git a/pages/order/filterList/index.js b/pages/order/filterList/index.js index 7df2671..79994c1 100644 --- a/pages/order/filterList/index.js +++ b/pages/order/filterList/index.js @@ -59,18 +59,6 @@ Page({ }); }, - //拨打客户电话xz - call(e) { - let params = {}; - params['id'] = e.currentTarget.dataset.id; - params['type'] = 1; - _.apiQuery.getAppXz(params).then(res=>{ - wx.makePhoneCall({ - phoneNumber: res.data.mobile, - }) - }) - }, - //显示短信弹框 showMessage(e){ this.setData({ diff --git a/pages/order/filterList/index2.js b/pages/order/filterList/index2.js index 0bcadc3..33d4d6f 100644 --- a/pages/order/filterList/index2.js +++ b/pages/order/filterList/index2.js @@ -101,18 +101,6 @@ Page({ }); }, - //拨打客户电话xz - call(e) { - let params = {}; - params['id'] = e.currentTarget.dataset.id; - params['type'] = 1; - _.apiQuery.getAppXz(params).then(res=>{ - wx.makePhoneCall({ - phoneNumber: res.data.mobile, - }) - }) - }, - //显示短信弹框 showMessage(e){ this.setData({ diff --git a/pages/order/index.js b/pages/order/index.js index 5085c0b..9d0f318 100644 --- a/pages/order/index.js +++ b/pages/order/index.js @@ -154,18 +154,6 @@ Page({ }); }, - //拨打客户电话xz - call(e) { - let params = {}; - params['id'] = e.currentTarget.dataset.id; - params['type'] = 1; - _.apiQuery.getAppXz(params).then(res=>{ - wx.makePhoneCall({ - phoneNumber: res.data.mobile, - }) - }) - }, - // 输入 searchInput(e){ this.setData({