1

@@ -89,11 +89,9 @@
 		          let temdata = JSON.parse(res.data);
 		          let temdata = JSON.parse(res.data);
 		          console.log(temdata)
 		          console.log(temdata)
 		          let urlobj = {
 		          let urlobj = {
-		           
 		            url: temdata.data.url
 		            url: temdata.data.url
 		          }
 		          }
 		          resolve(urlobj);
 		          resolve(urlobj);
-		
 		        },
 		        },
 		        fail: function (res) {
 		        fail: function (res) {
 		          reject('网络出错');
 		          reject('网络出错');

@@ -68,7 +68,7 @@
 				</view>
 				</view>
 				<view class="homename">秒杀专区</view>
 				<view class="homename">秒杀专区</view>
 			</view>
 			</view>
-			<view class="homeboxitem flexfour">
+			<view class="homeboxitem flexfour" @click="hotline">
 				<view class="homeitemimg">
 				<view class="homeitemimg">
 					<image src="../../static/hotline.png" mode=""></image>
 					<image src="../../static/hotline.png" mode=""></image>
 				</view>
 				</view>
@@ -141,9 +141,9 @@
 				<view class="jiimg">
 				<view class="jiimg">
 					<image src="../../static/ji.png" mode=""></image>
 					<image src="../../static/ji.png" mode=""></image>
 					<view class="jitext">
 					<view class="jitext">
-						<view class="jiname">+5积分</view>
+						<view class="jiname">+{{qiandaoinfo.score}}积分</view>
 						<view class="qian">每日签到</view>
 						<view class="qian">每日签到</view>
-						<view class="lianxu lianqianday">连续签到22天</view>
+						<view class="lianxu lianqianday">{{qiandaoinfo.title}}</view>
 						<view class="lianxu">明天签到可获得10积分</view>
 						<view class="lianxu">明天签到可获得10积分</view>
 					</view>
 					</view>
 					<view class="chahao" @click="hidejifen">
 					<view class="chahao" @click="hidejifen">
@@ -154,7 +154,7 @@
 		</view>
 		</view>
 
 
 		<!--  @click="tabClick" -->
 		<!--  @click="tabClick" -->
-		<tabBar :current="currentTabIndex"  backgroundColor="#fbfbfb" color="#999" tintColor="#42b983" ></tabBar>
+		<tabBar :current="currentTabIndex" backgroundColor="#fbfbfb" color="#999" tintColor="#42b983"></tabBar>
 		<!-- 底部导航 -->
 		<!-- 底部导航 -->
 		<!-- <view class="teacherfooter">
 		<!-- <view class="teacherfooter">
 			<view class="teacherfootitem" @click="selnav" :data-id="1">
 			<view class="teacherfootitem" @click="selnav" :data-id="1">
@@ -189,7 +189,7 @@
 	import app from "../../App.vue";
 	import app from "../../App.vue";
 	import tabBar from '../../components/tabvue/tabvue.vue'
 	import tabBar from '../../components/tabvue/tabvue.vue'
 	export default {
 	export default {
-		components:{
+		components: {
 			tabBar
 			tabBar
 		},
 		},
 		data() {
 		data() {
@@ -201,9 +201,11 @@
 				order: '',
 				order: '',
 				page: 1,
 				page: 1,
 				shoplist: [],
 				shoplist: [],
-				carttotal:0,
-				provincename:'',
-				currentTabIndex:0
+				carttotal: 0,
+				provincename: '',
+				currentTabIndex: 0,
+				datamianfang:false,
+				qiandaoinfo:''
 			}
 			}
 		},
 		},
 		onLoad() {
 		onLoad() {
@@ -217,8 +219,14 @@
 			// 	this.currentTabIndex=index;
 			// 	this.currentTabIndex=index;
 			// 	console.log('我是homepage',this.currentTabIndex)
 			// 	console.log('我是homepage',this.currentTabIndex)
 			// },
 			// },
+			// 拨打电话
+			hotline() {
+				uni.makePhoneCall({
+					phoneNumber: '114' //仅为示例
+				});
+			},
 			// 获取签到信息
 			// 获取签到信息
-			getqiandaoinfo(){
+			getqiandaoinfo() {
 				let that = this;
 				let that = this;
 				var url = 'sign/index';
 				var url = 'sign/index';
 				var params = {
 				var params = {
@@ -226,14 +234,15 @@
 				}
 				}
 				console.log(params)
 				console.log(params)
 				app.post(url, params).then((res) => {
 				app.post(url, params).then((res) => {
-					console.log(res);
+					console.log('获取签到信息',res);
+					that.qiandaoinfo=res.data.data
 
 
 				}).catch((err) => {
 				}).catch((err) => {
 
 
 				})
 				})
 			},
 			},
 			// 签到
 			// 签到
-			qiandao(){
+			qiandao() {
 				let that = this;
 				let that = this;
 				var url = 'sign/sign';
 				var url = 'sign/sign';
 				var params = {
 				var params = {
@@ -249,14 +258,14 @@
 			},
 			},
 
 
 			getlocation() {
 			getlocation() {
-				let that=this;
+				let that = this;
 				uni.getLocation({
 				uni.getLocation({
 					type: 'wgs84',
 					type: 'wgs84',
 					success: function(res) {
 					success: function(res) {
 						console.log('当前位置的经度：' + res.longitude);
 						console.log('当前位置的经度：' + res.longitude);
 						console.log('当前位置的纬度：' + res.latitude);
 						console.log('当前位置的纬度：' + res.latitude);
-						uni.setStorageSync("longitude",res.longitude);
-						uni.setStorageSync("latitude",res.latitude)
+						uni.setStorageSync("longitude", res.longitude);
+						uni.setStorageSync("latitude", res.latitude)
 						var point = new plus.maps.Point(res.longitude, res.latitude);
 						var point = new plus.maps.Point(res.longitude, res.latitude);
 						plus.maps.Map.reverseGeocode(
 						plus.maps.Map.reverseGeocode(
 							point, {},
 							point, {},
@@ -268,14 +277,14 @@
 								console.log(address, 'address');
 								console.log(address, 'address');
 								var reg = /.+?(省|市|自治区|自治州|县|区)/g;
 								var reg = /.+?(省|市|自治区|自治州|县|区)/g;
 								console.log(address.match(reg));
 								console.log(address.match(reg));
-								var addressname=address.match(reg);
+								var addressname = address.match(reg);
 								console.log(addressname);
 								console.log(addressname);
 
 
-								if(uni.getStorageSync("provincename")==''){
-									that.provincename=addressname[0];
-									uni.setStorageSync("provincename",that.provincename)
-								}else{
-									that.provincename=uni.getStorageSync("provincename")
+								if (uni.getStorageSync("provincename") == '') {
+									that.provincename = addressname[0];
+									uni.setStorageSync("provincename", that.provincename)
+								} else {
+									that.provincename = uni.getStorageSync("provincename")
 								}
 								}
 
 
 								console.log(that.provincename);
 								console.log(that.provincename);
@@ -295,24 +304,24 @@
 				});
 				});
 			},
 			},
 			// 修改个人信息
 			// 修改个人信息
-			changeinfo(){
+			changeinfo() {
 				let that = this;
 				let that = this;
 				var url = 'member/update_user';
 				var url = 'member/update_user';
 				var params = {
 				var params = {
 
 
-					longitude:uni.getStorageSync("longitude"),
-					latitude:uni.getStorageSync("latitude")
+					longitude: uni.getStorageSync("longitude"),
+					latitude: uni.getStorageSync("latitude")
 				}
 				}
 				console.log(params)
 				console.log(params)
 				app.post(url, params).then((res) => {
 				app.post(url, params).then((res) => {
 					console.log(res);
 					console.log(res);
-					this.carttotal=res.data.data.total
+					this.carttotal = res.data.data.total
 				}).catch((err) => {
 				}).catch((err) => {
 
 
 				})
 				})
 			},
 			},
 			// 获取购物车气泡
 			// 获取购物车气泡
-			getcartnum(){
+			getcartnum() {
 				let that = this;
 				let that = this;
 				var url = 'car/bubble';
 				var url = 'car/bubble';
 				var params = {
 				var params = {
@@ -320,21 +329,21 @@
 				}
 				}
 				app.post(url, params).then((res) => {
 				app.post(url, params).then((res) => {
 					console.log(res);
 					console.log(res);
-					this.carttotal=res.data.data.total
+					this.carttotal = res.data.data.total
 				}).catch((err) => {
 				}).catch((err) => {
 
 
 				})
 				})
 			},
 			},
 			// 店铺收藏
 			// 店铺收藏
-			collectshop(){
-				let token=uni.getStorageSync("token");
-				if(token==''){
+			collectshop() {
+				let token = uni.getStorageSync("token");
+				if (token == '') {
 					uni.navigateTo({
 					uni.navigateTo({
-						url:'/pages/login/loginindex'
+						url: '/pages/login/loginindex'
 					})
 					})
-				}else{
+				} else {
 					uni.navigateTo({
 					uni.navigateTo({
-						url:"/pages/homepage/collectshop"
+						url: "/pages/homepage/collectshop"
 					})
 					})
 				}
 				}
 
 
@@ -346,37 +355,37 @@
 				})
 				})
 			},
 			},
 			// 购物车列表
 			// 购物车列表
-			cartlist(){
-				let token=uni.getStorageSync("token");
-				if(token==''){
+			cartlist() {
+				let token = uni.getStorageSync("token");
+				if (token == '') {
 					uni.redirectTo({
 					uni.redirectTo({
-						url:'/pages/login/loginindex?type=1'
+						url: '/pages/login/loginindex?type=1'
 					})
 					})
-				}else{
+				} else {
 					uni.navigateTo({
 					uni.navigateTo({
-						url:'/pages/nearshop/cartlist'
+						url: '/pages/nearshop/cartlist'
 					})
 					})
 				}
 				}
 
 
 			},
 			},
 			// 会员卡
 			// 会员卡
-			huiyuanka(){
-				let token=uni.getStorageSync("token");
-				if(token==''){
+			huiyuanka() {
+				let token = uni.getStorageSync("token");
+				if (token == '') {
 					uni.navigateTo({
 					uni.navigateTo({
-						url:"/pages/login/loginindex"
+						url: "/pages/login/loginindex"
 					})
 					})
-				}else{
+				} else {
 					uni.navigateTo({
 					uni.navigateTo({
-						url:'/pages/usercenter/usercenter'
+						url: '/pages/usercenter/usercenter'
 					})
 					})
 				}
 				}
 
 
 			},
 			},
 			// 覆盖城市
 			// 覆盖城市
-			gocityfugai(){
+			gocityfugai() {
 				uni.navigateTo({
 				uni.navigateTo({
-					url:'/pages/homepage/map'
+					url: '/pages/homepage/map'
 				})
 				})
 			},
 			},
 			// 获取面访商品列表
 			// 获取面访商品列表
@@ -390,9 +399,11 @@
 					pageNum: 6
 					pageNum: 6
 				}
 				}
 				app.post(url, params).then((res) => {
 				app.post(url, params).then((res) => {
-					console.log(res);
-					that.shoplist = res.data.data
-
+					console.log('面坊列表', res);
+					that.shoplist = that.shoplist.concat(res.data.data)
+					if (res.data.data.length == 0) {
+						that.datamianfang=true
+					}
 				}).catch((err) => {
 				}).catch((err) => {
 
 
 				})
 				})
@@ -466,16 +477,35 @@
 				}
 				}
 			},
 			},
 		},
 		},
