// 添加登录跳转、首页banner图、文字长度限制

common/api.js

@@ -4,7 +4,7 @@ import request from './axios';
 
 //  微信授权登录
 export const wxLogin = (params, succCallback, errorCallback) => {
-	return request('/job-dev/house/applet/login',params,'POST', succCallback,errorCallback)
+	return request('/job-dev/house/applet/login',params,'GET', succCallback,errorCallback)
 };
 
 //  获取首页轮播图

common/axios.js

@@ -24,7 +24,7 @@ const doCommand = function (response, var0, var1) {
 };
 
 const request = function (uri, param, method, var0, var1) {
-    console.log("==> " + config + uri);
+    // console.log("==> " + config + uri);
 		// 是否要检测有token
 		
 		return new Promise((resolve,reject) => {
@@ -36,7 +36,7 @@ const request = function (uri, param, method, var0, var1) {
 			    header: {'x-auth': tokenUtil.token()},
 			    success: function (res) {
 			        let response = res.data;
-			        console.log("<== ", response);
+			        // console.log("<== ", response);
 							if(response.code == 200) {
 								// 成功   执行成功回调
 								resolve(response);

pages/index/index.vue

@@ -1,20 +1,29 @@
 <template>
 	<view class="container">
-		
+
 		<view class="ant-banner-box">
-			<image class="ant-banner" mode="scaleToFill" :src="bannerList[3].image"/>
-			<view  class="ant-title">
+			<!-- banner 部分 -->
+			<swiper class="swiper " circular indicator-dots autoplay :interval="2000"
+				:duration="500" indicator-active-color="#00a0ff" >
+				<swiper-item v-for="(bannerItem,index) in bannerList" class="ant-title" :key="index" @click="toItem(index)">
+					<view class="">
+						<image :src="bannerItem.image" mode=""></image>
+					</view>
+				</swiper-item>
+			</swiper>
+			<!-- <image class="ant-banner" mode="scaleToFill" :src="bannerList[3].image" /> -->
+			<!-- <view class="">
 				<p>一个有温度的家</p>
 				<p class="ant-font-24">超多房源｜等你来挑</p>
-			</view>
+			</view> -->
 		</view>
 		<view class="ant-float">
 			<view class="ant-flex-line">
-				<view  class="ant-select">江华</view>
+				<view class="ant-select">江华</view>
 				<!-- <input class="ant-input" value="" placeholder="试试输入你想住的地点"/> -->
 			</view>
 		</view>
-		<view class="ant-menu-card"> 
+		<view class="ant-menu-card">
 			<view class="ant-flex-line">
 				<view class="ant-icon-menu">
 					<view class="ant-icon">
@@ -40,86 +49,87 @@
 					</view>
 					<view class="ant-text">转租</view>
 				</view>
-				
+
 			</view>
 		</view>
-		
-		
+
+
 		<view class="ant-content">
-			
+
 			<view class="ant-content-page">
-				
+
 				<view class="ant-flex-line">
 					<view class="ant-page-title">好房源</view>
 					<view class="ant-page-span">平台甄选</view>
 					<view class="ant-page-span">品质保障</view>
 				</view>
-				
+
 				<view class="ant-flex-line scroll-view_H_x">
-					<scroll-view class="scroll-view_H" scroll-x="true" lower-threshold="51" @scrolltolower="scrollTolowerHotList" >
+					<scroll-view class="scroll-view_H" scroll-x="true" lower-threshold="51"
+						@scrolltolower="scrollTolowerHotList">
 						<view class="ant-page-image-item" v-for="(item,index) in hotList">
-							<image class="ant-page-image-item" mode="aspectFill" :src="item.image === null? image:item.image"/>
-							<view  class="ant-img-tags">
+							<image class="ant-page-image-item" mode="aspectFill"
+								:src="item.image ? item.image :image" />
+							<view class="ant-img-tags">
 								<!-- <view class="ant-tags-title">{{item.title}}</view> -->
-								<view class="ant-tags-text">{{item.price}}元起</view>
+								<view class="ant-tags-text">{{item.price}}元起{{item.image? '1':'2'}}</view>
 							</view>
 						</view>
 					</scroll-view>
-					
+
 				</view>
 			</view>
-			
+
 			<view class="ant-content-page">
-				
+
 				<view class="ant-flex-line ant-head-line" @click="test">
 					<view class="ant-page-title">推荐房源</view>
 				</view>
-				
-				<view class="ant-item-box" v-for="(item,index) in list" >
+
+				<view class="ant-item-box" v-for="(item,index) in list">
 					<view>
-						<image class="ant-item-image" mode="aspectFill" 
-						:src="item.image === null? image:item.image"/>
+						<image class="ant-item-image" mode="aspectFill" :src="item.image? item.image : image" />
 					</view>
 					<view class="ant-item-content">
 						<view class="ant-item-title">{{item.title}}</view>
-						<view class="ant-item-span">{{item.titleText}}</view>
+						<view class="ant-item-span">{{spliceText(item.titleText,0,39)}}</view>
 						<view class="ant-item-span">{{item.address}}</view>
 						<view class="ant-item-span"><span>{{item.payType}}</span></view>
 						<view class="ant-item-price">{{item.price}} <span>元/月</span></view>
 					</view>
 				</view>
-				
+
 			</view>
-			
+
 		</view>
-		
+
 		<view class="content-end">
-			<view class="line"/>
+			<view class="line" />
 			<view class="center">湖南瀚海黎明·技术支持</view>
 		</view>
-	
+
 	</view>
 </template>
 
 
 <script>
-	export default{
-		data(){
-			return{
-				image:"https://vrlab-image4.ljcdn.com/release/auto3dhd/eba09229a901cb5cba66fda38f281405/screenshot/1657677701_15/pc0_m7ks1AA5Y.jpg?imageMogr2/quality/70/thumbnail/1024x",
-				bannerList:[],
-				addressList:[],
-				classList:[],
-				hotList:[],
-				list:[],
-				lock: true, 
+	export default {
+		data() {
+			return {
+				image: "https://vrlab-image4.ljcdn.com/release/auto3dhd/eba09229a901cb5cba66fda38f281405/screenshot/1657677701_15/pc0_m7ks1AA5Y.jpg",
+				bannerList: [],
+				addressList: [],
+				classList: [],
+				hotList: [],
+				list: [],
+				lock: true,
 				size: 20,
 				page: 1,
 				total: null,
 				is_pull: 1, // 1是下拉刷新 2是上拉加载
 				scrollPage: 1, //横向滚动
-				scrollSize:20,
-				scrollTotal:null,
+				scrollSize: 20,
+				scrollTotal: null,
 			}
 		},
 		onLoad() {
@@ -141,27 +151,29 @@
 			const size = this.size;
 			const total = this.total;
 			// 写下限制重复发  以及最后一页
-			if(page * size > total) {
+			if (page * size > total) {
 				this.$functions.showToast('没有更多了')
 				return;
 			}
 			this.getHouseListPage()
 		},
 		// 好房源 向右加载 
-		
+
 		// 隐藏微信h5的标题栏
 		onReady() {
-			
+
 		},
-		methods:{
-			
+		methods: {
+			toItem(index){
+				console.log(index)
+			},
 			//获取轮播图
-			getBannerList(){
+			getBannerList() {
 				// this.getBannerList()
 				this.$api.getBannerList().then(res => {
-						this.bannerList = res.result;
+					this.bannerList = res.result;
 				}).catch(err => {
-					console.log(err,"错误信息")
+					console.log(err, "错误信息")
 				});
 				// this.$request('/job-dev/house/applet/banner',{},'GET', (res) => {
 				// 	this.bannerList = res;
@@ -170,11 +182,11 @@
 				// })
 			},
 			//获取地区
-			getAddressList(){
+			getAddressList() {
 				this.$api.getAddressList().then(res => {
-						this.addressList = res.result;
+					this.addressList = res.result;
 				}).catch(err => {
-					console.log(err,"错误信息")
+					console.log(err, "错误信息")
 				});
 				// this.$request('/job-dev/house/applet/indexListPage',{},'GET', (res) => {
 				// 	this.addressList = res.records;
@@ -182,11 +194,11 @@
 				// })
 			},
 			//获取分类
-			getClassList(){
+			getClassList() {
 				this.$api.getClassList().then(res => {
-						this.classList = res.result;
+					this.classList = res.result;
 				}).catch(err => {
-					console.log(err,"错误信息")
+					console.log(err, "错误信息")
 				});
 				// this.$request('/job-dev/house/applet/indexClass',{},'GET', (res) => {
 				// 	this.classList = res.records;
@@ -194,12 +206,12 @@
 				// })
 			},
 			// 向右滚动加载好房源
-			scrollTolowerHotList () {
+			scrollTolowerHotList() {
 				// 是否已经是最后
 				const scrollPage = this.scrollPage;
 				const scrollSize = this.scrollSize;
 				const scrollTotal = this.scrollTotal;
-				if(scrollPage* scrollSize > scrollTotal) {
+				if (scrollPage * scrollSize > scrollTotal) {
 					this.$functions.showToast('没有更多了');
 					return;
 				}
@@ -207,99 +219,109 @@
 				this.getHotList();
 			},
 			//获取好房源
-			getHotList(){
-				
+			getHotList() {
+
 				this.$api.getHotList().then(res => {
-					if(this.scrollTotal !== null){
-						this.scrollPage+=1;
+					if (this.scrollTotal !== null) {
+						this.scrollPage += 1;
 						const hotList = this.hotList;
 						this.hotList = hotList.concat(res.result.records);
 						this.$functions.hideLoading();
-					}else if(this.scrollTotal === null) {
+					} else if (this.scrollTotal === null) {
 						this.scrollSize = res.result.size;
 						this.scrollTotal = res.result.total;
 						this.hotList = res.result.records;
 					}
-					
-						
+
+
 				}).catch(err => {
-					console.log(err,"错误信息")
+					console.log(err, "错误信息")
 				});
 				// this.$request('/job-dev/house/applet/indexHotList',{},'GET', (res) => {
 				// 	this.hotList = res.records;
 				// 	console.log(res.records)
 				// })
 			},
+			// 截断字
+			spliceText(text,start_s,length_s) {
+				const starts = start_s || 0;
+				const lengths = length_s || 10;
+				if(text.length < lengths){
+					return text;
+				}else {
+					return text.slice(starts,lengths) + "...";
+				}
+			},
 			//请求接口获得后台列表数据信息 = 推荐房源
 			getHouseListPage() {
 				// 区分上拉加载和下拉刷新 is_pull  下拉 1 上拉 2
 				const is_pull = this.is_pull;
 				this.$functions.showLoading();
 				this.$api.getHouseListPage().then(res => {
-						// this.list = res.result;
-						if(this.page === 1 || this.total == null || is_pull === 1) {
-							this.total = res.result.total;
-							this.size = res.result.size;
-						}
-						console.log(is_pull)
-						if(is_pull === 1) {
-							// 下拉
-							console.log(123132)
-							this.page = 1;
-							this.list = res.result.records;
-						}else {
-							// 加载
-							this.page +=1;
-							this.list = this.list.concat(res.result.records);
-						}
-						this.$functions.hideLoading();
+					// this.list = res.result;
+					if (this.page === 1 || this.total == null || is_pull === 1) {
+						this.total = res.result.total;
+						this.size = res.result.size;
+					}
+					console.log(is_pull)
+					if (is_pull === 1) {
+						// 下拉
+						console.log(123132)
+						this.page = 1;
+						this.list = res.result.records;
+						// 停止下拉
+						uni.stopPullDownRefresh();
+					} else {
+						// 加载
+						this.page += 1;
+						this.list = this.list.concat(res.result.records);
+					}
+					this.$functions.hideLoading();
 				}).catch(err => {
 					this.$functions.hideLoading();
-					console.log(err,"错误信息")
+					console.log(err, "错误信息")
 				});
 				// this.$request('/job-dev/house/applet/indexListPage',{},'GET', (res) => {
 				// 	this.list = res.records;
 				// 	console.log(res.records)
 				// })
-					
+
 			}
-			
+
 			// 下拉刷新 首页推荐房源分页下拉加载，上拉刷新。如果加载完了提示 没有更多了
-			
-			
+
+
 			// 上拉加载
 		}
-	
+
 	}
-	
-	
 </script>
 
 
 
 
 <style lang="scss">
-	
-	.container{
+	.container {
 		background-color: #FFF !important;
 		position: relative;
 	}
-	
-	.ant-float{
+
+	.ant-float {
 		position: fixed;
 		top: 60rpx;
 		left: 24rpx;
 		z-index: -2;
-		
-		
-		.ant-select{
+
+
+		.ant-select {
 			width: 120rpx;
 			padding: 10rpx 24rpx;
 			color: #fff;
 			font-weight: bolder;
 			position: relative;
 		}
-		.ant-select::after{
+
+		.ant-select::after {
 			content: "";
 			position: absolute;
 			top: 8rpx;
@@ -310,54 +332,63 @@
 			border-right: 2rpx solid #FFF;
 			transform: rotate(45deg);
 		}
-		
-		.ant-input{
+
+		.ant-input {
 			height: 48rpx;
 			min-width: 460rpx;
 			line-height: 48rpx;
 			background: rgba(255, 255, 255, .4);
 			border-radius: 8rpx;
 			padding: 6rpx 24rpx;
-			
+
 			color: #333;
 			font-size: 20rpx;
 		}
-		
-		.ant-input::placeholder{
+
+		.ant-input::placeholder {
 			color: #FFF;
 			font-size: 20rpx;
-			
+
 		}
 	}
-	
-	.ant-banner-box{
+
+	.ant-banner-box {
 		position: fixed;
 		top: 0;
 		z-index: -3;
 		background-color: #FFF;
-		
-		.ant-banner{
+		width: 100%;
+		.swiper{
+			width: 100%;
+			height: 500rpx;
+			image{
+				width: 100%;
+				height: 500rpx;
+				border-bottom-left-radius: 100rpx;
+				border-bottom-right-radius: 100rpx;
+			}
+		}
+		.ant-banner {
 			width: 100vw;
 			height: 500rpx;
 			border-bottom-left-radius: 100rpx;
 			border-bottom-right-radius: 100rpx;
 		}
-		
-		.ant-title{
+
+		.ant-title {
 			color: #FFF;
 			font-size: 42rpx;
 			font-weight: bolder;
 			text-align: center;
-			
 			position: absolute;
-			top: 45%;
+			// top: 45%;
 			width: 100%;
 			line-height: 50rpx;
 		}
 	}
-	
-	
-	.ant-menu-card{
+
+
+	.ant-menu-card {
 		position: absolute;
 		top: -40rpx;
 		z-index: 1;
@@ -368,25 +399,26 @@
 		min-height: 100rpx;
 		padding: 24rpx;
 		box-shadow: 10rpx 10rpx 20rpx rgba(134, 136, 136, 0.2);
-		
-		.ant-icon-menu{
+
+		.ant-icon-menu {
 			width: 150rpx;
 			flex: 1;
-			
-			.ant-icon{
+
+			.ant-icon {
 				width: 80rpx;
 				height: 80rpx;
 				margin: 8rpx auto;
 				border-radius: 50%;
+
 				// border: 1rpx dashed red;
-				image{
+				image {
 					width: 80rpx;
 					height: 80rpx;
 					border-radius: 50%;
 				}
 			}
-			
-			.ant-text{
+
+			.ant-text {
 				width: 100%;
 				font-size: 22rpx;
 				color: #222;
@@ -396,47 +428,48 @@
 			}
 		}
 	}
-	
-	.ant-content{
+
+	.ant-content {
 		margin-top: 520rpx;
 		padding: 120rpx 24rpx 20rpx;
 		width: calc(100vw - 48rpx);
 		overflow: hidden;
-		
-		
-		.ant-content-page{
+
+
+		.ant-content-page {
 			border-radius: 16rpx;
 			min-height: 100rpx;
 			padding: 24rpx 0;
 			margin-bottom: 24rpx;
-			
-			.scroll-view_H{
+
+			.scroll-view_H {
 				// width: 100%;
 				white-space: nowrap;
 				width: 100%;
 				height: 300rpx;
 			}
-			.ant-page-title{
+
+			.ant-page-title {
 				color: #000;
 				font-size: 32rpx;
 				font-weight: bolder;
 				line-height: 62rpx;
 				width: 140rpx;
 			}
-			
-			.ant-head-line{
+
+			.ant-head-line {
 				width: 100%;
 				border-bottom: 1rpx solid #ccc;
 				margin-bottom: 20rpx;
 			}
-			
-			.ant-page-span{
+
+			.ant-page-span {
 				color: #aaa;
 				font-size: 20rpx;
 				margin-right: 10rpx;
 			}
-			
-			.ant-page-image-item{
+
+			.ant-page-image-item {
 				display: inline-block;
 				border-radius: 4rpx;
 				width: 240rpx;
@@ -444,8 +477,8 @@
 				margin: 0 10rpx 0 0;
 				flex-shrink: 0;
 				position: relative;
-				
-				.ant-img-tags{
+
+				.ant-img-tags {
 					background-color: rgba(255, 255, 255, .8);
 					width: calc(240rpx - 36rpx);
 					height: 50rpx;
@@ -454,58 +487,58 @@
 					left: 8rpx;
 					padding: 20rpx 10rpx;
 					border-radius: 4rpx;
-					
-					.ant-tags-title{
+
+					.ant-tags-title {
 						line-height: 30rpx;
 						color: #000;
 						font-size: 24rpx;
 					}
-					
-					.ant-tags-text{
+
+					.ant-tags-text {
 						font-size: 18rpx;
 						color: #888;
 						line-height: 40rpx;
 					}
 				}
 			}
-			
-			
+
+
 		}
-		
-		
-		
-		
+
+
+
+
 	}
-	
-	.ant-item-box{
+
+	.ant-item-box {
 		display: flex;
 		min-height: 80rpx;
 		margin-bottom: 20rpx;
-		
-		.ant-item-image{
+
+		.ant-item-image {
 			width: 200rpx;
 			height: 200rpx;
 			border-radius: 4rpx;
 		}
-		
-		.ant-item-content{
+
+		.ant-item-content {
 			color: #888;
 			font-size: 28rpx;
 			line-height: 42rpx;
 			padding: 0 20rpx;
-			
-			.ant-item-title{
+
+			.ant-item-title {
 				color: #000;
 				font-weight: bold;
 				font-size: 32rpx;
 			}
-			
-			.ant-item-span{
+
+			.ant-item-span {
 				color: #888;
 				line-height: 40rpx;
 				font-size: 24rpx;
-				
-				span{
+
+				span {
 					margin-right: 20rpx;
 					font-size: 18rpx;
 					background-color: #eee;
@@ -513,14 +546,14 @@
 					border-radius: 4rpx;
 				}
 			}
-			
-			.ant-item-price{
+
+			.ant-item-price {
 				color: #4996f5;
 				line-height: 48rpx;
 				font-size: 34rpx;
 				font-weight: bolder;
-				
-				span{
+
+				span {
 					line-height: 42rpx;
 					font-size: 22rpx;
 					font-weight: normal;
@@ -528,13 +561,8 @@
 				}
 			}
 		}
-		
-		
-		
-	}
-
-</style>
-
 
 
 
+	}
+</style>

pages/login/login.vue

@@ -2,7 +2,7 @@
 
 	<view v-else class="login">
 		<view class="login-img flex align-center justify-center">
-			<view>
+			<view class="login_img">
 				<image src="@/static/image/logo.jpg" mode=""></image>
 			</view>
 
@@ -10,10 +10,9 @@
 		<view class="login-title">找房租房尽在兼兼街</view>
 
 		<view>
-			<view>
-				<button type="primary" @click="login">授权登录</button>
+			<view class="btn">
+				<button class="btn_class" type="primary" @click="login">授权登录</button>
 			</view>
-
 		</view>
 		<view class="tips flex align-center justify-between" @click="xieyiChoose = !xieyiChoose">
 			<view>
@@ -52,6 +51,7 @@
 
 		},
 		methods: {
+	
 			//微信授权
 			login() {
 				uni.showLoading()
@@ -143,39 +143,50 @@
 			},
 			// 登录
 			toLogin(data) {
-				console.log("========data==")
-				console.log(data)
-				this.$request('/job-dev/house/applet/login', data, 'GET', (res) => {
-						console.log("登录成功")
-						console.log(res)
-						// uni.hideLoading()
-						// let {
-						// 	result,
-						// 	code,
-						// 	message
-						// } = res
-						// result?.token && this.$store.commit('set_userToken', result.token)
-						if (res.code == 200) {
-							console.log("登录成功")
-							uni.showToast({
-								title: "登录成功",
-								icon: 'none'
-							})
-						}else{
-							uni.showToast({
-								title: res.message,
-								icon: 'none'
-							})
-						}
-					})
-					.catch(err => {
-						uni.hideLoading()
-						uni.showToast({
-							title: err.message,
-							icon: 'none'
-						})
-						console.log(err)
+				this.$functions.showLoading("登录中...")
+				this.$api.wxLogin(data).then(res => {
+					console.log("等是否",res)
+					// 保存token 跳转页面
+					uni.setStorageSync("token",res.result.token);
+					this.$functions.hideLoading();
+					uni.switchTab({
+						url: "/pages/index/index"
 					})
+				}).catch( err => {
+					this.$functions.showToast(err.message)
+				})
+				// this.$request('/job-dev/house/applet/login', data, 'GET', (res) => {
+				// 		console.log("登录成功")
+				// 		// console.log(res)
+				// 		// uni.hideLoading()
+				// 		// let {
+				// 		// 	result,
+				// 		// 	code,
+				// 		// 	message
+				// 		// } = res
+				// 		// result?.token && this.$store.commit('set_userToken', result.token)
+				// 		if (res.code === 200) {
+				// 			console.log("登录成功");
+				// 			console.log(res,"登录成功后的信息")
+				// 			uni.showToast({
+				// 				title: "登录成功",
+				// 				icon: 'none'
+				// 			});
+				// 		}else{
+				// 			uni.showToast({
+				// 				title: res.message,
+				// 				icon: 'none'
+				// 			})
+				// 		}
+				// 	})
+				// 	.catch(err => {
+				// 		uni.hideLoading()
+				// 		uni.showToast({
+				// 			title: err.message,
+				// 			icon: 'none'
+				// 		})
+				// 		console.log(err)
+				// 	})
 			}
 		}
 	}
@@ -187,7 +198,6 @@
 		height: 70vh;
 		padding-top: 154rpx;
 
-
 		.login-title {
 			margin-top: 40rpx;
 			font-size: 34rpx;
@@ -202,12 +212,23 @@
 				width: 248rpx;
 				height: 248rpx;
 			}
+			.login_img{
+				display: flex;
+				justify-content: center;
+			}
 		}
 
 		.btn-box {
 			margin-top: 136rpx;
 		}
-
+		.btn{
+			display: flex;
+			justify-content: center;
+			.btn_class{
+				width: 720rpx;
+				border-radius: 20rpx;
+			}
+		}
 		.tips {
 			width: 500rpx;
 			position: fixed;