Merge branch 'master' of http://git.ringzle.com:3000/htcwl/hotelHomestayWx

pages.json

@@ -5,7 +5,8 @@
 			"path": "pages/home/index",
 			"style": {
 				"navigationBarTitleText": "首页",
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		},
 		{

pages/home/condition.vue

@@ -53,10 +53,11 @@
 					if(res.data.code===0){
 						this.list = res.data.data;
 						let n = new Date().Format('yyyy-MM-dd');
+						let y = new Date(new Date().setDate(new Date().getDate()-1)).Format('yyyy-MM-dd');
 						this.list.forEach(l=>{
 							let w = new Date(l.dateDay).getDay();
 							l.yr = new Date(l.dateDay).Format('MM-dd');
-							l.week = n==l.dateDay?'今天':this.weekCfg[w];
+							l.week = y==l.dateDay?'昨天':(n==l.dateDay?'今天':this.weekCfg[w]);
 							l.color = n==l.dateDay?'c_today':([6,0].includes(w)?'c_week':'c_normal');
 						})
 					}else this.$showToast(res.data.msg)

pages/home/index.vue

@@ -55,7 +55,7 @@
 			</view>
 		</view>
 		<block v-if="list.length>0">
-			<view class="card" v-for="(item,index) in list" :key="index">
+			<view class="card" v-for="(item,index) in list" :key="index" @tap="handleDetail(item)">
 				<view class="c_top">
 					<text>订单号：{{item.orderCode}}</text>
 					<text v-if='item.orderStatus==-1&&item.status==1' class="orange">待确认</text>
@@ -76,9 +76,9 @@
 				<view class="c_bottom">
 					<view class="btn" v-if="item.orderStatus==-1" :class="item.orderStatus==-1?'btn_jj':''" @tap="cancle(item)">拒绝</view>
 					<view class="btn" v-if="item.orderStatus==-1" @tap="toConfrimOrder(item)">确认订单</view>
-					<view class="btn" v-if="item.orderStatus==1" @tap="checkIn(2,item)">办理入住</view>
+					<view class="btn" v-if="item.orderStatus==1&&item.istoday" @tap="checkIn(2,item)">办理入住</view>
 					<view class="btn" v-if="item.orderStatus==2" @tap="toBltf(item)">办理退房</view>
-					<view class="btn" v-if="item.orderStatus==3||item.orderStatus==4" :class="item.orderStatus==3||item.orderStatus==4?'btn_xq':''" @tap="handleDetail(item)">详情</view>
+					<view class="btn" v-if="item.orderStatus==3||item.orderStatus==4||(item.orderStatus==1&&!item.istoday)" :class="(item.orderStatus==3||item.orderStatus==4||(item.orderStatus==1&&!item.istoday))?'btn_xq':''" @tap="handleDetail(item)">详情</view>
 				</view>
 			</view>
 		</block>
@@ -143,6 +143,14 @@
 			if(this.finished) return
 			this.getList();
 		},
