Merge branch 'dev' into 'test'

Dev See merge request !704

Merge branch 'dev' into 'test'
Dev See merge request !704
后端研发-苏明海
2 parents fe12de23 3437fe3e
Showing 13 changed files with 157 additions and 67 deletions
app.wxss
components/my_confirm/my_confirm.wxss
components/qr_code/qr_code.wxml
components/qr_code/qr_code.wxss
packageA/pages/myGift/myGift.js
packageA/pages/myGift/myGift.wxml
packageA/pages/myGiftDetails/myGiftDetails.wxml
packageB/pages/luckactivity/index/index.wxml
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
packageB/pages/luckactivity/luckinfo/luckinfo.wxss
packageB/pages/zuhegou/index/index.js
pages/index/index/index.js
@@ -703,9 +703,9 @@ background: #ffe3e2;
 /* 图标字体(ty) */
 @font-face {
   font-family: 'iconfont';  /* Project id 2054717 */
-  src: url('//at.alicdn.com/t/font_2054717_v0znypg14xq.woff2?t=1627541682562') format('woff2'),
-       url('//at.alicdn.com/t/font_2054717_v0znypg14xq.woff?t=1627541682562') format('woff'),
-       url('//at.alicdn.com/t/font_2054717_v0znypg14xq.ttf?t=1627541682562') format('truetype');
+  src: url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.woff2?t=1627893975776') format('woff2'),
+       url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.woff?t=1627893975776') format('woff'),
+       url('//at.alicdn.com/t/font_2054717_3fwbtkdbxhl.ttf?t=1627893975776') format('truetype');
 }
 .iconfont {
@@ -716,6 +716,10 @@ background: #ffe3e2;
   -moz-osx-font-smoothing: grayscale;
 }
