Commit 7784fd3405ba8ae7181d61d35a4c73f55a3779ae
1 parent
2afdecc5
幸运购普通购买 该店不可售的优化
Showing
2 changed files
with
10 additions
and
9 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
| @@ -842,17 +842,14 @@ Page({ | @@ -842,17 +842,14 @@ Page({ | ||
| 842 | return false; | 842 | return false; |
| 843 | } | 843 | } |
| 844 | 844 | ||
| 845 | - if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) | ||
| 846 | - var ee = JSON.parse(JSON.stringify(e)); | ||
| 847 | - //--定时器推迟一下-- | ||
| 848 | - setTimeout(function () { | 845 | + if(getApp().globalData.is_dj_pk) th.setData({has_def:1}) |
| 846 | + var ee = JSON.parse(JSON.stringify(e)); | ||
| 847 | + | ||
| 849 | if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type; | 848 | if (th.data.fir_goods) var g_distr_type = th.data.fir_goods.distr_type; |
| 850 | //--如果默认门店的配送方式不对,就不能被选择,这里不控制,如果不一样,就说明配送方式不对-- | 849 | //--如果默认门店的配送方式不对,就不能被选择,这里不控制,如果不一样,就说明配送方式不对-- |
| 851 | if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) { | 850 | if (ee.distr_type != 0 && g_distr_type != 0 && ee.distr_type != g_distr_type) { |
| 852 | ee.is_no_dis = 1; | 851 | ee.is_no_dis = 1; |
| 853 | } | 852 | } |
| 854 | - | ||
| 855 | - | ||
| 856 | var appd = getApp().globalData; | 853 | var appd = getApp().globalData; |
| 857 | var w_time = setInterval(function () { | 854 | var w_time = setInterval(function () { |
| 858 | if (that.data.is_get_local_ok == 0) return false; | 855 | if (that.data.is_get_local_ok == 0) return false; |
| @@ -891,8 +888,8 @@ Page({ | @@ -891,8 +888,8 @@ Page({ | ||
| 891 | that.set_def_storage(e); | 888 | that.set_def_storage(e); |
| 892 | } | 889 | } |
| 893 | } | 890 | } |
| 894 | - }, 500) | ||
| 895 | - }, 700) | 891 | + }, 200) |
| 892 | + | ||
| 896 | }); | 893 | }); |
| 897 | }, | 894 | }, |
| 898 | 895 | ||
| @@ -3197,6 +3194,7 @@ Page({ | @@ -3197,6 +3194,7 @@ Page({ | ||
| 3197 | 3194 | ||
| 3198 | var timer_get = setInterval(function () { | 3195 | var timer_get = setInterval(function () { |
| 3199 | if (th.data.is_get_local_ok == 0) return false; | 3196 | if (th.data.is_get_local_ok == 0) return false; |
| 3197 | + if (!th.data.fir_def_store) return false; | ||
| 3200 | var dd = null, i = getApp().request; | 3198 | var dd = null, i = getApp().request; |
| 3201 | if (!th.data.sele_g) return false; | 3199 | if (!th.data.sele_g) return false; |
| 3202 | 3200 |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
| @@ -3147,4 +3147,7 @@ button.custom-service::after{ | @@ -3147,4 +3147,7 @@ button.custom-service::after{ | ||
| 3147 | .shop_name.max{ | 3147 | .shop_name.max{ |
| 3148 | max-width:370rpx; flex-shrink: 0; | 3148 | max-width:370rpx; flex-shrink: 0; |
| 3149 | } | 3149 | } |
| 3150 | - | 3150 | +.no_store, .c-red22 { |
| 3151 | + color: #d60021; | ||
| 3152 | + font-size: 26rpx; | ||
| 3153 | +} |