wxd / MShopWeApp

Commit c601fde72b7c68f2ee23d7d0df06819dd185fdf8

Authored by 后端研发-苏泰源
1 parent 127cc347

联系客服修改

Inline Side-by-side
Showing 16 changed files with 127 additions and 265 deletions
... ... @@ -876,8 +876,29 @@ App({
876 876 wx.makePhoneCall({ phoneNumber: t.store_tel, })
877 877 }
878 878 });
879   - }
880   -
  879 + },
  880 +
  881 + com_call(self) {
  882 + self.getTel()
  883 + .then(() => {
  884 + if(self.data.store_tel) {
  885 + wx.showModal({
  886 + title: '联系客服',
  887 + content: '客服热线:' + self.data.store_tel,
  888 + confirmText: '拨打',
  889 + success(res) {
  890 + if(res.confirm) {
  891 + getApp().globalData.no_clear = 1;
  892 + wx.makePhoneCall({
  893 + phoneNumber: self.data.store_tel,
  894 + })
  895 + };
  896 + },
  897 + });
  898 + };
  899 + });
  900 + },
  901 +
881 902  
882 903  
883 904 });
... ...
app.wxss
  View file @c601fde
1 1 @import './utils/weapp-icon.wxss';
2 2 @import "./utils/wxParse/wxParse.wxss";
  3 +@import './components/com_servicer/com_servicer.wxss';
