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

yvan.ni
2 parents ae26e7d4 628a35bb
Showing 4 changed files with 80 additions and 50 deletions
app.wxss
packageB/pages/coupons/query/index.js
packageB/pages/coupons/query/index.wxml
packageB/pages/coupons/query/index.wxss
@@ -706,9 +706,9 @@ background: #ffe3e2;
 /* 图标字体(ty) */
 @font-face {
   font-family: 'iconfont';  /* Project id 2054717 */
-  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');
+  src: url('//at.alicdn.com/t/font_2054717_j27uzo13r5f.woff2?t=1628845583213') format('woff2'),
+       url('//at.alicdn.com/t/font_2054717_j27uzo13r5f.woff?t=1628845583213') format('woff'),
+       url('//at.alicdn.com/t/font_2054717_j27uzo13r5f.ttf?t=1628845583213') format('truetype');
 }
 .iconfont {
@@ -719,6 +719,10 @@ background: #ffe3e2;
   -moz-osx-font-smoothing: grayscale;
 }
+.icon-nodata:before {
+  content: "\e636";
+}
+
 .icon-zhuanfa1:before {
   content: "\e614";
 }
@@ -23,7 +23,7 @@ Page({
     isBind:true,//控制清空时间日期的按钮
     isBinds: true,
     select: false,//下拉框
-    grade_name: '所有',
+    grade_name: '未使用',
     // grades: [ //old
     //   '所有',
     //   '已使用',
@@ -198,7 +198,7 @@ Page({
 		var store_id = os.stoid;
-		this.getData(true, '/api/weshop/users/listExchangeCoupons?pageSize=10', {
+		this.getData(true, '/api/weshop/users/listExchangeCoupons', {
 			user_id: user_id, store_id: store_id, 
 		}).then(()=>{
 			_this.setData({
@@ -231,7 +231,7 @@ Page({
 	  this.data.integr = item.Integral;
 	  this.data.number = item.Number;
-		let content = `确定使用${th.data.integr}积分兑换面值${th.data.monye}元的代金券吗?`;
+		let content = `确定使用${th.data.integr}积分兑换代金券面值${th.data.monye}元吗?`;
 		wx.showModal({
 		  title: '提示',
 		  content: content,
@@ -479,13 +479,24 @@ Page({
   },
+	// 使用说明详情展开
+	clickDetails: function(e) {
+		let details = this.data.details;
+		let index = e.currentTarget.dataset.index;
+		details[index].isShowDetails = !details[index].isShowDetails;
+		this.setData({
+			details,
+		});
+	},
+	
+	
   //---加载更多是靠这个函数----
   onReachBottom: function () {
 		if(this.data.currentIndex != 3) {
 			this.wjquery();
 		} else {
-			this.scrollToLower('/api/weshop/users/listExchangeCoupons?pageSize=10', {
+			this.scrollToLower('/api/weshop/users/listExchangeCoupons', {
 				user_id: getApp().globalData.user_id,
 				store_id: os.stoid,
 			}, function() {
@@ -499,35 +510,35 @@ Page({
   //起始时间
-  bindDateChenge: function(e) {
-    console.log("是什么", e.detail.value);
-    var isBind = false;
-    this.setData({
-      datet: e.detail.value, isBind: isBind 
-    });
-  },
+  // bindDateChenge: function(e) {
+  //   console.log("是什么", e.detail.value);
+  //   var isBind = false;
+  //   this.setData({
+  //     datet: e.detail.value, isBind: isBind 
+  //   });
+  // },
   // 结束时间
-  bindDateChenges: function(e) {
-    console.log("是什么", e.detail.value);
-    var isBinds = false;
-    this.setData({
-      dates: e.detail.value, isBinds: isBinds 
-    });
-  },
+  // bindDateChenges: function(e) {
+  //   console.log("是什么", e.detail.value);
+  //   var isBinds = false;
+  //   this.setData({
+  //     dates: e.detail.value, isBinds: isBinds 
+  //   });
+  // },
   //catchtap阻止冒泡，点击清除开始时间的按钮
-  eliminate:function(){
-    console.log("试试");
-    var isBind= true;
-    var data="";
-    this.setData({ datet: data, isBind: isBind})
-  },
+  // eliminate:function(){
+  //   console.log("试试");
+  //   var isBind= true;
+  //   var data="";
+  //   this.setData({ datet: data, isBind: isBind})
+  // },
    //catchtap阻止冒泡，点击清除结束时间的按钮
-  eliminates: function () {
-    console.log("试试");
-    var isBinds = true;
-    var dates = "";
-    this.setData({ dates: dates, isBinds: isBinds })
-  },
+  // eliminates: function () {
+  //   console.log("试试");
+  //   var isBinds = true;
+  //   var dates = "";
+  //   this.setData({ dates: dates, isBinds: isBinds })
+  // },
@@ -63,25 +63,24 @@
 			<block wx:if="{{detail.isby}}">
 				<view class="coupon">
 					<view class="flex">
-						<view class="c-l"><text class="rmb fs40">20</text></view>
+						<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">立即使用</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 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 class="c-info arrow-down"> -->
-				<view class="c-info">
-					<text class="ellipsis-1x">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>
+				<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>
@@ -100,15 +99,15 @@
 								</view>
 							</view>
 							<view class="c-time">
-								<text  wx:if="{{detail.ValidDate!=null}}" class="ellipsis-1x">有效期:{{detail.BeginDate==null ? " " : time.replace_time2(detail.BeginDate)}} 至 {{time.replace_time2(detail.ValidDate)}}</text>
+								<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 class="c-info">
-					<text class="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 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 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>
@@ -123,7 +122,7 @@
 					<view class="c-r dash">
 						<view class="flex jc_sb ai_c">
 							<view class="pdr20">
-								<view class="fs28 ellipsis-1x">{{result.Integral}}积分兑换{{filter.getNum(result.ToSum)}}元微券</view>
+								<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>
@@ -154,15 +153,22 @@
 <view class="popup-container" hidden="{{!showQr}}">
 	<view class="t-r pdb20"><text class="iconfont icon-close fs40" bindtap="closeQr"></text></view>
 	<view class="popup">
-		<view class="popup-title">{{filter.getNum(details[useIndex].Sum)}}元微券</view>
-		<view class="pdt20 c-fe0000"><text class="rmb fs80">{{filter.getNum(details[useIndex].Sum)}}</text></view>
+		<view class="popup-title">
+			<block wx:if="{{details[useIndex].isby == 1}}">包邮券</block>
+			<block wx:else>
+				{{filter.getNum(details[useIndex].Sum)}}元微券
+			</block>
+		</view>
+		<view class="pdt20 c-fe0000"><text class="rmb fs80" wx:if="{{details[useIndex].isby != 1}}">{{filter.getNum(details[useIndex].Sum)}}</text></view>
 		<!-- <img src="" alt="" class="img-qr"/> -->
 		<view class="qr-container">
 		  <canvas class="qrcode" canvas-id="qrcode"/>
 		</view>
-		<view class="pdt20 pdb10 fs26">{{details[useIndex].CashRepNo}}</view>
+		<view class="pdt20 pdb10 fs26" wx:if="{{details[useIndex].CashRepNo}}">{{details[useIndex].CashRepNo}}</view>
+		<view class="pdt20 pdb10 fs26" wx:else>{{details[useIndex].no}}</view>
 		<view class="pdv30 c-7b fs26 bdt">
-			<text  wx:if="{{details[useIndex].ValidDate!=null}}" class="ellipsis-1x">有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}}</text>
+			<text  wx:if="{{details[useIndex].ValidDate}}" class="ellipsis-1x">有效期:{{details[useIndex].BeginDate==null ? " " : time.replace_time2(details[useIndex].BeginDate)}} 至 {{time.replace_time2(details[useIndex].ValidDate)}}</text>
+			<text  wx:elif="{{details[useIndex].use_end_time}}" class="ellipsis-1x">有效期:{{details[useIndex].use_start_time==null ? " " : time.format_time(details[useIndex].use_start_time)}} 至 {{time.format_time(details[useIndex].use_end_time)}}</text>
 			<text wx:else>有效期:不限</text>
 		</view>
 	</view>
@@ -530,8 +530,13 @@ page {
 	 font-size: 32rpx;
 	 position: absolute;
 	 right: 10rpx;
-	 top: 50%;
-	 transform: translateY(-50%);
+	 top: 10rpx;
+	 /* transform: translateY(-50%); */
+	 transition: all 0.3s;
+ }
+ 
+ .arrow-down.active::after {
+	 transform: rotateZ(180deg);
  }
  .mask {
@@ -614,6 +619,10 @@ page {
 	 font-size: 22rpx;
  }
+ .breakall {
+	 word-break: break-all;
+ }
+