Commit 06b98db07a291c0dd3f5578df43270456ec2e08e
Merge branch 'dev_oa_luo42' into dev
Showing
10 changed files
with
22 additions
and
12 deletions
components/diy_goodsGroup/diy_goodsGroup.wxml
| ... | ... | @@ -11,8 +11,8 @@ |
| 11 | 11 | <view class="{{'tabBox ' + (object.menu_style==2 ? 'tab2' :'')}}"> |
| 12 | 12 | <!--样式一--> |
| 13 | 13 | <block wx:if="{{object.menu_style==1}}"> |
| 14 | - <view wx:if="{{object.show_all==1}}" style="padding: 0 35rpx;font-size: {{object.title_font_size*2}}rpx;color: {{object.title_color}};" class="{{'tab ' + (title_index == 10 ? 'clor ' :'')}}" >全部<span class="tab1" wx:if="{{10==title_index}}"></span></view> | |
| 15 | - <view wx:for="{{object.nav_list}}" style="padding: 0 35rpx;font-size: {{object.title_font_size*2}}rpx;color: {{object.title_color}};" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}" class="{{'tab ' + (index==title_index ? 'clor ' :'')}}">{{item.title}}<span class="tab1" wx:if="{{index==title_index}}"></span></view> | |
| 14 | + <view wx:if="{{object.show_all==1}}" style="padding: 0 35rpx;font-size: {{object.title_font_size*2}}rpx;color: {{title_index==10 ? (object.title_color_action ? object.title_color_action : '#ff0000') : object.title_color}};" class="{{'tab ' }}" >全部<span class="tab1" wx:if="{{10==title_index}}"></span></view> | |
| 15 | + <view wx:for="{{object.nav_list}}" style="padding: 0 35rpx;font-size: {{object.title_font_size*2}}rpx;color: {{index==title_index ? (object.title_color_action ? object.title_color_action : '#ff0000') : object.title_color}};" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}" class="{{'tab ' }}">{{item.title}}<span class="tab1" style="background-color: {{(object.title_color_action ? object.title_color_action : '#ff0000')}};" wx:if="{{index==title_index}}"></span></view> | |
| 16 | 16 | </block> |
| 17 | 17 | <!--样式二--> |
| 18 | 18 | <block wx:if="{{object.menu_style==2}}"> |
| ... | ... | @@ -33,14 +33,14 @@ |
| 33 | 33 | <mp-sticky wx:if="{{sticky == 1}}" container="{{container}}"> |
| 34 | 34 | <view class="flex gr_title_list" style="overflow-x: auto;"> |
| 35 | 35 | <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}"> |
| 36 | - <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text> | |
| 36 | + <text style="{{title_class + (index==title_index ? ('color:'+object.title_color_action) : '')}}">{{item.title}}</text> | |
| 37 | 37 | </view> |
| 38 | 38 | </view> |
| 39 | 39 | </mp-sticky> |
| 40 | 40 | |
| 41 | 41 | <view class="flex gr_title_list" style="overflow-x: auto;" wx:else> |
| 42 | 42 | <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}"> |
| 43 | - <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text> | |
| 43 | + <text style="{{title_class + (index==title_index ? ('color:'+object.title_color_action) : '')}}">{{item.title}}</text> | |
| 44 | 44 | </view> |
| 45 | 45 | </view> |
| 46 | 46 | </block> | ... | ... |
components/diy_luckyGo/diy_luckyGo.js
| ... | ... | @@ -106,7 +106,7 @@ Component({ |
| 106 | 106 | var user_id=getApp().globalData.user_id; |
| 107 | 107 | if(!user_id){ user_id=0;} |
| 108 | 108 | // var req={ store_id: os.stoid, is_end: 0, is_show: 1, timetype: 2,user_id:user_id}; 原来的 |
| 109 | - var req={ store_id: os.stoid, is_end: 0, timetype: 1}; | |
| 109 | + var req={ store_id: os.stoid, is_end: 0, timetype: 1,user_id:user_id}; | |
| 110 | 110 | getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", |
| 111 | 111 | { isShowLoading: 1, data:req } |
| 112 | 112 | ).then(res => { | ... | ... |
components/diy_public/diy_public.js
packageA/pages/activity_share/activity_share.js
| ... | ... | @@ -572,7 +572,8 @@ Page({ |
| 572 | 572 | |
| 573 | 573 | case 7: //幸运购 |
| 574 | 574 | url = '/api/weshop/prom/luckyActivity/page'; |
| 575 | - req_data.is_end = 0; | |
| 575 | + req_data.is_end = 0; | |
| 576 | + req_data.user_id = user_id; | |
| 576 | 577 | req_data.timetype = 1; |
| 577 | 578 | if(th.data.key_str && th.data.key_str.trim()){ |
| 578 | 579 | req_data.key_str = th.data.key_str.trim(); | ... | ... |
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js
| ... | ... | @@ -69,7 +69,8 @@ Page({ |
| 69 | 69 | self.getData(true, '/api/weshop/prom/luckyActivity/page', { |
| 70 | 70 | store_id: app.globalData.setting.stoid, |
| 71 | 71 | is_end: 0, |
| 72 | - timetype: 1, | |
| 72 | + timetype: 1, | |
| 73 | + user_id: user ? user.user_id : '0' | |
| 73 | 74 | }); |
| 74 | 75 | |
| 75 | 76 | |
| ... | ... | @@ -97,10 +98,12 @@ Page({ |
| 97 | 98 | * 页面上拉触底事件的处理函数 |
| 98 | 99 | */ |
| 99 | 100 | onReachBottom: function () { |
| 101 | + let user = this.data.user | |
| 100 | 102 | this.scrollToLower('/api/weshop/prom/luckyActivity/page', { |
| 101 | 103 | store_id: app.globalData.setting.stoid, |
| 102 | 104 | is_end: 0, |
| 103 | - timetype: 1, | |
| 105 | + timetype: 1, | |
| 106 | + user_id: user ? user.user_id : '0' | |
| 104 | 107 | }); |
| 105 | 108 | }, |
| 106 | 109 | ... | ... |
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
| ... | ... | @@ -2167,8 +2167,8 @@ Page({ |
| 2167 | 2167 | var th=this; |
| 2168 | 2168 | let aid = options.aid; |
| 2169 | 2169 | let store_id = options.store_id; |
| 2170 | - let user_id = options.user_id; | |
| 2171 | - let url = `/api/weshop/prom/luckyActivity/page?store_id=${store_id}&is_end=0&timetype=1&id=${aid}`; | |
| 2170 | + let user_id = options.user_id || '0'; | |
| 2171 | + let url = `/api/weshop/prom/luckyActivity/page?store_id=${store_id}&is_end=0&timetype=1&id=${aid}&user_id=${user_id}`; | |
| 2172 | 2172 | getApp().request.get(url, { |
| 2173 | 2173 | success: function (res) { |
| 2174 | 2174 | if (res.data.code == 0) { | ... | ... |
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
| ... | ... | @@ -1166,7 +1166,9 @@ Page({ |
| 1166 | 1166 | var team_id; |
| 1167 | 1167 | var luckyGoInfo; |
| 1168 | 1168 | var user_id = getApp().globalData.user_id; |
| 1169 | - | |
| 1169 | + if (!user_id) { | |
| 1170 | + user_id=0 | |
| 1171 | + } | |
| 1170 | 1172 | |
| 1171 | 1173 | |
| 1172 | 1174 | // 邀请链接待完善 |
| ... | ... | @@ -1177,6 +1179,7 @@ Page({ |
| 1177 | 1179 | is_end: 0, |
| 1178 | 1180 | timetype: 1, |
| 1179 | 1181 | id: th.data.param.group_id, |
| 1182 | + user_id, | |
| 1180 | 1183 | } |
| 1181 | 1184 | }).then(res => { |
| 1182 | 1185 | if(res.data.code == 0) { | ... | ... |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
pages/index/index/index.js