11.7

pages/index/houses-info.vue

@@ -442,11 +442,11 @@
 
 		.houses-box {
 			width: 702rpx;
-			height: 594rpx;
+			min-height: 594rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx;
 			margin: 20rpx auto;
-			padding: 0 20rpx;
+			padding: 20rpx 20rpx;
 
 			.kaifa-box {
 				padding: 24rpx 20rpx;

pages/index/index.vue

@@ -86,33 +86,23 @@
 				<image style="width: 650rpx;height: 650rpx;" :src="config.service_code" mode=""></image>
 			</view>
 		</u-popup>
-		<u-popup v-model="youhui" mode="center" border-radius="20">
+		<u-popup v-model="youhui" mode="center" border-radius="20" v-if="coupon == 0">
 			<view style="font-size: 0;">
 				<view class="back">
-					<view class="back-item u-flex">
-						<view class="left">
-							<text class="top">¥</text>
-							<text class="bottom">1000</text>
-						</view>
-						<view class="right">
-							<text class="top">满100万可用</text>
-							<view class="bottom">
-								满减券-仅限购房使用
+					<scroll-view scroll-y style="height: 330rpx;" :show-scrollbar="false">
+						<view class="back-item u-flex " v-for="(item,index) in couponlist " :key="index">
+							<view class="left">
+								<text class="top">¥</text>
+								<text class="bottom">{{item.amount.slice(0,-3)}}</text>
 							</view>
-						</view>
-					</view>
-					<view class="back-item u-flex">
-						<view class="left">
-							<text class="top">¥</text>
-							<text class="bottom">1000</text>
-						</view>
-						<view class="right">
-							<text class="top">满100万可用</text>
-							<view class="bottom">
-								满减券-仅限购房使用
+							<view class="right">
+								<text class="top">满{{item.low_amount.slice(0,-3)}}万可用</text>
+								<view class="bottom">
+									{{item.title}}
+								</view>
 							</view>
 						</view>
-					</view>
+					</scroll-view>
 					<view class="u-flex " style="justify-content: center;">
 						<view class="btn" @click="toyouhui">
 							开心收下
@@ -121,7 +111,8 @@
 				</view>
 			</view>
 			<view class="u-flex" style="justify-content: center;">
-				<image @click="this.youhui = false" src="../../static/images/close.png" style="width: 46rpx;height: 46rpx;margin-top: 46rpx;" mode="">
+				<image @click="this.youhui = false" src="../../static/images/close.png"
+					style="width: 46rpx;height: 46rpx;margin-top: 46rpx;" mode="">
 				</image>
 			</view>
 		</u-popup>
@@ -146,7 +137,9 @@
 				popularity: 0,
 				dijialist: [],
 				tuijianlist: [],
-				youhui: false
+				youhui: false,
+				couponlist: [],
+				coupon: 0,
 			}
 		},
 		onLoad() {
@@ -154,18 +147,48 @@
 			this.gettabs()
 			this.getguanggao()
 			this.getlist()
+			this.coupon_list()
+
 		},
 		onShow() {
 			this.getpopularity()
+			if (uni.getStorageSync("token")) {
+				this.member_info()
+			}
 		},
 		computed: {
 			...mapGetters(['config']),
 			...mapState(['city'])
 		},
 		methods: {
-			toyouhui(){
-				uni.reLaunch({
-					url:"../mine/youhui"
+			member_info() {
+				this.$u.post('/api/Member/member_info').then(res => {
+					this.coupon = res.data.is_receive_coupon
+				})
+			},
+			toyouhui() {
+				if (uni.getStorageSync("token")) {
+					this.$u.post('/api/Member/receive_coupon').then(res => {
+						console.log(res);
+						setTimeout(() => {
+							uni.reLaunch({
+								url: "/pages/mine/youhui"
+							})
+						}, 800)
+					})
+				} else {
+					this.$u.toast("请先登录")
+					setTimeout(() => {
+						uni.reLaunch({
+							url: "/pages/mine/mine"
+						})
+					}, 800)
+				}
+
+			},
+			coupon_list() {
+				this.$u.post('/api/Index/coupon_list').then(res => {
+					this.couponlist = res.data
 				})
 			},
 			getlist() {
@@ -190,6 +213,9 @@
 					if (this.s == 0) {
 						this.showguanggao = false
 						this.youhui = true
+						// if (this.guanggaolist > 0) {
+						// 	this.youhui = true
+						// }
 						clearInterval(this.time)
 					} else {
 						this.s--
@@ -199,6 +225,9 @@
 			getguanggao() {
 				this.$u.post('/api/Index/adv_list').then(res => {
 					this.guanggaolist = res.data
+					if (this.guanggaolist == 0) {
+						this.youhui = true
+					}
 					this.showguanggao = true
 					this.daojishi()
 				})
@@ -325,7 +354,6 @@
 	page {
 		background-color: #F6F6F6;
 	}
-
 	.btn {
 		margin-top: 44rpx;
 		width: 266rpx;
@@ -350,32 +378,33 @@
 	}
 
 	.back-item {
-		width: 498rpx;
+		// width: 498rpx;
 		height: 144rpx;
 		margin-top: 24rpx;
 		background: url(../../static/images/beijing.png) no-repeat;
-		background-size: cover;
+		background-size: 100% 100%;
 		padding: 28rpx 40rpx 28rpx 36rpx;
 
 		.left {
 			font-family: JDZhengHT-Regular, JDZhengHT;
 			font-weight: 400;
 			color: #FFFFFF;
+			width: 168rpx;
 
 			.top {
 				font-size: 24rpx;
 			}
 
 			.bottom {
-				font-size: 52rpx;
+				font-size: 40rpx;
 			}
 		}
 
 		.right {
-			margin-left: 80rpx;
+			margin-left: 40rpx;
 
 			.top {
-				font-size: 34rpx;
+				font-size: 28rpx;
 				font-family: PingFangSC-Medium, PingFang SC;
 				font-weight: 500;
 				color: #FFFFFF;
@@ -566,7 +595,7 @@
 	}
 </style>
 <style scoped>
-	::v-deep .u-mode-center-box{
+	::v-deep .u-mode-center-box {
 		background-color: rgba(0, 0, 0, 0) !important;
 	}
 </style>

pages/mine/youhui.vue

@@ -1,14 +1,14 @@
 <template>
 	<view class="youhui">
-		<view class="list u-flex">
+		<view class="list u-flex" v-for="(item,index) in list1" :key="index">
 			<view class="left">
 				<text class="font-left">¥</text>
-				<text class="font-right">30000</text>
+				<text class="font-right">{{item.amount.slice(0,-3)}}</text>
 			</view>
 			<view class="concent">
-				<text class="top">【满减券】仅限购房使用</text>
+				<text class="top">{{item.title}}</text>
 				<view class="bottom">
-					满2500万可用
+					满{{item.low_amount.slice(0,-3)}}万可用
 				</view>
 			</view>
 		</view>
@@ -19,11 +19,11 @@
 	export default {
 		data() {
 			return {
-
+				list1:[]
 			}
 		},
 		onLoad() {
-
+			this.list()
 		},
 		computed: {
 
@@ -32,7 +32,16 @@
 
 		},
 		methods: {
-
+			list() {
+				this.$u.post('/api/Member/coupon_list').then(res => {
+					this.list1 =  res.data
+					// setTimeout(() => {
+					// 	uni.reLaunch({
+					// 		url: "/pages/mine/youhui"
+					// 	})
+					// }, 800)
+				})
+			}
 		}
 	}
 </script>
@@ -55,6 +64,7 @@
 				font-weight: 400;
 				color: #1F7EFF;
 				margin-right: 28rpx;
+				width: 240rpx;
 
 				.font-left {
 					font-size: 34rpx;