-		onShow(){
+		onShow() {
 			uni.hideTabBar({
 			uni.hideTabBar({
 
 
 			})
 			})
+			// this.page = 1;
+			// this.shoplist=[];
+			
 			this.getlocation();
 			this.getlocation();
 			this.getqiandaoinfo();
 			this.getqiandaoinfo();
-			let token=uni.getStorageSync("token");
-			if(token!=''){
+			let token = uni.getStorageSync("token");
+			if (token != '') {
 				this.getcartnum()
 				this.getcartnum()
 			}
 			}
+		},
+		onReachBottom() {
+			if(this.datamianfang==true){
+				uni.showToast({
+					title:'没有更多了~',
+					icon:"none"
+				})
+			}else{
+				let newpage = this.page;
+				newpage++;
+				this.page = newpage;
+				this.getfoodlist()
+			}
+				
+			
+
 		}
 		}
 
 
 	}
 	}
@@ -483,19 +513,22 @@
 
 
 <style>
 <style>
 	@import url('../../base/homepage');
 	@import url('../../base/homepage');
-	.middleenter{
-		color:#BDC4CE;
+
+	.middleenter {
+		color: #BDC4CE;
 		font-size: 24rpx;
 		font-size: 24rpx;
-		height:60rpx;
+		height: 60rpx;
 		line-height: 60rpx;
 		line-height: 60rpx;
 	}
 	}
 
 
 	.content {
 	.content {
 		padding-top: calc(var(--status-bar-height) + 88rpx);
 		padding-top: calc(var(--status-bar-height) + 88rpx);
 	}
 	}
