优惠券

pages/index/discountCard.vue

@@ -15,7 +15,7 @@
 			</view>
 			
 			<view style="height: 92rpx;"></view>
-			<view class="itemBg" v-for="(item,index) in currentList">
+			<view class="itemBg" v-for="(item,index) in currentList" @click="goDetail(item.id)">
 				<view class="itemTop">
 					<view class="leftB">
 						<view class="use" v-if="item.state==0">￥<span class="use2">{{item.actMoney}}</span></view>
@@ -23,7 +23,11 @@
 						<view class="tiaojian">{{item.whereMoney!==0?'满'+item.whereMoney+'元可用':'满任意金额可用'}}</view>
 					</view>
 					<view class="centerB">
-						<view class="name">{{item.actName}}</view>
+						<view class="name" >
+						 <span class="djq">代金券</span>
+						 <span>{{item.actName}}</span>
+						</view>
+						<view class="plateNumer">限鲁A9JK32使用</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>
@@ -31,22 +35,26 @@
 						<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="">
+						<!-- <view class="shareB"  v-if="item.shareQty>0&&tabIndex==2" @click.stop="">
 						  <image  src="../../static/img/icon_share.png" alt="" class="couponlineshareImg"></image>
 						  <view class="keshare">赠送给好友</view>
-						</view>
+						</view> -->
+					</view>
+				</view>
+				<view class="itemBottom" @click.stop="">
+					<view  class="rightJian">使用规则
+					  <image src="../../static/img/little_rightArrow.png" mode="" style="width: 24rpx;height: 24rpx;"></image>
 					</view>
+					<view class="gouse" v-if="item.usedState==0">去使用</view>
 				</view>
 
-				<view class="itemBottom">
-					<!-- <view v-if="tabIndex==1">可用次数:{{item.avaQty}}</view>  v-else -->
-					<!-- <view >可分享次数:{{item.shareQty}}</view> -->
+				<!-- <view class="itemBottom">
 					<view></view>
 					<view @click="goDetail(item.id)" class="rightJian">查看详情 
 					<image src="../../static/img/little_rightArrow.png" mode="" style="width: 24rpx;height: 24rpx;"></image>
 					</view>
 					
-				</view>
+				</view> -->
 			</view>
 
 			<!-- 无数据空白页 -->
@@ -148,7 +156,37 @@
 		min-height: 100vh;
 		background: #F4F5F7;
 	}