+.icon-zhuanfa1:before {
+  content: "\e614";
+}
+
 .icon-zhiwen:before {
   content: "\e6aa";
-
+@import '../../app.wxss';
 /* 弹窗样式 */
 .xc-pop-up{
  	   width: 100%;
@@ -23,19 +23,19 @@
 .shut{
     display: block;
-    width: 54rpx;
-    height: 54rpx;
-    font-size: 50rpx;
-    line-height:47rpx;
+    width: 45rpx;
+    height: 45rpx; 
+    line-height:36rpx;
     border-radius: 50%;
     -moz-border-radius: 50%;
     -webkit-border-radius: 50%;
+    font-size: 40rpx;
     color: #fff;
     text-align: center;
     position: fixed;
-    margin-top: -25rpx;
     z-index: 66666;
-   right: 65rpx;
+    right: 75rpx;
+    top: 465rpx;
    background: #c8162c;
 }
 .xc-qr-frame{ 
@@ -50,7 +50,7 @@
   margin-left: -280rpx; border-radius:10rpx 
 }
-.ck_btn{width:44%;height:52rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;}
+.ck_btn{color: #000; width:44%;height:52rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;}
 .fs36{ font-size: 36rpx; }
 .fs30{ font-size: 30rpx; }
@@ -24,7 +24,7 @@
      </view>
   </view>
-  <view class="shut" bindtap="close">ⅹ</view>
+  <view class="shut" bindtap="close"><text class="iconfont icon-close"></text></view>
 </view>
 <!-- </scroll-view> -->
 </view>
 \ No newline at end of file
+@import '../../app.wxss';
+
 .xc-pop-up{
 	width: 100%;
 	height: 100%;
@@ -102,17 +104,17 @@ top: 5rpx;
 }
 .shut{
-    display: block;
+    /* display: block;
     width: 54rpx;
     height: 54rpx;
     border: 2rpx solid #fff;
     font-size: 50rpx;
-    z-index:55;
-    line-height:47rpx;
+    line-height:54rpx;
     margin-top: 45rpx;
     border-radius: 50%;
     -moz-border-radius: 50%;
-    -webkit-border-radius: 50%;
+    -webkit-border-radius: 50%; */
+    z-index:55;
     color: #fff;
     text-align: center;
     position: fixed;
@@ -120,6 +122,10 @@ top: 5rpx;
     left:50%;
     transform: translateX(-50%);
 }
+.icon-close:before {
+  content: "\e62e";
+  font-size: 50rpx;
+}
 .mt{ margin-top:130rpx}
 .mts{ margin-top:70rpx}
@@ -144,7 +144,7 @@ Page({
 			isShowLoading: true,
 		})
 		.then(function(res) {
-		
+			console.log(res);
 			if(res.data.code == 0) {
 				self.setData({
@@ -36,7 +36,7 @@
 							<view class="fs24 c-a4">已售{{item.salenum}}件</view>
 						</view>
 						<!-- 时间 -->
-						<view class="date">活动截止日期 {{filter.format_time(item.endtime)}}</view>
+						<view class="date">活动结束日期 {{filter.format_time(item.endtime)}}</view>
 						<!-- 按钮 -->
 					</view>
 				</view>
@@ -55,7 +55,7 @@
 						<!-- 标题 -->
 						<view class="mgb10 ellipsis-2 lh taj">{{item.lbtitle}}</view>
 						<!-- 时间 -->
-						<view class="date pdb20">兑换截止日期 {{filter.format_time(item.endtime)}}</view>
+						<view class="date pdb20" wx:if="{{item.lbtype==1}}">兑换截止日期 {{filter.format_time(item.expdate,1)}}</view>
 						<view catchtap="show_remark" data-index="{{index}}" wx:if="{{item.lbintro}}" class="date pdb20">活动说明</view>
 					</view>
 					<!-- 说明 -->
@@ -3,7 +3,17 @@
 	<!-- 图片 -->
 	<view><image src="{{imghost + (details.lburl ? details.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/></view>
-	<view wx:if="{{index==1}}" class="fs26 exp_title">兑换结束时间：{{filter.format_time(details.endtime,1)}}</view>
+	 <!-- 未买 -->    
+    <block wx:if="{{index==0}}">
+	  <view class="fs26 exp_title">活动结束时间：{{filter.format_time(details.endtime,1)}}</view>
+	 </block>
+	 <!-- 已买 -->
+     <block wx:else>
+       <view wx:if="{{details.lbtype==1}}"class="fs26 exp_title">兑换结束时间：{{filter.format_time(details.expdate,1)}}</view>
+	 </block>
+
+	
+
 	<!-- 描述-->
 	<view class="desc-container">
 		<!-- 标题 -->
@@ -30,7 +40,7 @@
 			<view class="fs24 c-a4">已售{{details.salenum}}件</view>
 		</view>
 		<!-- 时间 -->
-		<view class="date">活动截止日期 {{details.expdate ? filter.format_time(details.expdate):filter.format_time(details.endtime)}}</view>
+		<!-- <view class="date">活动结束日期 {{filter.format_time(details.endtime)}}</view> -->
 	</view>
@@ -20,7 +20,7 @@
 		<block wx:for="{{list.pageData}}">
 			<view class="tab-item" bindtap="goto" data-id="{{item.id}}" data-title="{{item.act_name}}">
 				<view class="img-container">
-					<image wx:if="{{item.imageurl}}" src="{{imghost + item.imageurl}}" class="img"></image>
+					<image wx:if="{{item.imageurl}}" src="{{imghost + item.imageurl}}" class="img" mode="aspectFit"></image>
 					<text class="iconfont icon-zhuanpan" wx:else></text>
 				</view>
 				<view class="desc-container">
@@ -57,6 +57,10 @@ Page({
   },
 	onLoad(options) {
+		// wx.showLoading();
+		// this.setData({
+		// 	showMask2: true,
+		// });
 		// console.log('imghost+++++', imghost);
 		self = this;
 		this.data.options = options;
@@ -118,18 +122,24 @@ Page({
 									// console.log('prizes//////', res.data.data);
 									self.setData({
 										template: res.data.data,
-										bannerUrl: imghost + ((res.data.data&&res.data.data.bannerUrl) ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png'), //背景图
-										'blocks[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelBaseUrl) ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png'), //转盘
-										'buttons[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelPointerUrl) ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png'), //指针
+										bannerUrl: imghost + ((res.data.data&&res.data.data.bannerUrl) ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png?v=2'), //背景图
+										'blocks[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelBaseUrl) ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png?v=2'), //转盘
+										'buttons[0].imgs[0].src': imghost + ((res.data.data&&res.data.data.wheelPointerUrl) ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png?v=2'), //指针
 									});
 								},
 							});
 						}  else {
+							// wx.hideLoading();
 							if(luckInfo && luckInfo.store_bannerUrl) {
 								self.setData({
 									bannerUrl: imghost + luckInfo.store_bannerUrl,
 								});
 							};
+							
+							// self.setData({
+							// 	showMask2: false,
+							// 	hiddenCanvas: false,
+							// });
 						};
@@ -178,8 +188,8 @@ Page({
 							self.setData({
 								record: res.data.data.pageData,
 							});
-						};
-					},	
+						}
+					},
 				});
@@ -575,6 +585,8 @@ Page({
 							}, 3000);
+							
+							
 							if(res.data.code == -1) {
 								wx.showToast({
 									title: res.data.msg,
@@ -585,13 +597,15 @@ Page({
 								// self.data.start = true;
 							};
 							// console.log('请求出错');
-							if(self.data.luckInfo.vip_act_num != 0) {
+							if(res.data.code == -2 && self.data.luckInfo.vip_act_num != 0) {
 								self.setData({
 									'luckInfo.user_LuckNumDay': self.data.luckInfo.user_LuckNumDay - 1,
 								});
 							};
+							
+							
 						};
 					},
@@ -640,13 +654,14 @@ Page({
 			showResult: true,
 			showMask: true,
 			resultTitle,
+			showPopup: false,
 			currentLbtype: lbtype,
 		});
-		if(no_luck_urltype == 1 && (resultTitle == '谢谢参与')) {
+		if(no_luck_urltype == 1 && resultTitle == '谢谢参与') {
 			if(this.data.luckInfo.no_luck_weappurl) {
 				let num = this.data.num;
 				let url = this.data.luckInfo.no_luck_weappurl;
@@ -662,8 +677,47 @@ Page({
 				}, 1000);
 			};
+			
 		};
+		
+		if(self.data.luckInfo.give_user) {
+			if(resultTitle == '谢谢参与') {
+				if(self.data.luckInfo.give_type == 1) {
+					if(self.data.luckInfo.give_integral > 0) {
+						wx.showToast({
+							title: `获得游戏奖励积分${self.data.luckInfo.give_integral}`,
+							icon: 'none',
+						});
+					};
+				} else if((self.data.luckInfo.give_type == 2)) {
+					if(self.data.luckInfo.give_integral > 0) {
+						wx.showToast({
+							title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`,
+							icon: 'none',
+						});
+					};
+				};
+			};
+		} else {
+			if(self.data.luckInfo.give_type == 1) {
+				if(self.data.luckInfo.give_integral > 0) {
+					wx.showToast({
+						title: `获得游戏奖励积分${self.data.luckInfo.give_integral}`,
+						icon: 'none',
+					});
+				};
+			} else if((self.data.luckInfo.give_type == 2)) {
+				if(self.data.luckInfo.give_integral > 0) {
+					wx.showToast({
+						title: `获得游戏奖励成长值${self.data.luckInfo.give_growth}`,
+						icon: 'none',
+					});
+				};
+			};
+		};
+		
+		
   },
 	showPopup() {
@@ -799,6 +853,14 @@ Page({
 	goto(e) {
 		let url = '';
 		let type = e.currentTarget.dataset.type;
+		let ordersn = null;
+		let buyreceive_id = null;
+		if(e.currentTarget.dataset.ordersn) {
+			ordersn = e.currentTarget.dataset.ordersn;
+		};
+		if(e.currentTarget.dataset.buyreceiveid) {
+			buyreceive_id = e.currentTarget.dataset.buyreceiveid;
+		};
 		switch(type) {
 			case 1: {
 				url = '/pages/user/integral/integral';
@@ -817,7 +879,7 @@ Page({
 				break;
 			};
 			case 6: {
-				url = '/packageA/pages/myGift/myGift';
+				url = `/pages/giftpack/giftpacklist/giftpacklist?isBuy=0&orderSn=${ordersn}&lbId=${buyreceive_id}`;
 				break;
 			};
 		};
 <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
 <wxs module="tool" src="./tool.wxs"></wxs>
-<view class="luck-container" style="background: {{template.colorCode ? template.colorCode:'#8102FD'}} url({{bannerUrl ? bannerUrl:(imghost + 'miniapp/images/luckDraw/bg.png')}}) no-repeat;">
-<!-- <view class="luck-container" style="background: url({{ bannerUrl}}) no-repeat;"> -->
+<view class="luck-container" style="background: {{template.colorCode ? template.colorCode:'#da104b'}} url({{bannerUrl ? bannerUrl:(imghost + 'miniapp/images/luckDraw/bg.png?v=2')}}) no-repeat;">
 	<!-- 中奖人员 -->
 	<view class="swiper-container" wx:if="{{nameList && nameList.length != 0}}">
 		<swiper class="swiper" autoplay="true" circular="true" vertical="true" interval="3000">
@@ -63,28 +62,24 @@
 		</view>
 	</view>
 	<!-- 活动展示 -->
-	<view wx:if="{{luckInfo.remark}}">
+	<view>
 		<view class="badge-container"><image src="{{imghost + 'miniapp/images/luckDraw/badge.png'}}" class="badge activity" lazy-load></image></view>
 		<view class="bg-white br12 pd20 fs28">
 			<!-- {{luckInfo.remark}} -->
 			<import src="../../../../utils/wxParse/wxParse.wxml"/>
-			<template is="wxParse" data="{{wxParseData:content.nodes}}"/>
+			<!-- <template is="wxParse" data="{{wxParseData:content.nodes}}"/> -->
 			<!-- 时间 -->
-			<!-- <view class="bdb">
-				<view class="">
+			<view class="bdb">
+				<!-- <view class=""> -->
 					<view class="txt-red">活动时间：</view>
-					<view class="fs28 pdv20">187606546456</view>
-				</view>
-				<view>
-					<view class="txt-red">兑换时间：</view>
-					<view class="fs28 pdv20">-</view>
-				</view>
-			</view> -->
+					<view class="fs28 pdv20">{{filter.format_time(luckInfo.begindate, 1) + ' 至 ' + filter.format_time(luckInfo.enddate, 1)}}</view>
+				<!-- </view> -->
+			</view>
 			<!-- 规则 -->
-			<!-- <view class="bdb">
-				<view class="txt-red pdt20">活动规则：</view>
-				<view class="fs28 pdv20">-</view>
-			</view> -->
+			<view class="bdb" wx:if="{{luckInfo.remark}}">
+				<view class="txt-red pdt20">活动说明：</view>
+				<view class="fs28 pdv20"><template is="wxParse" data="{{wxParseData:content.nodes}}"/></view>
+			</view>
 			<!-- 电话 -->
 			<!-- <view class="bdb">
 				<view class="txt-red pdt20">联系电话：</view>
@@ -127,8 +122,11 @@
 	</view>
 </view>
+<!-- 分享按钮 -->
+<!-- <view class="circle-container zhuanfa" bindtap=""><text class="iconfont icon-zhuanfa1"></text></view> -->
+
 <!-- 悬浮按钮 -->
-<view class="gift-container {{((record && record.length != 0) || isActive) ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
+<view class="circle-container gift {{((record && record.length != 0) || isActive) ? 'active':''}}" bindtap="showPopup"><text class="iconfont icon-liwu"></text></view>
 <!-- 弹窗 -->
 <view class="popup-container" wx:if="{{showPopup}}">
@@ -145,7 +143,8 @@
 						<view class="flex ai_c jc_fe fs26 xc-black3 ">
 							<!-- <view style="visibility: {{item.luck_type == 5 ? 'visible':'hidden'}};">兑换状态：{{item.state == 0 ? '未兑换':'已兑换'}}</view> -->
 							<!-- <view style="">兑换状态：{{item.state == 0 ? '未兑换':'已兑换'}}</view> -->
-							<view class="btn" bindtap="{{item.luck_type == 5 ? (item.state == 0 ? 'showQr':''):'goto'}}" data-type="{{item.luck_type}}" data-id="{{item.id}}">{{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}}</view>
+							<!-- <view class="fs24 c-a">中奖时间：{{filter.format_time(item.luck_time, 1)}}</view> -->
+							<view class="btn" bindtap="{{item.luck_type == 5 ? (item.state == 0 ? 'showQr':''):'goto'}}" data-type="{{item.luck_type}}" data-id="{{item.id}}" data-ordersn="{{item.order_sn}}" data-buyreceiveid="{{item.buyreceive_id}}">{{item.luck_type == 5 ? (item.state == 1 ? '已兑换':'兑换'):'查看'}}</view>
 						</view>
 					</view>
 				</view>
@@ -179,7 +178,7 @@
 		</view>
 		<view class="pdt40" wx:if="{{currentLbtype == 5}}">
-			<view class="btn btn2" bindtap="clickReceive">立即领取</view>
+			<view class="btn btn2" bindtap="clickReceive">立即兑换</view>
 		</view>
@@ -190,5 +189,7 @@
 <!-- 遮罩层 -->
 <view class="mask" wx:if="{{showMask}}"></view>
+<!-- 进场遮罩层 -->
+<view class="mask2" wx:if="{{showMask2}}"></view>
 <qrcode id="qrcode" bind:close="closeQr"></qrcode>
 \ No newline at end of file
@@ -68,7 +68,7 @@ page,
 	width: 140rpx;
 	height: 140rpx;
 	margin-right: 20rpx;
-	background-color: #f5f5f5;
+	/* background-color: #f5f5f5; */
 }
 .img {
@@ -118,7 +118,7 @@ page,
 	margin-right: 10rpx;
 }
-.gift-container {
+.circle-container {
 	background-color: rgba(44, 44, 44, 0.2);
 	width: 100rpx;
 	height: 100rpx;
@@ -126,14 +126,21 @@ page,
 	color: white;
 	position: fixed;
 	right: 20rpx;
-	bottom: 20rpx;
 	display: flex;
 	justify-content: center;
 	align-items: center;
 	z-index: 1;
 }
-.gift-container.active::after {
+.circle-container.gift {
+	bottom: 20rpx;
+}
+
+.circle-container.zhuanfa {
+	bottom: 160rpx;
+}
+
+.circle-container.active::after {
 	content: '';
 	position: absolute;
 	width: 14rpx;
@@ -145,7 +152,8 @@ page,
 	right: 10rpx;
 }
-.icon-liwu {
+.icon-liwu,
+.icon-zhuanfa1 {
 	font-size: 40rpx;
 }
@@ -161,7 +169,7 @@ page,
   width: 6rem;
   z-index: 2;
   -webkit-transform: translate(0, -50%); */
-  transform: translate(0, -50%);
+  /* transform: translate(0, -50%); */
   /* color: #fff;
   font: normal 400 20px/1 'Josefin Sans', sans-serif;
   letter-spacing: .1em;
@@ -175,9 +183,10 @@ page,
   left: 50%;
   width: 1rem;
   height: 1rem;
-  margin-left: -12px;
-  border-left: 1px solid #fff;
-  border-bottom: 1px solid #fff;
+	/* transform: translateX(-50%); */
+  margin-left: -13rpx;
+  border-left: 2rpx solid #fff;
+  border-bottom: 2rpx solid #fff;
   -webkit-transform: rotate(-45deg);
   transform: rotate(-45deg);
   -webkit-animation: sdb07 2s infinite;
@@ -190,7 +199,7 @@ page,
   animation-delay: 0s;
 }
 .tip-to-down text:nth-of-type(2) {
-  top: 16px;
+  top: 32rpx;
   -webkit-animation-delay: .15s;
   animation-delay: .15s;
 }
@@ -23,14 +23,14 @@ let imgDraw = {
 		},
 		{ //昵称
 			"type": "text",
-			"text": "我是店铺名称名称名称名称名称名称名称名称名称名称名称名称名称名称",
+			"text": "我是店铺",
 			"css": {
-				"width": "400px",
+				"width": "650px",
 				"color": "#fff",
 				"top": "136px",
-				"left": "137px",
 				"fontSize": "26px",
 				"maxLines": "1",
+				"textAlign": "center",
 			}
 		},
 		{ //10元任选3件
@@ -992,13 +992,11 @@ Page({
 		for(var i in swiperimage){
 			var item=swiperimage[i];
-			if(item.id ==img.id && type==img.type){
+			if(item.id ==img.id && item.type==img.type){
 				return false;
 			}
 		}
-		
-		
-		
+
         swiperimage.unshift(img);
         th.setData({
           swiperimage: swiperimage,