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

yvan.ni
2 parents 7b960f77 c10963de
Showing 9 changed files with 164 additions and 95 deletions
packageA/images/liveStreamDetails/circle.jpg
packageA/images/liveStreamDetails/friend.jpg
packageA/images/liveStreamDetails/home.jpg
packageA/images/liveStreamDetails/save.jpg
packageA/images/liveStreamDetails/share.jpg
packageA/pages/liveStreamDetails/liveStreamDetails.wxml
pages/user/coupons/coupons.js
pages/user/coupons/coupons.wxml
pages/user/coupons/coupons.wxss
@@ -35,7 +35,7 @@
             <!-- <view>WEI</view> -->
             <view>{{item.name}}</view>
           </view>
-          <view class="item-price">{{filter.toFix(item.price, 2)}}</view>
+          <view class="item-price">{{filter.toFix(item.price/100, 2)}}</view>
         </view>
       </view>
     </block>
@@ -73,8 +73,10 @@ Page({
 			let grades = th.data.grades;
 			// console.log('is_show_dhwz----------------------------',is_show_dhwz);
 			if(is_show_dhwz) {
-				grades.push('微券兑换');
-				th.setData({ grades });
+				if(grades.indexOf('微券兑换') == -1) {
+					grades.push('微券兑换');
+					th.setData({ grades });
+				};
 			};
 		  th.setData({ is_show_dhwz });
 		},1);
@@ -143,6 +145,7 @@ Page({
 			noMore: false,
 			details: [],
 			by_list: [],
+			showQr: false,
 		});
@@ -161,6 +164,7 @@ Page({
 		let useIndex = e.currentTarget.dataset.index;
 		let val = e.currentTarget.dataset.cashrepno;
+		
 		this.setData({
 			showQr: true,
 			useIndex,
@@ -598,5 +602,23 @@ Page({
 			});
 		};
 	},
+	
+	// 禁用滚动
+	// disableScroll() {
+	// 	this.setData({
+	// 		scrollType: 'disableScroll'
+	// 	});
+	// },
+	
+	//启用滚动
+	// enableScroll() {
+	// 	this.setData({
+	// 		scrollType: '',
+	// 	});
+	// },
+	
+	touchStart() {},
+	touchMove() {},
+	touchEnd() {},
 })
 \ No newline at end of file
@@ -52,105 +52,111 @@
   </form>
 </view> -->
-
-<view class="tab-head" bindtap="clickTab">
-	<view wx:for="{{grades}}" wx:key="unique" class="tab-head-item {{currentIndex == index ? 'active':''}}" data-name="{{item}}" data-index="{{index}}">{{item}}</view>
-</view>
-
-<view class="tab-body">
-	<block wx:if="{{currentIndex != 3}}">
-		<view class="tab-list-item" wx:for="{{details}}" wx:for-index="idx" wx:for-item="detail">
-			<block wx:if="{{detail.isby}}">
-				<view class="coupon">
-					<view class="flex">
-						<view class="c-l"><text class="fs40">包邮券</text></view>
-						<view class="c-r dash">
-							<view class="flex jc_sb ai_c">
-								<view class="pdr20">
-									<view class="fs28 ellipsis-1x">包邮券</view>
-									<view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: 微信商城</view>
+<view>
+	
+	<view class="tab-head" bindtap="clickTab">
+		<view wx:for="{{grades}}" wx:key="unique" class="tab-head-item {{currentIndex == index ? 'active':''}}" data-name="{{item}}" data-index="{{index}}">{{item}}</view>
+	</view>
+	
+	<view class="tab-body">
+		<block wx:if="{{currentIndex != 3}}">
+			<view class="tab-list-item" wx:for="{{details}}" wx:for-index="idx" wx:for-item="detail">
+				<block wx:if="{{detail.isby}}">
+					<view class="coupon">
+						<view class="flex">
+							<view class="c-l"><text class="fs40">包邮券</text></view>
+							<view class="c-r dash">
+								<view class="flex jc_sb ai_c">
+									<view class="pdr20">
+										<view class="fs28 ellipsis-1x">包邮券</view>
+										<view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: 微信商城</view>
+									</view>
+									<view class="shrink0"><text class="btn {{currentIndex != 0 ? 'gray':''}}" bindtap="{{currentIndex == 0 ? 'clickUse':''}}" data-index="{{idx}}" data-cashrepno="{{detail.no}}">{{filter.showBtnText(currentIndex)}}</text></view>
+								</view>
+								<view class="c-time">
+									<text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}} 至 {{time.format_time(detail.use_end_time)}}</text>
+									<text wx:else>有效期:不限</text>
 								</view>
