From eeec174b1e331d253abbcd7ab49bb139bd7aeae4 Mon Sep 17 00:00:00 2001 From: taiwan Date: Thu, 10 Mar 2022 18:15:14 +0800 Subject: [PATCH] 预售、商品、个人中心、幸运购、服务卡客服修改 --- app.wxss | 15 ++++++++++++--- packageA/pages/goodsInfo/goodsInfo.js | 62 +++++++++++++++++++++++++++++++++++--------------------------- packageA/pages/goodsInfo/goodsInfo.wxml | 12 ++++++++---- packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js | 35 +++++++++++++++++++++++++++++++++-- packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml | 9 +++++++-- packageC/pages/presell/goodsInfo/goodsInfo.js | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- packageC/pages/presell/goodsInfo/goodsInfo.wxml | 13 ++++++++----- pages/goods/goodsInfo/goodsInfo.js | 31 ++++++++++++++++++++++++++++++- pages/goods/goodsInfo/goodsInfo.wxml | 9 +++++++-- pages/user/index/index.js | 36 +++++++++++++++++++++++++++++++++--- pages/user/index/index.wxml | 9 +++++++-- pages/user/index/index.wxss | 2 +- 12 files changed, 247 insertions(+), 53 deletions(-) diff --git a/app.wxss b/app.wxss index fac6378..d1339e3 100644 --- a/app.wxss +++ b/app.wxss @@ -744,11 +744,20 @@ background: #ffe3e2; /* 图标字体(ty) */ @font-face { font-family: 'iconfont'; /* Project id 2054717 */ - src: url('//at.alicdn.com/t/font_2054717_o34jrbrtxpk.woff2?t=1645781927179') format('woff2'), - url('//at.alicdn.com/t/font_2054717_o34jrbrtxpk.woff?t=1645781927179') format('woff'), - url('//at.alicdn.com/t/font_2054717_o34jrbrtxpk.ttf?t=1645781927179') format('truetype'); + src: url('//at.alicdn.com/t/font_2054717_qbvqi1zioy.woff2?t=1646731629521') format('woff2'), + url('//at.alicdn.com/t/font_2054717_qbvqi1zioy.woff?t=1646731629521') format('woff'), + url('//at.alicdn.com/t/font_2054717_qbvqi1zioy.ttf?t=1646731629521') format('truetype'); } +.icon-kefu1:before { + content: "\e666"; +} + +.icon-dianhua:before { + content: "\e623"; +} + + .icon-infofill:before { content: "\e6e6"; } diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index fb561ec..62ab05e 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -208,6 +208,8 @@ Page({ // 秒杀 prom_st: 1, prom_r_null: 0, + + hiddenCS: true, }, //------初始化加载---------- @@ -1105,29 +1107,13 @@ Page({ }); } } -<<<<<<< HEAD }, + //---------联系客服------------ contactService: function () { - this.getTel() - .then(() => { - if(self.data.store_tel) { - wx.showModal({ - title: '联系客服', - content: '客服热线:' + self.data.store_tel, - confirmText: '拨打', - success(res) { - if(res.confirm) { - getApp().globalData.no_clear = 1; - wx.makePhoneCall({ - phoneNumber: self.data.store_tel, - }); - }; - }, - }); - }; - }); + getApp().com_call(this); }, + // 获取客服电话 getTel() { return new Promise((resolve, reject) => { @@ -1158,14 +1144,8 @@ Page({ }); }); }, -======= - }, - //---------联系客服------------ - contactService: function() { - getApp().con_Service(); - }, ->>>>>>> 6cc9871992b5529c4963f34338001ebc04f1af34 + //-------获取购物车数量---------- requestCardNum: function() { var t = this; @@ -3224,7 +3204,35 @@ Page({ click_contact:function () { getApp().globalData.no_clear=1; - } + }, + + //打开客服操作菜单 + openCS() { + // csType/在线客服设置： + // 0关闭（如果有设置热线电话，则显示拨打热线电话）、 + // 1小程序客服、 + // 2企业微信客服 + let csType = this.data.sys_switch.weapp_customertype; + if(csType == 0) { + // 获取电话号码 + this.contactService(); + } else { + this.getTel() + .then(() => { + self.setData({ + hiddenCS: false, + }); + }); + + }; + }, + + //关闭客服操作菜单 + closeCS() { + this.setData({ + hiddenCS: true, + }); + }, diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index f822020..6a8a1fd 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -506,7 +506,7 @@ -