-
+.djq{
+	background: linear-gradient(128deg, #FFE4C5 0%, #FDC692 100%);
+	border-radius: 4rpx;
+	height: 34rpx;
+	width: 76rpx;
+	line-height: 34rpx;
+	text-align: center;
+	color: #2B2219;
+	font-size: 20rpx;
+	margin-top: 4rpx;
+	margin-right: 10rpx;
+}
+.plateNumer{
+	color: #FF0000;
+	line-height: 30rpx;
+	font-size: 22rpx;
+	padding: 3rpx 0rpx;
+	width: 193rpx;
+	text-align: center;
+	background: rgba(255,0,0,0.06);
+	border-radius: 4rpx;
+	margin-top: 10rpx;
+}
+.gouse{
+	width: 99rpx;
+	height: 44rpx;
+	border-radius: 22rpx;
+	border: 1rpx solid #FF0000;
+	text-align: center;
+	line-height: 42rpx;
+}
 	.tab {
 		background: #FFFFFF;
 		display: flex;
@@ -280,7 +318,7 @@
 	.name{
 		
 		font-size: 30rpx;
-		
+		display: flex;
 		font-weight: 500;
 		color: #333333;
 		line-height: 42rpx;
@@ -294,8 +332,6 @@
 	.itemBottom {
 		display: flex;
 		justify-content: space-between;
-		padding-top: 20rpx;
-		border-top: 1rpx solid #EEEEEE;
 		font-size: 24rpx;
 		color: #999999;
 		line-height: 33rpx;

pages/index/discountCardDetail.vue

@@ -54,7 +54,44 @@
 
 
 			</view>
-
+			<view class="comtentBox" v-if="detail.usedState==1">
+				<view class="titleBox">
+					<image src="../../static/img/icon_youhui_red.png" mode="" class="redPoint"></image>
+					<view class="title">使用记录</view>
+				</view>
+				<view class="couponCodeBox">
+					<view class="couponCodeYd"></view>
+					<view class="ouponCode">{{detail.couponCode}}</view>
+					<view class="couponCodeUse">已使用</view>
+				</view>
+				<view class="couponCodeLine">
+					<view class="couponCodeLeft">核销时间：</view>
+					<view class="couponCodeLineRight">{{detail.usedTime}}</view>
+				</view>
+				<view class="couponCodeLine">
+					<view class="couponCodeLeft">核销门店：</view>
+					<view class="couponCodeLineRight">{{detail.usedShopName}}</view>
+				</view>
+				
+			</view>
+			
+			<view style="height: 120rpx;"></view>
+			<view class="useBox" v-if="detail.usedState==0">
+				<view class="useBtn">去使用</view>
+			</view>
+				
+	
+<!-- 手机号授权 -->
+	<view class="authorizBox" v-if="authorizShow" @click="authorizShow=false">
+		<view class="authorizCont" @click.stop="">
+			<view class="authorizName">{{wxOpenData.miniAppName}}</view>
+			<view class="authorizMs">您好，欢迎访问本店，授权手机号登录能获取我们最新的促销活动哦~</view>
+			<button class="authorizContbutton" type="default" open-type="getPhoneNumber" @getphonenumber="decryptPhoneNumber">授权</button>
+		</view>
+		<view style="text-align: center;padding-top: 56rpx;">
+			<image src="../../../static/timg/icon_guanbi@2x.png" mode="" class="authorizCloseImg"></image>
+		</view>
+	</view>
 		
 	</view>
 </template>
@@ -67,13 +104,38 @@
 				detail: {},
 				themeColor:'',
 				type:'',
+				userInfo:'',
+				ext:'',
+				wxOpenData:'',
+				authorizShow:false,
 			}
 		},
 		onLoad(opt) {
 			this.themeColor = uni.getStorageSync("themeColor");
 			this.id = opt.id;
-			this.type=opt.type
-			this.getData();
+			this.type=opt.type;
+			this.userInfo=this.$store.state.userInfo;
+			this.ext=this.$common.getExtStoreId();
+			if(this.userInfo){
+				if (this.id) {
+					this.getData();
+
+				}
+			}else{
+				this.$common.automaticlogin().then(val => {
+					this.userInfo=this.$store.state.userInfo;
+					this.wxOpenData=this.$store.state.wxOpenData;
+					this.themeColor = uni.getStorageSync("themeColor");
+					if (this.id) {
+						this.getData();
+						
+					}
+					if(!this.userInfo){
+						this.authorizShow=true
+					}
+				})
+			}
+			//this.getData();
 		},
 		methods: {
 			getData() {
@@ -104,6 +166,63 @@
 </script>
 
 <style scoped>
+.couponCodeBox{
+	display: flex;
+	padding-top: 15rpx;
+}
+.useBox{
+	height: 120rpx;
+	width: 750rpx;
+	position: fixed;
+	left: 0;
+	bottom: 0;
+	background: #FFFFFF;
+	box-shadow: 0rpx -2rpx 10rpx 0rpx rgba(153,153,153,0.2);
+}
+.useBtn{
+	width: 690rpx;
+	height: 74rpx;
+	background: #D53533;
+	border-radius: 37rpx;
+	font-weight: 500;
+	color: #FFFFFF;
+	font-size: 30rpx;
+	text-align: center;
+	line-height: 74rpx;
+	margin-top: 23rpx;
+	margin-left: 30rpx;
+}
+.couponCodeYd{
+	width: 10rpx;
+	height: 10rpx;
+	background: #FF0000;
+	border-radius: 50%;
+	margin-top: 10rpx;
+	margin-right: 12rpx;
+	
+}
+.ouponCode{
+	color: #666666;
+	line-height: 33rpx;
+	font-size: 24rpx;
+	text-decoration: line-through;
+}
+.couponCodeUse{
+	width: 86rpx;
+	height: 32rpx;
+	border-radius: 4rpx;
+	border: 1rpx solid #DDDDDD;
+	color: #999999;
+	line-height: 32rpx;
+	text-align: center;
+	font-size: 22rpx;
+	margin-left: 12rpx;
+}
+.couponCodeLine{
+	padding-left: 20rpx;display: flex;
+	color: #999999;font-size: 24rpx;
+	line-height: 33rpx;padding-top: 8rpx;
+}
 	.boxtop{
 		background: #FF0000;
 	}
@@ -211,4 +330,91 @@
 		margin-top: 16rpx;
 		margin-left: 28rpx;
 	}
+	.authorizBox{
+			width: 100vw;
+			height: 100vh;
+			background: rgba(0, 0, 0, 0.5);
+			position: fixed;
+			top: 0;
+			left: 0;
+		}
+		.authorizCont{
+			margin-top: 30vh;
+			width: 564rpx;
+			height: 408rpx;
+			background: #FFFFFF;
+			border-radius: 24rpx;
+			margin-left: 93rpx;
+			position: relative;
+		}
+		.authorizCloseImg{
+			width: 62rpx;
+			height: 62rpx;
+		}
+		.sqLogoBox{
+			width: 180rpx;
+			height: 180rpx;
+			background: #FFFFFF;
+			border-radius: 90rpx;
+			text-align: center;
+			position: absolute;
+			top: -50rpx;
+			left: 192rpx;
+		}
+		.authorizName{
+			color: #333333;
+			line-height: 42rpx;
+			font-size: 30rpx;
+			text-align: center;
+			padding-top: 58rpx;
+		}
+		.authorizMs{
+			color: #999999;
+			line-height: 36rpx;
+			font-size: 26rpx;
+			width: 452rpx;
+			padding-top: 24rpx;
+			text-align: center;
+			margin-left: 56rpx;
+		}
+		.authorizContbutton{
+			width: 422rpx;
+			height: 88rpx;
+			background: #D53533;
+			border-radius: 44rpx;
+			line-height: 88rpx;
+			text-align: center;
+			font-size:30rpx;
+			color: #FFFFFF;
+			margin-top: 62rpx;
+			margin-left:71rpx;
+		}
+		.shopBoxpt{
+			margin-top: 20rpx;
+		}
+		button::after{
+		 	border: none;
+		}
+		button{
+			position: relative;
+			display: block;
+			margin-left: 0;
+			margin-right: 0;
+			padding-left: 0px;
+			padding-right: 0px;
+			box-sizing: border-box;
+			// font-size: 18px;
+			text-align: center;
+			text-decoration: none;
+			// line-height: 1;
+			line-height: 1.35;
+			// border-radius: 5px;
+			-webkit-tap-highlight-color: transparent;
+			overflow: hidden;
+			color: #000000;
+			background-color: #fff;
+			
+			height: 100%;
+			}
+			
 </style>

pages/subPack/depositDetail.vue

@@ -0,0 +1,249 @@
+<template>
+	<view class="box">
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'寄存详情'" :cj="4"></homenav>
+	    <view class="top" :style="{background:'#'+themeColor}">
+			<view class="orderState">
+				<image src="../../static/img/icon_order_def.png" mode="" style="width: 44rpx;height: 44rpx;"></image>
+				<view class="SheetState" v-if="data.sheetState==-1">待寄存</view>
+				<view class="SheetState" v-if="data.sheetState==0">寄存中</view>
+				<view class="SheetState" v-if="data.sheetState==1">已领取</view>
+				<view class="SheetState" v-if="data.sheetState==2">已作废</view>
+			</view>
+		</view>
+		<!-- 店铺信息 -->
+		<view class="shopBox" ><!-- :class="{shopBoxpt:orderData.data.sheetState == 5}" -->
+			<image src="../../static/timg/icon_che.png" mode="" class="shopBoximg"></image>
+			<view class="shopCont">
+				<view class="shopName">
+				 <span style="font-weight: 500;padding-left: 20rpx;">{{data.plateNumber}}</span>
+				 <span style="color: #3C3C3C;font-size: 24rpx;padding-left: 20rpx;">{{data.customerName}}</span>
+				</view>
+				<view class="Address">
+					{{data.carModel}}
+				</view>
+		
+			</view>
+		</view>
+		<!-- 基本信息 -->
+		<view class="information">
+			<view class="detailedTitle">基本信息</view>
+			<view class="informationLine">
+				<view class="informationTxt">寄存时间：</view>
+				<view class="informationNum">{{data.billDate}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">寄存类型：</view>
+				<view class="informationNum" >轮胎</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">数量：</view>
+				<view class="informationNum">{{data.goodsQty}}</view>
+			</view>
+		</view>
+		
+		<view class="information" v-for="(item,index) in data.detailList">
+			<view class="detailedTitle">
+				<span v-if="item.locationType==1">左前</span>
+				<span v-if="item.locationType==2">右前</span>
+				<span v-if="item.locationType==3">左后</span>
+				<span v-if="item.locationType==4">右后</span>
+				<span v-if="item.locationType==5">备胎</span>
+				<span >轮胎</span>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">品牌：</view>
+				<view class="informationNum">{{item.brand}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">尺寸：</view>
+				<view class="informationNum" >{{item.size}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">生产时间：</view>
+				<view class="informationNum">{{item.createTime}}</view>
+			</view>
+			<view class="informationLine">
+				<view class="informationTxt">外伤检测：</view>
+				<view class="informationNum">{{item.tireState}}</view>
+			</view>
+		</view>
+		
+		<view style="height: 50rpx;background-color: #F4F5F7;"></view>
+		
+		<view class="bottom">
+		 	<view class="defer" :style="{border:'1rpx solid #'+themeColor,color:'#'+themeColor}" @click="seeBy" >查看保养单</view>
+
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import nodata from '@/components/nodata/nodata.vue'
+	import homenav from "@/components/homenav/nav.vue"
+	export default {
+		components: {
+			nodata,homenav
+		},
+		data() {
+			return {
+		        data:'',
+				isload: false,
+                iStatusBarHeight:'',
+				themeColor:'',
+				id:'',
+				
+			}
+		},
+		onLoad(opt) {
+            this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+			this.themeColor = uni.getStorageSync("themeColor");
+			this.id=opt.id
+			this.getData()
+		},
+		onShow() {
+			
+		},
+		methods: {
+			
+			goDetail(item) {
+				//SheetType 1 商品2项目3套餐4救援5钣喷6集客
+					uni.navigateTo({
+						url: "rescueOrderOrderDetail?id=" + item.ID
+					})
+				
+			},
+			getData() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.isload = false;
+				var padata = {
+					id:this.id
+				}
+
+				this.$http('applet/tire-deposit-sheet/detail/'+this.id, {}, 'GET').then(res => {
+					uni.hideLoading();
+					this.isload = true;
+                    this.data = res.data
+
+				})
+			},
+
+		},
+		onReachBottom() {
+			this.page++;
+
+			this.getData()
+		},
+		onPullDownRefresh() {
+			this.page = 1;
+			this.getData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		}
+	}
+</script>
+
+<style scoped>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+	}
+.top {
+		height: 190rpx;
+		background: #FF0000;
+
+	}
+	.orderState {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding-top: 40rpx;
+	}
+	.SheetState {
+		display: flex;
+		justify-content: center;
+		font-size: 36rpx;
+		font-weight: 500;
+		color: #FFFFFF;
+		margin-left: 15rpx;
+	}
+	.shopBoximg {
+		width: 40rpx;
+		height: 40rpx;
+	}
+	.shopBox {
+		display: flex;
+		padding: 30rpx 20rpx;
+		margin: 0rpx 24rpx;
+		margin-top: -60rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+	.shopName{
+		
+		color: #3C3C3C;
+		line-height: 42rpx;
+		font-size: 30rpx;
+	}
+	.Address{
+		color: #999999;font-size: 24rpx;padding-top: 10rpx;
+	}
+.information {
+		background: #FFFFFF;
+		border-radius: 10rpx;
+		margin: 20rpx 24rpx;
+		padding-bottom: 15rpx;
+	}
+	.informationLine {
+		display: flex;
+		padding: 15rpx 20rpx;
+	}
+	.informationTxt {
+		width: 190rpx;
+		font-size: 26rpx;
+		color: #999999;
+	}
+.informationNum {
+		color: #333333;
+		font-size: 26rpx;
+		width: 500rpx;
+	}
+.detailedTitle{
+	padding: 23rpx 20rpx;
+	display: flex;
+	text-align: center;
+	align-content: flex-start;
+	border-bottom: 1rpx solid #EEEEEE;
+	
+	font-size: 30rpx;
+	font-weight: bold;
+	color: #3C3C3C;
+}
+.bottom {
+		display: flex;
+		justify-content: flex-end;
+		padding: 20rpx;
+		background-color: #FFFFFF;
+		align-items: center;
+		height: 98rpx;
+		width: 100vw;
+		position: fixed;
+		bottom: 0rpx;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+	}
+	.defer {
+		color: #D53533;
+		font-size: 28rpx;
+		width: 180rpx;
+		height: 56rpx;
+		border-radius: 36rpx;
+		border: 1rpx solid #D53533;
+		text-align: center;
+		line-height: 56rpx;
+		margin-right: 40rpx;
+	}
+</style>

pages/subPack/depositList.vue

@@ -0,0 +1,131 @@
+<template>
+	<view class="box">
+		<homenav :iStatusBarHeight="iStatusBarHeight" :title="'我的订单'" :cj="4"></homenav>
+		<view class="cont">
+			<view class="line" @click="goDetail(item)" v-for="(item,index) in items">
+				<view class="lineLeft">
+					<view class="plateNumber">{{item.plateNumber}}</view>
+					<view class="tire" v-if="item.goodsQty">{{item.goodsQty}}条轮胎</view>
+				</view>
+				<view class="state1" v-if="item.sheetState==0">寄存中</view>
+				<view class="state2" v-if="item.sheetState==-1">待寄存</view>
+				<view class="state2" v-if="item.sheetState==1">已领取</view>
+				<view class="state2" v-if="item.sheetState==2">已作废</view>
+			</view>
+			
+		</view>
+
+		<nodata v-show="items==''&&isload"></nodata>
+		
+	</view>
+</template>
+
+<script>
+	import nodata from '@/components/nodata/nodata.vue'
+	import homenav from "@/components/homenav/nav.vue"
+	export default {
+		components: {
+			nodata,homenav
+		},
+		data() {
+			return {
+				page: 1,
+				tabIndex: -1,
+				items: [],
+				isload: false,
+                iStatusBarHeight:'',
+			}
+		},
+		onLoad(opt) {
+            this.iStatusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+			this.getData()
+		},
+		onShow() {
+			
+		},
+		methods: {
+			
+			goDetail(item) {
+					uni.navigateTo({
+						url: "depositDetail?id="+item.id
+					})
+				
+			},
+			getData() {
+				uni.showLoading({
+					title: '加载中'
+				});
+				this.isload = false;
+				var padata = {
+					page: this.page,
+					limit: 10,
+				}
+
+				this.$http('/applet/tire-deposit-sheet/list', padata, 'GET').then(res => {
+					uni.hideLoading();
+					this.isload = true;
+
+					var list = res.data.Items;
+
+					if (this.page == 1) {
+						this.items = list
+					} else {
+						this.items = this.items.concat(list)
+					}
+
+				})
+			},
+
+		},
+		onReachBottom() {
+			this.page++;
+
+			this.getData()
+		},
+		onPullDownRefresh() {
+			this.page = 1;
+			this.getData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		}
+	}
+</script>
+
+<style scoped>
+	.box {
+		min-height: 100vh;
+		background: #F4F5F7;
+	}
+.cont{
+	padding:0 24rpx;
+}
+.line{
+	display: flex;
+	justify-content: space-between;
+	line-height: 42rpx;
+	padding: 29rpx 20rpx;
+	margin-top: 20rpx;
+	background: #ffffff;
+	border-radius: 10rpx;
+}
+.lineLeft{
+	display: flex;
+}
+.plateNumber{
+	font-weight: 500;
+	color: #3C3C3C;
+	font-size: 30rpx;
+}
+.tire{
+	color: #666666;
+	font-size: 24rpx;
+	padding-left: 24rpx;
+}
+.state1{
+	color: #FF0000;font-size: 24rpx;
+}
+.state2{
+	color: #00A040;font-size: 24rpx;
+}
+</style>

pages/subPack/rescueOrderOrderDetail.vue

@@ -80,7 +80,7 @@
 				<view class="informationNum2" v-if="orderData.openShopHelpSheet.helpType==2">拖车</view>
 				<view class="informationNum2" v-if="orderData.openShopHelpSheet.helpType==3">换胎</view>
 				<view class="informationNum2" v-if="orderData.openShopHelpSheet.helpType==4">未知原因</view>
-				-
+				<view class="informationNum2">-</view>
 				<view class="informationNum2" v-if="orderData.openShopHelpSheet.hscene==1">地面</view>
 				<view class="informationNum2" v-if="orderData.openShopHelpSheet.hscene==2">车库</view>
 				<view class="informationNum2" v-if="orderData.openShopHelpSheet.hscene==3">其他</view>

pages/user/user.vue

@@ -147,6 +147,13 @@
 
 		<!-- 我的 相关 -->
 		<view class="rowBoxBg">
+			<view class="rowBox" @click="gonavigateTo('../subPack/depositList')">
+				<view class="leftView">
+					<image src="../../static/img/icon_me1.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">我的寄存</view>
+				</view>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
+			</view> 
 			 <view class="rowBox" @click="gonavigateTo('../subPack/rescueOrder')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me1.png" mode="" class="liftIcon"></image>

utils/request.js

@@ -8,9 +8,9 @@
 import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
-const baseUrl=extConfig.url+'/'
-//const baseUrl='http://192.168.0.126:20187/'
-//const baseUrl='http://dmss.66km.com.cn/'
+//const baseUrl=extConfig.url+'/'
+const baseUrl='http://192.168.0.147:20187/'
+//const baseUrl='http://dms.66km.com.cn/'
 
 //wx2c6f04c0dcd15984正式  wx33053a645546ec31
 //测试地址