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

taiyuan
2 parents 56fc8b31 c39a4157
Showing 14 changed files with 162 additions and 44 deletions
app.js
components/my_confirm/my_confirm.wxml
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/myGift/myGift.wxss
packageA/pages/myGiftDetails/myGiftDetails.js
packageA/pages/myGiftDetails/myGiftDetails.wxml
pages/index/index/index.js
pages/index/index/index.wxml
pages/index/index/index.wxss
project.config.json
@@ -718,6 +718,12 @@ App({
 					resolve(user_info);
 				};
 			});
+
+
+
+
+
+
 		},
  
  
@@ -6,8 +6,8 @@
 		<view class="shut" bindtap="close_yu_e">ⅹ</view>
 			<view class="fs32 xc-black3 flex jc-center ai-center" style="padding: 10rpx 20rpx;min-height:220rpx;"><text>{{title}}</text></view>
 		 <view class="flex jc-center ai_center" style="width: 100%;height: 75rpx;">
-			   <view bindtap="go_sure" class="fs30 white flex jc-center ai-center ck_btn color color" style="margin-right: 20rpx;">{{s_text}}</view>
-		     <view bindtap='go_cancle' class="fs30 xc-ash flex jc-center ai-center ck_btn"style="background:#ececea;">{{c_text}}</view>
+			   <view bindtap="go_sure" class="fs30 white flex jc-center ai-center ck_btn" style="margin-right: 20rpx;background:#ececea;">{{s_text}}</view>
+		     <view bindtap='go_cancle' class="fs30 xc-ash flex jc-center ai-center ck_btn color" >{{c_text}}</view>
 		  </view>
 		</view>
   </view>
-
+@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: -23rpx;
     z-index: 66666;
-   right: 60rpx;
+    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%;
@@ -90,36 +92,39 @@ top: 5rpx;
 .qrcode{
  width:520rpx;
  height:520rpx;
- margin-top:-27rpx 
+ margin-top:-18rpx 
  
  
 }
 .r-code{
   font-size:28rpx;
-  padding-left: 25rpx;
-margin-top: -5.5rpx;
+  margin-top: -5.5rpx;
+  text-align: center;
  
 }
  
 .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;
     top:940rpx;
-    left:345rpx;
-
-
+    left:50%;
+    transform: translateX(-50%);
+}
+.icon-close:before {
+  content: "\e62e";
+  font-size: 50rpx;
 }
  
 .mt{ margin-top:130rpx}
