Commit ecd0b0a22c92bc7d0255060918a618b456f604d0
1 parent
5271092e
商品未启用要用白色底
Showing
2 changed files
with
13 additions
and
9 deletions
packageC/pages/presell/goodsInfo/goodsInfo.js
| @@ -595,13 +595,13 @@ Page({ | @@ -595,13 +595,13 @@ Page({ | ||
| 595 | this.data.show_prew_img = 0; return false; | 595 | this.data.show_prew_img = 0; return false; |
| 596 | } | 596 | } |
| 597 | 597 | ||
| 598 | + /*-- | ||
| 598 | //优惠券要实时更新 | 599 | //优惠券要实时更新 |
| 599 | getApp().getConfig2(function (e) { | 600 | getApp().getConfig2(function (e) { |
| 600 | var json_d = JSON.parse(e.switch_list); | 601 | var json_d = JSON.parse(e.switch_list); |
| 601 | th.setData({ is_closecoupon: json_d.is_closecoupon }) | 602 | th.setData({ is_closecoupon: json_d.is_closecoupon }) |
| 602 | th.setData({ is_open_offline: json_d.is_pricing_open }) | 603 | th.setData({ is_open_offline: json_d.is_pricing_open }) |
| 603 | - }, 1) | ||
| 604 | - | 604 | + }, 1)--*/ |
| 605 | 605 | ||
| 606 | var ui = setInterval(function () { | 606 | var ui = setInterval(function () { |
| 607 | goods_list = th.selectComponent("#goods_list"); | 607 | goods_list = th.selectComponent("#goods_list"); |
| @@ -717,7 +717,6 @@ Page({ | @@ -717,7 +717,6 @@ Page({ | ||
| 717 | } else { | 717 | } else { |
| 718 | if (e) { | 718 | if (e) { |
| 719 | e.distance = null; | 719 | e.distance = null; |
| 720 | - | ||
| 721 | that.set_def_storage(e); | 720 | that.set_def_storage(e); |
| 722 | } | 721 | } |
| 723 | } | 722 | } |
| @@ -752,14 +751,13 @@ Page({ | @@ -752,14 +751,13 @@ Page({ | ||
| 752 | ee.setData({ | 751 | ee.setData({ |
| 753 | data: t.data.data, | 752 | data: t.data.data, |
| 754 | sele_g: t.data.data, | 753 | sele_g: t.data.data, |
| 755 | - userInfo: getApp().globalData.userInfo | 754 | + userInfo: getApp().globalData.userInfo, |
| 756 | }); | 755 | }); |
| 757 | 756 | ||
| 758 | //获取门店 | 757 | //获取门店 |
| 759 | ee.get_sto(); | 758 | ee.get_sto(); |
| 760 | ee.get_sku(o.stoid, t.data.data, gid); | 759 | ee.get_sku(o.stoid, t.data.data, gid); |
| 761 | 760 | ||
| 762 | - | ||
| 763 | ee.data.g_buy_num = new Map(); | 761 | ee.data.g_buy_num = new Map(); |
| 764 | 762 | ||
| 765 | if (ee.data.cat_name == '') { | 763 | if (ee.data.cat_name == '') { |
| @@ -3966,12 +3964,10 @@ Page({ | @@ -3966,12 +3964,10 @@ Page({ | ||
| 3966 | } | 3964 | } |
| 3967 | }) | 3965 | }) |
| 3968 | 3966 | ||
| 3969 | - | ||
| 3970 | if(!gnext){ | 3967 | if(!gnext){ |
| 3971 | return false; | 3968 | return false; |
| 3972 | } | 3969 | } |
| 3973 | 3970 | ||
| 3974 | - | ||
| 3975 | var userInfo = getApp().globalData.userInfo; | 3971 | var userInfo = getApp().globalData.userInfo; |
| 3976 | var pre_data = {store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, prom_type: 8, prom_id: presell_id}; | 3972 | var pre_data = {store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, prom_type: 8, prom_id: presell_id}; |
| 3977 | if (userInfo) { | 3973 | if (userInfo) { |
| @@ -3988,7 +3984,7 @@ Page({ | @@ -3988,7 +3984,7 @@ Page({ | ||
| 3988 | }) | 3984 | }) |
| 3989 | 3985 | ||
| 3990 | pre_arr = e.data.data.pageData[idx]; | 3986 | pre_arr = e.data.data.pageData[idx]; |
| 3991 | - th.setData({pre_arr: pre_arr}) | 3987 | + th.setData({pre_arr: pre_arr,show:1}) |
| 3992 | th.data.prom_buy_limit = pre_arr.vip_butyqty; | 3988 | th.data.prom_buy_limit = pre_arr.vip_butyqty; |
| 3993 | } | 3989 | } |
| 3994 | }) | 3990 | }) |
packageC/pages/presell/goodsInfo/goodsInfo.wxml
| @@ -2,6 +2,9 @@ | @@ -2,6 +2,9 @@ | ||
| 2 | <wxs module="filters" src="../../../../utils/filter.wxs"></wxs> | 2 | <wxs module="filters" src="../../../../utils/filter.wxs"></wxs> |
| 3 | <wxs module="g_filters" src="g_filter.wxs"></wxs> | 3 | <wxs module="g_filters" src="g_filter.wxs"></wxs> |
| 4 | <wxs module="tool" src="filter.wxs"></wxs> | 4 | <wxs module="tool" src="filter.wxs"></wxs> |
| 5 | + | ||
| 6 | + | ||
| 7 | +<block wx:if="{{show}}"> | ||
| 5 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> | 8 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> |
| 6 | <view class="container"> | 9 | <view class="container"> |
| 7 | <view class="type-navbar"> | 10 | <view class="type-navbar"> |
| @@ -525,6 +528,10 @@ | @@ -525,6 +528,10 @@ | ||
| 525 | </view> | 528 | </view> |
| 526 | <!-- 制作一个圆球导航 --> | 529 | <!-- 制作一个圆球导航 --> |
| 527 | <nav_box></nav_box> | 530 | <nav_box></nav_box> |
| 531 | +</block> | ||
| 532 | + | ||
| 533 | + | ||
| 534 | + | ||
| 528 | <!-- --弹起来,选择规格数量,普通商品购买和秒杀---- --> | 535 | <!-- --弹起来,选择规格数量,普通商品购买和秒杀---- --> |
| 529 | <view hidden="{{!openSpecModal}}"> | 536 | <view hidden="{{!openSpecModal}}"> |
| 530 | <view bindtap="closeSpecModal" class="cover-layer"></view> | 537 | <view bindtap="closeSpecModal" class="cover-layer"></view> |
| @@ -922,4 +929,5 @@ | @@ -922,4 +929,5 @@ | ||
| 922 | 929 | ||
| 923 | </view> | 930 | </view> |
| 924 | </view> | 931 | </view> |
| 925 | -</view> | ||
| 926 | \ No newline at end of file | 932 | \ No newline at end of file |
| 933 | +</view> | ||
| 934 | + |