-								<view class="shrink0"><text class="btn {{currentIndex != 0 ? 'gray':''}}" bindtap="{{currentIndex == 0 ? 'clickUse':''}}" data-index="{{idx}}" data-cashrepno="{{detail.no}}">{{filter.showBtnText(currentIndex)}}</text></view>
 							</view>
-							<view class="c-time">
-								<text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}} 至 {{time.format_time(detail.use_end_time)}}</text>
-								<text wx:else>有效期:不限</text>
+						</view>
+					</view>
+					<view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
+						<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>
+					</view>
+				</block>
+				
+				<block wx:else>
+					<view class="coupon">
+						<view class="flex">
+							<view class="c-l"><text class="rmb fs40">{{filter.getNum(detail.Sum)}}</text></view>
+							<view class="c-r dash">
+								<view class="flex jc_sb ai_c">
+									<view class="pdr20">
+										<view class="fs28 ellipsis-1x">{{filter.getNum(detail.Sum)}}元微券</view>
+										<view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: {{detail.SendMan==null?'线下发放':detail.SendMan==''?"线下发放":detail.SendMan}}</view>
+									</view>
+									<view class="shrink0">
+										<text class="btn {{currentIndex != 0 ? 'gray':''}}" bindtap="{{currentIndex == 0 ? 'clickUse':''}}" data-index="{{idx}}" data-cashrepno="{{detail.CashRepNo}}">{{filter.showBtnText(currentIndex)}}</text>
+									</view>
+								</view>
+								<view class="c-time">
+									<text  wx:if="{{detail.ValidDate}}" class="ellipsis-1x">有效期:{{detail.BeginDate==null ? " " : time.replace_time2(detail.BeginDate)}} 至 {{time.replace_time2(detail.ValidDate)}}</text>
+									<text wx:else>有效期:不限</text>
+								</view>
 							</view>
 						</view>
 					</view>
-				</view>
-				<view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
-					<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>
-				</view>
-			</block>
-			
-			<block wx:else>
-				<view class="coupon">
+					<view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
+						<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:if="{{detail.Remark1}}">{{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}</text>
+						<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:else>使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}</text>
+					</view>
+				</block>
+			</view>
+		</block>
+		
+	
+		<block wx:else>
+			<view class="tab-list-item" wx:for="{{result}}" wx:for-item="result">
+				<view class="coupon2">
 					<view class="flex">
-						<view class="c-l"><text class="rmb fs40">{{filter.getNum(detail.Sum)}}</text></view>
+						<view class="c-l"><text class="rmb fs40">{{filter.getNum(result.ToSum)}}</text></view>
 						<view class="c-r dash">
 							<view class="flex jc_sb ai_c">
 								<view class="pdr20">
-									<view class="fs28 ellipsis-1x">{{filter.getNum(detail.Sum)}}元微券</view>
-									<view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: {{detail.SendMan==null?'线下发放':detail.SendMan==''?"线下发放":detail.SendMan}}</view>
-								</view>
-								<view class="shrink0">
-									<text class="btn {{currentIndex != 0 ? 'gray':''}}" bindtap="{{currentIndex == 0 ? 'clickUse':''}}" data-index="{{idx}}" data-cashrepno="{{detail.CashRepNo}}">{{filter.showBtnText(currentIndex)}}</text>
+									<view class="fs26 ellipsis-1x breakall">{{result.Integral}}积分兑换{{filter.getNum(result.ToSum)}}元微券</view>
+									<!-- <view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: 微信商城</view> -->
 								</view>
+								<view class="shrink0"><text class="btn2" bindtap="clickExchange" data-index="{{index}}">立即兑换</text></view>
 							</view>
-							<view class="c-time">
-								<text  wx:if="{{detail.ValidDate}}" class="ellipsis-1x">有效期:{{detail.BeginDate==null ? " " : time.replace_time2(detail.BeginDate)}} 至 {{time.replace_time2(detail.ValidDate)}}</text>
+							<!-- <view class="c-time">
+								<text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}}至{{  time.format_time(detail.use_end_time)}}</text>
 								<text wx:else>有效期:不限</text>
-							</view>
+							</view> -->
 						</view>
 					</view>
 				</view>
