1.会员卡

pages/index/discountCard.vue

@@ -9,27 +9,38 @@
 		
 		<view class="main" :class="{mainActive:tabIndex==1}">
 			<view class="okBox" v-if="tabIndex==1">
-				<view class="tabLine2" :class="{tabActive2:tabIndex2==1}" @click="tabClick2(1)">可使用</view>
+				<view class="tabLine2" :class="{tabActive2:tabIndex2==0}" @click="tabClick2(0)">可使用</view>
 				<view class="tabLine2" :class="{tabActive2:tabIndex2==2}" @click="tabClick2(2)">已使用</view>
-				<view class="tabLine2" :class="{tabActive2:tabIndex2==3}" @click="tabClick2(3)">已过期</view>
+				<view class="tabLine2" :class="{tabActive2:tabIndex2==1}" @click="tabClick2(1)">已过期</view>
 			</view>
-			<view class="itemBg" v-for="(item,index) in items" @click="goDetail(item.ID)">
+			<view class="itemBg" v-for="(item,index) in currentList" @click="goDetail(item.ID)">
 				<view class="itemTop">
 					<view class="leftB">
 						<view class="use">￥<span class="use2">{{item.actMoney}}</span></view>
-						<!-- <view class="used">￥<span class="used2">{{item.actMoney}}</span></view> -->
+						<!-- <view class="used">￥<span class="used2">{{item.actMoney}}</span></view> -->
+						<view class="tiaojian">{{item.whereMoney!==0?'满'+item.whereMoney+'元可用':'满任意金额可用'}}</view>
 					</view>
 					<view class="centerB">
 						<view class="name">{{item.actName}}</view>
-						<view class="time" v-if="item.startTime">有效期：{{item.startTime}}-{{item.endTime}}</view>
+						<view class="time" v-if="item.startTime">有效期：{{item.startTime.slice(0,10)}}-{{item.endTime.slice(0,10)}}</view>
 						<view class="time" v-else></view>
 					</view>
-					<view class="rightB"></view>
+					<view class="rightB">
+						<image src="../../static/img/icon_yishiyong.png" mode="" v-if="item.state==2&&tabIndex==1"  class="couponlineTopImg"></image>
+						<image src="../../static/img/icon_guoqi.png" mode="" v-if="item.state==1&&tabIndex==1"  class="couponlineTopImg"></image>
+						
+						<view class="shareB"  v-if="item.shareQty>0&&tabIndex==2" @click.stop="shareCoupon(item)">
+						  <image  src="../../static/img/icon_share.png" alt="" class="couponlineshareImg"></image>
+						  <view class="keshare">赠送给好友</view>
+						</view>
+					</view>
 				</view>
 
 				<view class="itemBottom">
-					<view>可用次数：10</view>
-					<view>查看详情 ></view>
+					<view v-if="tabIndex==1">可用次数:{{item.avaQty}}</view>
+					<view v-else>可分享次数:{{item.shareQty}}</view>
+					<view>查看详情 ></view>
+					
 				</view>
 			</view>
 
