设置和订单管理

pages/login/login.vue

@@ -36,7 +36,8 @@ export default {
 			// console.log(res)
 			if (res.code === 200) {
 				uni.setStorageSync('openid', res.data.openid)
-				uni.setStorageSync('userInfo', res.data)
+				uni.setStorageSync('userInfo', res.data)
+				uni.setStorageSync('userId', res.data.id)
 				uni.showToast({
 					title: '授权成功',
 					icon: 'success',

pages/my/my.vue

@@ -6,8 +6,8 @@
 			<!-- 页面标题 -->
 			<view class="title">我的</view>
 			<!-- 头像区域 -->
-			<img class="img" src="../../static/my/portrait.png" />
-
+			<img class="img" v-if="flag" :src="userInfo.headPhoto" />
+			<img class="img" v-else src="../../static/my/portrait.png" />
 			<!-- 姓名区域 -->
 			<view class="name" v-if="flag">{{ userInfo.user_name || '游客' }}</view>
 			<!-- 用户id区域 -->

pages/orderDetail/orderDetail.vue

@@ -30,11 +30,12 @@
 			<view class="header_type" v-if="info.orderStatus === '10'">退款中</view>
 			<view class="header_info" v-if="info.orderStatus === '10'">正在退款中...</view>
 
-			<view class="header_btn">
+			<view class="header_btn">
+				<!-- hotelIsCanorder  1可取消，0不可 -->
 				<view class="btn_box" v-if="info.orderStatus === '1'" @click="handlePay">去支付 ￥{{ info.houseTotalPrice }}.00</view>
-				<view class="btn_box" v-if="info.orderStatus === '2' || info.orderStatus === '3'" @click="handleCancel">取消订单</view>
+				<view class="btn_box" v-if="((info.orderStatus === '2' || info.orderStatus === '3') && info.hotelIsCanorder=='1') || info.orderStatus === '1'" @click="handleCancel">取消订单</view>
 				<view class="btn_box" v-if="info.orderStatus * 1 > 3" @click="handleAgain">再次预定</view>
-				<view class="btn_box" @click="handleDelete">删除订单</view>
+				<view class="btn_box" @click="handleDelete" v-if="info.orderStatus === '5' || info.orderStatus === '7' || info.orderStatus === '8' || info.orderStatus === '9'">删除订单</view>
 			</view>
 
 			<view class="header_msg" v-if="info.orderStatus === '1'">预定成功后，07月26日12:00前可免费取消</view>
@@ -81,23 +82,23 @@
 			<!-- 房型信息和用户信息区域 -->
 			<view class="body_box2">
 				<view class="info_time">
-					7月26日
-					<text class="gap">今天</text>
+					{{info.orderStartTime.slice(5,7)}}月{{info.orderStartTime.slice(8,10)}}日
+					<!-- <text class="gap">今天</text> -->
 					<view class="time_line"></view>
-					<view class="time_num">1晚</view>
+					<view class="time_num">{{info.houseOrderNumber}}晚</view>
 					<view class="time_line"></view>
-					<view class="gap">7月26日</view>
-					<text>明天</text>
+					<view class="gap">{{info.checkOutTime.slice(5,7)}}月{{info.checkOutTime.slice(8,10)}}日</view>
+					<!-- <text>明天</text> -->
 				</view>
-				<view class="info_msg">大床房</view>
+				<view class="info_msg">{{info.houseName}}</view>
 				<view class="info_type">
 					<view class="type_item">包吃住型</view>
 					<view class="type_item">包吃住型</view>
 					<view class="type_item">包吃住型</view>
 				</view>
 				<view class="info_tag">
-					<view class="tag_item">16-20㎡</view>
-					<view class="tag_item">双人床</view>
+					<view class="tag_item">{{info.houseAreas}}㎡</view>
+					<view class="tag_item">{{info.houseName}}</view>
 					<view class="tag_item">窗户位于走廊/窗户较小</view>
 				</view>
 				<view class="info_box">
@@ -119,8 +120,8 @@
 				<view class="box_title">订单信息</view>
 				<view class="box_container">
 					<view class="container_key">订单号</view>
-					<view class="container_value">2626262626260660606</view>
-					<view class="container_copy" @click="handleCopy('2626262626260660606')">复制</view>
+					<view class="container_value">{{info.orderNum}}</view>
+					<view class="container_copy" @click="handleCopy(info.orderNum)">复制</view>
 				</view>
 				<view class="box_container">
 					<view class="container_key">下单时间</view>
@@ -211,17 +212,26 @@ export default {
 			uni.showModal({
 				title: '提示',
 				content: '确定取消该订单吗？',
-				success: (res) => {
-					if (res.confirm) {
-						uni.showToast({
-							title: '取消成功',
-							icon: 'success'
-						})
-						setTimeout(() => {
-							uni.redirectTo({
-								url: '/pages/orderManage/orderManage'
-							})
-						}, 1500)
+				success: async (res) => {
+					if (res.confirm) {
+						const result = await this.$myRequest({
+							url: '/mhotel/abkcancelBooking.action',
+							data: {
+								bookingId:this.info.id,
+							}
+						})
+						if (result.code === 200) {
+							uni.showToast({
+								title: '取消成功',
+								icon: 'success',
+								mask: true
+							})
+							setTimeout(() => {
+								uni.redirectTo({
+									url: '/pages/orderManage/orderManage'
+								})
+							}, 1500)
+						}
 					}
 				}
 			})
@@ -237,17 +247,26 @@ export default {
 			uni.showModal({
 				title: '提示',
 				content: '确定删除该订单吗？',
-				success: (res) => {
-					if (res.confirm) {
-						uni.showToast({
-							title: '删除成功',
-							icon: 'success'
-						})
-						setTimeout(() => {
-							uni.redirectTo({
-								url: '/pages/orderManage/orderManage'
-							})
-						}, 1500)
+				success: async (res) => {
+					if (res.confirm) {
+						const result = await this.$myRequest({
+							url: '/mhotel/abkdelBooking.action',
+							data: {
+								bookingId:this.info.id,
+							}
+						})
+						if (result.code === 200) {
+							uni.showToast({
+								title: '删除成功',
+								icon: 'success',
+								mask: true
+							})
+							setTimeout(() => {
+								uni.redirectTo({
+									url: '/pages/orderManage/orderManage'
+								})
+							}, 1500)
+						}
 					}
 				}
 			})

pages/orderManage/orderManage.vue

@@ -15,8 +15,9 @@
 						<img class="img" src="../../static/my/hotel.png" />
 						<view class="title">{{ item.hotelName }}</view>
 						<view class="type type2" v-if="item.orderStatus === '1'">
-							待支付，剩余
-							<uv-count-down :time="countDownTime" format="mm:ss" @change="change" @finish="finish"></uv-count-down>
+							待支付，剩余
+							<uni-countdown :show-day="false" :second="countDownTime" @timeup="timeup(item.createTime)" />
+							<!-- <uv-count-down :time="countDownTime" format="mm:ss" @change="change" @finish="finish"></uv-count-down> -->
 						</view>
 						<view class="type" v-if="item.orderStatus === '2'">已支付</view>
 						<view class="type" v-if="item.orderStatus === '3'">待入住</view>
@@ -33,7 +34,7 @@
 					<view class="box_info">
 						<img class="img" :src="item.imgUrl || '../../static/my/test.png'" />
 						<view class="info_right">
-							<view class="info_right_item">{{ item.houseOrderNumber }}间，{{ item.houseName }}房</view>
+							<view class="info_right_item">{{ item.houseOrderNumber }}间，{{ item.houseName }}</view>
 							<view class="info_right_item">{{ item.orderStartTime }} - {{ item.orderEndTime }}</view>
 							<view class="info_right_item">总价：¥{{ item.houseTotalPrice }}.00</view>
 						</view>
@@ -57,7 +58,7 @@ export default {
 			// 订单列表
 			orderList: [],
 			// 倒计时时间（毫秒）
-			countDownTime: 1000 * 60 * 15,
+			countDownTime: null,
 			// 当前页
 			page: 1,
 			// 每页多少条数据
@@ -68,6 +69,9 @@ export default {
 	},
 	onLoad() {
 		this.getOrderList()
+	},
+	onUnload: function () {
+	  clearInterval(this.timer);
 	},
 	// 下拉刷新
 	onPullDownRefresh() {
@@ -126,6 +130,47 @@ export default {
 					}
 				}
 			})
+		},
+		// 倒计时
+		timeup(createTime) {
+			    var that = this;
+			    /**setInterval间歇调用 */
+			    that.timer = setInterval(function () {
+				//订单下单时间
+				var buy_time = createTime;
+				//计算剩余下单时间
+				var time = (new Date(buy_time).getTime() + 15* 60 * 1000) - (new Date().getTime());
+				if(time>0){
+				  //计算剩余的分钟
+				  var minutes = parseInt(time / 1000 / 60 % 60, 10);
+				  //计算剩余的秒数
+				  var seconds = parseInt(time / 1000 % 60, 10);
+				  that.countDownTime=parseInt(time / 1000);
+				  // console.log(that.countDownTime)
+				  //判断分钟和秒数小于10要在前面加个0.
+				  if(minutes<10){
+					minutes = '0' + minutes;
+				  }
+				  if (seconds < 10) {
+					seconds = '0' + seconds;
+				  }
+				  var timer = minutes + ":" + seconds;
+				}
+			}, 1000);
+			if(that.countDownTime==0) {
+				uni.showModal({
+					title: '提示',
+					content: '订单已超过可支付时间，请重新下单',
+					showCancel: false,
+					success: (res) => {
+						if (res.confirm) {
+							uni.switchTab({
+								url: '/pages/home/home'
+							})
+						}
+					}
+				})
+			}
 		},
 		// 点击预定按钮回调
 		goPagePay() {

pages/set/set.vue

@@ -24,7 +24,7 @@
 			<view class="body_box">
 				ID
 				<view class="box_right">
-					<view class="msg">1925689</view>
+					<view class="msg">{{id}}</view>
 				</view>
 			</view>
 		</view>
@@ -38,7 +38,9 @@ export default {
 			// 头像
 			imgUrl: '',
 			// 账号名
-			name: ''
+			name: '',
+			//用户id
+			id:'',
 		}
 	},
 	onLoad() {
@@ -48,7 +50,8 @@ export default {
 		getUserInfo() {
 			let userInfo = uni.getStorageSync('userInfo')
 			this.name = userInfo.user_name
-			this.imgUrl = userInfo.headPhoto
+			this.imgUrl = userInfo.headPhoto
+			this.id=userInfo.id
 		},
 		// 点击头像图片回调
 		handleClickPhoto() {
@@ -67,9 +70,26 @@ export default {
 				count: 1,
 				sizeType: ['compressed'],
 				sourceType: ['album'], //从相册选择
-				success: (res) => {
-					// console.log(res.tempFilePaths)
-					this.imgUrl = res.tempFilePaths[0]
+				success: async (res) => {
+					// this.imgUrl = res.tempFilePaths[0]
+					const result = await this.$myRequest({
+						url: '/mhotel/ampupdateUserInfo.action',
+						data: {
+							userId: this.id,
+							userName: this.name,
+							headPhoto: res.tempFilePaths[0]
+						}
+					})
+					if (result.code === 200) {
+						uni.showToast({
+							title: '头像修改成功',
+							icon: 'success',
+							mask: true
+						})
+						setTimeout(() => {
+							this.getUser()
+						}, 1500)
+					}
 				}
 			})
 		},
@@ -103,17 +123,39 @@ export default {
 							const result = await this.$myRequest({
 								url: '/mhotel/ampupdateUserInfo.action',
 								data: {
-									userId: uni.getStorageSync('userInfo').id,
+									userId: this.id,
 									userName: res.content,
-									headPhoto: ''
+									headPhoto: this.imgUrl
 								}
-							})
-							console.log(result)
+							})
+							if (result.code === 200) {
+								uni.showToast({
+									title: '账号修改成功',
+									icon: 'success',
+									mask: true
+								})
+								setTimeout(() => {
+									this.getUser()
+								}, 1500)
+							}
 						}
 					}
 				}
 			})
-		}
+		},
+		//获取个人信息
+		async getUser(){
+			const res = await this.$myRequest({
+				url: '/mhotel/ampqueryUsersById.action',
+				data: {
+					userId:uni.getStorageSync('userId')
+				}
+			})
+			if (res.code === 200) {
+				this.name = res.data.user_name
+				this.imgUrl = res.data.headPhoto
+			}
+		},
 	}
 }
 </script>

unpackage/dist/dev/mp-weixin/pages/orderManage/orderManage.json

@@ -3,7 +3,6 @@
   "enablePullDownRefresh": true,
   "usingComponents": {
     "uni-swipe-action": "/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action",
-    "uni-swipe-action-item": "/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item",
-    "uv-count-down": "/uni_modules/uv-count-down/components/uv-count-down/uv-count-down"
+    "uni-swipe-action-item": "/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item"
   }
 }

unpackage/dist/dev/mp-weixin/project.config.json

@@ -15,8 +15,7 @@
       "ignore": [],
       "disablePlugins": [],
       "outputPath": ""
-    },
-    "condition": false
+    }
   },
   "compileType": "miniprogram",
   "libVersion": "",

unpackage/dist/dev/mp-weixin/sitemap.json

@@ -0,0 +1,7 @@
+{
+  "desc": "关于本文件的更多信息，请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
+  "rules": [{
+  "action": "allow",
+  "page": "*"
+  }]
+}