+
 	.status_bar {
 	.status_bar {
 		background: ;
 		background: ;
 	}
 	}
+
 	.lianxu {
 	.lianxu {
 		color: #3D444C;
 		color: #3D444C;
 		font-size: 28rpx;
 		font-size: 28rpx;
@@ -551,7 +584,7 @@
 	}
 	}
 
 
 	.listbox {
 	.listbox {
-		margin-bottom: 150rpx;
+		margin-bottom: 20rpx;
 
 
 	}
 	}
 
 

 <template>
 <template>
 	<view class="content">
 	<view class="content">
+		
 		<view class="goodtailtop">
 		<view class="goodtailtop">
 			<image :src="goodtail.image" mode=""></image>
 			<image :src="goodtail.image" mode=""></image>
 		</view>
 		</view>
@@ -354,6 +355,34 @@
 					this.getcommentlist();
 					this.getcommentlist();
 				}
 				}
 			},
 			},
+			
+			// 获取评论列表
+			getcommentlist() {
+				let that = this;
+				var url = 'goods_comments/get_list';
+				var params = {
+					type: that.type,
+					goods_id: that.goodid,
+					star_type: that.star_type,
+					page: that.page,
+					pageNum: 10
+				}
+				console.log('33478478',params)
+				app.post(url, params).then((res) => {
+					console.log('获取评论列表',res);
+					that.commentlist = that.commentlist.concat(res.data.data.list);
+					// that.total=res.data.data.total;
+					// that.total1=res.data.data.total1;
+					// that.total2=res.data.data.total2
+					// that.total3=res.data.data.total3
+			
+			
+				}).catch((err) => {
+					console.log(err)
+			
+				})
+			},
+			
 			// 数量加减
 			// 数量加减
 			reducenum() {
 			reducenum() {
 				this.cartnumber = this.cartnumber - 1;
 				this.cartnumber = this.cartnumber - 1;
@@ -374,30 +403,7 @@
 				this.cartnumber = this.cartnumber
 				this.cartnumber = this.cartnumber
 			},
 			},
 
 
