修改

pages/hotel/description.vue

@@ -4,7 +4,7 @@
 			<u-tabs :is-scroll="false" name="Name" :list="navs" active-color="#DFBE6E" :current="active" @change="changeHandler"
 			 :show-bar="true" :activeFontSize="32" inactive-color="#111111" :bold="true" height="100" duration="0" font-size="28"></u-tabs>
 		</view>
-		<scroll-view scroll-y="true" class="hotel-descr" @scroll="scroll">
+		<scroll-view scroll-y="true" class="hotel-descr" @scroll="scroll" :scroll-top="scrollTop">
 			<view class="content">
 				<view class="flex">
 					<image src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1622085515000_731.png" mode="widthFix"
@@ -141,7 +141,7 @@
 				this.scrollTop = posi;
 				this.$nextTick(function() {
 					this.scrollTop = posi;
-				});
+				});				
 			},
 			changeActive() {
 				let t = 0

pages/hotel/detail.vue

@@ -32,7 +32,6 @@
 						</view>
 						<view class="mi-right">
 							<view style="font-size: 40rpx;font-weight: 600;text-align: right;margin-bottom: 6rpx;" class="king">{{dataList.StarName}}</view>
-							<view style="font-weight: 500;color:#dfbe6e99;text-align: right;" class="f12">658人下单入住</view>
 							<!-- <view class="flex">
 								<text style="color:white;margin-right: 14rpx;" class="f12">星级</text>
 								<u-rate active-color="#DFBE6E" inactive-color="#f1f1f1" current="4" active-icon="star" inactive-icon="star" disabled></u-rate>
@@ -75,7 +74,7 @@
 						<view class="sb-left">
 							<view class="sb-item" v-for="(subItem,sIndex) in dataList.PublicFacilities">{{subItem}}</view>
 						</view>
-						<view class="sb-right">
+						<view class="sb-right" @click="openDescription">
 							<text style="margin-right: 20rpx;">设施/详情</text>
 							<u-icon name="arrow" size="20" />
 						</view>
@@ -833,8 +832,11 @@
 	.hotel-detail .hotel-content .hotel-base .shebei .sb-left {
 		width: 1px;
 		flex: 1;
-		display: flex;
+		/* display: flex; */
 		align-items: center;
+		display: -webkit-box;
+		overflow: auto;
+		margin-right:20rpx;
 	}
 
 	.hotel-detail .hotel-content .hotel-base .shebei .sb-left .sb-item {

pages/jiuzhai/jz_MyOrder.vue

@@ -5,10 +5,6 @@
 
 	}
 
-	/* 	.jz_MyOrderMain{
-		background-color: #ECF1F4;
-	}
- */
 	.jz_OrderList {
 		width: 100%;
 		min-height: 334rpx;
@@ -71,7 +67,7 @@
 	.jz_Zailai {
 		position: absolute;
 		right: 40rpx;
-		bottom: 40rpx;
+		bottom: 20rpx;
 		background-color: #111111;
 		border-radius: 16px;
 		width: 150rpx;
@@ -115,7 +111,8 @@
 								<view style="margin-top:22rpx;">付款总额：¥{{item.preferPrice}}</view>
 							</view>
 						</view>
-						<view class="jz_Zailai" @click="gojz_List">再来一单</view>
+						<view class="jz_Zailai" style="right:90px;" @click="gojz_List">再来一单</view>
+						<view class="jz_Zailai" style="width:60px;" @click="goCancel(item)">取消</view>
 					</view>
 				</scroll-view>
 			</view>
@@ -133,15 +130,19 @@
 				msg: {
 					pageIndex: 1,
 					pageSize: 15,
-					MiniAppUserId: 0
+					MiniAppUserId: 0,
+					orderState:-1
 				},
 				mainColor: "",
 				list: [{
-					name: '全部'
+					name: '全部',
+					Id:-1
 				}, {
-					name: '待付款'
+					name: '待付款',
+					Id:2
 				}, {
-					name: '未使用'
+					name: '已付款',
+					Id:1
 				}],
 				current: 0,
 				dataList: [],
@@ -158,12 +159,15 @@
 			this.getOrderInfo();
 		},
 		onLoad(option) {
+			this.current = option.status || 0;
 			this.mainColor = this.$uiConfig.mainColor;
 
 		},
 		methods: {
-			change(val) {
-
+			change(i) {
+				this.current = i;
+				this.msg.orderState = this.list[i].Id;
+				this.research();
 			},
 			//获取第一张图
 			getFirstImg(obj) {
@@ -191,14 +195,28 @@
 					this.status = "nomore";
 				}
 			},
-			getOrderInfo() {
+			research()
+			{
+				this.msg.pageIndex=1;
+				this.getOrderInfo(1);
+			},
+			getOrderInfo(type) {
+				if(type==1){
+					this.dataList=[];
+				}
 				this.userInfo = uni.getStorageSync('mall_UserInfo');
 				this.msg.MiniAppUserId = this.userInfo.UserId
 				this.apipost("sellorder_post_GetMiniAppTravelOrderList", this.msg,
 					res => {
 						if (res.resultCode == 1) {
 							console.log(res, '数据');
-							this.dataList = this.dataList.concat(res.data.pageData);
+							if(type==1){
+								this.dataList = res.data.pageData;
+							}
+							else{
+								this.dataList = this.dataList.concat(res.data.pageData);
+							}
+							
 							this.dataList.forEach(x => {
 								x.isShowHalf = true;
 							})
@@ -209,6 +227,51 @@
 					},
 					null
 				);
+			},
+			//取消订单
+			goCancel(item) {
+				console.log(item, 'item');
+				//未付款-调用后台取消
+				if ((item.paymentTime == null||item.paymentTime=='')&&item.orderState==2) {
+					this.apipost(
+						"sellorder_post_B2BRemoveOrder", {
+							ID: item.orderId
+						},
+						res => {
+							if (res.data.resultCode == 1) {
+								uni.showToast({
+									title: '操作成功',
+									icon: 'success',
+								})
+								this.research();
+							}
+						},
+						err => {}
+					);
+				}	
+				else{
+					let msg={
+						OrderId:item.orderId,
+						UserId:uni.getStorageSync('mall_UserInfo').UserId
+					}
+					//已付款取消申请
+					this.apipost("sellorder_post_AppletUserCancelOrder", msg ,
+						res => {
+							if (res.resultCode == 1) {
+								console.log(res, '数据');
+								uni.showToast({
+									title: '操作成功',
+									icon: 'success',
+								})
+								this.research();
+							
+							} else {
+					
+							}
+						},
+						null
+					);
+				}
 			}
 		}