-				<view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
-					<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:if="{{detail.Remark1}}">{{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}</text>
-					<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:else>使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}</text>
-				</view>
-			</block>
-		</view>
-	</block>
-	
-
-	<block wx:else>
-		<view class="tab-list-item" wx:for="{{result}}" wx:for-item="result">
-			<view class="coupon2">
-				<view class="flex">
-					<view class="c-l"><text class="rmb fs40">{{filter.getNum(result.ToSum)}}</text></view>
-					<view class="c-r dash">
-						<view class="flex jc_sb ai_c">
-							<view class="pdr20">
-								<view class="fs26 ellipsis-1x breakall">{{result.Integral}}积分兑换{{filter.getNum(result.ToSum)}}元微券</view>
-								<!-- <view class="fs24 c-7b pdt4 ellipsis-1x">微券来源: 微信商城</view> -->
-							</view>
-							<view class="shrink0"><text class="btn2" bindtap="clickExchange" data-index="{{index}}">立即兑换</text></view>
-						</view>
-						<!-- <view class="c-time">
-							<text class="ellipsis-1x" wx:if="{{detail.use_end_time!=null}}">有效期:{{detail.use_start_time==null?" " : time.format_time(detail.use_start_time)}}至{{  time.format_time(detail.use_end_time)}}</text>
-							<text wx:else>有效期:不限</text>
-						</view> -->
-					</view>
-				</view>
 			</view>
-		</view>
-	</block>
-	
-	<!-- 暂无数据 -->
-	<nodata nodataContainer="t-c" wx:if="{{(is_no_more == 1 && current_page == 1) || (result.length == 0)}}"></nodata>
+		</block>
+		
+		<!-- 暂无数据 -->
+		<nodata nodataContainer="t-c" wx:if="{{(is_no_more == 1 && current_page == 1) || (result.length == 0)}}"></nodata>
+		
+		<block wx:if="{{is_get}}">
+			<!-- 没有更多数据 -->
+			<view class="noMore 1" wx:if="{{(is_no_more == 1)||((details.length !== 0) && (pageSize >= (byTotal+wjTotal)))}}">—— 已经到底了 ——</view>
+		</block>
+		<view class="noMore 2" wx:if="{{noMore}}">—— 已经到底了 ——</view>
+	</view>
-	<block wx:if="{{is_get}}">
-		<!-- 没有更多数据 -->
-		<view class="noMore 1" wx:if="{{(is_no_more == 1)||((details.length !== 0) && (pageSize >= (byTotal+wjTotal)))}}">—— 已经到底了 ——</view>
-	</block>
-	<view class="noMore 2" wx:if="{{noMore}}">—— 已经到底了 ——</view>
 </view>
+
+
+
 <!-- 遮罩层 -->
-<view class="mask" hidden="{{!showQr}}"></view>
+<view class="mask" hidden="{{!showQr}}" catchtouchmove="touchMove"></view>
 <!-- 码 -->
-<view class="popup-container" hidden="{{!showQr}}">
+<view class="popup-container" hidden="{{!showQr}}" catchtouchmove="touchMove">
 	<view class="t-r pdb20"><text class="iconfont icon-close fs40" bindtap="closeQr"></text></view>
 	<view class="popup">
 		<view class="popup-title">