-			// 获取评论列表
-			getcommentlist() {
-				let that = this;
-				var url = 'goods_comments/get_list';
-				var params = {
-					type: '',
-					goods_id: that.goodid,
-					star_type: that.star_type,
-					page: that.page,
-					pageNum: 10
-				}
-				app.post(url, params).then((res) => {
-					console.log(res);
-					that.commentlist = that.commentlist.concat(res.data.data.list);
-					that.total=res.data.data.total;
-					that.total1=res.data.data.total1;
-					that.total2=res.data.data.total2
-					that.total3=res.data.data.total3
-
 			
 			
-				}).catch((err) => {
-
-				})
-			},
 			//获取面坊商品详情
 			//获取面坊商品详情
 			getgoodtail() {
 			getgoodtail() {
 				let that = this;
 				let that = this;
@@ -888,7 +894,10 @@
 		width:200rpx;
 		width:200rpx;
 		display:block;
 		display:block;
 		position: absolute;
 		position: absolute;
-		left:-20rpx;
+		left:0rpx;
 		top:0;
 		top:0;
+		text-align: left;
+		padding-left: 10rpx;
+		box-sizing: border-box;
 	}
 	}
 </style>
 </style>

 <template>
 <template>
 	<view class="page">
 	<view class="page">
-		<view class="boxb">
+		<view class="nodata" v-if="couponlist.length==0">暂无优惠券</view>
+		<view class="boxb" v-else>
 			<view class="container">
 			<view class="container">
 				<view class="bitem flexone" @click="item.status!=1?'':selcoupon(item,index)" :class="item.status!=1?'borderactive':''"  v-for="(item,index) in couponlist" :key="index">
 				<view class="bitem flexone" @click="item.status!=1?'':selcoupon(item,index)" :class="item.status!=1?'borderactive':''"  v-for="(item,index) in couponlist" :key="index">
 					<view class="couponleft" v-if="item.status!=1">
 					<view class="couponleft" v-if="item.status!=1">

