Commit e5952bc7f31c27bba85e529cb234f72bb38dea54
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
2 changed files
with
25 additions
and
19 deletions
app.js
| @@ -671,24 +671,30 @@ App({ | @@ -671,24 +671,30 @@ App({ | ||
| 671 | 671 | ||
| 672 | //清空登录时候缓存的值 | 672 | //清空登录时候缓存的值 |
| 673 | onHide: function () { | 673 | onHide: function () { |
| 674 | - if(!this.globalData.no_clear) { | ||
| 675 | - this.globalData.is_test = 0; | ||
| 676 | - this.globalData.guide_id = null; //导购清空 | ||
| 677 | - this.globalData.first_leader = null; //分享的会员清空 | ||
| 678 | - this.globalData.wuliu = null; //关闭要把物流清空 | ||
| 679 | - this.globalData.room_id = null; //关闭要把房间号关闭 | ||
| 680 | - this.globalData.room_goods_id = null; //关闭要把物流清空 | ||
| 681 | - this.globalData.config2 = null; //清除config2的缓存 | ||
| 682 | - this.globalData.config = null; //清除config的缓存 | ||
| 683 | - this.globalData.gr_index = 0; //商品分组的序列 | ||
| 684 | - this.globalData.pk_store = null; | ||
| 685 | - this.globalData.wxapp_buy_obj = null; | ||
| 686 | - this.globalData.dis_buy_obj = null; //等级卡的购买记录 | ||
| 687 | - this.globalData.storeFooter = null; //底部的导航 | ||
| 688 | - this.globalData.full_screen = null; //全屏 | ||
| 689 | - }else{ | ||
| 690 | - this.globalData.no_clear=0; | ||
| 691 | - } | 674 | + var th=this; |
| 675 | + setTimeout(function () { | ||
| 676 | + console.log("app onhide"); | ||
| 677 | + console.log(th.globalData.no_clear); | ||
| 678 | + if(!th.globalData.no_clear) { | ||
| 679 | + th.globalData.is_test = 0; | ||
| 680 | + th.globalData.guide_id = null; //导购清空 | ||
| 681 | + th.globalData.first_leader = null; //分享的会员清空 | ||
| 682 | + th.globalData.wuliu = null; //关闭要把物流清空 | ||
| 683 | + th.globalData.room_id = null; //关闭要把房间号关闭 | ||
| 684 | + th.globalData.room_goods_id = null; //关闭要把物流清空 | ||
| 685 | + th.globalData.config2 = null; //清除config2的缓存 | ||
| 686 | + th.globalData.config = null; //清除config的缓存 | ||
| 687 | + th.globalData.gr_index = 0; //商品分组的序列 | ||
| 688 | + th.globalData.pk_store = null; | ||
| 689 | + th.globalData.wxapp_buy_obj = null; | ||
| 690 | + th.globalData.dis_buy_obj = null; //等级卡的购买记录 | ||
| 691 | + th.globalData.storeFooter = null; //底部的导航 | ||
| 692 | + th.globalData.full_screen = null; //全屏 | ||
| 693 | + }else{ | ||
| 694 | + th.globalData.no_clear=0; | ||
| 695 | + } | ||
| 696 | + },600) | ||
| 697 | + | ||
| 692 | }, | 698 | }, |
| 693 | 699 | ||
| 694 | clear_word: function (word) { | 700 | clear_word: function (word) { |
pages/cart/cart2/c_filter.wxs
| @@ -45,7 +45,7 @@ var filters = { | @@ -45,7 +45,7 @@ var filters = { | ||
| 45 | if (ind == 2) return "指定品类"; | 45 | if (ind == 2) return "指定品类"; |
| 46 | if (ind == 11) return "指定用途"; | 46 | if (ind == 11) return "指定用途"; |
| 47 | if (ind == 12) return "指定分类1"; | 47 | if (ind == 12) return "指定分类1"; |
| 48 | - if (ind == 13) return "全场通用"; | 48 | + if (ind == 13) return "自定义"; |
| 49 | if (ind == 20) return "指定单品"; | 49 | if (ind == 20) return "指定单品"; |
| 50 | return ""; | 50 | return ""; |
| 51 | }, | 51 | }, |