+		onPullDownRefresh() {
+			setTimeout(()=>{
+				this.getType();
+				this.getDetails();
+				this.init();
+				uni.stopPullDownRefresh();
+			},1000);
+		},
 		methods: {
 			getType(){
 				this.$api.post('/merchant/register/getMerchantStoreList').then(res=>{
@@ -194,6 +202,7 @@
 						this.list = [...this.list,...res.data.data.list];
 						this.list.forEach(l=>{
 							l.date = new Date(l.arriveDate).Format('MM/dd')+" - "+new Date(l.leaveDate).Format('MM/dd');
+							l.istoday = new Date().Format('yyyy-MM-dd')==new Date(l.arriveDate).Format('yyyy-MM-dd')?true:false;
 						})
 						if (res.data.data.list.length == 0) this.finished = true;
 						else this.page++;

pages/house/orderInfo.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page" :style="{'height':(h)+'px','padding-top':mt+'px'}">
-		<c-nav-bar title="订单详情" :showIcon="true" :titleStyle="titleStyle"></c-nav-bar>
+		<c-nav-bar title="订单详情" showIcon="true" :titleStyle="titleStyle"></c-nav-bar>
 		<view class="body">
 			<!-- 个人信息 -->
 			<view class="uname">
@@ -52,7 +52,7 @@
 						<text>何伟婷</text>
 					</view>
 				</u-cell> -->
-				<u-cell>
+				<u-cell v-if="orderInfo.orderStatus==4">
 					<text slot="icon" style="font-size: 30rpx; margin-right: 20rpx;">取消原因</text>
 					<view slot="title" class="title">
 						<text>{{orderInfo.refundReason}}</text>
@@ -113,9 +113,16 @@
 	export default {
 		data() {
 			return {
+				titleStyle: {
+					fontSize: '34rpx',
+					fontWeight: "bold",
+				},
+				h:uni.getSystemInfoSync().windowHeight - 87,
+				mt: uni.getSystemInfoSync().statusBarHeight + 44,
 				show: false,
 				show2: false,
 				show3: false,
+				
 				check: {
 					initiator: 1,
 					refundReason: "",
@@ -138,6 +145,7 @@
 				this.$api.get(`/merchant/hotel/order/getOrderDetail/${this.orderId}`).then((res) => {
 					if (res.data.code == 0) {
 						this.orderInfo = res.data.data
+						
 					}
 				})
 			},

pagesMy/orderList/orderList.vue

@@ -10,10 +10,9 @@
 			</view>
 		</view>
 		<view class="mainContain">
-			<view class="card" v-for="item,index  in dataList" :key="index">
+			<view v-if="dataList.length>0" class="card" v-for="item,index  in dataList" :key="index">
 				<view class="header">
 					<span style="font-weight: 700;">订单号：{{item.orderCode}}</span>
-
 					<text v-if='item.orderStatus==-1&&item.status==1' class="orange">待确认</text>
 					<text v-else-if='item.status==0&&item.orderStatus==-1' class="red">待支付</text>
 					<text v-else-if='item.orderStatus==1&&item.status==1' class="green">已预订</text>
@@ -62,16 +61,20 @@
 					</view>
 				</view> -->
 			</view>
+			<view class="nodata" v-if='dataList.length==0'>
+				<NoData></NoData>
+			</view>
 		</view>
 	</view>
 </template>
 
 <script>
 	import TopTabs from '../../components/TopTabs/topTabs.vue';
+	// import NoData from '../../components/NoData/index.vue';
 	export default {
 		components: {
 			TopTabs,
-
+			// NoData
 		},
 		data() {
 			return {
@@ -129,7 +132,7 @@
 			},
 			getOrderList(orderStatus) {
 				this.$api.get('/merchant/hotel/order/getMerchantOrderPageList', {
-					homestayId: '1711268640588517378',
+					homestayId: this.homestayId,
 					limit: this.limit,
 					page: this.page,
 					orderStatus: orderStatus ? orderStatus : ''
@@ -140,6 +143,7 @@
 							this.dataList[index].arriveDate = i.arriveDate.slice(0, 10)
 							this.dataList[index].leaveDate = i.leaveDate.slice(0, 10)
 						})
+						console.log(this.dataList,'this.dataList');
 					} else {
 						uni.showToast({
 							title: res.data.msg,
@@ -175,7 +179,7 @@
 			},
 			handleDetail(item) {
 				uni.navigateTo({
-					url: '/pages/house/orderInfo?orderId='+item.id
+					url: '/pages/house/orderInfo?orderId=' + item.id
 				})
 			},
 			changeTab(index) {
@@ -272,6 +276,11 @@
 			flex-direction: column;
 			padding: 0 20rpx;
 
+			.nodata {
+				background: white;
+
+			}
+
 			.card {
 				background: #fff;
 				border-radius: 16rpx;

pagesMy/stayInfo/roomPosition.vue

@@ -66,6 +66,7 @@
 	export default {
 		data() {
 			return {
+				
 				selectIndex: undefined,
 				selectAddr: {},
 				searchWords: "",
@@ -150,6 +151,9 @@
 			// });
 		},
 		methods: {
+			changeBegin(){
+				this.visible=true
+			},
 			myPosition() {
 				var myAmapFun = new amapFile.AMapWX({
 					key: '1173b1eb83eb93bff1fb4a5987503a51'