wxd / MShopWeApp

Commit 928d2dffd32d25d418b115ea5806d0e7a5a73f35

Authored by yvan.ni
1 parent d896e39f

1.分享的会员的user_id,分销的上下级关系的bug优化。 打开相册，分享，预览图片，照相扫描，聊天，打电话，获取微信地址的时候。 

2.自定义模板时候，首页分享空白页的OA单优化
3. 测肤的分享和生成海报的bug优化
Inline Side-by-side
Showing 116 changed files with 335 additions and 590 deletions

Too many changes.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 116 files are displayed.

components/diy_scan/diy_scan.js
  View file @928d2df
... ... @@ -26,6 +26,7 @@ Component({
26 26 //-- 扫描成功之后 --
27 27 getScancode:function(){
28 28 var _this = this;
  29 + getApp().globalData.no_clear=1;
29 30 //-- 允许从相机和相册扫码 --
30 31 wx.scanCode({
31 32 success: (res) => {
... ...
components/diy_service/diy_service.js
  View file @928d2df
... ... @@ -38,35 +38,16 @@ Component({
38 38  
39 39 //---------联系客服------------
40 40 contactService: function() {
41   - getApp().getConfig(function(t) {
42   - if (t.store_tel == undefined) {
43   - getApp().request.get("/api/weshop/store/get/" + os.stoid, {
44   - isShowLoading: 1,
45   - data: {},
46   - success: function(rs) {
47   - getApp().globalData.config = rs.data.data;
48   - if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
49   - getApp().my_warnning("商家未设置电话", 0, th);
50   - return false;
51   - }
52   - wx.makePhoneCall({ phoneNumber: rs.data.data.store_tel, })
53   - }
54   - })
55   - } else {
56   - wx.makePhoneCall({ phoneNumber: t.store_tel, })
57   - }
58   - });
59   - },
  41 + getApp().con_Service();
  42 + },
60 43  
61 44 //---------联系微信客服------------
62 45 con_weixin:function () {
63   - var url=this.data.sys_switch.weapp_customertype_url;
64   - var id=this.data.sys_switch.weapp_customertype_appid;
65   - wx.openCustomerServiceChat({
66   - extInfo: {url: url},
67   - corpId: id,
68   - success(res) {}
69   - })
  46 + getApp().con_wx(this);
  47 + },
  48 +
  49 + click_contact:function () {
  50 + getApp().globalData.no_clear=1;
70 51 }
71 52 }
72 53 })
... ...
components/diy_service/diy_service.wxml
  View file @928d2df
... ... @@ -8,7 +8,7 @@
8 8 </view>
9 9 </view>
10 10  
11   - <button wx:else class="custom-service" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
  11 + <button wx:else class="custom-service" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
12 12 <view style="text-align: center;">
13 13 <image class="cs-img" src="{{object.img}}"></image>
14 14 <view class="s_title" wx:if="{{object.title!=''}}">{{object.title}}</view>
... ...
components/nav_b/nav_b.wxss
  View file @928d2df
... ... @@ -26,6 +26,9 @@
26 26 color: #ffff;
27 27 font-size: 50rpx;
28 28 background: none;
  29 + display: flex;
  30 + justify-content: center;
  31 + align-items: center;
29 32 }
30 33  
31 34 .box_main .dian image {
... ...
packageA/pages/activity_share/activity_share.js
  View file @928d2df
... ... @@ -141,9 +141,10 @@ Page({
141 141 /**
142 142 * 用户点击右上角分享
143 143 */
144   - onShareAppMessage: function () {
145   - console.log('abc');
146   - var th = this;
  144 + onShareAppMessage: function () {
  145 + getApp().globalData.no_clear=1;
  146 +
  147 + var th = this;
147 148 //礼包的转发
148 149 if(th.data.currentIndex==3) {
149 150 var lbid=th.data.hui_active.lbId;
... ... @@ -1054,10 +1055,8 @@ Page({
1054 1055 })
1055 1056 return false;
1056 1057 }
1057   - wx.previewImage({
1058   - //将图片预览出来
1059   - urls: [that.data.shareImgPath]
1060   - });
  1058 + getApp().pre_img(that.data.shareImgPath);
  1059 +
1061 1060 //-- 将商品清空 --
1062 1061 th.setData({share_good:null});
1063 1062  
... ...
packageA/pages/addCustomer/addCustomer.js
  View file @928d2df
... ... @@ -60,7 +60,7 @@ Page({
60 60 /**
61 61 * 用户点击右上角分享
62 62 */
63   - onShareAppMessage: function () {
64   -
65   - }
  63 + onShareAppMessage: function () {
  64 + getApp().globalData.no_clear=1
  65 + }
66 66 })
67 67 \ No newline at end of file
... ...
packageA/pages/cardDetails/cardDetails.js
  View file @928d2df
... ... @@ -92,7 +92,7 @@ Page({
92 92 /**
93 93 * 用户点击右上角分享
94 94 */
95   - onShareAppMessage: function () {
  95 + onShareAppMessage: function () { getApp().globalData.no_clear=1
96 96  
97 97 }
98 98 })
99 99 \ No newline at end of file
... ...
packageA/pages/cardList/cardList.js
  View file @928d2df
... ... @@ -134,7 +134,7 @@ Page({
134 134 /**
135 135 * 用户点击右上角分享
136 136 */
137   - onShareAppMessage: function () {
  137 + onShareAppMessage: function () { getApp().globalData.no_clear=1
138 138  
139 139 },
140 140  
... ...
packageA/pages/chongzhi/chongzhi.js
  View file @928d2df
... ... @@ -106,7 +106,7 @@ Page({
106 106 /**
107 107 * 用户点击右上角分享
108 108 */
109   - onShareAppMessage: function () {
  109 + onShareAppMessage: function () { getApp().globalData.no_clear=1
110 110  
111 111 },
112 112  
... ...
packageA/pages/chongzhiDetails/chongzhiDetails.js
  View file @928d2df
... ... @@ -125,7 +125,7 @@ Page({
125 125 /**
126 126 * 用户点击右上角分享
127 127 */
128   - onShareAppMessage: function () {
  128 + onShareAppMessage: function () { getApp().globalData.no_clear=1
129 129  
130 130 },
131 131  
... ...
packageA/pages/choujiang/choujiang.js
  View file @928d2df
... ... @@ -60,7 +60,7 @@ Page({
60 60 /**
61 61 * 用户点击右上角分享
62 62 */
63   - onShareAppMessage: function () {
  63 + onShareAppMessage: function () { getApp().globalData.no_clear=1
64 64  
65 65 }
66 66 })
67 67 \ No newline at end of file
... ...
packageA/pages/details_serviceCard/details_serviceCard.js
  View file @928d2df
... ... @@ -112,7 +112,7 @@ Page({
112 112 * 用户点击右上角分享
113 113 */
114 114 onShareAppMessage: function() {
115   -
  115 + getApp().globalData.no_clear=1
116 116 },
117 117  
118 118  
... ... @@ -163,6 +163,7 @@ Page({
163 163  
164 164 // 联系微信客服
165 165 contact_wx() {
  166 + getApp().globalData.no_clear=1;
166 167 var url = this.data.sys_switch.weapp_customertype_url;
167 168 var id = this.data.sys_switch.weapp_customertype_appid;
168 169 wx.openCustomerServiceChat({
... ... @@ -177,24 +178,7 @@ Page({
177 178  
178 179 // 联系电话客服
179 180 contactService() {
180   - app.getConfig(function(t) {
181   - if (t.store_tel == undefined) {
182   - app.request.get('/api/weshop/store/get/' + os.stoid, {
183   - isShowLoading: 1,
184   - data: {},
185   - success: function(rs) {
186   - app.globalData.config = rs.data.data;
187   - if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
188   - app.my_warnning('商家未设置电话', 0, self);
189   - return false;
190   - }
191   - app.confirmBox('请联系客服:' + rs.data.data.store_tel);
192   - }
193   - })
194   - } else {
195   - app.confirmBox('请联系客服:' + t.store_tel);
196   - }
197   - });
  181 + getApp().con_Service();
198 182 },
199 183  
200 184  
... ... @@ -478,9 +462,9 @@ Page({
478 462 });
479 463 },
480 464  
481   -
482   -
483   -
  465 + click_contact:function () {
  466 + getApp().globalData.no_clear=1;
  467 + }
484 468  
485 469  
486 470  
... ...
packageA/pages/details_serviceCard/details_serviceCard.wxml
  View file @928d2df
... ... @@ -57,7 +57,7 @@
57 57 <view class="flex t-c bdt">
58 58 <!-- 客服 -->
59 59 <block>
60   - <button class="f1" wx:if="{{sys_switch.weapp_customertype == 1}}" hover-class="none" open-type="contact"
  60 + <button class="f1" wx:if="{{sys_switch.weapp_customertype == 1}}" hover-class="none" open-type="contact" bindtap="click_contact"
61 61 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</button>
62 62 <view class="f1 pd20" wx:elif="{{sys_switch.weapp_customertype== 2}}" bindtap="contact_wx"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</view>
63 63 <view class="f1 pd20" wx:else bindtap="contactService"><text class="iconfont icon-kefu c29f pdr10 fs36"></text>联系客服</view>
... ...
packageA/pages/distribution/card/card.js
  View file @928d2df
... ... @@ -92,7 +92,7 @@ Page({
92 92 /**
93 93 * 用户点击右上角分享
94 94 */
95   - onShareAppMessage: function () {
  95 + onShareAppMessage: function () { getApp().globalData.no_clear=1
96 96  
97 97 },
98 98  
... ...
packageA/pages/distribution/commision/commision.js
  View file @928d2df
... ... @@ -149,7 +149,7 @@ Page({
149 149 /**
150 150 * 用户点击右上角分享
151 151 */
152   - onShareAppMessage: function () {
  152 + onShareAppMessage: function () { getApp().globalData.no_clear=1
153 153  
154 154 },
155 155  
... ...
packageA/pages/distribution/goods/goods.js
  View file @928d2df
... ... @@ -264,7 +264,7 @@ Page({
264 264 /**
265 265 * 用户点击右上角分享
266 266 */
267   - onShareAppMessage: function () {
  267 + onShareAppMessage: function () { getApp().globalData.no_clear=1
268 268  
269 269 },
270 270  
... ...
packageA/pages/distribution/myteam/myteam.js
  View file @928d2df
... ... @@ -157,7 +157,7 @@ Page({
157 157 /**
158 158 * 用户点击右上角分享
159 159 */
160   - onShareAppMessage: function () {
  160 + onShareAppMessage: function () { getApp().globalData.no_clear=1
161 161  
162 162 },
163 163  
... ...
packageA/pages/distribution/order/order.js
  View file @928d2df
... ... @@ -141,7 +141,7 @@ Page({
141 141 /**
142 142 * 用户点击右上角分享
143 143 */
144   - onShareAppMessage: function () {
  144 + onShareAppMessage: function () { getApp().globalData.no_clear=1
145 145  
146 146 },
147 147  
... ...
packageA/pages/distribution/rank/rank.js
  View file @928d2df
... ... @@ -151,7 +151,7 @@ Page({
151 151 /**
152 152 * 用户点击右上角分享
153 153 */
154   - onShareAppMessage: function () {
  154 + onShareAppMessage: function () { getApp().globalData.no_clear=1
155 155  
156 156 },
157 157  
... ...
packageA/pages/distribution/rookie/rookie.js
  View file @928d2df
... ... @@ -112,7 +112,7 @@ Page({
112 112 /**
113 113 * 用户点击右上角分享
114 114 */
115   - onShareAppMessage: function () {
  115 + onShareAppMessage: function () { getApp().globalData.no_clear=1
116 116  
117 117 },
118 118  
... ...
packageA/pages/distribution/shop/shop.js
  View file @928d2df
... ... @@ -316,7 +316,7 @@ Page({
316 316 * 用户点击右上角分享
317 317 *--点击分享事件--分享我的小店
318 318 *--*/
319   - onShareAppMessage: function (t) {
  319 + onShareAppMessage: function (t) { getApp().globalData.no_clear=1;
320 320  
321 321 var th = this;
322 322 var title = "我的小店";
... ...
packageA/pages/goodsInfo/goodsInfo.js
  View file @928d2df
... ... @@ -1049,24 +1049,7 @@ Page({
1049 1049  
1050 1050 //---------联系客服------------
1051 1051 contactService: function() {
1052   - s.getConfig(function(t) {
1053   - if (t.store_tel == undefined) {
1054   - getApp().request.get("/api/weshop/store/get/" + os.stoid, {
1055   - isShowLoading: 1,
1056   - data: {},
1057   - success: function(rs) {
1058   - getApp().globalData.config = rs.data.data;
1059   - if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
1060   - getApp().my_warnning("商家未设置电话", 0, th);
1061   - return false;
1062   - }
1063   - s.confirmBox("请联系客服：" + rs.data.data.store_tel);
1064   - }
1065   - })
1066   - } else {
1067   - s.confirmBox("请联系客服：" + t.store_tel);
1068   - }
1069   - });
  1052 + getApp().con_Service();
1070 1053 },
1071 1054 //-------获取购物车数量----------
1072 1055 requestCardNum: function() {
... ... @@ -1109,6 +1092,7 @@ Page({
1109 1092  
1110 1093 //--点击分享事件---
1111 1094 onShareAppMessage: function(t) {
  1095 + getApp().globalData.no_clear=1;
1112 1096  
1113 1097 var th = this;
1114 1098 var price = th.data.data.shop_price;
... ... @@ -2562,10 +2546,7 @@ Page({
2562 2546 },
2563 2547  
2564 2548 previewImage() {
2565   - wx.previewImage({
2566   - //将图片预览出来
2567   - urls: [this.data.shareImgPath]
2568   - });
  2549 + getApp().pre_img(this.data.shareImgPath);
2569 2550 },
2570 2551  
2571 2552 onShareTimeline() {
... ... @@ -2589,13 +2570,7 @@ Page({
2589 2570  
2590 2571 //---------联系微信客服------------
2591 2572 con_weixin:function () {
2592   - var url=this.data.sys_switch.weapp_customertype_url;
2593   - var id=this.data.sys_switch.weapp_customertype_appid;
2594   - wx.openCustomerServiceChat({
2595   - extInfo: {url: url},
2596   - corpId: id,
2597   - success(res) {}
2598   - })
  2573 + getApp().con_wx(this)
2599 2574 },
2600 2575  
2601 2576 //评论的调用
... ... @@ -2792,10 +2767,9 @@ Page({
2792 2767 // b[i] = this.data.iurl + e[i];
2793 2768 // }
2794 2769 this.data.show_prew_img = 1;
2795   - wx.previewImage({
2796   - current: b[t.currentTarget.dataset.id],
2797   - urls: b
2798   - });
  2770 + //调用预览图片
  2771 + getApp().pre_img2(b,t);
  2772 +
2799 2773 },
2800 2774  
2801 2775  
... ... @@ -2934,9 +2908,9 @@ Page({
2934 2908 // });
2935 2909 // return false;
2936 2910 // }
2937   -
2938 2911  
2939   -
  2912 +
  2913 +
2940 2914 // if (prom_type == 1 && prom_id == 0) {
2941 2915 // this.setData({
2942 2916 // prom_type: 0, isshow: 1,
... ... @@ -2950,7 +2924,7 @@ Page({
2950 2924 // this.check_is_youhui(gid, 1);
2951 2925 // return false;
2952 2926 // }
2953   -
  2927 +
2954 2928 //if (prom_type != 3 && prom_type!=0){
2955 2929 //---判断秒杀----
2956 2930 if (prom_type == 1 && prom_id > 0) {
... ... @@ -3030,7 +3004,7 @@ Page({
3030 3004 // //-- 获取秒杀活动的多少规格 --
3031 3005 // ee.get_more_flahs(function (list) {
3032 3006 // if (list && list.length > 1) {
3033   -
  3007 +
3034 3008 // var n_item = list[0];
3035 3009 // var ind = list.findIndex(function (ele) {
3036 3010 // return ele.goods_id == ee.data.data.goods_id;
... ... @@ -3041,10 +3015,10 @@ Page({
3041 3015 // list.splice(ind, 1);
3042 3016 // list.unshift(n_item);
3043 3017 // }
3044   -
  3018 +
3045 3019 // ee.data.sele_g.viplimited = n_item.viplimited;
3046 3020 // ee.data.data.viplimited = n_item.viplimited;
3047   -
  3021 +
3048 3022 // var gb = 1;
3049 3023 // //-- 显示多规格 --
3050 3024 // for (let i in list) {
... ... @@ -3052,7 +3026,7 @@ Page({
3052 3026 // var gg = "";
3053 3027 // if (item.goods_spec == "null" || item.goods_spec == null) item.goods_spec = "";
3054 3028 // if (item.goods_color == "null" || item.goods_color == null) item.goods_color = "";
3055   -
  3029 +
3056 3030 // if (item.goods_spec != "" && item.goods_color != "") {
3057 3031 // gg = item.goods_spec + "/" + item.goods_color;
3058 3032 // } else if (item.goods_spec != "" || item.goods_color != "") {
... ... @@ -3065,11 +3039,11 @@ Page({
3065 3039 // item.prom_id = item.prom_id;
3066 3040 // item.prom_type = 1;
3067 3041 // }
3068   -
  3042 +
3069 3043 // ee.setData({
3070 3044 // sku_g: list,
3071 3045 // });
3072   -
  3046 +
3073 3047 // }
3074 3048 // })
3075 3049 // }
... ... @@ -3132,22 +3106,14 @@ Page({
3132 3106 }
3133 3107 });
3134 3108 },
3135   -
3136   -
3137   -
3138   -
3139 3109  
  3110 + click_contact:function () {
  3111 + getApp().globalData.no_clear=1;
  3112 + }
3140 3113  
3141 3114  
3142 3115  
3143   -
3144   -
3145   -
3146   -
3147   -
3148   -
3149 3116  
3150   -
3151 3117 });
3152 3118  
3153 3119  
... ...
packageA/pages/goodsInfo/goodsInfo.wxml
  View file @928d2df
... ... @@ -506,7 +506,7 @@
506 506 <view class="join-cart jc_sb ai_c">
507 507  
508 508 <view class="flex">
509   - <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split pdh20" open-type="contact"
  509 + <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split pdh20" open-type="contact" bindtap="click_contact"
510 510 session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
511 511 <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
512 512 <view>客服</view>
... ...
packageA/pages/goods_share/goods_share.js
  View file @928d2df
... ... @@ -177,7 +177,8 @@ Page({
177 177 /**e
178 178 * 用户点击右上角分享
179 179 */
180   - onShareAppMessage: function () {
  180 + onShareAppMessage: function () {
  181 + getApp().globalData.no_clear=1;
181 182 var th = this;
182 183 var item=this.data.share_good;
183 184 var price = item.shop_price;
... ... @@ -732,10 +733,7 @@ Page({
732 733 })
733 734 return false;
734 735 }
735   - wx.previewImage({
736   - //将图片预览出来
737   - urls: [that.data.shareImgPath]
738   - });
  736 + getApp().pre_img(that.data.shareImgPath);
739 737 wx.hideLoading();
740 738 }
741 739 })
... ...
packageA/pages/hongBao/hongBao.js
  View file @928d2df
... ... @@ -113,7 +113,7 @@ Page({
113 113 /**
114 114 * 用户点击右上角分享
115 115 */
116   - onShareAppMessage: function () {
  116 + onShareAppMessage: function () { getApp().globalData.no_clear=1
117 117  
118 118 },
119 119  
... ...
packageA/pages/hongBaoDetails/hongBaoDetails.js
  View file @928d2df
... ... @@ -98,7 +98,7 @@ Page({
98 98 /**
99 99 * 用户点击右上角分享
100 100 */
101   - onShareAppMessage: function () {
  101 + onShareAppMessage: function () { getApp().globalData.no_clear=1
102 102  
103 103 },
104 104  
... ...
packageA/pages/jfbuy/jfbuy.js
  View file @928d2df
... ... @@ -187,8 +187,8 @@ Page({
187 187 /**
188 188 * 用户点击右上角分享
189 189 */
190   - onShareAppMessage: function () {
191   -
  190 + onShareAppMessage: function () {
  191 + getApp().globalData.no_clear=1;
192 192 var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:'';
193 193  
194 194 var pagePath = this.route; //当前页面url
... ...
packageA/pages/liveStream/liveStream.js
  View file @928d2df
... ... @@ -348,7 +348,7 @@ Page({
348 348 /**
349 349 * 用户点击右上角分享
350 350 */
351   - onShareAppMessage: function () {
  351 + onShareAppMessage: function () { getApp().globalData.no_clear=1;
352 352 if (res.from === 'button') {
353 353 // 来自页面内转发按钮
354 354 // console.log(res.target)
... ...
packageA/pages/liveStreamDetails/liveStreamDetails.js
  View file @928d2df
... ... @@ -605,6 +605,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un
605 605 * 用户点击右上角分享
606 606 */
607 607 onShareAppMessage: function (res) {
  608 + getApp().globalData.clear=1;
608 609 this.setData({
609 610 showActionSheet: 'false'
610 611 })
... ...
packageA/pages/live_share/live_share.js
  View file @928d2df
... ... @@ -71,7 +71,7 @@ Page({
71 71 /**
72 72 * 用户点击右上角分享
73 73 */
74   - onShareAppMessage: function () {
  74 + onShareAppMessage: function () { getApp().globalData.no_clear=1;
75 75 var th=this;
76 76 var id=th.data.hui_active.id;
77 77 var url='/packageA/pages/liveStreamDetails/liveStreamDetails?id=' + id + '&live=ing';
... ...
packageA/pages/myGift/myGift.js
  View file @928d2df
... ... @@ -147,7 +147,7 @@ Page({
147 147 /**
148 148 * 用户点击右上角分享
149 149 */
150   - onShareAppMessage: function () {
  150 + onShareAppMessage: function () { getApp().globalData.no_clear=1
151 151  
152 152 },
153 153  
... ...
packageA/pages/myGiftDetails/myGiftDetails.js
  View file @928d2df
... ... @@ -192,7 +192,7 @@ Page({
192 192 /**
193 193 * 用户点击右上角分享
194 194 */
195   - onShareAppMessage: function () {
  195 + onShareAppMessage: function () { getApp().globalData.no_clear=1
196 196  
197 197 },
198 198  
... ...
packageA/pages/my_service/beauty_deta.js
  View file @928d2df
... ... @@ -394,6 +394,7 @@ Page({
394 394 previewImage: function(e) {
395 395 var th = this;
396 396 var current = e.currentTarget.dataset.src;
  397 + getApp().globalData.no_clear=1;
397 398 wx.previewImage({
398 399 current: current, // 当前显示图片的http链接
399 400 urls: [th.data.head_img] // 需要预览的图片http链接列表
... ...
packageA/pages/my_service2/beauty_deta.js
  View file @928d2df
... ... @@ -394,6 +394,7 @@ Page({
394 394 previewImage: function(e) {
395 395 var th = this;
396 396 var current = e.currentTarget.dataset.src;
  397 + getApp().globalData.no_clear=1;
397 398 wx.previewImage({
398 399 current: current, // 当前显示图片的http链接
399 400 urls: [th.data.head_img] // 需要预览的图片http链接列表
... ...
packageA/pages/parseHtml/parseHtml.js
  View file @928d2df
... ... @@ -320,7 +320,7 @@ Page({
320 320 /**
321 321 * 用户点击右上角分享
322 322 */
323   - onShareAppMessage: function () {
  323 + onShareAppMessage: function () { getApp().globalData.no_clear=1
324 324  
325 325 },
326 326  
... ...
packageA/pages/profile/profile.js
  View file @928d2df
... ... @@ -875,6 +875,7 @@ Page({
875 875  
876 876 //--点击分享事件---
877 877 onShareAppMessage: function(t) {
  878 + getApp().globalData.no_clear=1
878 879 return o.share;
879 880 },
880 881  
... ...
packageA/pages/prom_list/prom_list.js
  View file @928d2df
... ... @@ -711,6 +711,7 @@ Page({
711 711  
712 712 //--点击分享事件---
713 713 onShareAppMessage: function(t) {
  714 + getApp().globalData.no_clear=1
714 715 var curPage=this;
715 716 var pagePath = curPage.route; //当前页面url
716 717 if (pagePath.indexOf('/') != 0) {
... ...
packageA/pages/quan/quan.js
  View file @928d2df
... ... @@ -73,7 +73,7 @@ Page({
73 73 /**
74 74 * 用户点击右上角分享
75 75 */
76   - onShareAppMessage: function () {
  76 + onShareAppMessage: function () { getApp().globalData.no_clear=1;
77 77 var th=this;
78 78 var id=th.data.hui_active.id;
79 79 var url="/packageA/pages/quan_pro/quan_pro?id="+id;
... ...
packageA/pages/service_share/service_share.js
  View file @928d2df
... ... @@ -141,7 +141,7 @@ Page({
141 141 /**e
142 142 * 用户点击右上角分享
143 143 */
144   - onShareAppMessage: function () {
  144 + onShareAppMessage: function () { getApp().globalData.no_clear=1;
145 145 var th = this;
146 146 var item=this.data.share_good;
147 147 var price = item.money;
... ... @@ -709,10 +709,7 @@ Page({
709 709 })
710 710 return false;
711 711 }
712   - wx.previewImage({
713   - //将图片预览出来
714   - urls: [that.data.shareImgPath]
715   - });
  712 + getApp().pre_img(that.data.shareImgPath);
716 713 wx.hideLoading();
717 714 }
718 715 })
... ...
packageA/pages/text/text.js deleted
View file @d896e39
1   -// packageA//pages/text/text.js
2   -Page({
3   -
4   - /**
5   - * 页面的初始数据
6   - */
7   - data: {
8   -
9   - },
10   -
11   - /**
12   - * 生命周期函数--监听页面加载
13   - */
14   - onLoad: function (options) {
15   -
16   - },
17   -
18   - /**
19   - * 生命周期函数--监听页面初次渲染完成
20   - */
21   - onReady: function () {
22   -
23   - },
24   -
25   - /**
26   - * 生命周期函数--监听页面显示
27   - */
28   - onShow: function () {
29   -
30   - },
31   -
32   - /**
33   - * 生命周期函数--监听页面隐藏
34   - */
35   - onHide: function () {
36   -
37   - },
38   -
39   - /**
40   - * 生命周期函数--监听页面卸载
41   - */
42   - onUnload: function () {
43   -
44   - },
45   -
46   - /**
47   - * 页面相关事件处理函数--监听用户下拉动作
48   - */
49   - onPullDownRefresh: function () {
50   -
51   - },
52   -
53   - /**
54   - * 页面上拉触底事件的处理函数
55   - */
56   - onReachBottom: function () {
57   -
58   - },
59   -
60   - /**
61   - * 用户点击右上角分享
62   - */
63   - onShareAppMessage: function () {
64   -
65   - }
66   -})
67 0 \ No newline at end of file
packageA/pages/text/text.json deleted
View file @d896e39
1   -{
2   - "usingComponents": {}
3   -}
4 0 \ No newline at end of file
packageA/pages/text/text.wxml deleted
View file @d896e39
1   -<!--packageA//pages/text/text.wxml-->
2   -<text>packageA//pages/text/text.wxml</text>
packageA/pages/text/text.wxss deleted
View file @d896e39
1   -/* packageA//pages/text/text.wxss */
2 0 \ No newline at end of file
packageA/pages/user/my_service2/appment_main.js
  View file @928d2df
... ... @@ -60,7 +60,7 @@ Page({
60 60 /**
61 61 * 用户点击右上角分享
62 62 */
63   - onShareAppMessage: function () {
  63 + onShareAppMessage: function () { getApp().globalData.no_clear=1
64 64  
65 65 }
66 66 })
67 67 \ No newline at end of file
... ...
packageB/pages/boxes-details/boxes-details.js
  View file @928d2df
... ... @@ -124,7 +124,7 @@ Page({
124 124 * 用户点击右上角分享
125 125 */
126 126 onShareAppMessage: function() {
127   -
  127 + getApp().globalData.no_clear=1
128 128 },
129 129  
130 130  
... ...
packageB/pages/luckactivity/index/index.js
  View file @928d2df
... ... @@ -166,7 +166,7 @@ Page({
166 166 /**
167 167 * 用户点击右上角分享
168 168 */
169   - onShareAppMessage: function () {
  169 + onShareAppMessage: function () { getApp().globalData.no_clear=1
170 170  
171 171 },
172 172  
... ...
packageB/pages/user/Change_phone/Change_phone.js
  View file @928d2df
... ... @@ -246,6 +246,6 @@ Page({
246 246 * 用户点击右上角分享
247 247 */
248 248 onShareAppMessage: function() {
249   -
  249 + getApp().globalData.no_clear=1
250 250 }
251 251 })
... ...
packageB/pages/user/add_comment/add_comment.js
  View file @928d2df
... ... @@ -220,6 +220,7 @@ Page({
220 220  
221 221 var imgs = this.data.imgs;
222 222  
  223 + getApp().globalData.no_clear=1;
223 224 wx.chooseImage({
224 225 count: 1, // 默认9
225 226 sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
... ... @@ -259,6 +260,7 @@ Page({
259 260 var index = e.currentTarget.dataset.index;
260 261 //所有图片
261 262 var imgs = this.data.imgs;
  263 + getApp().globalData.no_clear=1;
262 264 wx.previewImage({
263 265 //当前显示图片
264 266 current: imgs[index],
... ...
packageB/pages/user/binding_info/binding_info.js
  View file @928d2df
... ... @@ -60,7 +60,7 @@ Page({
60 60 /**
61 61 * 用户点击右上角分享
62 62 */
63   - onShareAppMessage: function () {
  63 + onShareAppMessage: function () { getApp().globalData.no_clear=1
64 64  
65 65 }
66 66 })
67 67 \ No newline at end of file
... ...
packageB/pages/user/buyDetails/buyDetails.js
  View file @928d2df
... ... @@ -106,7 +106,7 @@ Page({
106 106 /**
107 107 * 用户点击右上角分享
108 108 */
109   - onShareAppMessage: function () {
  109 + onShareAppMessage: function () { getApp().globalData.no_clear=1
110 110  
111 111 },
112 112  
... ...
packageB/pages/user/choice_guide/choice_guide.js
  View file @928d2df
... ... @@ -26,6 +26,7 @@ Page({
26 26  
27 27 //--点击分享事件---
28 28 onShareAppMessage: function(t) {
  29 + getApp().globalData.no_clear=1
29 30 return o.share;
30 31 },
31 32 get_list: function() {
... ...
packageB/pages/user/comment/comment.js
  View file @928d2df
... ... @@ -161,6 +161,7 @@ Page({
161 161 } else {
162 162 image = imgArr[index].weapp_img[sindex];
163 163 }
  164 + getApp().globalData.no_clear=1;
164 165 wx.previewImage({
165 166 current: image,
166 167 //当前图片地址
... ...
packageB/pages/user/view_comment/view_comment.js
  View file @928d2df
... ... @@ -112,6 +112,7 @@ Page({
112 112 var iurl = th.data.iurl;
113 113 if (image != "") {
114 114 image = imgArr[0].weapp_img[index];
  115 + getApp().globalData.no_clear=1;
115 116 wx.previewImage({
116 117 current: image,
117 118 //当前图片地址
... ... @@ -119,6 +120,7 @@ Page({
119 120 })
120 121 } else {
121 122 image = imgArr[0].img[index];
  123 + getApp().globalData.no_clear=1;
122 124 wx.previewImage({
123 125 current: iurl + image,
124 126 //当前图片地址
... ...
packageB/pages/video/index.js
  View file @928d2df
... ... @@ -7,6 +7,7 @@ Page({
7 7 },
8 8 bindButtonTap: function() {
9 9 var that = this
  10 + getApp().globalData.no_clear=1;
10 11 wx.chooseVideo({
11 12 sourceType: ['album', 'camera'],
12 13 maxDuration: 60,
... ... @@ -34,6 +35,7 @@ Page({
34 35  
35 36 //---------分享配置--------
36 37 onShareAppMessage: function (e) {
  38 + getApp().globalData.no_clear=1
37 39 return {
38 40 title: "直播视频回放",
39 41 }
... ...
packageB/pages/zuhegou/index/index.js
  View file @928d2df
... ... @@ -446,7 +446,7 @@ Page({
446 446 /**
447 447 * 用户点击右上角分享
448 448 */
449   - onShareAppMessage: function () {
  449 + onShareAppMessage: function () { getApp().globalData.no_clear=1;
450 450 var title = this.data.act.name;
451 451 var url = "/packageB/pages/zuhegou/index/index?id=" + this.data.act.id;
452 452 if (getApp().globalData.user_id) {
... ...
packageB/pages/zuhegou/list/list.js
  View file @928d2df
... ... @@ -198,6 +198,7 @@ Page({
198 198  
199 199 //---------分享配置--------
200 200 onShareAppMessage: function (e) {
  201 + getApp().globalData.no_clear=1
201 202 var curPage=this;
202 203 var pagePath = curPage.route; //当前页面url
203 204 if (pagePath.indexOf('/') != 0) {
... ...
packageB/pages/zuhegou/preindex/index.js
  View file @928d2df
... ... @@ -447,7 +447,7 @@ Page({
447 447 /**
448 448 * 用户点击右上角分享
449 449 */
450   - onShareAppMessage: function () {
  450 + onShareAppMessage: function () { getApp().globalData.no_clear=1;
451 451 var title = this.data.act.name;
452 452 var url = "/packageB/pages/zuhegou/index/index?id=" + this.data.act.id;
453 453 if (getApp().globalData.user_id) {
... ...
packageC/pages/goods/distributionCategoryList/index.js
  View file @928d2df
... ... @@ -404,6 +404,7 @@ Page({
404 404 },
405 405 //---------分享配置--------
406 406 onShareAppMessage: function (e) {
  407 + getApp().globalData.no_clear=1
407 408  
408 409 var url = "pages/goods/categoryList/categoryList";
409 410 var userInfo = getApp().globalData.userInfo;
... ... @@ -639,9 +640,9 @@ Page({
639 640 //扫一扫
640 641 getScancode: function () {
641 642 // 允许从相机和相册扫码
  643 + getApp().globalData.no_clear=1;
642 644 wx.scanCode({
643 645 success: (res) => {
644   - console.log(res);
645 646 var key_word = res.result;
646 647 wx.navigateBack({
647 648 delta: 1
... ...
packageC/pages/goods/goodsList/goodsList.js
  View file @928d2df
... ... @@ -240,6 +240,7 @@ Page({
240 240 },
241 241 //---------分享配置--------
242 242 onShareAppMessage: function (e) {
  243 + getApp().globalData.no_clear=1
243 244 var curPage = this;
244 245 var pagePath = curPage.route; //当前页面url
245 246 if (pagePath.indexOf('/') != 0) {
... ...
packageC/pages/goods/search/search.js
  View file @928d2df
... ... @@ -235,6 +235,7 @@ Page({
235 235  
236 236 //---------分享配置--------
237 237 onShareAppMessage: function (e) {
  238 + getApp().globalData.no_clear=1
238 239 var curPage = this;
239 240 var pagePath = curPage.route; //当前页面url
240 241 if (pagePath.indexOf('/') != 0) {
... ...
packageC/pages/group_list/group_list.js
  View file @928d2df
... ... @@ -147,7 +147,7 @@ Page({
147 147 /**
148 148 * 用户点击右上角分享
149 149 */
150   - onShareAppMessage: function () {
  150 + onShareAppMessage: function () { getApp().globalData.no_clear=1
151 151  
152 152 },
153 153  
... ...
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js
  View file @928d2df
... ... @@ -191,6 +191,7 @@ Page({
191 191 * 用户点击右上角分享
192 192 */
193 193 onShareAppMessage: function (e) {
  194 + getApp().globalData.no_clear=1
194 195 var pagePath = this.route; //当前页面url
195 196 if (pagePath.indexOf('/') != 0) {
196 197 pagePath = '/' + pagePath;
... ...
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
  View file @928d2df
... ... @@ -972,6 +972,7 @@ Page({
972 972  
973 973 //------ 分享配置 --------
974 974 onShareAppMessage: function (e) {
  975 + getApp().globalData.no_clear=1
975 976 var pagePath = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${this.data.param.goods_id}&prom_type=9&group_id=${this.data.param.group_id}`; //当前页面url
976 977 // console.log('pagePath=====xxxxxx>', pagePath);
977 978 var imgPath = this.data.iurl + this.data.luckyGoInfo.original_img;
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
  View file @928d2df
... ... @@ -2248,24 +2248,7 @@ Page({
2248 2248  
2249 2249 //---------联系客服------------
2250 2250 contactService: function () {
2251   - s.getConfig(function (t) {
2252   - if (t.store_tel == undefined) {
2253   - getApp().request.get("/api/weshop/store/get/" + os.stoid, {
2254   - isShowLoading: 1,
2255   - data: {},
2256   - success: function (rs) {
2257   - getApp().globalData.config = rs.data.data;
2258   - if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
2259   - getApp().my_warnning("商家未设置电话", 0, th);
2260   - return false;
2261   - }
2262   - s.confirmBox("请联系客服：" + rs.data.data.store_tel);
2263   - }
2264   - })
2265   - } else {
2266   - s.confirmBox("请联系客服：" + t.store_tel);
2267   - }
2268   - });
  2251 + getApp().con_Service();
2269 2252 },
2270 2253 //-------获取购物车数量----------
2271 2254 requestCardNum: function () {
... ... @@ -2306,11 +2289,7 @@ Page({
2306 2289 b[i] = this.data.iurl + e[i];
2307 2290 }
2308 2291 this.data.show_prew_img = 1;
2309   -
2310   - wx.previewImage({
2311   - current: b[t.currentTarget.dataset.id],
2312   - urls: b
2313   - });
  2292 + getApp().pre_img2(b,t);
2314 2293 },
2315 2294  
2316 2295 previewCommentImgs_w: function (t) {
... ... @@ -2320,21 +2299,16 @@ Page({
2320 2299 b[i] = this.data.iurl + e[i];
2321 2300 }
2322 2301 this.data.show_prew_img = 1;
2323   - wx.previewImage({
2324   - current: b[t.currentTarget.dataset.id],
2325   - urls: b
2326   - });
  2302 + getApp().pre_img2(b,t);
2327 2303 },
2328 2304  
2329 2305 previewGoodsCommentImgs: function (t) {
2330 2306 var e = this,
2331 2307 a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
  2308 + getApp().globalData.no_clear=1;
2332 2309 a = a.map(function (t) {
2333 2310 return e.data.url + t;
2334   - }), wx.previewImage({
2335   - current: a[t.currentTarget.dataset.id],
2336   - urls: a
2337   - });
  2311 + }), getApp().pre_img2(a,t);
2338 2312 this.data.show_prew_img = 1;
2339 2313 },
2340 2314 closePromModal: function () {
... ... @@ -2349,7 +2323,7 @@ Page({
2349 2323 },
2350 2324  
2351 2325 //--点击分享事件---
2352   - onShareAppMessage: function (t) {
  2326 + onShareAppMessage: function (t) { getApp().globalData.no_clear=1;
2353 2327  
2354 2328 // var th = this;
2355 2329 // var price = th.data.sele_g.shop_price;
... ... @@ -6095,11 +6069,8 @@ Page({
6095 6069 },
6096 6070  
6097 6071 previewImage() {
6098   - this.data.show_prew_img = 1;
6099   - wx.previewImage({
6100   - //将图片预览出来
6101   - urls: [this.data.sele_g.original_img]
6102   - });
  6072 + this.data.show_prew_img = 1;
  6073 + getApp().pre_img(this.data.sele_g.original_img);
6103 6074 },
6104 6075  
6105 6076 is_show_more_buy: function () {
... ... @@ -6327,13 +6298,7 @@ Page({
6327 6298 },
6328 6299  
6329 6300 con_weixin: function () {
6330   - var url = this.data.sys_switch.weapp_customertype_url;
6331   - var id = this.data.sys_switch.weapp_customertype_appid;
6332   - wx.openCustomerServiceChat({
6333   - extInfo: { url: url },
6334   - corpId: id,
6335   - success(res) { }
6336   - })
  6301 + getApp().con_wx(this);
6337 6302 },
6338 6303  
6339 6304  
... ... @@ -6486,6 +6451,7 @@ Page({
6486 6451  
6487 6452 // 预览海报
6488 6453 previewPoster() {
  6454 + getApp().globalData.no_clear=1;
6489 6455 wx.previewImage({
6490 6456 current: this.data.shareImgPath, // 当前显示图片的http链接
6491 6457 urls: [this.data.shareImgPath],// 需要预览的图片http链接列表
... ... @@ -6493,4 +6459,9 @@ Page({
6493 6459 },
6494 6460  
6495 6461  
  6462 + click_contact:function () {
  6463 + getApp().globalData.no_clear=1;
  6464 + }
  6465 +
  6466 +
6496 6467 });
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
  View file @928d2df
... ... @@ -871,7 +871,7 @@
871 871 <!-- -----------------底部按钮------------------ -->
872 872 <view class="join-cart">
873 873 <!-- bindtap="contactService" -->
874   - <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
  874 + <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
875 875 <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
876 876 <view>客服</view>
877 877 </button>
... ...
packageC/pages/luckyGo/luckyGo_members/luckyGo_members.js
  View file @928d2df
... ... @@ -92,7 +92,7 @@ Page({
92 92 /**
93 93 * 用户点击右上角分享
94 94 */
95   - onShareAppMessage: function () {
  95 + onShareAppMessage: function () { getApp().globalData.no_clear=1
96 96  
97 97 },
98 98  
... ...
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
  View file @928d2df
... ... @@ -237,24 +237,7 @@ Page({
237 237 },
238 238 /*-----联系客户------*/
239 239 contactService: function() {
240   - e.getConfig(function(t) {
241   - if (t.store_tel == undefined) {
242   - getApp().request.get("/api/weshop/store/get/" + os.stoid, {
243   - isShowLoading: 1,
244   - data: {},
245   - success: function (rs) {
246   - getApp().globalData.config = rs.data.data;
247   - if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
248   - getApp().showWarning("商家未设置电话");
249   - return false;
250   - }
251   - e.confirmBox("请联系客服：" + rs.data.data.store_tel);
252   - }
253   - })
254   - } else {
255   - e.confirmBox("请联系客服：" + t.store_tel);
256   - }
257   - });
  240 + getApp().con_Service();
258 241 },
259 242  
260 243 //--------取消订单---------
... ... @@ -1074,13 +1057,7 @@ Page({
1074 1057 },
1075 1058  
1076 1059 con_weixin:function () {
1077   - var url=this.data.sys_switch.weapp_customertype_url;
1078   - var id=this.data.sys_switch.weapp_customertype_appid;
1079   - wx.openCustomerServiceChat({
1080   - extInfo: {url: url},
1081   - corpId: id,
1082   - success(res) {}
1083   - })
  1060 + getApp().con_wx(this);
1084 1061 },
1085 1062  
1086 1063 //跳转到商品
... ... @@ -1115,6 +1092,11 @@ Page({
1115 1092 // }
1116 1093 // })
1117 1094 },
  1095 +
  1096 +
  1097 + click_contact:function () {
  1098 + getApp().globalData.no_clear=1;
  1099 + }
1118 1100  
1119 1101  
1120 1102  
... ...
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
  View file @928d2df
... ... @@ -61,7 +61,7 @@
61 61 <view bindtap="checkTeam" class="contact-us check-btn" wx:if="{{optionIsGoup}}">查看拼团详情</view>
62 62 <view>
63 63  
64   - <button wx:if="{{sys_switch.weapp_customertype==1}}" class="contact-us goods-btn" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">联系客服</button>
  64 + <button wx:if="{{sys_switch.weapp_customertype==1}}" class="contact-us goods-btn" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">联系客服</button>
65 65  
66 66 <view wx:elif="{{sys_switch.weapp_customertype==2}}" bindtap="con_weixin" class="contact-us goods-btn">联系客服</view>
67 67 <view wx:else bindtap="contactService" class="contact-us goods-btn">联系客服</view>
... ...
packageC/pages/luckyGo/luckyGo_winners/luckyGo_winners.js
  View file @928d2df
... ... @@ -114,7 +114,7 @@ Page({
114 114 /**
115 115 * 用户点击右上角分享
116 116 */
117   - onShareAppMessage: function () {
  117 + onShareAppMessage: function () { getApp().globalData.no_clear=1
118 118  
119 119 },
120 120  
... ...
packageC/pages/presell/cart/cart.js
  View file @928d2df
... ... @@ -2601,35 +2601,12 @@ Page({
2601 2601  
2602 2602 //---------联系客服------------
2603 2603 contactService: function () {
2604   - getApp().getConfig(function (t) {
2605   - if (t.store_tel == undefined) {
2606   - getApp().request.get("/api/weshop/store/get/" + os.stoid, {
2607   - isShowLoading: 1,
2608   - data: {},
2609   - success: function (rs) {
2610   - getApp().globalData.config = rs.data.data;
2611   - if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
2612   - getApp().my_warnning("商家未设置电话", 0, th);
2613   - return false;
2614   - }
2615   - wx.makePhoneCall({ phoneNumber: rs.data.data.store_tel, })
2616   - }
2617   - })
2618   - } else {
2619   - wx.makePhoneCall({ phoneNumber: t.store_tel, })
2620   - }
2621   - });
  2604 + getApp().con_Service();
2622 2605 },
2623 2606  
2624 2607 //---------联系微信客服------------
2625 2608 con_weixin: function () {
2626   - var url = this.data.sys_switch.weapp_customertype_url;
2627   - var id = this.data.sys_switch.weapp_customertype_appid;
2628   - wx.openCustomerServiceChat({
2629   - extInfo: { url: url },
2630   - corpId: id,
2631   - success(res) { }
2632   - })
  2609 + getApp().con_wx(this);
2633 2610 }
2634 2611  
2635 2612  
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @928d2df
... ... @@ -1430,24 +1430,7 @@ Page({
1430 1430  
1431 1431 //---------联系客服------------
1432 1432 contactService: function () {
1433   - s.getConfig(function (t) {
1434   - if (t.store_tel == undefined) {
1435   - getApp().request.get("/api/weshop/store/get/" + os.stoid, {
1436   - isShowLoading: 1,
1437   - data: {},
1438   - success: function (rs) {
1439   - getApp().globalData.config = rs.data.data;
1440   - if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
1441   - getApp().my_warnning("商家未设置电话", 0, th);
1442   - return false;
1443   - }
1444   - s.confirmBox("请联系客服：" + rs.data.data.store_tel);
1445   - }
1446   - })
1447   - } else {
1448   - s.confirmBox("请联系客服：" + t.store_tel);
1449   - }
1450   - });
  1433 + getApp().con_Service();
1451 1434 },
1452 1435 //-------获取购物车数量----------
1453 1436 requestCardNum: function () {
... ... @@ -1488,11 +1471,8 @@ Page({
1488 1471 b[i] = this.data.iurl + e[i];
1489 1472 }
1490 1473 this.data.show_prew_img = 1;
  1474 + getApp().pre_img2(b,t)
1491 1475  
1492   - wx.previewImage({
1493   - current: b[t.currentTarget.dataset.id],
1494   - urls: b
1495   - });
1496 1476 },
1497 1477  
1498 1478 previewCommentImgs_w: function (t) {
... ... @@ -1502,21 +1482,16 @@ Page({
1502 1482 b[i] = this.data.iurl + e[i];
1503 1483 }
1504 1484 this.data.show_prew_img = 1;
1505   - wx.previewImage({
1506   - current: b[t.currentTarget.dataset.id],
1507   - urls: b
1508   - });
  1485 + getApp().pre_img2(b,t)
1509 1486 },
1510 1487  
1511 1488 previewGoodsCommentImgs: function (t) {
1512 1489 var e = this,
1513 1490 a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
  1491 + getApp().globalData.no_clear=1;
1514 1492 a = a.map(function (t) {
1515 1493 return e.data.url + t;
1516   - }), wx.previewImage({
1517   - current: a[t.currentTarget.dataset.id],
1518   - urls: a
1519   - });
  1494 + }), getApp().pre_img2(a,t);
1520 1495 this.data.show_prew_img = 1;
1521 1496 },
1522 1497 closePromModal: function () {
... ... @@ -1531,7 +1506,7 @@ Page({
1531 1506 },
1532 1507  
1533 1508 //--点击分享事件---
1534   - onShareAppMessage: function (t) {
  1509 + onShareAppMessage: function (t) { getApp().globalData.no_clear=1;
1535 1510  
1536 1511 var th = this;
1537 1512 var price = th.data.pre_arr.presell_price;
... ... @@ -3813,10 +3788,7 @@ Page({
3813 3788  
3814 3789 previewImage() {
3815 3790 this.data.show_prew_img = 1;
3816   - wx.previewImage({
3817   - //将图片预览出来
3818   - urls: [this.data.shareImgPath]
3819   - });
  3791 + getApp().pre_img(this.data.shareImgPath);
3820 3792 },
3821 3793  
3822 3794  
... ... @@ -4012,21 +3984,21 @@ Page({
4012 3984 },
4013 3985  
4014 3986 con_weixin:function () {
4015   - var url=this.data.sys_switch.weapp_customertype_url;
4016   - var id=this.data.sys_switch.weapp_customertype_appid;
4017   - wx.openCustomerServiceChat({
4018   - extInfo: {url: url},
4019   - corpId: id,
4020   - success(res) {}
4021   - })
  3987 + getApp().con_wx(this);
4022 3988 },
4023 3989  
4024 3990 // 预览海报
4025 3991 previewPoster() {
  3992 + getApp().globalData.no_clear=1;
4026 3993 wx.previewImage({
4027 3994 current: this.data.shareImgPath, // 当前显示图片的http链接
4028 3995 urls: [this.data.shareImgPath] ,// 需要预览的图片http链接列表
4029 3996 });
4030 3997 },
4031 3998  
  3999 +
  4000 + click_contact:function () {
  4001 + getApp().globalData.no_clear=1;
  4002 + }
  4003 +
4032 4004 });
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  View file @928d2df
... ... @@ -495,7 +495,7 @@
495 495 <!-- -----------------底部按钮------------------ -->
496 496 <view class="join-cart">
497 497 <!-- bindtap="contactService" -->
498   - <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
  498 + <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
499 499 <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
500 500 <view>客服</view>
501 501 </button>
... ...
packageC/pages/presell/pregoodsInfo/goodsInfo.js
  View file @928d2df
... ... @@ -1431,24 +1431,7 @@ Page({
1431 1431  
1432 1432 //---------联系客服------------
1433 1433 contactService: function () {
1434   - s.getConfig(function (t) {
1435   - if (t.store_tel == undefined) {
1436   - getApp().request.get("/api/weshop/store/get/" + os.stoid, {
1437   - isShowLoading: 1,
1438   - data: {},
1439   - success: function (rs) {
1440   - getApp().globalData.config = rs.data.data;
1441   - if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
1442   - getApp().my_warnning("商家未设置电话", 0, th);
1443   - return false;
1444   - }
1445   - s.confirmBox("请联系客服：" + rs.data.data.store_tel);
1446   - }
1447   - })
1448   - } else {
1449   - s.confirmBox("请联系客服：" + t.store_tel);
1450   - }
1451   - });
  1434 + getApp().con_Service();
1452 1435 },
1453 1436 //-------获取购物车数量----------
1454 1437 requestCardNum: function () {
... ... @@ -1489,11 +1472,7 @@ Page({
1489 1472 b[i] = this.data.iurl + e[i];
1490 1473 }
1491 1474 this.data.show_prew_img = 1;
1492   -
1493   - wx.previewImage({
1494   - current: b[t.currentTarget.dataset.id],
1495   - urls: b
1496   - });
  1475 + getApp().pre_img2(b,t)
1497 1476 },
1498 1477  
1499 1478 previewCommentImgs_w: function (t) {
... ... @@ -1503,21 +1482,16 @@ Page({
1503 1482 b[i] = this.data.iurl + e[i];
1504 1483 }
1505 1484 this.data.show_prew_img = 1;
1506   - wx.previewImage({
1507   - current: b[t.currentTarget.dataset.id],
1508   - urls: b
1509   - });
  1485 + getApp().pre_img2(b,t)
1510 1486 },
1511 1487  
1512 1488 previewGoodsCommentImgs: function (t) {
1513 1489 var e = this,
1514 1490 a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
  1491 + getApp().globalData.no_clear=1;
1515 1492 a = a.map(function (t) {
1516 1493 return e.data.url + t;
1517   - }), wx.previewImage({
1518   - current: a[t.currentTarget.dataset.id],
1519   - urls: a
1520   - });
  1494 + }), getApp().pre_img2(a,t);
1521 1495 this.data.show_prew_img = 1;
1522 1496 },
1523 1497 closePromModal: function () {
... ... @@ -1532,7 +1506,7 @@ Page({
1532 1506 },
1533 1507  
1534 1508 //--点击分享事件---
1535   - onShareAppMessage: function (t) {
  1509 + onShareAppMessage: function (t) { getApp().globalData.no_clear=1;
1536 1510  
1537 1511 var th = this;
1538 1512 var price = th.data.pre_arr.presell_price;
... ... @@ -3814,10 +3788,7 @@ Page({
3814 3788  
3815 3789 previewImage() {
3816 3790 this.data.show_prew_img = 1;
3817   - wx.previewImage({
3818   - //将图片预览出来
3819   - urls: [this.data.shareImgPath]
3820   - });
  3791 + getApp().pre_img(this.data.shareImgPath);
3821 3792 },
3822 3793  
3823 3794  
... ... @@ -4014,13 +3985,12 @@ Page({
4014 3985 },
4015 3986  
4016 3987 con_weixin:function () {
4017   - var url=this.data.sys_switch.weapp_customertype_url;
4018   - var id=this.data.sys_switch.weapp_customertype_appid;
4019   - wx.openCustomerServiceChat({
4020   - extInfo: {url: url},
4021   - corpId: id,
4022   - success(res) {}
4023   - })
  3988 + getApp().con_wx(this);
  3989 + },
  3990 +
  3991 +
  3992 + click_contact:function () {
  3993 + getApp().globalData.no_clear=1;
4024 3994 }
4025 3995  
4026 3996 });
... ...
packageC/pages/presell/pregoodsInfo/goodsInfo.wxml
  View file @928d2df
... ... @@ -495,7 +495,7 @@
495 495 <!-- -----------------底部按钮------------------ -->
496 496 <view class="join-cart">
497 497 <!-- bindtap="contactService" -->
498   - <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
  498 + <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
499 499 <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
500 500 <view>客服</view>
501 501 </button>
... ...
packageD/pages/AI-test-skin/history_record/history_record.js
  View file @928d2df
... ... @@ -344,7 +344,7 @@ Page({
344 344 /**
345 345 * 用户点击右上角分享
346 346 */
347   - onShareAppMessage: function () {
  347 + onShareAppMessage: function () { getApp().globalData.no_clear=1
348 348  
349 349 }
350 350 })
351 351 \ No newline at end of file
... ...
packageD/pages/AI-test-skin/index/aiskin.js
  View file @928d2df
... ... @@ -101,7 +101,7 @@ Page({
101 101 /**
102 102 * 用户点击右上角分享
103 103 */
104   - onShareAppMessage: function () {
  104 + onShareAppMessage: function () { getApp().globalData.no_clear=1
105 105  
106 106 },
107 107  
... ...
packageD/pages/AI-test-skin/select_photo/select_photo.js
  View file @928d2df
... ... @@ -52,6 +52,7 @@ Page({
52 52 //-- 重新从相册中选择图片 --
53 53 show_pai_pop: function () {
54 54 var th = this;
  55 + getApp().globalData.no_clear=1;
55 56 //选择和拍照一张图片
56 57 wx.chooseImage({
57 58 count: 1,
... ... @@ -70,6 +71,7 @@ Page({
70 71 //选择图片
71 72 takePhoto() {
72 73 var that = this;
  74 + getApp().globalData.no_clear=1;
73 75 wx.chooseImage({
74 76 count: 1,
75 77 sizeType: ['compressed'],
... ...
packageD/pages/AI-test-skin/shoot_notice/shoot_notice.js
  View file @928d2df
... ... @@ -68,13 +68,14 @@ Page({
68 68 /**
69 69 * 用户点击右上角分享
70 70 */
71   - onShareAppMessage: function () {
  71 + onShareAppMessage: function () { getApp().globalData.no_clear=1
72 72  
73 73 },
74 74  
75 75 //从相册中选择图片
76 76 show_pai_pop: function () {
77 77 let th = this;
  78 + getApp().globalData.no_clear=1;
78 79 //选择和拍照一张图片
79 80 wx.chooseImage({
80 81 count: 1,
... ... @@ -98,7 +99,7 @@ Page({
98 99 //选择图片
99 100 takePhoto() {
100 101 var that = this;
101   -
  102 + getApp().globalData.no_clear=1;
102 103 wx.chooseImage({
103 104 count: 1,
104 105 sizeType: ['compressed'],
... ...
packageD/pages/AI-test-skin/success_result/success_result.js
  View file @928d2df
... ... @@ -83,7 +83,29 @@ Page({
83 83 this.init();
84 84 //var face_result=getApp().globalData.face_result;
85 85 //var face_data=face_result.face_list[0];
86   - this.data.id = options.id;
  86 + var id=options.id;
  87 + var first_leader = options.first_leader;
  88 +
  89 + if (id == undefined || id == null || id == "") {
  90 + var gid_str = decodeURIComponent(options.scene);
  91 + gid_str = gid_str.split("_");
  92 + id=gid_str[0];
  93 + if (gid_str.length > 1) {
  94 + first_leader = gid_str[1];
  95 + }
  96 + }
  97 +
  98 + this.data.id=id;
  99 + if (first_leader) {
  100 + console.log("log---".first_leader);
  101 + getApp().globalData.first_leader = first_leader;
  102 + //调用接口判断是不是会员
  103 + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + first_leader, {}).then(res => {
  104 + if (res.data.code == 0) {
  105 + getApp().globalData.guide_id = res.data.data.id;
  106 + }
  107 + })
  108 + }
87 109  
88 110 //用异步的获取比较准一点
89 111 wx.getSystemInfo({
... ... @@ -590,7 +612,15 @@ Page({
590 612 * 用户点击右上角分享
591 613 */
592 614 onShareAppMessage: function () {
  615 + getApp().globalData.no_clear=1;
  616 + var url="packageD/pages/AI-test-skin/success_result/success_result?id="+this.data.id+"&first_leader="+getApp().globalData.user_id;
  617 +
  618 + var ob = {
  619 + title: "测肤报告",
  620 + path: url,
  621 + };
593 622  
  623 + return ob;
594 624 },
595 625  
596 626 //商品页面跳转
... ... @@ -748,7 +778,7 @@ Page({
748 778 }
749 779 ///二微码
750 780 var path3 = setting.url + "/api/wx/open/app/user/getWeAppEwm/" +
751   - setting.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
  781 + setting.stoid + "?sceneValue=" + scene + "&pageValue=packageD/pages/AI-test-skin/success_result/success_result";
752 782  
753 783 // 读取文件成功则OK--
754 784 wx.getImageInfo({
... ...
pages/activity/pind_list/pind_list.js
  View file @928d2df
... ... @@ -195,6 +195,7 @@ Page({
195 195  
196 196 //---------分享配置--------
197 197 onShareAppMessage: function (e) {
  198 + getApp().globalData.no_clear=1;
198 199 var curPage = this;
199 200 var pagePath = curPage.route; //当前页面url
200 201 if (pagePath.indexOf('/') != 0) {
... ...
pages/activity/seckill_list/seckill_list.js
  View file @928d2df
... ... @@ -233,6 +233,7 @@ Page({
233 233  
234 234 //---------分享配置--------
235 235 onShareAppMessage: function (e) {
  236 + getApp().globalData.no_clear=1;
236 237 var curPage = this;
237 238 var pagePath = curPage.route; //当前页面url
238 239 if (pagePath.indexOf('/') != 0) {
... ...
pages/cart/cart_wk/cart_wk.js
  View file @928d2df
... ... @@ -94,7 +94,7 @@ Page({
94 94 /**
95 95 * 用户点击右上角分享
96 96 */
97   - onShareAppMessage: function () { },
  97 + onShareAppMessage: function () { getApp().globalData.no_clear=1 },
98 98 //---------------获取物流---------------
99 99 get_wuliu(func) {
100 100 var th = this,
... ...
pages/distribution/distribution.js
  View file @928d2df
... ... @@ -233,7 +233,7 @@ Page({
233 233 /**
234 234 * 用户点击右上角分享
235 235 */
236   - onShareAppMessage: function () {
  236 + onShareAppMessage: function () { getApp().globalData.no_clear=1
237 237  
238 238 },
239 239  
... ...
pages/giftpack/mygiftpack/mygiftpack.js
  View file @928d2df
... ... @@ -163,6 +163,7 @@ Page({
163 163  
164 164 //--- 分享设置 --
165 165 onShareAppMessage: function (e) {
  166 + getApp().globalData.no_clear=1;
166 167 var curPage = this;
167 168 var pagePath = curPage.route; //当前页面url
168 169 if (pagePath.indexOf('/') != 0) {
... ...
pages/goods/categoryList/categoryList.js
  View file @928d2df
... ... @@ -627,7 +627,7 @@ Page({
627 627  
628 628 //---------分享配置--------
629 629 onShareAppMessage: function (e) {
630   -
  630 + getApp().globalData.no_clear=1;
631 631 var url="pages/goods/categoryList/categoryList";
632 632 var userInfo=getApp().globalData.userInfo;
633 633 //是分销商才带
... ... @@ -799,6 +799,7 @@ Page({
799 799 //扫一扫
800 800 getScancode:function(){
801 801 var _this = this;
  802 + getApp().globalData.no_clear=1;
802 803 // 允许从相机和相册扫码
803 804 wx.scanCode({
804 805 success: (res) => {
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @928d2df
... ... @@ -752,6 +752,9 @@ Page({
752 752  
753 753 //---展示---
754 754 onShow: function () {
  755 +
  756 +
  757 +
755 758 var goods_list = null, th = this, that = this;
756 759 var show_prew_img = this.data.show_prew_img
757 760 if (show_prew_img) {
... ... @@ -759,6 +762,11 @@ Page({
759 762 return false;
760 763 }
761 764  
  765 + if(this.data.show_video) {
  766 + this.data.show_video=0;
  767 + return false;
  768 + }
  769 +
762 770 //优惠券要实时更新
763 771 getApp().getConfig2(function (e) {
764 772 var json_d = JSON.parse(e.switch_list);
... ... @@ -2280,24 +2288,7 @@ Page({
2280 2288  
2281 2289 //---------联系客服------------
2282 2290 contactService: function () {
2283   - s.getConfig(function (t) {
2284   - if (t.store_tel == undefined) {
2285   - getApp().request.get("/api/weshop/store/get/" + os.stoid, {
2286   - isShowLoading: 1,
2287   - data: {},
2288   - success: function (rs) {
2289   - getApp().globalData.config = rs.data.data;
2290   - if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
2291   - getApp().my_warnning("商家未设置电话", 0, th);
2292   - return false;
2293   - }
2294   - s.confirmBox("请联系客服：" + rs.data.data.store_tel);
2295   - }
2296   - })
2297   - } else {
2298   - s.confirmBox("请联系客服：" + t.store_tel);
2299   - }
2300   - });
  2291 + getApp().con_Service();
2301 2292 },
2302 2293 //-------获取购物车数量----------
2303 2294 requestCardNum: function () {
... ... @@ -2338,11 +2329,7 @@ Page({
2338 2329 b[i] = this.data.iurl + e[i];
2339 2330 }
2340 2331 this.data.show_prew_img = 1;
2341   -
2342   - wx.previewImage({
2343   - current: b[t.currentTarget.dataset.id],
2344   - urls: b
2345   - });
  2332 + getApp().pre_img2(b,t)
2346 2333 },
2347 2334  
2348 2335 previewCommentImgs_w: function (t) {
... ... @@ -2352,10 +2339,7 @@ Page({
2352 2339 b[i] = this.data.iurl + e[i];
2353 2340 }
2354 2341 this.data.show_prew_img = 1;
2355   - wx.previewImage({
2356   - current: b[t.currentTarget.dataset.id],
2357   - urls: b
2358   - });
  2342 + getApp().pre_img2(b,t)
2359 2343 },
2360 2344  
2361 2345 previewGoodsCommentImgs: function (t) {
... ... @@ -2363,10 +2347,7 @@ Page({
2363 2347 a = this.data.data.comment[t.currentTarget.dataset.cidx].img;
2364 2348 a = a.map(function (t) {
2365 2349 return e.data.url + t;
2366   - }), wx.previewImage({
2367   - current: a[t.currentTarget.dataset.id],
2368   - urls: a
2369   - });
  2350 + }), getApp().pre_img2(a,t);
2370 2351 this.data.show_prew_img = 1;
2371 2352 },
2372 2353 closePromModal: function () {
... ... @@ -2381,7 +2362,7 @@ Page({
2381 2362 },
2382 2363  
2383 2364 //--点击分享事件---
2384   - onShareAppMessage: function (t) {
  2365 + onShareAppMessage: function (t) { getApp().globalData.no_clear=1;
2385 2366  
2386 2367 var th = this;
2387 2368 var price = th.data.sele_g.shop_price;
... ... @@ -5911,6 +5892,12 @@ Page({
5911 5892  
5912 5893 wait_for_store_config: function () {
5913 5894 var th = this;
  5895 + //----获取系统参数-----
  5896 + getApp().getConfig2(function (e) {
  5897 + th.setData({
  5898 + bconfig: e,
  5899 + });
  5900 + })
5914 5901 var t_time = setInterval(function () {
5915 5902 if (th.data.bconfig == null) false;
5916 5903 var e = th.data.bconfig;
... ... @@ -6246,10 +6233,7 @@ Page({
6246 6233  
6247 6234 previewImage(e) {
6248 6235 this.data.show_prew_img = 1;
6249   - wx.previewImage({
6250   - //将图片预览出来
6251   - urls: [this.data.sele_g.original_img]
6252   - });
  6236 + getApp().pre_img(this.data.sele_g.original_img);
6253 6237 },
6254 6238  
6255 6239 is_show_more_buy: function () {
... ... @@ -6499,14 +6483,7 @@ Page({
6499 6483 },
6500 6484  
6501 6485 con_weixin: function () {
6502   - var url = this.data.sys_switch.weapp_customertype_url;
6503   - var id = this.data.sys_switch.weapp_customertype_appid;
6504   - wx.openCustomerServiceChat({
6505   - extInfo: {url: url},
6506   - corpId: id,
6507   - success(res) {
6508   - }
6509   - })
  6486 + getApp().con_wx(this);
6510 6487 },
6511 6488 get_normal(gid){
6512 6489 this.setData({
... ... @@ -6616,11 +6593,24 @@ Page({
6616 6593  
6617 6594 // 预览海报
6618 6595 previewPoster() {
  6596 + getApp().globalData.no_clear=1;
6619 6597 wx.previewImage({
6620 6598 current: this.data.shareImgPath, // 当前显示图片的http链接
6621 6599 urls: [this.data.shareImgPath] ,// 需要预览的图片http链接列表
6622 6600 });
6623 6601 },
  6602 +
  6603 + screenChange:function (e) {
  6604 + let fullScreen = e.detail.fullScreen //值true为进入全屏，false为退出全屏
  6605 + if (fullScreen ){ //退出全屏
  6606 + getApp().globalData.no_clear=1;
  6607 + this.data.show_video=1;
  6608 + }
  6609 + },
  6610 +
  6611 + click_contact:function () {
  6612 + getApp().globalData.no_clear=1;
  6613 + }
6624 6614  
6625 6615  
6626 6616  
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @928d2df
... ... @@ -42,7 +42,7 @@
42 42 </image>
43 43 </view>
44 44 <view wx:else>
45   - <video class="xc-videos" src="{{iurl+mapurl}}" id="{{index}}" wx:if="{{_index == index}}"></video>
  45 + <video bindfullscreenchange="screenChange" class="xc-videos" src="{{iurl+mapurl}}" id="{{index}}" wx:if="{{_index == index}}"></video>
46 46 </view>
47 47 </swiper-item>
48 48 <swiper-item wx:for="{{gallery}}" wx:key="gallery">
... ... @@ -1011,7 +1011,7 @@
1011 1011 <!-- -----------------底部按钮------------------ -->
1012 1012 <view class="join-cart">
1013 1013 <!-- bindtap="contactService" -->
1014   - <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
  1014 + <button wx:if="{{sys_switch.weapp_customertype==1}}" class="custom-service cart-ico new_split" bindtap="click_contact" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
1015 1015 <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
1016 1016 <view>客服</view>
1017 1017 </button>
... ...
pages/goods/goodsInfo/goodsInfo.wxss
  View file @928d2df
... ... @@ -706,6 +706,7 @@ view.cart-btn-lg {
706 706 color: #d60021;
707 707 font-size: 33rpx;
708 708 font-weight: bold;
  709 + display: flex;
709 710 }
710 711  
711 712 .spec-goods-stock {
... ...
pages/goods/goodsList/goodsList.js
  View file @928d2df
... ... @@ -380,6 +380,7 @@ Page({
380 380 },
381 381 //---------分享配置--------
382 382 onShareAppMessage: function (e) {
  383 + getApp().globalData.no_clear=1;
383 384 var curPage=this;
384 385 var pagePath = curPage.route; //当前页面url
385 386 if (pagePath.indexOf('/') != 0) {
... ...
pages/goods/search/search.js
  View file @928d2df
... ... @@ -389,6 +389,7 @@ Page({
389 389  
390 390 //---------分享配置--------
391 391 onShareAppMessage: function (e) {
  392 + getApp().globalData.no_clear=1;
392 393 var curPage=this;
393 394 var pagePath = curPage.route; //当前页面url
394 395 if (pagePath.indexOf('/') != 0) {
... ...
pages/index/index/index.js
  View file @928d2df
... ... @@ -84,7 +84,6 @@ Page({
84 84 full_ad: null, //全屏广告
85 85 full_screen: 0, //全屏广告
86 86 is_ok_h5:0, //判断要不要显示关注二维码
87   -
88 87 },
89 88  
90 89 onLoad: async function (tt) {
... ... @@ -223,18 +222,20 @@ Page({
223 222 //如果是自定义模板
224 223 if (this.data.isTemplate) {
225 224 //---先获取会员---
226   - t.getUserFir(function () {
227   - th.is_festival();
228   - var new_nav = th.data.new_nav;
229   - if (new_nav == "") {
230   - th.is_new();
231   - }
232   - // sty
233   - setTimeout(function () {
234   - if (getApp().globalData.user_id) getApp().requestCardNum(th);
235   - }, 500)
  225 + //t.getUserFir(function () {
  226 + if(getApp().globalData.user_id) {
  227 + th.is_festival();
  228 + var new_nav = th.data.new_nav;
  229 + if (new_nav == "") {
  230 + th.is_new();
  231 + }
  232 + // sty
  233 + setTimeout(function () {
  234 + if (getApp().globalData.user_id) getApp().requestCardNum(th);
  235 + }, 500)
  236 + }
236 237  
237   - });
  238 + //});
238 239 } else {
239 240 await this.init_fir();
240 241 wx.setNavigationBarColor({
... ... @@ -428,29 +429,18 @@ Page({
428 429 var th = this;
429 430  
430 431 var show = getApp().globalData.isLoad_ad;
431   - setTimeout(function () {
432   - //user没有及时更新
433   - var userInfo = getApp().globalData.userInfo;
434   - if (!userInfo || !userInfo.user_id) userInfo = null;
435   - //有加载过一次首页，就显示
436   - if (show || userInfo || getApp().globalData.user_id) {
  432 + if(!show){
437 433 setTimeout(function () {
438   - full_screen.get_the_full_screen(th);
439   - }, 800)
440   - //动画效果
  434 + full_screen.get_the_full_screen(th);
  435 + }, 800);
  436 + getApp().globalData.isLoad_ad=1;
441 437 if (!th.data.f_hidden) {
442   - wx.showLoading({
443   - title: '加载中..'
444   - });
445   - setTimeout(function () {
446   - th.setData({ f_hidden: 1 })
447   - wx.hideLoading();
448   - }, 960)
  438 + setTimeout(function () {
  439 + th.setData({ f_hidden: 1 })
  440 + wx.hideLoading();
  441 + }, 960)
449 442 }
450   - } else {
451   - getApp().globalData.isLoad_ad = 1;
452   - }
453   - }, 1500)
  443 + }
454 444  
455 445 setTimeout(function () {
456 446 const query = wx.createSelectorQuery();
... ... @@ -649,19 +639,20 @@ Page({
649 639 });
650 640  
651 641 //---先获取会员---
652   - t.getUserFir(function () {
653   - th.is_festival();
654   - var new_nav = th.data.new_nav;
655   - if (new_nav == "") {
656   - th.is_new();
657   - }
658   -
659   - // sty
660   - setTimeout(function () {
661   - if (getApp().globalData.user_id) getApp().requestCardNum(th);
662   - }, 500)
  642 + //t.getUserFir(function () {
  643 + if(getApp().globalData.user_id) {
  644 + th.is_festival();
  645 + var new_nav = th.data.new_nav;
  646 + if (new_nav == "") {
  647 + th.is_new();
  648 + }
663 649  
664   - });
  650 + // sty
  651 + setTimeout(function () {
  652 + if (getApp().globalData.user_id) getApp().requestCardNum(th);
  653 + }, 500)
  654 + }
  655 + //});
665 656  
666 657 setTimeout(function () {
667 658 var goods_list = th.selectComponent("#goods_list"); //组件的id
... ... @@ -743,6 +734,7 @@ Page({
743 734 });
744 735 },
745 736 onShareAppMessage: function (e) {
  737 + getApp().globalData.no_clear=1;
746 738 var url = "/pages/index/index/index";
747 739 var userInfo = getApp().globalData.userInfo;
748 740 //是分销商才带
... ... @@ -938,6 +930,7 @@ Page({
938 930 //---扫一扫的函数---
939 931 getScancode: function () {
940 932 var _this = this;
  933 + getApp().globalData.no_clear=1;
941 934 // 允许从相机和相册扫码
942 935 wx.scanCode({
943 936 success: (res) => {
... ...
pages/team/team_show/team_show.js
  View file @928d2df
... ... @@ -959,6 +959,7 @@ Page({
959 959  
960 960 //------ 分享配置 --------
961 961 onShareAppMessage: function (e) {
  962 + getApp().globalData.no_clear=1;
962 963 var curPage=this;
963 964 var pagePath = curPage.route; //当前页面url
964 965 if (pagePath.indexOf('/') != 0) {
... ...
pages/team/team_success/team_success.js
  View file @928d2df
... ... @@ -817,6 +817,7 @@ Page({
817 817  
818 818 //------ 分享配置 --------
819 819 onShareAppMessage: function (e) {
  820 + getApp().globalData.no_clear=1;
820 821 var th=this;
821 822 var scene=this.data.teamgroup.id;
822 823 var goods_id=this.data.teamlist.goods_id;
... ...
pages/template/index.js
  View file @928d2df
... ... @@ -94,7 +94,7 @@ Page({
94 94 },
95 95  
96 96 onShareAppMessage: function(e) {
97   -
  97 + getApp().globalData.no_clear=1;
98 98 },
99 99  
100 100 /**
... ...
pages/user/Detailed/Detailed.js
  View file @928d2df
... ... @@ -184,7 +184,7 @@ Page({
184 184  
185 185 saveImageToPhotosAlbum: function () {
186 186 if (this.data.imagePath != "") {
187   - wx.previewImage({ urls: [this.data.imagePath], })
  187 + getApp().pre_img(this.data.imagePath);
188 188 return;
189 189 }
190 190  
... ... @@ -372,9 +372,8 @@ Page({
372 372 maskHidden: false,
373 373 canvasHidden: true
374 374 });
375   - wx.previewImage({
376   - urls: [res.tempFilePath],
377   - })
  375 +
  376 + getApp().pre_img(res.tempFilePath);
378 377 if (!res.tempFilePath) {
379 378 wx.showModal({
380 379 title: '提示',
... ...
pages/user/assistance/assistance.js
  View file @928d2df
... ... @@ -229,6 +229,7 @@ Page({
229 229 },
230 230  
231 231 onShareAppMessage(res) {
  232 + getApp().globalData.no_clear=1;
232 233 if (res.from === 'button') {
233 234 // 来自页面内转发按钮
234 235 console.log(res.target)
... ...
pages/user/assistance/friend_assistance.js
  View file @928d2df
... ... @@ -171,7 +171,7 @@ Page({
171 171 * 用户点击右上角分享
172 172 */
173 173 onShareAppMessage: function() {
174   -
  174 + getApp().globalData.no_clear=1;
175 175 },
176 176  
177 177 })
... ...
pages/user/assistance/task_assistance.js
  View file @928d2df
... ... @@ -671,13 +671,14 @@ Page({
671 671 /**
672 672 * 用户点击右上角分享
673 673 */
674   - onShareAppMessage: function () {
  674 + onShareAppMessage: function () { getApp().globalData.no_clear=1
675 675  
676 676 },
677 677  
678 678 preview: function () {
679 679 var th = this;
680 680 var shareImgPath = th.data.shareImgPath;
  681 + getApp().globalData.no_clear=1;
681 682 wx.previewImage({
682 683 url: shareImgPath[0],
683 684 urls: shareImgPath
... ... @@ -920,6 +921,7 @@ Page({
920 921 preview: function () {
921 922 var th = this;
922 923 var shareImgPath = th.data.shareImgPath;
  924 + getApp().globalData.no_clear=1;
923 925 wx.previewImage({
924 926 url: shareImgPath[0],
925 927 urls: shareImgPath
... ...
pages/user/cardinfo/cardinfo.js
  View file @928d2df
... ... @@ -324,12 +324,11 @@ Page({
324 324 */
325 325 saveImageToPhotosAlbum: function () {
326 326 if (this.data.imagePath != "") {
327   - wx.previewImage({
328   - urls: [this.data.imagePath],
329   - })
  327 + getApp().pre_img(this.data.imagePath);
330 328 return;
331 329 }
332   - // if(this.data.is_loading) return false ;
  330 +
  331 + //if(this.data.is_loading) return false ;
333 332 this.data.is_loading=1;
334 333  
335 334 wx.showLoading({
... ... @@ -607,9 +606,7 @@ Page({
607 606 maskHidden: false,
608 607 canvasHidden: true
609 608 });
610   - wx.previewImage({
611   - urls: [res.tempFilePath],
612   - })
  609 + getApp().pre_img(res.tempFilePath);
613 610 if (!res.tempFilePath) {
614 611 wx.showModal({
615 612 title: '提示',
... ...
pages/user/deposit/prepaid/msg/msg.js
  View file @928d2df
... ... @@ -105,7 +105,7 @@ Page({
105 105 /**
106 106 * 用户点击右上角分享
107 107 */
108   - onShareAppMessage: function () {
  108 + onShareAppMessage: function () { getApp().globalData.no_clear=1
109 109  
110 110 }
111 111 })
112 112 \ No newline at end of file
... ...