Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

yvan.ni
2 parents 9695e37e 0908a754
Showing 6 changed files with 118 additions and 73 deletions
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
pages/index/index/index.wxss
pages/user/user_spsy/user_spsy.js
pages/user/userqy/userqy.wxml
@@ -70,6 +70,7 @@ page {
 .name {
 	height: 88rpx;
+	word-break: break-all;
 }
 .no-more {
@@ -113,16 +113,17 @@ Page({
 	onUnload: function () {
-		console.log('999999999999999999999onUnolad~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~',this.data.luckyGoInfo);
 		// 开团成功后,清除storage里的team_id
-		if(this.data.luckyGoInfo && this.data.luckyGoInfo.num == 0) {
-			wx.removeStorageSync('team_id');
-		};
-		// 如果是从会员中心的幸运购列表点击进来的,退出时清除storage里的team_id
-		if(this.data.param.from == 1) {
-			let team_id = wx.getStorageSync('team_id');
-			if(team_id != null && team_id != undefined) wx.removeStorageSync('team_id');
-		};
+		// if(this.data.luckyGoInfo && this.data.luckyGoInfo.num == 0) {
+		// 	wx.removeStorageSync('team_id');
+		// };
+		// // 如果是从会员中心的幸运购列表点击进来的,退出时清除storage里的team_id
+		// if(this.data.param.from == 1) {
+		// 	let team_id = wx.getStorageSync('team_id');
+		// 	if(team_id != null && team_id != undefined) wx.removeStorageSync('team_id');
+		// };
+		
+		wx.removeStorageSync('team_id');
 	},
   //关闭展开列表
@@ -1149,78 +1150,115 @@ Page({
 		// 获取幸运购参团情况
 		async get_team_info () {
-			var th = this;
-			// wx.removeStorageSync('team_id');
-			// 幸运购成团信息
-			await getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", {
-			  data: {
-					store_id: o.stoid,
-					is_end: 0,
-					timetype: 1,
-					id: this.data.param.group_id,
-				}
-			}).then(res => {
-				if(res.data.code == 0) {
-					console.log('当前成团信息', res);
-					var luckyGoInfo = res.data.data.pageData[0];
-					var team_id;
-					
-					if(th.data.param.from == 1) {
-						team_id = th.data.team_id;
-					} else {
-						team_id = luckyGoInfo.team_id;
-						if(luckyGoInfo.team_id == 0) {
-							team_id = wx.getStorageSync('team_id');
-						};
-						// else {
-						// 	team_id = luckyGoInfo.team_id;
+      var th = this;
+      var team_id;
+      var luckyGoInfo;
+      var user_id = getApp().globalData.user_id;
+
+
+			
+      // 邀请链接待完善
+
+      getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", {
+        data: {
+              store_id: o.stoid,
+              is_end: 0,
+              timetype: 1,
+              id: th.data.param.group_id,
+          }
+      }).then(res => {
+          if(res.data.code == 0) {
+    
+              luckyGoInfo = res.data.data.pageData[0];
+              
+							
+    
+    // else {
+    //   team_id = luckyGoInfo.team_id;
+      
+    //   // 待完善
+              // 	if(luckyGoInfo.team_id == 0) {
+              // 		team_id = wx.getStorageSync('team_id');
+              // 	};
+    
+              // };
+              
+              th.setData({
+                  luckyGoInfo,
+              });
+              
+              //参团成功后,检查team_id
+              //如果team_id为0, 表示当前已开启新的一期，文字提示应改为’参团成功，本期幸运购已开团，中奖结果可点击下方查看参团列表‘
+              //如果team_id为0，取出之前保存的team_id替换掉，请求上一期已成团的幸运购活动
+              //如果从会员中心的幸运购列表邀请好友点击进来，不执行storage操作
+              if(th.data.param.from == 1) return false;
+              // if(team_id > 0) {
+              // 	wx.setStorage({
+              // 	  key: 'team_id',
+              // 	  data: team_id,
+              // 	});
+              // 	console.log('存储team_id', team_id);
+              // } else {
+              // 	let team_id2 = wx.getStorageSync('team_id');
+              // 	console.log('获取team_id', team_id2);
+              // 	th.setData({
+              // 		team_id: team_id2,
+              // 		// isSuccess: true,
+              // 	});
+              // };
+              
+              // th.setData({
+              // 	luckyGoInfo,
+              // 	team_id,
+              // });
+              
+          };
+          
+      });
+
+			if(th.data.param.from == 1) {
+			  team_id = th.data.param.team_id;
+			 } else {
+				
+				// 单独获取最新的team_id;
+				await getApp().request.promiseGet("/api/weshop/prom/luckyOrder/getUserOrderLastInfo/" + o.stoid + "/" + user_id + "/" + th.data.param.group_id, {
+				  data: {
+					}
+				}).then(res => {
+				
+					if(res.data.code == 0) {
+				    
+						// if(th.data.param.from == 1) {
+						//   team_id = luckyGoInfo.team_id;
+						//  } else {
+						// 	team_id = res.data.data.team_id;
 						// };
-						// team_id = wx.getStorageSync('team_id');
+						
+						team_id = res.data.data.team_id;
+						
+						
+						th.setData({
+							team_id,
+						});
+						
 					};
-					th.setData({
-						luckyGoInfo,
-						team_id,
-					});
-					
-					//参团成功后,检查team_id
-					//如果team_id为0, 表示当前已开启新的一期，文字提示应改为’参团成功，本期幸运购已开团，中奖结果可点击下方查看参团列表‘
-					//如果team_id为0，取出之前保存的team_id替换掉，请求上一期已成团的幸运购活动
-					//如果从会员中心的幸运购列表邀请好友点击进来，不执行storage操作
-					if(th.data.param.from == 1) return false;
-					// if(team_id > 0) {
-					// 	wx.setStorage({
-					// 	  key: 'team_id',
-					// 	  data: team_id,
-					// 	});
-					// 	console.log('存储team_id', team_id);
-					// } else {
-					// 	let team_id2 = wx.getStorageSync('team_id');
-					// 	console.log('获取team_id', team_id2);
-					// 	th.setData({
-					// 		team_id: team_id2,
-					// 		// isSuccess: true,
-					// 	});
-					// };
-					
-					// th.setData({
-					// 	luckyGoInfo,
-					// 	team_id,
-					// });
-					
-				};
+				});
-			});
+			};
+			// wx.removeStorageSync('team_id');
+			
+      
 			// 幸运购成团成员
 			await getApp().request.promiseGet("/api/weshop/prom/luckyOrder/page", {
 			  data: {
 					store_id: o.stoid,
-					team_id: this.data.team_id,
+					team_id: team_id,
 				}
 			}).then(res => {
 				if(res.data.code == 0) {
-					console.log('当前参团成员', res, self.data.team_id);
+					console.log('当前参团成员', res, team_id);
 					let myId = getApp().globalData.userInfo.user_id;
 					let luckyGoMembers = res.data.data.pageData;
 					th.setData({
@@ -1230,7 +1268,10 @@ Page({
 					self.isMe(myId, luckyGoMembers);
 				};
-			});
+      });
+      
+      
+
 		},
@@ -922,7 +922,7 @@
 				<!-- openSpecModel_pt -->
 				<view class="xc-ash-b f1 flex ai-center jc-center white fs26" wx:if="{{isTimeUp}}">活动已经结束</view>
 				<block wx:else>
-					<view class="btn-red f1 flex ai-center jc-center" bindtap="go" data-it="0" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{luckGoInfo.id}}&goods_id={{luckGoInfo.goods_id}}&goods_name={{data.goods_name}}&team_id={{buyInfo.team_id}}&&from=list" wx:if="{{showDetails}}">查看详情</view>
+					<view class="btn-red f1 flex ai-center jc-center" bindtap="go" data-it="0" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{luckGoInfo.id}}&goods_id={{luckGoInfo.goods_id}}&goods_name={{data.goods_name}}&team_id={{buyInfo.team_id}}" wx:if="{{showDetails}}">查看详情</view>
 					<view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt" data-it="0" wx:elif="{{!showDetails && surplus != 0 && canBuy}}">立即参团</view>
 					<view class="f1 flex ai-center jc-center xc-ash-b fs26 white" wx:elif="{{!showDetails && surplus == 0}}">已经抢光了</view>
 					<view class="f1 flex ai-center jc-center xc-ash-b fs26 white" wx:elif="{{!showDetails && surplus != 0 && !canBuy}}">已超限购次数</view>
@@ -1180,6 +1180,7 @@ page {
 .luck .name {
 	height: 88rpx;
+	word-break: break-all;
 }
@@ -83,7 +83,8 @@ Page({
       userId: getApp().globalData.user_id,
     }
     const res = await getApp().request.promiseGet("/api/weshop/users/grade/wechat/wares/page", {
-      data: req_data
+      data: req_data,
+      isShowLoading:true,
     });
     if (ut.ajax_ok(res)) {
@@ -88,12 +88,13 @@
     </view>
   </view>
+
    <view class="project-frame">
         <view class="item t-c" wx:for="{{qy_list}}" data-no="{{item.PrivilegeType}}"
               data-img="{{item.PrivilegeImageUrl}}"
               bindtap="go_url"  data-ind="{{index}}" data-name='{{item.PrivilegeName}}' >
           <image class="xc-project-img  {{item.ishas==1?'':'img_gray'}} " src="{{item.PrivilegeICOUrl}}"></image>
-          <view class="three-level-word xc-project-word">{{item.PrivilegeName}}</view>
+          <view class="three-level-word xc-project-word ellipsis-1">{{item.PrivilegeName}}</view>
         </view>
     </view>
   </view>