Merge branch 'dev_oa_luo42' into dev

WXD-SEASON\season
2 parents fa823149 1d298b94
Showing 10 changed files with 22 additions and 12 deletions
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_luckyGo/diy_luckyGo.js
components/diy_public/diy_public.js
packageA/pages/activity_share/activity_share.js
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
pages/index/index/index.js
pages/user/order_list/order_list.js
@@ -11,8 +11,8 @@
     <view  class="{{'tabBox ' + (object.menu_style==2 ? 'tab2' :'')}}">
       <!--样式一-->
       <block wx:if="{{object.menu_style==1}}">
-        <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>
-        <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>
+        <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>
+        <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>
       </block>
       <!--样式二-->
       <block wx:if="{{object.menu_style==2}}">       
@@ -33,14 +33,14 @@
       <mp-sticky wx:if="{{sticky == 1}}" container="{{container}}">
         <view class="flex gr_title_list" style="overflow-x: auto;">
           <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}}">
-            <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text>
+            <text  style="{{title_class + (index==title_index ? ('color:'+object.title_color_action) : '')}}">{{item.title}}</text>
           </view>
         </view>
       </mp-sticky>
       <view class="flex gr_title_list" style="overflow-x: auto;" wx:else>
         <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}}">
-          <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text>
+          <text  style="{{title_class + (index==title_index ? ('color:'+object.title_color_action) : '')}}">{{item.title}}</text>
         </view>
       </view>
     </block>
@@ -106,7 +106,7 @@ Component({
       var user_id=getApp().globalData.user_id;
       if(!user_id){ user_id=0;}
       // var req={ store_id: os.stoid, is_end: 0, is_show: 1, timetype: 2,user_id:user_id}; 原来的
-			var req={ store_id: os.stoid, is_end: 0, timetype: 1};
+			var req={ store_id: os.stoid, is_end: 0, timetype: 1,user_id:user_id};
       getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page",
         { isShowLoading: 1, data:req  }
       ).then(res => {
@@ -265,9 +265,9 @@ Component({
           store_id:os.stoid,
           is_end:0,
           timetype:1,
+          user_id:user_id,
           // isuse:1,
           // page:1,
-          // user_id:user_id,
           // pageSize:9
         }
       }
@@ -572,7 +572,8 @@ Page({
 				case 7: //幸运购
 				url = '/api/weshop/prom/luckyActivity/page';
-				req_data.is_end = 0;
+        req_data.is_end = 0;
+        req_data.user_id = user_id;
 				req_data.timetype = 1;
 				if(th.data.key_str && th.data.key_str.trim()){
 				  req_data.key_str = th.data.key_str.trim();
@@ -69,7 +69,8 @@ Page({
 				self.getData(true, '/api/weshop/prom/luckyActivity/page', {
 					store_id: app.globalData.setting.stoid,
 					is_end: 0,
-					timetype: 1,
+          timetype: 1,
+          user_id: user ? user.user_id : '0'
 				});
@@ -97,10 +98,12 @@ Page({
 	 * 页面上拉触底事件的处理函数
 	 */
 	onReachBottom: function () {
+    let user = this.data.user
 		this.scrollToLower('/api/weshop/prom/luckyActivity/page', {
 			store_id: app.globalData.setting.stoid,
 			is_end: 0,
-			timetype: 1,
+      timetype: 1,
+      user_id: user ? user.user_id : '0'
 		});
 	},
@@ -2167,8 +2167,8 @@ Page({
     var th=this;
     let aid = options.aid;
     let store_id = options.store_id;
-    let user_id = options.user_id;
-    let url = `/api/weshop/prom/luckyActivity/page?store_id=${store_id}&is_end=0&timetype=1&id=${aid}`;
+    let user_id = options.user_id || '0';
+    let url = `/api/weshop/prom/luckyActivity/page?store_id=${store_id}&is_end=0&timetype=1&id=${aid}&user_id=${user_id}`;
     getApp().request.get(url, {
       success: function (res) {
         if (res.data.code == 0) {
@@ -1166,7 +1166,9 @@ Page({
       var team_id;
       var luckyGoInfo;
       var user_id = getApp().globalData.user_id;
-
+      if (!user_id) {
+        user_id=0
+      }
       // 邀请链接待完善
@@ -1177,6 +1179,7 @@ Page({
               is_end: 0,
               timetype: 1,
               id: th.data.param.group_id,
+              user_id,
           }
       }).then(res => {
           if(res.data.code == 0) {
@@ -976,6 +976,7 @@ Page({
         is_end: 0,
         timetype: 1,
         id: this.data.group_id,
+        user_id:getApp().globalData.user_id?getApp().globalData.user_id:0 
       }
     }).then(res => {
       // console.log()
@@ -513,6 +513,7 @@ Page({
             store_id: getApp().globalData.setting.stoid,
             is_end: 0,
             timetype: 1,
+            user_id:getApp().globalData.user_id?getApp().globalData.user_id:0 
           }
         }).then(res => {
           if (res.data.code == 0) {
@@ -1660,6 +1660,7 @@ Page({
               is_end: 0,
               timetype: 1,
               id: goodsinfo.prom_id,
+              user_id:getApp().globalData.user_id?getApp().globalData.user_id:0
             }
         });