diff --git a/App.vue b/App.vue
index c9da682..0b362d0 100644
--- a/App.vue
+++ b/App.vue
@@ -3,12 +3,12 @@
 		globalData: {
 			// url: 'http://192.168.3.4:9301/crest',
 			// url: 'http://192.168.12.53.21:9301/crest',
-			url: 'https://hsg.dctpay.com/crest',
-			imgUrl: 'https://hsg.dctpay.com/filesystem/',
-			brestUrl : 'https://hsg.dctpay.com/brest',
-			// url: 'https://hsgcs.dctpay.com/crest',
-			// brestUrl : 'https://hsgcs.dctpay.com/brest',
-			// imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
+			// url: 'https://hsg.dctpay.com/crest',
+			// imgUrl: 'https://hsg.dctpay.com/filesystem/',
+			// brestUrl : 'https://hsg.dctpay.com/brest',
+			url: 'https://hsgcs.dctpay.com/crest',
+			brestUrl : 'https://hsgcs.dctpay.com/brest',
+			imgUrl: 'https://hsgcs.dctpay.com/filesystem/',
 			
 			userInfo: "",
 			brestUserInfo : '',
diff --git a/Utils/Api.js b/Utils/Api.js
index 3d17699..3b70a52 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -74,6 +74,10 @@ export const getUserCouponList = params => {
 //获取用户卡券详情
 export const getUserCouponDetail = params => {
 	return POST('GET', `${base}/coupon/getUserCouponDetail`, params).then(res => res.data);
+}
+//获取用户最新卡券详情
+export const getUserNewCouponDetail = params => {
+	return POST('GET', `${base}/coupon/getUserNewCouponDetail`, params).then(res => res.data);
 }
 //获取订单信息
 export const getUserOrderList = params => {
diff --git a/pages/goods/coupon-details/coupon-details.vue b/pages/goods/coupon-details/coupon-details.vue
index 2133125..b6b4059 100644
--- a/pages/goods/coupon-details/coupon-details.vue
+++ b/pages/goods/coupon-details/coupon-details.vue
@@ -67,11 +67,13 @@
 				storeList: [],
 				oneTime: '',
 				twoTime: '',
-				threeTime: ''
+				threeTime: '',
+				menddesId: ''
 			}
 		},
 		onLoad(option) {
 			this.couDesId = option.id;
+			this.menddesId = option.mendId;
 			this.getUserCouponDetail();
 			this.getStoreListByCoupon();
 		},
@@ -103,14 +105,14 @@
 					title: '加载中...'
 				})
 				let params = {
-					couponId: this.couDesId
+					userCouponId: this.couDesId
 				}
 				getUserCouponDetail(params).then(res => {
 					if (res.return_code == '000000') {
 						this.couponDesInfo = res.return_data;
-						this.oneTime = res.return_data.couponCodeInfo.receiveTime;
-						this.twoTime = res.return_data.couponCodeInfo.salesEndTime;
-						this.threeTime = res.return_data.couponCodeInfo.consumeTime;
+						this.oneTime = res.return_data.highUserCoupon.createTime;
+						this.twoTime = res.return_data.highUserCoupon.useEndTime;
+						this.threeTime = res.return_data.highUserCoupon.consumeTime;
 						uni.hideLoading()
 					} else {
 						uni.hideLoading()
@@ -136,7 +138,7 @@
 				})
 
 				let params = {
-					couponId: this.couDesId,
+					couponId: this.menddesId,
 					longitude: app.globalData.longitude,
 					latitude: app.globalData.latitude
 				}
@@ -167,9 +169,9 @@
 							duration: 2000
 						})
 						this.couponDesInfo = res.return_data;