@@ -144,8 +144,9 @@ Page({
 			isShowLoading: true,
 		})
 		.then(function(res) {
+			console.log(res);
 			if(res.data.code == 0) {
-				
+		
 				self.setData({
 					isLoading: false
 				});
@@ -154,10 +155,12 @@ Page({
 					self.setData({
 						list: res.data.data
 					});
+					// console.log(this.data.list);
 				} else {
 					self.setData({
 						'list.pageData': self.data.list.pageData.concat(res.data.data.pageData)
 					});
+					
 				};
  
 				if((res.data.data.pageData.length == 0) || (res.data.data.pageSize * res.data.data.page >= res.data.data.total)) {
@@ -312,5 +315,19 @@ Page({
  
 			})
 	},
+	
+	
+	show_remark:function(e){
+		var index=e.currentTarget.dataset.index;
+		var item=this.data.list.pageData[index];
+		this.setData({
+			show_rem_pop:1,
+			pop_remark_text:item.lbintro
+		})
+	},
+	
+	close_remark:function(){
+		this.setData({show_rem_pop:0,})
+	}
  
 })
 \ No newline at end of file
@@ -8,7 +8,10 @@
 			<view class="tab-item" wx:for="{{list.pageData}}">
 				<view bindtap="goto" data-url="{{'/packageA/pages/myGiftDetails/myGiftDetails?index=0&id=' + item.id}}">
 					<!-- 图片 -->
-					<view class="img-container"><image src="{{imghost + (item.lburl ? item.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/></view>
+					<view class="img-container rel">
+						<image src="{{imghost + (item.lburl ? item.lburl:'miniapp/images/default_g_img.gif')}}" class="img" mode="widthFix"/>					
+						<view catchtap="show_remark" data-index="{{index}}" class="lb_remark ellipsis-1" wx:if="{{item.lbintro}}">活动说明:{{item.lbintro}}</view>
+					</view>
 					<view class="desc-container">
 						<!-- 标题 -->
 						<view class="mgb10 ellipsis-2 lh taj">{{item.lbtitle}}</view>
@@ -33,7 +36,7 @@
 							<view class="fs24 c-a4">已售{{item.salenum}}件</view>
 						</view>
 						<!-- 时间 -->
-						<view class="date">活动截止日期 {{filter.format_time(item.expdate)}}</view>
+						<view class="date">活动结束日期 {{filter.format_time(item.endtime)}}</view>
 						<!-- 按钮 -->
 					</view>
 				</view>
@@ -52,10 +55,11 @@
 						<!-- 标题 -->
 						<view class="mgb10 ellipsis-2 lh taj">{{item.lbtitle}}</view>
 						<!-- 时间 -->
-						<view class="date pdb20">活动截止日期 {{filter.format_time(item.endtime)}}</view>
+						<view class="date pdb20">兑换截止日期 {{filter.format_time(item.expdate,1)}}</view>
+						<view catchtap="show_remark" data-index="{{index}}" wx:if="{{item.lbintro}}" class="date pdb20">活动说明</view>
 					</view>
 					<!-- 说明 -->
-					<view class="c-red fs24">*请到线下门店兑换</view>
+					<view wx:if="{{item.lbtype==1}}" class="c-red fs24">注:请到线下门店兑换</view>
 				</view>
 			</view>
 		</block>
@@ -68,3 +72,13 @@
 <!-- 引入提示组件 -->
 <warn id="warn"></warn>
 <my_confirm id="my_confirm"></my_confirm>
+<view wx:if="{{show_rem_pop}}">
+	<view class="cover-layer" bindtap="close_remark"></view>
+	<view class="rem_pop;">
+		<view style="text-align: right;"bindtap="close_remark"><text class="iconfont icon-close" style="font-size: 40rpx;"></text></view>
+		<view style="padding: 0 16rpx;">
+			<view class="fs32">活动说明：</view>
+			<view class="fs30">{{pop_remark_text}}</view>
+		</view>
+	</view>
+</view>
 \ No newline at end of file
@@ -164,4 +164,28 @@ page {
 	color: #bbb;
 	text-align: center;
 	font-size: 22rpx;
-}
 \ No newline at end of file
+}
+.lb_remark{
+	    position: absolute;
+	    bottom: 0;
+	    left: 0;
+	    width: 100%;
+	    height: 50rpx;
+	    line-height: 50rpx;
+	    font-size: 30rpx;
+	    color: #333;
+	    padding-left: 10rpx;
+	    background-color: rgba(250,250,250,0.5);
+}
+
+.rem_pop{
+	    position: fixed;
+	    top: 30%;
+	    left: 6%;
+	    width: 88%;
+	    margin: 0 auto;
+	    height: 460rpx;
+	    background-color: #fff;
+	    z-index: 100; border-radius: 10rpx;
+		padding: 10rpx;
+}
@@ -11,7 +11,7 @@ Page({
   data: {
 	  qr_code_object: {
 		  val: "12121",
-		  content: "请将二维码展示给核销员，服务更快捷！"
+		  content: "当前核销码仅限当面使用！"
 	  },
   },
  
@@ -72,7 +72,7 @@ Page({
 						if(res.data.code==0 &&  res.data.data  &&  res.data.data.pageData &&  res.data.data.pageData.length>0){
 							var da= res.data.data.pageData[0]
                             self.setData({ details:da, });
-
+							console.log(da);
 							//礼包有俩种类型
 							if(da.lbtype==1){
                                 app.request.promiseGet('/api/weshop/libao/libaoList/page', {
@@ -94,6 +94,7 @@ Page({
                                     },
                                     isShowLoading: true,
                                 }).then(function(res) {
+									console.log(res);
                                 	if(res.data.code==0){
                                         self.setData({
                                             list: res.data.data,
@@ -150,6 +151,7 @@ Page({
                                     },
                                     isShowLoading: true,
                                 }).then(function(res) {
+									console.log(res);
                                     // console.log('res4-->', res);
                                     if(res.data.code==0  && res.data.data) {
                                         self.setData({
@@ -290,6 +292,7 @@ Page({
   	   getApp().request.get("/api/weshop/libao/libaoListvip/getLibaoCode",{
   	   	   data:data,
 		   success:function (res){
+			   console.log(res);
                if(res.data.code==0){
 				   th.data.qr_code_object.val=res.data.data;
 				   var qc_com = th.selectComponent("#qrcode"); //组件的id
@@ -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.expdate,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>
  
  
@@ -71,16 +81,40 @@
 	</view>
  
 	<view wx:if="{{details.lbtype==2}}" class="flex" style="flex-wrap: wrap;">
-		<block wx:for="{{list}}">
+		<block wx:for="{{list}}" wx:for-index="f_idx">		
 			<block wx:for="{{item.goods_num-0}}" wx:for-item="nitem" wx:for-index="idx">
 				<view class="lb_quan" style="background-image: url({{imghost}}/miniapp/images/yhq_{{index%2+1}}.png)">
 					 <view class="flex fs28 fir_view">
-						 <view>满1000.00使用</view>
-						 <view class="fs38" style="text-align: right">￥1000</view>
+						 <view>满{{item.condition}}使用</view>
+						 <view class="fs8" style="text-align: right">￥{{item.money}}</view>
 					 </view>
-					 <view style="font-size: 16rpx; text-align: center">活动结束日期： 2022-06-02 00:00:00 </view>
+					
+				
+					  <view style="font-size: 16rpx; text-align: center"> {{index==0?'活动结束日期':'截至时间'}}：
+					  
+					   <block wx:if="{{item.endtype<1}}">
+						  <block wx:if="{{item.use_end_time}}">
+							  {{filter.format_time(item.use_end_time,1)}}
+						  </block>
+						  <block wx:else>
+							  不限
+						  </block>
+					   </block>	  
+					   
+						<block wx:else>	
+							<block wx:if="{{item.days>0}}">
+								  有效期{{item.days}}天
+							</block>
+							<block wx:else>
+								不限
+							</block>
+						
+						</block>						  
+					  </view>
+					
+						 
 				</view>
-			</block>
+		    </block>
 		</block>
 	</view>
  
@@ -106,7 +140,7 @@
 			<view wx:if="{{details.lbprice>0}}" bindtap="GetBuyPrice"  class="btn pink">立即购买</view>
 		</block>
 		<block wx:else>
-		   <view wx:if="{{details.isget}}"  data-type="1" class="btn" style="background-color:#aaa;color: #fff">已领</view>
+		   <view wx:if="{{details.isget}}"  data-type="1" class="btn" style="background-color:#aaa;color: #fff">已领取</view>
 		   <view wx:else bindtap="show_get_quan" data-type="1" class="btn red">一键领取优惠券→</view>
 		</block>
 	</view>
@@ -978,15 +978,27 @@ Page({
         var giftBagId = res.data.data.gifBagId; //礼包id
         var nav_url = "/pages/giftpack/festival/festival?actId=" + actid + '&' + 'actType=' + 3 + '&' + 'giftBagId=' + giftBagId;
         var swiperimage = th.data.swiperimage;
-        var actBoundImg = res.data.data.actBoundImg; 
+        var actBoundImg = res.data.data.actBoundImg?res.data.data.actBoundImg:'/miniapp/images/default_g_img.gif'; 
  
 		th.data.holiday_image= res.data.data.actImg; 
 		th.data.holiday_url=nav_url;
  
         var img = {
           image: actBoundImg,
-          nav_url: nav_url
+          nav_url: nav_url,
+		  id:res.data.data.id,
+		  type:'festival'
         }
+		
+		for(var i in swiperimage){
+			var item=swiperimage[i];
+			if(item.id ==img.id && type==img.type){
+				return false;
+			}
+		}
+		
+		
+		
         swiperimage.unshift(img);
         th.setData({
           swiperimage: swiperimage,
@@ -9,7 +9,7 @@
 <!--普通界面-->
 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
  
-<view class="container rel" wx:if="{{ishow}}">
+<view class="container rel nor" wx:if="{{ishow}}">
   <block wx:if="{{banner}}">
     <image class="xc-top-img abs" src="{{url}}/miniapp/images/top-img.png"></image>
   </block>
@@ -9,7 +9,6 @@
 	z-index: 99;
 }
  
-
 .search-box {
 	/* position: fixed;
   top: 0;
@@ -976,6 +975,10 @@ page {
  
 .container {
 	overflow: hidden;
+	/* padding-top: 140rpx; */
+}
+
+.container.nor{
 	padding-top: 140rpx;
 }
  
@@ -21,6 +21,7 @@
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
     "useMultiFrameRuntime": true,
     "useApiHook": true,
     "useApiHostProcess": false,
@@ -30,12 +31,11 @@
       "outputPath": ""
     },
     "useIsolateContext": true,
-    "useCompilerModule": false,
-    "userConfirmedUseCompilerModuleSwitch": false,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
-    "minifyWXSS": true
+    "minifyWXSS": true,
+    "showES6CompileOption": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.16.0",