Commit e53c18ca62eceb707f8607385492698e980d462a
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
17 changed files
with
19 additions
and
4 deletions
packageA/pages/goodsInfo/goodsInfo.js
| ... | ... | @@ -2820,13 +2820,11 @@ Page({ |
| 2820 | 2820 | }, |
| 2821 | 2821 | |
| 2822 | 2822 | previewImage() { |
| 2823 | - wx.previewImage({ | |
| 2824 | - //将图片预览出来 | |
| 2825 | - urls: [this.data.shareImgPath] | |
| 2826 | - }); | |
| 2823 | + getApp().pre_img(this.data.shareImgPath); | |
| 2827 | 2824 | }, |
| 2828 | 2825 | |
| 2829 | 2826 | onShareTimeline() { |
| 2827 | + getApp().globalData.no_clear=1 | |
| 2830 | 2828 | var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; |
| 2831 | 2829 | if(!store_name) |
| 2832 | 2830 | store_name=getApp().globalData.setting.appName; | ... | ... |
packageA/pages/jfbuy/jfbuy.js
packageA/pages/liveStream/liveStream.js
packageA/pages/liveStreamDetails/liveStreamDetails.js
| ... | ... | @@ -631,6 +631,7 @@ drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, un |
| 631 | 631 | }, |
| 632 | 632 | |
| 633 | 633 | onShareTimeline: function (res) { |
| 634 | + getApp().globalData.no_clear=1; | |
| 634 | 635 | if (res.from === 'button') { |
| 635 | 636 | // 来自页面内转发按钮 |
| 636 | 637 | console.log(res.target) | ... | ... |
packageB/pages/zuhegou/index/index.js
| ... | ... | @@ -467,6 +467,7 @@ Page({ |
| 467 | 467 | * 用户分享朋友圈 |
| 468 | 468 | */ |
| 469 | 469 | onShareTimeline() { |
| 470 | + getApp().globalData.no_clear=1; | |
| 470 | 471 | var title = this.data.act.name; |
| 471 | 472 | var url = "/packageB/pages/zuhegou/index/index?id=" + this.data.act.id; |
| 472 | 473 | if (getApp().globalData.user_id) { | ... | ... |
packageB/pages/zuhegou/preindex/index.js
| ... | ... | @@ -468,6 +468,7 @@ Page({ |
| 468 | 468 | * 用户分享朋友圈 |
| 469 | 469 | */ |
| 470 | 470 | onShareTimeline() { |
| 471 | + getApp().globalData.no_clear=1; | |
| 471 | 472 | var title = this.data.act.name; |
| 472 | 473 | var url = "/packageB/pages/zuhegou/index/index?id=" + this.data.act.id; |
| 473 | 474 | if (getApp().globalData.user_id) { | ... | ... |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
| ... | ... | @@ -6181,6 +6181,7 @@ Page({ |
| 6181 | 6181 | }, |
| 6182 | 6182 | |
| 6183 | 6183 | onShareTimeline() { |
| 6184 | + getApp().globalData.no_clear=1; | |
| 6184 | 6185 | var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; |
| 6185 | 6186 | if (!store_name) |
| 6186 | 6187 | store_name = getApp().globalData.setting.appName; | ... | ... |
packageC/pages/presell/goodsInfo/goodsInfo.js
| ... | ... | @@ -3831,6 +3831,7 @@ Page({ |
| 3831 | 3831 | |
| 3832 | 3832 | |
| 3833 | 3833 | onShareTimeline() { |
| 3834 | + getApp().globalData.no_clear=1; | |
| 3834 | 3835 | var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; |
| 3835 | 3836 | if (!store_name) |
| 3836 | 3837 | store_name = getApp().globalData.setting.appName; | ... | ... |
packageC/pages/presell/pregoodsInfo/goodsInfo.js
| ... | ... | @@ -3795,6 +3795,7 @@ Page({ |
| 3795 | 3795 | |
| 3796 | 3796 | |
| 3797 | 3797 | onShareTimeline() { |
| 3798 | + getApp().globalData.no_clear=1; | |
| 3798 | 3799 | var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; |
| 3799 | 3800 | if (!store_name) |
| 3800 | 3801 | store_name = getApp().globalData.setting.appName; | ... | ... |
pages/activity/pind_list/pind_list.js
| ... | ... | @@ -250,6 +250,7 @@ Page({ |
| 250 | 250 | }, |
| 251 | 251 | |
| 252 | 252 | onShareTimeline() { |
| 253 | + getApp().globalData.no_clear=1; | |
| 253 | 254 | var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; |
| 254 | 255 | if (!store_name) |
| 255 | 256 | store_name = getApp().globalData.setting.appName; | ... | ... |
pages/activity/seckill_list/seckill_list.js
| ... | ... | @@ -268,6 +268,7 @@ Page({ |
| 268 | 268 | }, |
| 269 | 269 | |
| 270 | 270 | onShareTimeline() { |
| 271 | + getApp().globalData.no_clear=1; | |
| 271 | 272 | var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; |
| 272 | 273 | if (!store_name) |
| 273 | 274 | store_name = getApp().globalData.setting.appName; | ... | ... |
pages/giftpack/mygiftpack/mygiftpack.js
pages/goods/categoryList/categoryList.js
| ... | ... | @@ -1060,6 +1060,7 @@ Page({ |
| 1060 | 1060 | }, |
| 1061 | 1061 | |
| 1062 | 1062 | onShareTimeline(){ |
| 1063 | + getApp().globalData.no_clear=1; | |
| 1063 | 1064 | var store_name=getApp().globalData.config?getApp().globalData.config.store_name:''; |
| 1064 | 1065 | if(!store_name) |
| 1065 | 1066 | store_name=getApp().globalData.setting.appName; | ... | ... |
pages/goods/goodsInfo/goodsInfo.js
| ... | ... | @@ -6359,6 +6359,7 @@ Page({ |
| 6359 | 6359 | }, |
| 6360 | 6360 | |
| 6361 | 6361 | onShareTimeline() { |
| 6362 | + getApp().globalData.no_clear=1; | |
| 6362 | 6363 | var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; |
| 6363 | 6364 | if (!store_name) |
| 6364 | 6365 | store_name = getApp().globalData.setting.appName; | ... | ... |
pages/index/index/index.js
pages/template/index.js
pages/user/assistance/assistance.js
| ... | ... | @@ -241,6 +241,7 @@ Page({ |
| 241 | 241 | }, |
| 242 | 242 | |
| 243 | 243 | onShareTimeline() { |
| 244 | + getApp().globalData.no_clear=1; | |
| 244 | 245 | var store_name = getApp().globalData.config ? getApp().globalData.config.store_name : ''; |
| 245 | 246 | if (!store_name) |
| 246 | 247 | store_name = getApp().globalData.setting.appName; | ... | ... |