@@ -416,9 +416,18 @@ page {
 .coupon {
  position: relative;
- background: radial-gradient(transparent 0, #FFD3D6 0) top left / 200rpx no-repeat,
-    radial-gradient(transparent 6px, #fff 0),
-    radial-gradient(transparent 6px, #fff 0);
+ background: -webkit-radial-gradient(transparent 0, #FFD3D6 0) top left / 200rpx 100% no-repeat,
+    -webkit-radial-gradient(transparent 12rpx, #fff 0),
+    -webkit-radial-gradient(transparent 12rpx, #fff 0);
+ background: -moz-radial-gradient(transparent 0, #FFD3D6 0) top left / 200rpx 100% no-repeat,
+    -moz-radial-gradient(transparent 12rpx, #fff 0),
+    -moz-radial-gradient(transparent 12rpx, #fff 0);
+ background: -o-radial-gradient(transparent 0, #FFD3D6 0) top left / 200rpx 100% no-repeat,
+    -o-radial-gradient(transparent 12rpx, #fff 0),
+    -o-radial-gradient(transparent 12rpx, #fff 0);
+	background: radial-gradient(transparent 0, #FFD3D6 0) top left / 200rpx 100% no-repeat,
+		 radial-gradient(transparent 12rpx, #fff 0),
+		 radial-gradient(transparent 12rpx, #fff 0);
 }
@@ -426,12 +435,23 @@ page {
   content: '';
   position: absolute;
   height: 100%;
-  width:4px;
+  width: 8rpx;
   top: 0;
   left: 0;
-  background-image: linear-gradient(to bottom, #FFD3D6 4px, transparent 4px, transparent),
-  radial-gradient(4px circle at 0px 8px, #f0f0f0 4px, #FFD3D6 4px);
-  background-size: 4px 12px;
+	
+  background: -webkit-linear-gradient(to bottom, #FFD3D6 8rpx, transparent 8rpx, transparent),
+  -webkit-radial-gradient(16rpx circle at 0rpx 16rpx, #f0f0f0 8rpx, #FFD3D6 8rpx);
+	
+	background: -moz-linear-gradient(to bottom, #FFD3D6 8rpx, transparent 8rpx, transparent),
+	-moz-radial-gradient(16rpx circle at 0rpx 16rpx, #f0f0f0 8rpx, #FFD3D6 8rpx);
+	
+	background: -o-linear-gradient(to bottom, #FFD3D6 8rpx, transparent 8rpx, transparent),
+	-o-radial-gradient(16rpx circle at 0rpx 16rpx, #f0f0f0 8rpx, #FFD3D6 8rpx);
+	
+	background: linear-gradient(to bottom, #FFD3D6 8rpx, transparent 8rpx, transparent),
+	radial-gradient(16rpx circle at 0rpx 16rpx, #f0f0f0 8rpx, #FFD3D6 8rpx);
+	
+  background-size: 16rpx 24rpx;
   background-repeat: repeat-y;
  }
@@ -440,10 +460,22 @@ page {
    /* width: 300px; */
 	 padding: 40rpx 0;
 	 position: relative;
-	 background: radial-gradient(circle at right top, transparent 16rpx, #FFD3D6 0) top left / 200rpx 51% no-repeat,
-		 radial-gradient(circle at right bottom, transparent 16rpx, #FFD3D6 0) bottom left /200rpx 51% no-repeat,
-		 radial-gradient(circle at left top, transparent 16rpx, white 0) top right /calc(100% - 200rpx) 51% no-repeat,
-		 radial-gradient(circle at left bottom, transparent 16rpx, white 0) bottom right /calc(100% - 200rpx) 51% no-repeat;
+	 background: -webkit-radial-gradient(circle at right top, transparent 16rpx, #FFD3D6 0) top left / 200rpx 51% no-repeat,
+		-webkit-radial-gradient(circle at right bottom, transparent 16rpx, #FFD3D6 0) bottom left /200rpx 51% no-repeat,
+		-webkit-radial-gradient(circle at left top, transparent 16rpx, white 0) top right /calc(100% - 200rpx) 51% no-repeat,
+		-webkit-radial-gradient(circle at left bottom, transparent 16rpx, white 0) bottom right /calc(100% - 200rpx) 51% no-repeat;
+		background: -moz-radial-gradient(circle at right top, transparent 16rpx, #FFD3D6 0) top left / 200rpx 51% no-repeat,
+		-moz-radial-gradient(circle at right bottom, transparent 16rpx, #FFD3D6 0) bottom left /200rpx 51% no-repeat,
+		-moz-radial-gradient(circle at left top, transparent 16rpx, white 0) top right /calc(100% - 200rpx) 51% no-repeat,
+		-moz-radial-gradient(circle at left bottom, transparent 16rpx, white 0) bottom right /calc(100% - 200rpx) 51% no-repeat;
+		background: -o-radial-gradient(circle at right top, transparent 16rpx, #FFD3D6 0) top left / 200rpx 51% no-repeat,
+		-o-radial-gradient(circle at right bottom, transparent 16rpx, #FFD3D6 0) bottom left /200rpx 51% no-repeat,
+		-o-radial-gradient(circle at left top, transparent 16rpx, white 0) top right /calc(100% - 200rpx) 51% no-repeat,
+		-o-radial-gradient(circle at left bottom, transparent 16rpx, white 0) bottom right /calc(100% - 200rpx) 51% no-repeat;
+		background: radial-gradient(circle at right top, transparent 16rpx, #FFD3D6 0) top left / 200rpx 51% no-repeat,
+		radial-gradient(circle at right bottom, transparent 16rpx, #FFD3D6 0) bottom left /200rpx 51% no-repeat,
+		radial-gradient(circle at left top, transparent 16rpx, white 0) top right /calc(100% - 200rpx) 51% no-repeat,
+		radial-gradient(circle at left bottom, transparent 16rpx, white 0) bottom right /calc(100% - 200rpx) 51% no-repeat;
 		/* filter: drop-shadow(2px 2px 2px rgba(0,0,0,.2)); */
  }
@@ -584,9 +616,10 @@ page {
 	 bottom: -12rpx;
 	 width: 130%;
 	 height: 20rpx;
-	 background-image: -webkit-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
-	 background-image: -moz-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
-	 background-image: radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
+	 background: -webkit-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
+	 background: -moz-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
+	 background: -o-radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
+	 background: radial-gradient(circle, #FFD3D6, #FFD3D6 20rpx, transparent 20rpx, transparent);
 	 background-size: 40rpx 40rpx;
 	 transform: rotate(180deg);
 	 -webkit-transform: rotate(180deg);
@@ -623,6 +656,14 @@ page {
 	 word-break: break-all;
  }
+ /* .disableScroll {
+	 position: fixed;
+	 top: 0;
+	 left: 0;
+	 width: 100%;
+	 height: 100%;
+ } */
+