-						this.oneTime = res.return_data.couponCodeInfo.receiveTime;
-						this.twoTime = res.return_data.couponCodeInfo.salesEndTime;
-						this.threeTime = res.return_data.couponCodeInfo.consumeTime;
+						this.oneTime = res.return_data.highUserCoupon.createTime;
+						this.twoTime = res.return_data.highUserCoupon.useEndTime;
+						this.threeTime = res.return_data.highUserCoupon.consumeTime;
 					} else {
 						uni.hideLoading();
 						uni.showToast({
diff --git a/pages/goods/store-list/store-details.vue b/pages/goods/store-list/store-details.vue
index 5d721f9..4c5585c 100644
--- a/pages/goods/store-list/store-details.vue
+++ b/pages/goods/store-list/store-details.vue
@@ -34,12 +34,12 @@
 				<view class="flleft width70">
 					<view class="width90 fcor333 font15 mart5">{{mers.highCouponModel.couponName}}</view>
 					<view class="width90 fcorred font14 mart5">
-						过期时间:{{mers.highCouponModel.salesEndTime | formatDate('-')}}</view>
+						过期时间:{{mers.useEndTime | formatDate('-')}}</view>
 				</view>
 
 			</view>
 			<view class="width90">
-				<button class="store-jdes flleft mart5" @click="jumpCoupondes(mers.highCouponModel.id)">查看详情</button>
+				<button class="store-jdes flleft mart5" @click="jumpCoupondes(mers.id,mers.highCouponModel.id)">查看详情</button>
 			</view>
 		</view>
 
@@ -200,9 +200,9 @@
 				})
 			},
 			// 跳转卡券详情
