Commit 946dad07e02567ae765c94b3539c6588568ef044
1 parent
8a0e2ef7
权益
Showing
3 changed files
with
20 additions
and
32 deletions
app.js
| @@ -201,18 +201,10 @@ App({ | @@ -201,18 +201,10 @@ App({ | ||
| 201 | //调用接口判断是不是会员 | 201 | //调用接口判断是不是会员 |
| 202 | app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { | 202 | app.promiseGet("/api/weshop/shoppingGuide/get/" + os.stoid + "/" + e.data.data.user_id, {}).then(res => { |
| 203 | if (res.data.code == 0) { | 203 | if (res.data.code == 0) { |
| 204 | - | ||
| 205 | - | ||
| 206 | - // ut.m_toast('获取到导购:'+res.data.data.id) | ||
| 207 | - | 204 | + |
| 208 | app.globalData.guide_id = res.data.data.id; | 205 | app.globalData.guide_id = res.data.data.id; |
| 209 | app.globalData.guide_pick_id = res.data.data.pickup_id; | 206 | app.globalData.guide_pick_id = res.data.data.pickup_id; |
| 210 | - | ||
| 211 | - // setTimeout(()=>{ | ||
| 212 | - | ||
| 213 | - // ut.m_toast('globalData中导购id:'+app.globalData.guide_id) | ||
| 214 | - // },1200) | ||
| 215 | - | 207 | + |
| 216 | 208 | ||
| 217 | } | 209 | } |
| 218 | }) | 210 | }) |
packageB/pages/user/user_coupon/c_filter.wxs
| @@ -9,41 +9,42 @@ var filters = { | @@ -9,41 +9,42 @@ var filters = { | ||
| 9 | fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':') | 9 | fm=fm + ' '+ [d.getHours(), d.getMinutes(), d.getSeconds()].join(':') |
| 10 | return fm; | 10 | return fm; |
| 11 | }, | 11 | }, |
| 12 | + //全场为 红色 商品除了全场为蓝色 卡项为绿色 | ||
| 12 | setcolor:function(ind){ | 13 | setcolor:function(ind){ |
| 13 | if(ind==0) return "red"; | 14 | if(ind==0) return "red"; |
| 14 | - if(ind==1) return "green"; | 15 | + if(ind==1) return "blue"; |
| 15 | if(ind==2) return "blue"; | 16 | if(ind==2) return "blue"; |
| 16 | - if(ind==11) return "green"; | 17 | + if(ind==11) return "blue"; |
| 17 | 18 | ||
| 18 | if(ind==12) return "blue"; | 19 | if(ind==12) return "blue"; |
| 19 | - if(ind==13) return "red"; | 20 | + if(ind==13) return "blue"; |
| 20 | 21 | ||
| 21 | - if(ind==14) return "red"; | ||
| 22 | - if(ind==20) return "green"; | 22 | + if(ind==14) return "blue"; |
| 23 | + if(ind==20) return "blue"; | ||
| 23 | 24 | ||
| 24 | if(ind==21) return "green"; | 25 | if(ind==21) return "green"; |
| 25 | - if(ind==22) return "blue"; | 26 | + if(ind==22) return "green"; |
| 26 | 27 | ||
| 27 | - if(ind==24) return "red"; | ||
| 28 | - if(ind==25) return "blue"; | 28 | + if(ind==24) return "green"; |
| 29 | + if(ind==25) return "green"; | ||
| 29 | return ""; | 30 | return ""; |
| 30 | }, | 31 | }, |
| 31 | setbgcolor: function (ind) { | 32 | setbgcolor: function (ind) { |
| 32 | if (ind == 0) return "#ffa1b9";//红 | 33 | if (ind == 0) return "#ffa1b9";//红 |
| 33 | - if (ind == 1) return "#59e1d2";//绿 | 34 | + if (ind == 1) return "#a3bcff";//蓝 |
| 34 | if (ind == 2) return "#a3bcff";//蓝 | 35 | if (ind == 2) return "#a3bcff";//蓝 |
| 35 | - if (ind == 11) return "#59e1d2";//绿 | 36 | + if (ind == 11) return "#a3bcff";//蓝 |
| 36 | if (ind == 12) return "#a3bcff";//蓝 | 37 | if (ind == 12) return "#a3bcff";//蓝 |
| 37 | 38 | ||
| 38 | - if (ind==13) return "#ffa1b9";//红 | 39 | + if (ind==13) return "#a3bcff";//蓝 |
| 39 | 40 | ||
| 40 | - if (ind==14) return "#ffa1b9";//红 | ||
| 41 | - if (ind == 20) return "#59e1d2";//绿色 | ||
| 42 | - if (ind==21) return "#59e1d2"; | ||
| 43 | - if (ind==22) return "#a3bcff"; | 41 | + if (ind==14) return "#a3bcff";//蓝 |
| 42 | + if (ind == 20) return "#a3bcff";//蓝 | ||
| 43 | + if (ind==21) return "#59e1d2";//绿 | ||
| 44 | + if (ind==22) return "#59e1d2";//绿 | ||
| 44 | 45 | ||
| 45 | - if (ind==24) return "#ffa1b9";//红 | ||
| 46 | - if (ind==25) return "#a3bcff"; | 46 | + if (ind==24) return "#59e1d2";//绿 |
| 47 | + if (ind==25) return "#59e1d2";//绿 | ||
| 47 | return ""; | 48 | return ""; |
| 48 | }, | 49 | }, |
| 49 | 50 |
pages/goods/goodsInfo/goodsInfo.js
| @@ -1820,11 +1820,6 @@ Page({ | @@ -1820,11 +1820,6 @@ Page({ | ||
| 1820 | newd.prom_type = 0; | 1820 | newd.prom_type = 0; |
| 1821 | newd.prom_id = 0; | 1821 | newd.prom_id = 0; |
| 1822 | } | 1822 | } |
| 1823 | - | ||
| 1824 | - | ||
| 1825 | - | ||
| 1826 | - // ut.m_toast('商品详情，购买globalData中导购id:'+getApp().globalData.guide_id ); | ||
| 1827 | - | ||
| 1828 | //---是不是从收藏夹出来的--- | 1823 | //---是不是从收藏夹出来的--- |
| 1829 | if (th.data.c_guide_id) { | 1824 | if (th.data.c_guide_id) { |
| 1830 | newd['guide_id'] = th.data.c_guide_id; | 1825 | newd['guide_id'] = th.data.c_guide_id; |