Merge branch 'chelantuDev' of http://47.98.226.240:3000/twt/txCar into chelantuDev

pages.json

@@ -302,7 +302,25 @@
 			}
 		}
 
-	],
+	    ,{
+            "path" : "pages/homePage/allDiscountCard",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "优惠券",
+                "enablePullDownRefresh": true
+            }
+            
+        }
+        ,{
+            "path" : "pages/homePage/allCardDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "优惠券详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
 	"tabBar": {
 		"color": "#8a8a8a",
 		"selectedColor": "#FF4F00",

pages/changeStore/changeStoreList.vue

@@ -129,9 +129,9 @@
 					}
 			
 					if (list.length < 10) {
-						this.noMoreShow = false
-					} else {
 						this.noMoreShow = true
+					} else {
+						this.noMoreShow = false
 					}
 			
 				})

pages/homePage/allCardDetail.vue

@@ -0,0 +1,196 @@
+<template>
+	<view class="content">
+		<view style="background: #BE573F; height: 56rpx; width: 100%;"></view>
+
+		<view class="whiteBg">
+
+			<!-- firstView -->
+			<view class="firstView">
+				<view class="money">{{detailData.ActName}}</view>
+				<view class="condition" v-if="detailData.WhereMoney != 0">满{{detailData.WhereMoney}}元可用</view>
+				<view class="condition" v-else>满任意金额可用</view>
+			</view>
+			<view class="point leftP"></view>
+			<view class="point rightP"></view>
+
+			<!-- secondView -->
+			<view class="secondView">
+				
+				<view  v-if="detailData.EndOffsetDays===null||detailData.EndOffsetDays==='null'||detailData.EndOffsetDays===''">
+					
+					<view class="same" >有效期：{{detailData.StartTime.slice(0,detailData.StartTime.length-8)}}至 {{detailData.EndTime.slice(0,detailData.EndTime.length-8)}}</view>
+				</view>
+				<view v-else>
+				
+					<view class="same" v-if="detailData.EndOffsetDays>-1">有效期：自领取后，{{detailData.EndOffsetDays}}天有效</view>
+				     <view class="same" v-if="detailData.EndOffsetDays==-1||detailData.EndOffsetDays==null||detailData.EndOffsetDays=='null'">有效期：{{detailData.StartTime.slice(0,detailData.StartTime.length-8)}}至 {{detailData.EndTime.slice(0,detailData.EndTime.length-8)}}</view>
+				</view>
+				
+				
+				<!-- <view class="same">可用次数：{{detailData.avaQty}}</view> -->
+			</view>
+
+			<!-- thirdView -->
+			<view class="thirdView">
+				<view class="thirdTitle">适用门店</view>
+				<view class="store">
+					<!-- <view class="grayPoint"></view> -->
+					<view class="same" v-if="detailData.shopNames">{{detailData.shopNames}}</view>
+					<view class="same" v-else>全部</view>
+				</view>
+			</view>
+			
+			<!-- 列表 -->
+			<view class="itemContent">
+				<view class="thirdTitle">使用说明</view>
+				<rich-text :nodes="couContent" style="color: #666666; font-size: 26rpx;"></rich-text>
+				<!-- <view v-for="(item,index) in itemData" :key="index">
+					<view class="store">
+						<view class="grayPoint"></view>
+						<view class="same">{{item}}</view>
+					</view>
+				</view> -->
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				detailData:{},
+				couponId:'',
+				couContent:'',
+			}
+		},
+		onLoad(opt) {
+			this.couponId = opt.couponId,
+			
+			this.getDetailData()
+		},
+		methods: {
+			getDetailData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'worldKeepCar/keepCarMy/queryTCouponPickDetail',
+					params = {
+						ID: this.couponId,
+						
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading();
+					var data = res.data
+					
+					if(res.data.CouContent){
+						 this.couContent=res.data.CouContent.replace(/\<p/gi, '<p style="display: inline-block"');
+					}
+					// 处理 undefined和null转为空白字符串
+					
+						for (const key in data) {
+							data[key] = this.$praseStrEmpty(data[key])
+						}
+					
+					this.detailData = data
+			
+					
+					
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #BE573F;
+		min-height: 100vh;
+	}
+
+	.whiteBg {
+		margin: 0rpx 24rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+		min-height: 60vh;
+	}
+
+	.firstView {
+		border-bottom: 1rpx #EEEEEE dashed;
+		text-align: center;
+		padding: 50rpx 20rpx;
+		padding-bottom: 30rpx;
+	}
+
+	.money {
+		font-size: 44rpx;
+		color: #333333;
+		font-weight: bold;
+		margin-bottom: 10rpx;
+	}
+
+	.condition {
+		font-size: 28rpx;
+		color: #999999;
+	}
+
+	.point {
+		width: 30rpx;
+		height: 30rpx;
+		background-color: #BE573F;
+		border-radius: 15rpx;
+	}
+
+	.leftP {
+		float: left;
+		margin-left: -15rpx;
+		margin-top: -15rpx;
+	}
+
+	.rightP {
+		float: right;
+		margin-right: -15rpx;
+		margin-top: -15rpx;
+	}
+
+	.secondView {
+		padding: 30rpx 40rpx;
+		
+	}
+
+
+
+	.same {
+		font-size: 28rpx;
+		color: #666666;
+	}
+
+	.thirdView {
+		padding: 30rpx 40rpx;
+		border: 1rpx #EEEEEE solid;
+	}
+
+	.thirdTitle {
+		font-size: 32rpx;
+		color: #333333;
+		margin-bottom: 20rpx;
+	}
+
+	.store {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+	}
+
+	.grayPoint {
+		width: 12rpx;
+		height: 12rpx;
+		border-radius: 6rpx;
+		background-color: #DDDDDD;
+		margin-right: 15rpx;
+	}
+	.itemContent{
+		padding: 30rpx 40rpx;
+	}
+</style>

pages/homePage/allDiscountCard.vue

@@ -0,0 +1,320 @@
+<template>
+	<view class="content">
+
+		<!-- 列表 -->
+		<view class="itemContent">
+			<view v-for="(item,index) in itemData" :key="index">
+				<view class="item">
+					<image src="../../static/img/table_lingqu.png" mode="" class="stateImg" v-if="item.pickNum>0">
+
+						<!-- 第一块 -->
+						<view class="topView">
+							<view class="leftView">
+								<view class="moneyView">
+									<view>￥</view>
+									<view class="money">{{item.ActMoney}}</view>
+								</view>
+								<view class="condition" v-if="item.WhereMoney != 0">满{{item.WhereMoney}}元可用</view>
+								<view class="condition" v-else>满任意金额可用</view>
+							</view>
+
+							<view class="rightView">
+								<view class="cardName">{{item.ActName}}</view>
+								<!-- 时间截取 -->
+								<view class="valid" v-if="item.EndOffsetDays == -1">
+									{{item.StartTime.slice(0,item.StartTime.length-8)}}至
+									{{item.EndTime.slice(0,item.EndTime.length-8)}}</view>
+								<view class="valid" v-else>领取后 {{item.EndOffsetDays}} 天有效</view>
+							</view>
+							<view class="rightBtn" v-if="item.pickNum<=0" @click="lingqu(item, index)">立即领取</view>
+
+						</view>
+
+						<!-- 第二快 -->
+						<view class="bottomView">
+							<view class="shopName" v-if="item.shopNames">适用门店：{{item.shopNames}}</view>
+							<view class="shopName" v-else>适用门店：全部</view>
+							<view @click="goDiscountDetail(item)">查看详情</view>
+						</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="bottomViewBtn" v-if="itemData.length!=0">
+			<view class="saveCar" @click="alllingqu">一键领取</view>
+		</view>
+
+		<!-- 上拉 加载更多 -->
+		<view class="noMore" v-if="noMoreShow">没有更多数据</view>
+		<!-- 无数据空白页 -->
+		<nodata v-if="itemData.length==0"></nodata>
+
+	</view>
+</template>
+
+<script>
+	import nodata from '../../components/nodata/nodata.vue'
+	export default {
+		components: {
+			nodata,
+		},
+		data() {
+			return {
+				itemData: [],
+				page: 1,
+				noMoreShow: false,
+
+			}
+		},
+		onLoad(opt) {
+			this.page = 1
+			this.myOrderCoupon()
+
+		},
+		methods: {
+			lingqu() {
+
+				uni.showLoading({
+					title: '领取中'
+				})
+				this.$http('worldKeepCar/keepCarMy/listTCouponPage', {
+
+					page: this.page,
+					limit: 10,
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					
+					
+				})
+
+			},
+			lingqu(item, index) {
+				uni.showLoading({
+					title: '领取中'
+				})
+				this.$http('worldKeepCar/keepCarMy/pickTCoupon', {
+					couponID: item.ID,
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					if (res.code==0) {
+						var itemData = this.itemData[index]
+						itemData.pickNum = 1
+						console.log('itemData.pickNum',itemData.pickNum);
+						uni.showToast({
+							title: '领取成功',
+							icon: 'success',
+							duration: 2000
+						});
+					}
+				})
+			},
+			alllingqu() {
+				uni.showLoading({
+					title: '领取中'
+				})
+				this.$http('worldKeepCar/keepCarMy/pickTCouponAll', {
+					
+				}, 'POST').then(res => {
+					uni.hideLoading();
+					if (res.code==0) {
+						this.myOrderCoupon()
+						uni.showToast({
+							title: '领取成功',
+							icon: 'success',
+							duration: 2000
+						});
+					}
+				})
+			},
+			myOrderCoupon() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$http('worldKeepCar/keepCarMy/listTCouponPage', {
+
+					page: this.page,
+					limit: 10,
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					var list = res.data.Items
+
+					// 处理 undefined和null转为空白字符串
+					list.forEach((item, index) => {
+						for (const key in item) {
+							item[key] = this.$praseStrEmpty(item[key])
+						}
+					})
+
+					if (this.page == 1) {
+						this.itemData = list
+					} else {
+						this.itemData = this.itemData.concat(list)
+					}
+
+					if (list.length < 10) {
+						this.noMoreShow = true
+					} else {
+						this.noMoreShow = false
+					}
+					
+				})
+			},
+			goDiscountDetail(item) {
+
+				uni.navigateTo({
+
+					url: 'allCardDetail?couponId=' + item.ID,
+				})
+			},
+
+
+		},
+
+		// 下拉刷新 上拉加载更多
+		onPullDownRefresh() {
+			this.page = 1
+			this.myOrderCoupon()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		onReachBottom() {
+			this.page++;
+			this.myOrderCoupon()
+		},
+
+	}
+</script>
+
+<style scoped>
+	.content {
+		background: #F4F5F7;
+		min-height: 100vh;
+		margin-bottom: 120rpx;
+	}
+
+
+
+	.itemContent {
+		padding: 20rpx 24rpx;
+	}
+
+	.item {
+		margin: 20rpx 0rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+
+	}
+
+	.stateImg {
+		width: 118rpx;
+		height: 86rpx;
+		position: absolute;
+		right: 20rpx;
+		margin-right: 20rpx;
+	}
+
+	.topView {
+		display: flex;
+		justify-content: flex-start;
+		padding: 22rpx 0rpx;
+		margin-left: 22rpx;
+		margin-right: 22rpx;
+		border-bottom: 1rpx #CCCCCC dashed;
+		align-items: center;
+	}
+
+	.leftView,
+	.rightView {
+		margin-right: 40rpx;
+
+	}
+	.rightView{
+		flex-grow: 1;
+	}
+	.moneyView {
+		display: flex;
+		justify-content: flex-start;
+		color: #FF4F00;
+		align-items: baseline;
+	}
+
+	.money {
+		font-size: 56rpx;
+	}
+
+	.condition {
+		font-size: 22rpx;
+		color: #999999;
+	}
+
+	.cardName {
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #333333;
+		margin-top: 10rpx;
+		margin-bottom: 15rpx;
+	}
+
+	.valid {
+		font-size: 26rpx;
+		color: #999999;
+	}
+
+	.rightBtn {
+		width: 153rpx;
+		height: 56rpx;
+		line-height: 56rpx;
+		background: linear-gradient(137deg, #FF630F 0%, #FF450F 100%);
+		border-radius: 32rpx;
+		color: #FFFFFF;
+		font-size: 26rpx;
+		text-align: center;
+
+	}
+
+	.bottomView {
+		display: flex;
+		justify-content: space-between;
+		padding: 20rpx 24rpx;
+		font-size: 24rpx;
+		color: #666666;
+	}
+
+	.shopName {
+
+		width: 80%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.bottomViewBtn {
+		background-color: #FFFFFF;
+		width: 100%;
+		height: 120rpx;
+		position: fixed;
+		bottom: 0rpx;
+	}
+
+	.saveCar {
+
+		background: linear-gradient(135deg, #FD5300 0%, #FF270A 100%);
+		margin: 23rpx 30rpx;
+		height: 74rpx;
+		line-height: 74rpx;
+		border-radius: 37rpx;
+		color: #FFFFFF;
+		font-size: 30rpx;
+		font-weight: bold;
+		text-align: center;
+
+	}
+
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
+	}
+</style>

pages/homePage/homePage.vue

@@ -430,6 +430,9 @@
 			},
 			goquan(){
 				
+				uni.navigateTo({
+					url: 'allDiscountCard'
+				})
 			},
 			previewImage(img, arrDic) {
 				var arr = [];

pages/login/login.vue

@@ -107,7 +107,7 @@ export default {
 			 		     duration: 3000
 			 		 });
 			 		 uni.switchTab({
-			 			 url:'../index/index'
+			 			 url:'../homePage/homePage'
 			 		 }) 
 			 	}else{
 			 		uni.showToast({
@@ -144,7 +144,7 @@ export default {
 	.container{
 	        width: 100%;
 	        min-height: 100%;
-			background: url('http://phone.66km.cn:8088/keepCar/keepCarHome.png') ; 
+			background: url('http://123.56.219.146:10086/keepCar/keepCarHome.png') ; 
 			background-size: 100%;
 	}
 	.loginLogo{

pages/me/discountCard.vue

@@ -40,7 +40,8 @@
 
 					<!-- 第二快 -->
 					<view class="bottomView">
-						<view class="shopNamesView">适用门店：{{item.shopNames}}</view>
+						<view class="shopNamesView" v-if="item.shopNames">适用门店：{{item.shopNames}}</view>
+						<view class="shopNamesView" v-else>适用门店：全部</view>
 						<view @click="goDiscountDetail(item)">查看详情</view>
 					</view>
 				</view>
@@ -132,10 +133,10 @@
 						this.itemData = this.itemData.concat(list)
 					}
 
-					if (list.length < 10) {
-						this.noMoreShow = false
-					} else {
-						this.noMoreShow = true
+					if (list.length < 10) {
+						this.noMoreShow = true
+					} else {
+						this.noMoreShow = false
 					}
 
 

pages/me/discountDetail.vue

@@ -35,7 +35,8 @@
 				<view class="thirdTitle">适用门店</view>
 				<view class="store">
 					<!-- <view class="grayPoint"></view> -->
-					<view class="same">{{detailData.shopNames}}</view>
+					<view class="same" v-if="detailData.shopNames">{{detailData.shopNames}}</view>
+					<view class="same" v-else>全部</view>
 				</view>
 			</view>
 			

pages/me/myAppraise.vue

@@ -177,9 +177,9 @@
 					}
 
 					if (list.length < 10) {
-						this.noMoreShow = false
-					} else {
 						this.noMoreShow = true
+					} else {
+						this.noMoreShow = false
 					}
 
 

pages/module/usableDiscountCard.vue

@@ -30,7 +30,8 @@
 
 					<!-- 第二快 -->
 					<view class="bottomView">
-						<view class="shopName">适用门店：{{item.ShopName}}</view>
+						<view class="shopName" v-if="item.ShopName">适用门店：{{item.ShopName}}</view>
+						<view class="shopName" v-else>适用门店：全部</view>
 						<view @click="goDiscountDetail(item)">查看详情</view>
 					</view>
 				</view>
@@ -108,10 +109,10 @@
 						this.itemData = this.itemData.concat(list)
 					}
 					
-					if (list.length < 10) {
-						this.noMoreShow = false
-					} else {
-						this.noMoreShow = true
+					if (list.length < 10) {
+						this.noMoreShow = true
+					} else {
+						this.noMoreShow = false
 					}
 				})
 			},

pages/refundMoney/refundMoneyList.vue

@@ -129,9 +129,9 @@
 					}
 			
 					if (list.length < 10) {
-						this.noMoreShow = false
-					} else {
 						this.noMoreShow = true
+					} else {
+						this.noMoreShow = false
 					}
 			
 				})

pages/shop/shopAppraise.vue

@@ -135,9 +135,9 @@
 					}
 
 					if (list.length < 10) {
-						this.noMoreShow = false
-					} else {
 						this.noMoreShow = true
+					} else {
+						this.noMoreShow = false
 					}