-			jumpCoupondes(e) {
+			jumpCoupondes(e,item) {
 				uni.navigateTo({
-					url: '../coupon-details/coupon-details?id='+e
+					url: '../coupon-details/coupon-details?id='+e +'&mendId='+item
 				})
 			},
 			//前往导航
diff --git a/pages/pay/success/success.vue b/pages/pay/success/success.vue
index ef45de7..bf1b5ee 100644
--- a/pages/pay/success/success.vue
+++ b/pages/pay/success/success.vue
@@ -1,30 +1,34 @@
-<template>
-	<view>
-		<view class="width100 fotct coupon-status font20 fcorred" v-if="couponDesInfo.couponCodeInfo.status == 3">已使用
-		</view>
-		<view class="width100 fotct coupon-status font20 fcor41c" v-if="couponDesInfo.couponCodeInfo.status == 2">未使用
-		</view>
-		<view class="line1"></view>
-		<view class="coupon-cont width90">
-			<view class="flright fotct">
-				<image class="coupon-img" :src="imageUrl+couponDesInfo.couponInfo.couponImg"></image>
+<template>
+	<view>
+		<view class="width100" v-if="couponDesInfo">
+			<view class="width100 fotct coupon-status font20 fcorred" v-if="couponDesInfo.couponCodeInfo.status == 3">
+				已使用
 			</view>
-			<view class="coupon-mes mart10">
-				<view class="fcor333 fontwig6 font24 width100 text2">{{couponDesInfo.couponInfo.couponName}}</view>
-				<view class="fcor666  font13 width100 mart5" v-if="oneTime">
-					领取时间:{{oneTime | formatDate('-')}}</view>
-				<view class="fcor666  font13 width100 mart5" v-if="twoTime">
-					使用有效期:{{twoTime | formatDate('-')}}</view>
-				<view class="fcorred  font15 width100 mart5" v-if="threeTime">
-					消费时间:{{threeTime | formatDate('-')}}</view>
+			<view class="width100 fotct coupon-status font20 fcor41c" v-if="couponDesInfo.couponCodeInfo.status == 2">
+				未使用
+			</view>
+			<view class="line1"></view>
+			<view class="coupon-cont width90">
+				<view class="flright fotct">
+					<image class="coupon-img" :src="imageUrl+couponDesInfo.couponInfo.couponImg"></image>
+				</view>
+				<view class="coupon-mes mart10">
+					<view class="fcor333 fontwig6 font24 width100 text2">{{couponDesInfo.couponInfo.couponName}}</view>
+					<view class="fcor666  font13 width100 mart5" v-if="oneTime">
+						领取时间:{{oneTime | formatDate('-')}}</view>
+					<view class="fcor666  font13 width100 mart5" v-if="twoTime">
+						使用有效期:{{twoTime | formatDate('-')}}</view>
+					<view class="fcorred  font15 width100 mart5" v-if="threeTime">
+						消费时间:{{threeTime | formatDate('-')}}</view>
+				</view>
+			</view>
+			<view class="line1 mart15"></view>
+			<view class="width90 mart10 fcor666">核销码(商户扫客户)</view>
+			<view class="width90 mart20 fotct">
+				<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.highUserCoupon.qrCodeImg"></image>
 			</view>
 		</view>
-		<view class="line1 mart15"></view>
-		<view class="width90 mart10 fcor666">核销码(商户扫客户)</view>
-		<view class="width90 mart20 fotct">
-			<image class="coupon-qr" :src="imageUrl+'couponCode/'+couponDesInfo.couponCodeInfo.ext1"></image>
-		</view>
-		
+		<view class="width90 mart30 font20 fcor333 fotct marb40" v-if="!couponDesInfo">二维码生效中,前往个人中心查看</view>
 		<view class="width90 mart20" style="height: 80px;" v-for="(store,i) in storeList" :key="i">
 			<view class="coupon-des flleft">
 				立即<br>前往
@@ -44,12 +48,15 @@
 			</view>
 		</view>
 		<view class="height60"></view>
-		<button class="coupne-btn width100" @click="toUser">个人中心</button>
-	</view>
-</template>
-
+		<button class="coupne-btn width100" @click="toUser">个人中心</button>
+	</view>
+</template>
+
 <script>
-	import {getUserCouponDetail,getStoreListByCoupon} from "../../../Utils/Api.js"
+	import {
+		getUserNewCouponDetail,
+		getStoreListByCoupon
+	} from "../../../Utils/Api.js"
 	let app = getApp()
 	export default {
 		data() {
@@ -65,7 +72,7 @@
 		},
 		onLoad(option) {
 			this.couDesId = option.id;
-			this.getUserCouponDetail();
+			this.getUserNewCouponDetail();
 			this.getStoreListByCoupon();
 		},
 		filters: {
@@ -91,14 +98,14 @@
 		},
 		methods: {
 			//我的卡券详情
-			getUserCouponDetail() {
+			getUserNewCouponDetail() {
 				uni.showLoading({
 					title: '加载中...'
 				})
 				let params = {
 					couponId: this.couDesId
 				}
-				getUserCouponDetail(params).then(res => {
+				getUserNewCouponDetail(params).then(res => {
 					if (res.return_code == '000000') {
 						this.couponDesInfo = res.return_data;
 						this.oneTime = res.return_data.couponCodeInfo.receiveTime;
@@ -119,7 +126,7 @@
 					address: e.address
 				})
 			},
-			
+
 			/**
 			 * 查询门店列表
 			 */
@@ -127,7 +134,7 @@
 				uni.showLoading({
 					title: '加载中...'
 				})
-			
+
 				let params = {
 					couponId: this.couDesId,
 					longitude: app.globalData.longitude,
@@ -157,8 +164,8 @@
 				});
 			}
 		}
-	}
-</script>
+	}
+</script>
 <style lang="scss">
 	.loading-text {
 		width: 100%;
@@ -227,6 +234,7 @@
 		background-color: red;
 		color: #FFFFFF;
 	}
+
 	.coupne-btn {
 		position: fixed;
 		bottom: 0px;
diff --git a/pages/tabBar/user/user.vue b/pages/tabBar/user/user.vue
index 4d9e3de..0ce533b 100644
--- a/pages/tabBar/user/user.vue
+++ b/pages/tabBar/user/user.vue
@@ -154,12 +154,13 @@
 						url: '../../login/login',
 						text: '商户入口',
 						img: '/static/img/user/point.png'
-					},
-					{
-						url: '../../login/login',
-						text: '我的推广',
-						img: '/static/img/user/renw.png'
 					}
+					// ,
+					// {
+					// 	url: '../../login/login',
+					// 	text: '我的推广',
+					// 	img: '/static/img/user/renw.png'
+					// }
 
 				]
 			}
diff --git a/pages/user/mineCoupons/mineCoupons.vue b/pages/user/mineCoupons/mineCoupons.vue
index 68b6197..60ec0e7 100644
--- a/pages/user/mineCoupons/mineCoupons.vue
+++ b/pages/user/mineCoupons/mineCoupons.vue
@@ -16,7 +16,7 @@
 
 		<view class="product-list mart20">
 			<view class="product" v-for="product in productList" :key="product.id"
-				@click="jumpMineCou(product.highCouponModel.id)">
+				@click="jumpMineCou(product.id,product.highCouponModel.id)">
 				<image mode="widthFix" :src="imageUrl+product.highCouponModel.couponImg"></image>
 				<view class="name">{{ product.highCouponModel.couponName }}</view>
 				<view class="info" v-if="product.highCouponModel.payType == 1">
@@ -93,9 +93,9 @@
 					this.getUserCouponList(0);
 				}
 			},
-			jumpMineCou(item) {
+			jumpMineCou(item,items) {
 				uni.navigateTo({
-					url: '../../goods/coupon-details/coupon-details?id=' + item
+					url: '../../goods/coupon-details/coupon-details?id=' + item+'&mendId='+ items
 				})
 			},
 			//赠券卡券列表