Commit ee24c49b32ac11354cd4a8e6f585572e28399de5
Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa
Showing
1 changed file
with
20 additions
and
11 deletions
packageF/pages/giftpack/giftpacklist/giftpacklist.js
@@ -555,23 +555,32 @@ Page({ | @@ -555,23 +555,32 @@ Page({ | ||
555 | //-- 如果只限定链接的时候,要取消分享按钮 -- | 555 | //-- 如果只限定链接的时候,要取消分享按钮 -- |
556 | if(res.data.data.is_share){ | 556 | if(res.data.data.is_share){ |
557 | wx.hideShareMenu(); | 557 | wx.hideShareMenu(); |
558 | - wx.offCopyUrl() | ||
559 | - //替换掉复制链接 | ||
560 | - wx.onCopyUrl(() => { | ||
561 | - setTimeout(()=>{ | ||
562 | - wx.setClipboardData({ | ||
563 | - data: '暂不支持分享', | ||
564 | - success (res) { } | ||
565 | - }) | ||
566 | - },500) | ||
567 | - return { query: 'a=1&b=2' } | ||
568 | - }) | 558 | + |
559 | + try{ | ||
560 | + wx.offCopyUrl() | ||
561 | + //替换掉复制链接 | ||
562 | + wx.onCopyUrl(() => { | ||
563 | + setTimeout(()=>{ | ||
564 | + wx.setClipboardData({ | ||
565 | + data: '暂不支持分享', | ||
566 | + success (res) { } | ||
567 | + }) | ||
568 | + },500) | ||
569 | + return { query: 'a=1&b=2' } | ||
570 | + }) | ||
571 | + | ||
572 | + }catch(err){ | ||
573 | + | ||
574 | + } | ||
575 | + | ||
576 | + | ||
569 | } | 577 | } |
570 | 578 | ||
571 | 579 | ||
572 | var isStart = 0; | 580 | var isStart = 0; |
573 | var now = ut.gettimestamp(); | 581 | var now = ut.gettimestamp(); |
574 | 582 | ||
583 | + | ||
575 | var str = res.data.data.starTime.replace(/-/g, '/'); | 584 | var str = res.data.data.starTime.replace(/-/g, '/'); |
576 | var start = Date.parse(new Date(str)); | 585 | var start = Date.parse(new Date(str)); |
577 | start = start / 1000; | 586 | start = start / 1000; |