@@ -44,12 +55,21 @@
 	export default {
 		components: {
 			nodata
+		},
+		computed: {
+		  currentList () {
+		    if (this.tabIndex == 2) {
+		      return this.items.filter(item => ~~item.shareQty > 0)
+		    } else {
+		      return this.items.filter(item => item.state == this.tabIndex2)
+		    }
+		  }
 		},
 		data() {
 			return {
 
 				tabIndex: 1,
-				tabIndex2: 1,
+				tabIndex2: 0,
 				items: [],
 
 			}
@@ -73,16 +93,11 @@
 			tabClick(num) {
 				this.tabIndex = num;
 
-
-
-				this.myOrderCoupon()
+				
 			},
 			tabClick2(num) {
 				this.tabIndex2 = num;
 
-
-
-				this.myOrderCoupon()
 			},
 			goDetail(id) {
 				uni.navigateTo({
@@ -246,8 +261,17 @@
 		font-weight: 500;
 		color: #666666;
 		line-height: 56rpx;
+	}
+	.rightB{
+		position: relative;
 	}
-
+	.tiaojian{
+		
+		font-size: 24rpx;
+		
+		color: #666666;
+		
+	}
 	.name{
 		
 		font-size: 30rpx;
@@ -260,6 +284,7 @@
 		font-size: 24rpx;
 		
 		color: #666666;
+		margin-top: 15rpx;
 	}
 	.itemBottom {
 		display: flex;
@@ -269,5 +294,27 @@
 		font-size: 24rpx;
 		color: #999999;
 		line-height: 33rpx;
+	}
+	.couponlineTopImg{
+		width: 118rpx;
+		height: 86rpx;
+		position: absolute;
+		top: -24rpx;
+		right: 0;
+	}
+	.shareB{
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.couponlineshareImg{
+		width: 44rpx;
+		height: 44rpx;
+		
+	}
+	.keshare{
+		font-size: 22rpx;
+		color: #666666;
+		margin-top: 15rpx;
 	}
 </style>

pages/index/vipCard.vue

@@ -7,19 +7,19 @@
 					<image src="../../static/img/vipheader.png" mode="" style="width: 80rpx;height: 80rpx;"></image>
 					<view class="headerRight">
 						<view class="nameBox">
-							<view class="name">姓名</view>
+							<view class="name">{{vipData.name}}</view>
 							<image src="../../static/img/icon_vip.png" mode=""
 								style="width: 112rpx;height: 34rpx;margin-left: 10rpx;"></image>
 
 						</view>
-						<view class="phone">{{vipData.cardCode}}</view>
+						<view class="phone">{{userInfo.mobilePhone}}</view>
 					</view>
 				</view>
 
 				<view class="kahaoBox">
 					<image src="../../static/img/icon_kahao.png" mode=""
 						style="width: 28rpx;height: 28rpx;margin-right: 10rpx;"></image>
-					<view class="kahao">卡号 134243425</view>
+					<view class="kahao">卡号 {{vipData.cardCode}}</view>
 
 				</view>
 			</view>
@@ -33,18 +33,19 @@
 
 		<!-- 计次 -->
 		<view class="mainBox" v-if="tabIndex==1">
-			<view class="btnBox" @click="btnClick">
-				<image v-if="jiciState" src="../../static/img/icon_selectY.png" mode=""
-					style="width: 36rpx;height: 36rpx;"></image>
+			<view class="btnBox" @click="dis=!dis">
+				<image v-if="dis" src="../../static/img/icon_selectY.png" mode="" style="width: 36rpx;height: 36rpx;">
+				</image>
 				<image v-else src="../../static/img/icon_selectN.png" mode="" style="width: 36rpx;height: 36rpx;">
 				</image>
 				<view style="margin-left: 10rpx;color: #3C3C3C;font-size: 24rpx;">不展示剩余为0项</view>
 			</view>
 
 			<view class="itemBox" v-for="(item,index) in vipData.cardTimeList">
+				<view v-if="AmountQtyJs(item.list)">
 				<view class="itemTop">
 					<view class="itemName">{{item.PackName}}</view>
-					<view class="tiaokuan">使用条款</view>
+					<view class="tiaokuan" @click="useCl(item.useComment)">使用条款</view>
 				</view>
 				<view class="itemBottom" :class="{active:item.open}">
 					<view class="shopName">{{item.shopName}}</view>
@@ -54,46 +55,89 @@
 						mode="" style="width: 34rpx;height: 22rpx;"></image>
 				</view>
 
-				<view class="itemBg" v-if="item.open" v-for="(v,index2) in item.list" :key="index2">
-					<view class="nameTop" v-if="v.FlowType==2"><span class="type">项目</span> {{v.FlowName}}</view>
-					<view class="nameTop" v-if="v.FlowType==1"><span class="type">商品</span> {{v.FlowName}}</view>
+				<view v-if="item.open">
+					<!-- 不展示剩余为0项 -->
+					<view class="itemBg" v-if="dis&&v.AmountQty!=0" v-for="(v,index2) in item.list" :key="index2">
 
-					<view class="timeBottom">
-						<view class="time" v-if="v.ExpireTime">有效期：{{v.ExpireTime}}</view>
-						<view class="time" v-else></view>
-						<view>剩余/总：<span
-								style="color: #FF3B30;font-weight: bold;">{{v.TotalQty}}</span>/{{v.AmountQty}}</view>
-					</view>
+						<view class="nameTop" v-if="v.FlowType==2"><span class="type">项目</span> {{v.FlowName}}</view>
+						<view class="nameTop" v-if="v.FlowType==1"><span class="type">商品</span> {{v.FlowName}}</view>
+
+						<view class="timeBottom">
+							<view class="time" v-if="v.ExpireTime">有效期：{{v.ExpireTime.slice(0,10)}}</view>
+							<view class="time" v-else>有效期：永久</view>
+							<view>剩余/总：<span
+									style="color: #FF3B30;font-weight: bold;">{{v.AmountQty}}</span>/{{v.TotalQty}}
+							</view>
+						</view>
+
+					</view>
+					
+					<!-- 展示所有 -->
+					<view class="itemBg" v-if="!dis" v-for="(v,index2) in item.list" :key="index2">
+					
+							<view class="nameTop" v-if="v.FlowType==2"><span class="type">项目</span> {{v.FlowName}}</view>
+							<view class="nameTop" v-if="v.FlowType==1"><span class="type">商品</span> {{v.FlowName}}</view>
+					
+							<view class="timeBottom">
+								<view class="time" v-if="v.ExpireTime">有效期：{{v.ExpireTime.slice(0,10)}}</view>
+								<view class="time" v-else>有效期：永久</view>
+								<view>剩余/总：<span
+										style="color: #FF3B30;font-weight: bold;">{{v.AmountQty}}</span>/{{v.TotalQty}}
+								</view>
+							</view>
+					
+						</view>
+					
 				</view>
 
+				</view>
+				<!-- 使用条款-->
+
+				<view class="shiyongBox" v-if="shiyongShow" @click="shiyongShow=false">
+					<view class="shiyongCont" @click.stop="">
+						<view class="shiyongContTop">
+							<view class="shiyongContTopTitle">使用条款</view>
+							<image src="../../static/img/icon_close.png" alt="" class="shiyongContTopX"
+								@click="shiyongShow=false"></image>
+						</view>
+						<view class="shiyonghtml">
+							<view v-html="useComment" v-if="useComment"></view>
+							<view v-else class="shiyongno">使用条款暂无内容</view>
+						</view>
+					</view>
+				</view>
 
 
 
 			</view>
-			
-			<!-- 无数据空白页 -->
+
+			<!-- 无数据空白页 -->
 			<nodata v-if="vipData.cardTimeList.length==0"></nodata>
 		</view>
 
 		<!-- 储值 -->
 		<view class="mainBox" v-if="tabIndex==2">
-			<view class="btnBox" @click="btnClick2">
-				<image v-if="chuzhiState" src="../../static/img/icon_selectY.png" mode=""
-					style="width: 36rpx;height: 36rpx;"></image>
+			<view class="btnBox" @click="disCz=!disCz">
+				<image v-if="disCz" src="../../static/img/icon_selectY.png" mode="" style="width: 36rpx;height: 36rpx;">
+				</image>
 				<image v-else src="../../static/img/icon_selectN.png" mode="" style="width: 36rpx;height: 36rpx;">
 				</image>
 				<view style="margin-left: 10rpx;color: #3C3C3C;font-size: 24rpx;">不展示剩余为0项</view>
 			</view>
 
-			<view class="itemBox" v-for="(item,index) in vipData.carMoneyList">
+			<view class="itemBox" v-for="(item,index) in vipData.carMoneyList">
+				<!-- 不展示剩余为0项 -->
+				<view v-if="disCz&&item.Money!=0">
 				<view class="itemTop">
 					<view class="itemName">{{item.PacKName}}</view>
-					<view class="tiaokuan">使用条款</view>
+					<view class="tiaokuan" @click="useCl(item.useComment)">使用条款</view>
 				</view>
 				<view class="itemBottom" :class="{active:item.open}">
 					<view class="shopName">{{item.ShopName}}</view>
-					
-					<view style="font-size: 24rpx; color: #FF3B30;">￥<span class="money">{{item.Money}}</span> <span style="color: #999999;font-size: 24rpx;">(充{{item.ChargeMoney}}送{{item.GiftMoney}})</span></view>
+
+					<view style="font-size: 24rpx; color: #FF3B30;">￥<span class="money">{{item.Money}}</span> <span
+							style="color: #999999;font-size: 24rpx;">(充{{item.ChargeMoney}}送{{item.GiftMoney}})</span>
+					</view>
 					<image @click="changeState(item)" v-if="item.open==false" src="../../static/img/icon_arrow_down.png"
 						mode="" style="width: 34rpx;height: 22rpx;"></image>
 					<image @click="changeState(item)" v-if="item.open==true" src="../../static/img/icon_arrow_up.png"
@@ -101,48 +145,118 @@
 				</view>
 
 				<view class="itemBg" v-if="item.open" v-for="(v,index2) in item.payList" :key="index2">
-					
+
 					<view class="timeBottom">
-						<view class="time" v-if="v.PayTime">{{v.PayTime}}</view>
-						<view class="time" v-else></view>
-						
-						<view v-if="index2<v.payList.length-1">-{{v.PayMoney}}</view>
-						<view class="count" v-else>+{{v.PayMoney}}</view>
-					</view>
-				</view>
+						<view class="time" v-if="v.CreateTime">{{v.CreateTime}}</view>
 
 
+						<view v-if="v.Type==2">-{{v.Money}}</view>
+						<view class="count" v-else>+{{v.Money}}</view>
+					</view>
+				</view>
+
+				</view>
+				
+				<!-- 展示所有 -->
+				<view v-if="!disCz">
+				<view class="itemTop">
+					<view class="itemName">{{item.PacKName}}</view>
+					<view class="tiaokuan" @click="useCl(item.useComment)">使用条款</view>
+				</view>
+				<view class="itemBottom" :class="{active:item.open}">
+					<view class="shopName">{{item.ShopName}}</view>
+				
+					<view style="font-size: 24rpx; color: #FF3B30;">￥<span class="money">{{item.Money}}</span> <span
+							style="color: #999999;font-size: 24rpx;">(充{{item.ChargeMoney}}送{{item.GiftMoney}})</span>
+					</view>
+					<image @click="changeState(item)" v-if="item.open==false" src="../../static/img/icon_arrow_down.png"
+						mode="" style="width: 34rpx;height: 22rpx;"></image>
+					<image @click="changeState(item)" v-if="item.open==true" src="../../static/img/icon_arrow_up.png"
+						mode="" style="width: 34rpx;height: 22rpx;"></image>
+				</view>
+				
+				<view class="itemBg" v-if="item.open" v-for="(v,index2) in item.payList" :key="index2">
+				
+					<view class="timeBottom">
+						<view class="time" v-if="v.CreateTime">{{v.CreateTime}}</view>
+				
+				
+						<view v-if="v.Type==2">-{{v.Money}}</view>
+						<view class="count" v-else>+{{v.Money}}</view>
+					</view>
+				</view>
+				
+				</view>
+				
+				<!-- 使用条款-->
+
+				<view class="shiyongBox" v-if="shiyongShow" @click="shiyongShow=false">
+					<view class="shiyongCont" @click.stop="">
+						<view class="shiyongContTop">
+							<view class="shiyongContTopTitle">使用条款</view>
+							<image src="../../static/img/icon_close.png" alt="" class="shiyongContTopX"
+								@click="shiyongShow=false"></image>
+						</view>
+						<view class="shiyonghtml">
+							<view v-html="useComment" v-if="useComment"></view>
+							<view v-else class="shiyongno">使用条款暂无内容</view>
+						</view>
+					</view>
+				</view>
 
 
 			</view>
-			
-			<!-- 无数据空白页 -->
+
+			<!-- 无数据空白页 -->
 			<nodata v-if="vipData.carMoneyList.length==0"></nodata>
 		</view>
 
 	</view>
 </template>
 
-<script>
-	import nodata from '../../components/nodata/nodata.vue'
-	export default {
-		components: {
-			nodata,
+<script>
+	import nodata from '../../components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata,
 		},
-	
+
 		data() {
 			return {
 				tabIndex: '1',
-				jiciState: false,
-				chuzhiState: false,
+
 				vipData: {},
+				userInfo: '',
+				shiyongShow: false,
+				useComment: '',
+				dis: true,
+				disCz: true,
 			}
 		},
 		onLoad() {
+			this.userInfo = uni.getStorageSync("userInfo")
 			this.myOrderCoupon();
 		},
 
-		methods: {
+		methods: {
+			AmountQtyJs (item) {
+			  var state = false
+			  if (this.dis) {
+			    item.forEach(v => {
+			      if (v.AmountQty != 0) {
+			        state = true
+			      }
+			    })
+			  } else {
+			    state = true
+			  }
+			
+			  return state
+			},
+			useCl(useComment) {
+				this.useComment = useComment;
+				this.shiyongShow = true;
+			},
 			myOrderCoupon() {
 				uni.showLoading({
 					title: '加载中'
@@ -177,19 +291,12 @@
 			},
 			tabClick(tag) {
 				this.tabIndex = tag
-				this.myOrderCoupon();
+				
 			},
 			changeState(item) {
 				item.open = !item.open
 			},
-			btnClick() {
-				this.jiciState = !this.jiciState
-				this.myOrderCoupon();
-			},
-			btnClick2() {
-				this.chuzhiState = !this.chuzhiState
-				this.myOrderCoupon();
-			},
+
 
 			gonavigateTo(url) {
 
@@ -407,15 +514,65 @@
 		justify-content: space-between;
 		color: #999999;
 		font-size: 24rpx;
-	}
-	.money{
-		
-		font-size: 36rpx;
-		font-weight: bold;
-		color: #FF3B30;
-		line-height: 50rpx;
-	}
-	.count{
-		color: #F03B3B;
+	}
+
+	.money {
+
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #FF3B30;
+		line-height: 50rpx;
+	}
+
+	.count {
+		color: #F03B3B;
+	}
+
+	.shiyongBox {
+		width: 100%;
+		height: 100vh;
+		background: rgba(0, 0, 0, 0.5);
+		position: fixed;
+		left: 0;
+		top: 0;
+		z-index: 9999;
+	}
+
+	.shiyongCont {
+		width: 100%;
+		height: 70vh;
+		background: #ffffff;
+		left: 0;
+		bottom: 0;
+		position: absolute;
+		border-radius: 24rpx 24rpx 0rpx 0rpx;
+	}
+
+	.shiyongContTopX {
+		width: 25rpx;
+		height: 25rpx;
+	}
+
+	.shiyongContTop {
+		display: flex;
+		justify-content: space-between;
+		padding: 24rpx;
+		color: #3C3C3C;
+		font-size: 30rpx;
+		border-bottom: 1rpx solid #EEEEEE;
+	}
+
+	.shiyongContTopTitle {
+		font-size: 30rpx;
+	}
+
+	.shiyonghtml {
+		padding: 24rpx;
+		height: calc(70vh - 100px);
+		overflow-y: scroll;
+	}
+
+	.shiyongno {
+		color: #666666;
 	}
 </style>

pages/user/user.vue

@@ -21,7 +21,7 @@
 		</view>
 
 		<view class="headerBox">
-			<view class="quan">
+			<view class="quan" @click="gonavigateTo('../index/discountCard')">
 				<view class="numStr">{{numList.count?numList.count:0}}</view>
 				<view class="nameStr">优惠券</view>
 			</view>
@@ -29,7 +29,7 @@
 				<view class="numStr">{{numList.totalIntegral?numList.totalIntegral:0}}</view>
 				<view class="nameStr">积分</view>
 			</view>
-			<view class="quan">
+			<view class="quan" @click="gonavigateTo('../index/vipCard')">
 				<view class="numStr">{{numList.cardNum?numList.cardNum:0}}</view>
 				<view class="nameStr">会员卡</view>
 			</view>
@@ -111,7 +111,7 @@
 			</view>
 
 
-			<view class="rowBox" @click="gonavigateTo('../index/vipCard')">
+			<view class="rowBox" @click="gonavigateTo('')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me2.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">我的车库</view>
@@ -161,7 +161,7 @@
 				<image src="../../static/img/rightArrow.png" mode="" class="rightArrow"></image>
 			</view>
 
-			<view class="rowBox" @click="gonavigateTo('../index/discountCard')">
+			<view class="rowBox" @click="gonavigateTo('')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me8.png" mode="" class="liftIcon"></image>
 					<view class="rowTitle">清除缓存</view>