@@ -37,23 +37,24 @@
 						</view>
 						</view>
 						<view class="orderBox">
 						<view class="orderBox">
 							<view class="orderItem"  @click.stop="fahuo" :data-id="1">
 							<view class="orderItem"  @click.stop="fahuo" :data-id="1">
-								<image src="../../static/order_a.png" mode="widthFix"></image>
+								<image src="../../static/order_a.png" class="orderimg"></image>
 								<view>待付款</view>
 								<view>待付款</view>
 							</view>
 							</view>
 							<view class="orderItem"  @click.stop="fahuo" :data-id="2">
 							<view class="orderItem"  @click.stop="fahuo" :data-id="2">
-								<image src="../../static/order_b.png" mode="widthFix"></image>
+								<image src="../../static/order_b.png" ></image>
 								<view>待发货</view>
 								<view>待发货</view>
 							</view>
 							</view>
 							<view class="orderItem"  @click.stop="fahuo" :data-id="3">
 							<view class="orderItem"  @click.stop="fahuo" :data-id="3">
-								<image src="../../static/order_c.png" mode="widthFix"></image>
+								<image src="../../static/order_c.png" ></image>
 								<view>待收货</view>
 								<view>待收货</view>
 							</view>
 							</view>
 							<view class="orderItem"  @click.stop="fahuo" :data-id="4">
 							<view class="orderItem"  @click.stop="fahuo" :data-id="4">
-								<image src="../../static/order_d.png" mode="widthFix"></image>
+								<image src="../../static/order_d.png" ></image>
 								<view>待评价</view>
 								<view>待评价</view>
 							</view>
 							</view>
+							
 							<view class="orderItem"  @click.stop="fahuo" :data-id="0">
 							<view class="orderItem"  @click.stop="fahuo" :data-id="0">
-								<image src="../../static/order_e.png" mode="widthFix"></image>
+								<image src="../../static/order_e.png" class="dingorder"></image>
 								<view>全部订单</view>
 								<view>全部订单</view>
 							</view>
 							</view>
 						</view>
 						</view>
@@ -80,6 +81,7 @@
 						<view class="citem"  @click.stop="jump" data-id="7">
 						<view class="citem"  @click.stop="jump" data-id="7">
 							<view class="left">
 							<view class="left">
 								<image src="../../static/fenxiao.png" mode="widthFix" />
 								<image src="../../static/fenxiao.png" mode="widthFix" />
+							
 								我的分销
 								我的分销
 							</view>
 							</view>
 							<view class="right">
 							<view class="right">
@@ -351,6 +353,14 @@
 		background-color: #F9F9F9;
 		background-color: #F9F9F9;
 	}
 	}
 	
 	
+	.orderItem image{
+		width:42rpx!important;
+		height:38rpx;
+	}
+	.orderItem .dingorder{
+		width:38rpx!important;
+		
+	}
 	.header {
 	.header {
 		background: #fff;
 		background: #fff;
 		padding: 0 32rpx;
 		padding: 0 32rpx;
@@ -472,7 +482,9 @@
 	.orderItem {
 	.orderItem {
 		display: flex;
 		display: flex;
 		flex-wrap: wrap;
 		flex-wrap: wrap;
+		flex-direction: column;
 		justify-content: center;
 		justify-content: center;
+		align-items: center;
 		min-width: 84rpx;
 		min-width: 84rpx;
 	}
 	}