3 4  
4 5 .pdt4 {
5 6 padding-top: 4rpx;
... ...
components/com_servicer/com_servicer.wxml 0 → 100644
  View file @c601fde
  1 +
  2 +
  3 +<!-- 联系客服操作菜单 -->
  4 +<view class="action {{!hiddenCS ? 'active':''}}" hidden="{{hiddenCS}}">
  5 + <view class="pd20 t-c pr">
  6 + <text class="bold">联系客服</text>
  7 + <text class="iconfont icon-guan" bindtap="closeCS"></text>
  8 + </view>
  9 + <!-- 客服热线 -->
  10 + <view class="pd20 bdt fs30 btn2" bindtap="contactService">
  11 + <text class="iconfont icon-dianhua"></text>客服热线：
  12 + <text class="c-red">{{store_tel}}</text>
  13 + </view>
  14 + <!-- 小程序客服 -->
  15 + <block wx:if="{{sys_switch.weapp_customertype == 1}}">
  16 + <button class="pd20 bdt fs30 btn2" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
  17 + <text class="iconfont icon-kefu1"></text>在线客服
  18 + </button>
  19 + </block>
  20 + <!-- 微信客服 -->
  21 + <block wx:elif="{{sys_switch.weapp_customertype == 2}}">
  22 + <view class="pd20 bdt fs30 btn2" bindtap="con_weixin">
  23 + <text class="iconfont icon-kefu1"></text>在线客服
  24 + </view>
  25 + </block>
  26 +</view>
  27 +
  28 +<view class="mask2" bindtap="closeCS"></view>
0 29 \ No newline at end of file
... ...
components/com_servicer/com_servicer.wxss 0 → 100644
  View file @c601fde
  1 +/* 联系客服操作菜单 */
  2 + .action {
  3 + position: fixed;
  4 + bottom: 100rpx;
  5 + z-index: 1;
  6 + width: 100%;
  7 + background-color: white;
  8 + border-radius: 20rpx 20rpx 0 0;
  9 + }
  10 +
  11 + .action .icon-guan {
  12 + position: absolute;
  13 + left: 20rpx !important;
  14 + right: auto !important;
  15 + }
  16 +
  17 + .action .iconfont {
  18 + color: #ff7295;
  19 + margin-right: 10rpx;
  20 + }
  21 +
  22 + .action button {
  23 + text-align: left;
  24 + line-height: normal;
  25 + }
  26 +
  27 + .action button::after {
  28 + border-width: 0;
  29 + }
  30 +
  31 + .action .btn2 {
  32 + box-sizing: border-box;
  33 + height: 100rpx;
  34 + display: flex;
  35 + align-items: center;
  36 + }
  37 +
  38 + .mask2 {
  39 + display: none;
  40 + position: fixed;
  41 + left: 0;
  42 + right: 0;
  43 + top: 0;
  44 + bottom: 0;
  45 + background-color: rgba(0,0,0,.5);
  46 + }
  47 +
  48 + .action.active ~ .mask2 {
  49 + display: block;
  50 + }
0 51 \ No newline at end of file
... ...
packageA/pages/goodsInfo/goodsInfo.js
  View file @c601fde
... ... @@ -838,6 +838,11 @@ Page({
838 838  
839 839 //------------加入购物车--------------
840 840 addCart: function(t) {
  841 + if(this.data.goodsInputNum == 0) {
  842 + getApp().my_warnning('购买数量不能为0', 1, th, 450);
  843 + return false;
  844 + };
  845 +
841 846 var th = this;
842 847 var ind = t.currentTarget.dataset.openSpecModal_ind;
843 848 var action= t.currentTarget.dataset.action;
... ... @@ -854,6 +859,8 @@ Page({
854 859  
855 860  
856 861  
  862 +
  863 +
857 864 //000000
858 865 //如果是秒杀的话，要看redis够不够
859 866 // if (this.data.prom_type == 1) {
... ... @@ -879,7 +886,7 @@ Page({
879 886  
880 887  
881 888 if(this.data.options.prom_type == 1 && !this.data.prom_act.is_shop_buy) {
882   - var t = th.data.goodsInputNum + 1;
  889 + var t = th.data.goodsInputNum;
883 890 th.data.sele_g.viplimited = th.data.sele_g.buy_limit;
884 891 if (th.data.sele_g.viplimited > 0) {
885 892 var gd_buy_num = th.data.sele_g.buy_num;
... ... @@ -1235,9 +1242,10 @@ Page({
1235 1242 confirmText: '拨打',
1236 1243 success(res) {
1237 1244 if(res.confirm) {
  1245 + getApp().globalData.no_clear = 1;
1238 1246 wx.makePhoneCall({
1239 1247 phoneNumber: self.data.store_tel,
1240   - })
  1248 + });
1241 1249 };
1242 1250 },
1243 1251 });
... ...
packageA/pages/goodsInfo/goodsInfo.wxml
  View file @c601fde
... ... @@ -911,29 +911,6 @@
911 911 </view>
912 912  
913 913  
914   -<!-- 联系客服操作菜单 -->
915   -<view class="action {{!hiddenCS ? 'active':''}}" hidden="{{hiddenCS}}">
916   - <view class="pd20 t-c pr">
917   - <text class="bold">联系客服</text>
918   - <text class="iconfont icon-guan" bindtap="closeCS"></text>
919   - </view>
920   - <!-- 客服热线 -->
921   - <view class="pd20 bdt fs30 btn2" bindtap="contactService">
922   - <text class="iconfont icon-dianhua"></text>客服热线：
923   - <text class="c-red">{{store_tel}}</text>
924   - </view>
925   - <!-- 小程序客服 -->
926   - <block wx:if="{{sys_switch.weapp_customertype == 1}}">
927   - <button class="pd20 bdt fs30 btn2" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
928   - <text class="iconfont icon-kefu1"></text>在线客服
929   - </button>
930   - </block>
931   - <!-- 微信客服 -->
932   - <block wx:elif="{{sys_switch.weapp_customertype == 2}}">
933   - <view class="pd20 bdt fs30 btn2" bindtap="con_weixin">
934   - <text class="iconfont icon-kefu1"></text>在线客服
935   - </view>
936   - </block>
937   -</view>
  914 +<include src="../../../components/com_servicer/com_servicer.wxml"/>
  915 +
938 916  
939   -<view class="mask2" bindtap="closeCS"></view>
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @c601fde
... ... @@ -2252,23 +2252,7 @@ Page({
2252 2252  
2253 2253 //---------联系客服------------
2254 2254 contactService: function () {
2255   - this.getTel()
2256   - .then(() => {
2257   - if(self.data.store_tel) {
2258   - wx.showModal({
2259   - title: '联系客服',
2260   - content: '客服热线:' + self.data.store_tel,
2261   - confirmText: '拨打',
2262   - success(res) {
2263   - if(res.confirm) {
2264   - wx.makePhoneCall({
2265   - phoneNumber: self.data.store_tel,
2266   - })
2267   - };
2268   - },
2269   - });
2270   - };
2271   - });
  2255 + getApp().com_call(this);
2272 2256 },
2273 2257 // 获取客服电话
2274 2258 getTel() {
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
  View file @c601fde
... ... @@ -1653,31 +1653,6 @@
1653 1653 <!-- 制作一个圆球导航 -->
1654 1654 <nav_box></nav_box>
1655 1655  
1656   -
1657   -<!-- 联系客服操作菜单 -->
1658   -<view class="action {{!hiddenCS ? 'active':''}}" hidden="{{hiddenCS}}">
1659   - <view class="pd20 t-c pr">
1660   - <text class="bold">联系客服</text>
1661   - <text class="iconfont icon-guan" bindtap="closeCS"></text>
1662   - </view>
1663   - <!-- 客服热线 -->
1664   - <view class="pd20 bdt fs30 btn2" bindtap="contactService">
1665   - <text class="iconfont icon-dianhua"></text>客服热线：
1666   - <text class="c-red">{{store_tel}}</text>
1667   - </view>
1668   - <!-- 小程序客服 -->
1669   - <block wx:if="{{sys_switch.weapp_customertype == 1}}">
1670   - <button class="pd20 bdt fs30 btn2" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
1671   - <text class="iconfont icon-kefu1"></text>在线客服
1672   - </button>
1673   - </block>
1674   - <!-- 微信客服 -->
1675   - <block wx:elif="{{sys_switch.weapp_customertype == 2}}">
1676   - <view class="pd20 bdt fs30 btn2" bindtap="con_weixin">
1677   - <text class="iconfont icon-kefu1"></text>在线客服
1678   - </view>
1679   - </block>
1680   -</view>
  1656 +<include src="../../../../components/com_servicer/com_servicer.wxml"></include>
1681 1657  
1682   -<view class="mask2" bindtap="closeCS"></view>
1683 1658  
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
  View file @c601fde
... ... @@ -3118,53 +3118,4 @@ button.custom-service::after{
3118 3118 }
3119 3119  
3120 3120  
3121   - /* 联系客服操作菜单 */
3122   - .action {
3123   - position: fixed;
3124   - bottom: 100rpx;
3125   - z-index: 1;
3126   - width: 100%;
3127   - background-color: white;
3128   - border-radius: 20rpx 20rpx 0 0;
3129   - }
3130   -
3131   - .action .icon-guan {
3132   - position: absolute;
3133   - left: 20rpx !important;
3134   - right: auto !important;
3135   - }
3136   -
3137   - .action .iconfont {
3138   - color: #ff7295;
3139   - margin-right: 10rpx;
3140   - }
3141   -
3142   - .action button {
3143   - text-align: left;
3144   - line-height: normal;
3145   - }
3146   -
3147   - .action button::after {
3148   - border-width: 0;
3149   - }
3150   -
3151   - .action .btn2 {
3152   - box-sizing: border-box;
3153   - height: 100rpx;
3154   - display: flex;
3155   - align-items: center;
3156   - }
3157   -
3158   - .mask2 {
3159   - display: none;
3160   - position: fixed;
3161   - left: 0;
3162   - right: 0;
3163   - top: 0;
3164   - bottom: 0;
3165   - background-color: rgba(0,0,0,.5);
3166   - }
3167   -
3168   - .action.active ~ .mask2 {
3169   - display: block;
3170   - }
3171 3121 \ No newline at end of file
  3122 +
3172 3123 \ No newline at end of file
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @c601fde
... ... @@ -1434,23 +1434,7 @@ Page({
1434 1434  
1435 1435 //---------联系客服------------
1436 1436 contactService: function () {
1437   - this.getTel()
1438   - .then(() => {
1439   - if(self.data.store_tel) {
1440   - wx.showModal({
1441   - title: '联系客服',
1442   - content: '客服热线:' + self.data.store_tel,
1443   - confirmText: '拨打',
1444   - success(res) {
1445   - if(res.confirm) {
1446   - wx.makePhoneCall({
1447   - phoneNumber: self.data.store_tel,
1448   - })
1449   - };
1450   - },
1451   - });
1452   - };
1453   - });
  1437 + getApp().com_call(this);
1454 1438 },
1455 1439 // 获取客服电话
1456 1440 getTel() {
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  View file @c601fde
... ... @@ -957,31 +957,5 @@
957 957  
958 958  
959 959  
960   -
961   -<!-- 联系客服操作菜单 -->
962   -<view class="action {{!hiddenCS ? 'active':''}}" hidden="{{hiddenCS}}">
963   - <view class="pd20 t-c pr">
964   - <text class="bold">联系客服</text>
965   - <text class="iconfont icon-guan" bindtap="closeCS"></text>
966   - </view>
967   - <!-- 客服热线 -->
968   - <view class="pd20 bdt fs30 btn2" bindtap="contactService">
969   - <text class="iconfont icon-dianhua"></text>客服热线：
970   - <text class="c-red">{{store_tel}}</text>
971   - </view>
972   - <!-- 小程序客服 -->
973   - <block wx:if="{{sys_switch.weapp_customertype == 1}}">
974   - <button class="pd20 bdt fs30 btn2" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
975   - <text class="iconfont icon-kefu1"></text>在线客服
976   - </button>
977   - </block>
978   - <!-- 微信客服 -->
979   - <block wx:elif="{{sys_switch.weapp_customertype == 2}}">
980   - <view class="pd20 bdt fs30 btn2" bindtap="con_weixin">
981   - <text class="iconfont icon-kefu1"></text>在线客服
982   - </view>
983   - </block>
984   -</view>
985   -
986   -<view class="mask2" bindtap="closeCS"></view>
  960 +<include src="../../../../components/com_servicer/com_servicer.wxml"/>
987 961  
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @c601fde
... ... @@ -2290,24 +2290,9 @@ Page({
2290 2290  
2291 2291 //---------联系客服------------
2292 2292 contactService: function () {
2293   - this.getTel()
2294   - .then(() => {
2295   - if(self.data.store_tel) {
2296   - wx.showModal({
2297   - title: '联系客服',
2298   - content: '客服热线:' + self.data.store_tel,
2299   - confirmText: '拨打',
2300   - success(res) {
2301   - if(res.confirm) {
2302   - wx.makePhoneCall({
2303   - phoneNumber: self.data.store_tel,
2304   - })
2305   - };
2306   - },
2307   - });
2308   - };
2309   - });
  2293 + getApp().com_call(this);
2310 2294 },
  2295 +
2311 2296 // 获取客服电话
2312 2297 getTel() {
2313 2298 return new Promise((resolve, reject) => {
... ... @@ -6534,6 +6519,7 @@ Page({
6534 6519 con_weixin: function () {
6535 6520 getApp().con_wx(this);
6536 6521 },
  6522 +
6537 6523 get_normal(gid){
6538 6524 this.setData({
6539 6525 prom_type: 0,
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @c601fde
... ... @@ -1713,29 +1713,4 @@
1713 1713  
1714 1714  
1715 1715  
1716   -<!-- 联系客服操作菜单 -->
1717   -<view class="action {{!hiddenCS ? 'active':''}}" hidden="{{hiddenCS}}">
1718   - <view class="pd20 t-c pr">
1719   - <text class="bold">联系客服</text>
1720   - <text class="iconfont icon-guan" bindtap="closeCS"></text>
1721   - </view>
1722   - <!-- 客服热线 -->
1723   - <view class="pd20 bdt fs30 btn2" bindtap="contactService">
1724   - <text class="iconfont icon-dianhua"></text>客服热线：
1725   - <text class="c-red">{{store_tel}}</text>
1726   - </view>
1727   - <!-- 小程序客服 -->
1728   - <block wx:if="{{sys_switch.weapp_customertype == 1}}">
1729   - <button class="pd20 bdt fs30 btn2" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
1730   - <text class="iconfont icon-kefu1"></text>在线客服
1731   - </button>
1732   - </block>
1733   - <!-- 微信客服 -->
1734   - <block wx:elif="{{sys_switch.weapp_customertype == 2}}">
1735   - <view class="pd20 bdt fs30 btn2" bindtap="con_weixin">
1736   - <text class="iconfont icon-kefu1"></text>在线客服
1737   - </view>
1738   - </block>
1739   -</view>
1740   -
1741   -<view class="mask2" bindtap="closeCS"></view>
  1716 +<include src="../../../components/com_servicer/com_servicer.wxml"></include>
... ...
pages/user/index/index.js
  View file @c601fde
... ... @@ -705,23 +705,7 @@ Page({
705 705  
706 706 //---------联系客服------------
707 707 contactService: function() {
708   - this.getTel()
709   - .then(() => {
710   - if(self.data.store_tel) {
711   - wx.showModal({
712   - title: '联系客服',
713   - content: '客服热线:' + self.data.store_tel,
714   - confirmText: '拨打',
715   - success(res) {
716   - if(res.confirm) {
717   - wx.makePhoneCall({
718   - phoneNumber: self.data.store_tel,
719   - })
720   - };
721   - },
722   - });
723   - };
724   - });
  708 + getApp().com_call(this);
725 709 },
726 710  
727 711 // 获取客服热线
... ...
pages/user/index/index.wxml
  View file @c601fde
... ... @@ -379,6 +379,6 @@
379 379 </block>
380 380 </view>
381 381  
382   -<view class="mask" bindtap="closeCS"></view>
  382 +<view class="mask2" bindtap="closeCS"></view>
383 383  
384 384  
... ...
pages/user/index/index.wxss
  View file @c601fde
... ... @@ -741,48 +741,12 @@ button::after{ border: 0}
741 741 color: #555;
742 742 }
743 743  
744   -.action {
745   - position: fixed;
746   - bottom: 100rpx;
747   - z-index: 1;
748   - width: 100%;
749   - background-color: white;
750   - border-radius: 20rpx 20rpx 0 0;
751   -}
  744 +
752 745  
753 746 .action .icon-guan {
754 747 position: absolute;
755   - right: 20rpx;
  748 + right: 20rpx !important;
756 749 }
757 750  
758   -.action .iconfont {
759   - color: #ff7295;
760   - margin-right: 10rpx;
761   -}
762 751  
763   -.action button {
764   - text-align: left;
765   - line-height: normal;
766   -}
767   -
768   -.action .btn {
769   - box-sizing: border-box;
770   - height: 100rpx;
771   - display: flex;
772   - align-items: center;
773   -}
774   -
775   -.mask {
776   - display: none;
777   - position: fixed;
778   - left: 0;
779   - right: 0;
780   - top: 0;
781   - bottom: 0;
782   - background-color: rgba(0,0,0,.5);
783   -}
784   -
785   -.action.active ~ .mask {
786   - display: block;
787   -}
788 752  
... ...