更新代码

.hbuilderx/launch.json

@@ -1,11 +1,16 @@
-{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
-  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
-    "version": "0.0",
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
     "configurations": [{
-            "type": "uniCloud",
-            "default": {
-                "launchtype": "local"
-            }
-        }
-    ]
-}
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}

App.vue

@@ -1,27 +1,26 @@
-<script>
-	export default {
-		onLaunch: function() {
-			console.log('App Launch')
-			// console.log(localStorage.getItem('token')=='null')
-			if(localStorage.getItem('token')=='null' && localStorage.getItem('errorMsg')=='null') {
-				window.location.href ='https://open.wecard.qq.com/connect/oauth/authorize?app_key=4FD5599032819781&response_type=code&scope=snsapi_userinfo&ocode=1015730314&redirect_uri=https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/hotelUser/weixiaoAuth&state=https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/hotelUser/weixiaoAuth';
-			} else if (localStorage.getItem('token')=='null' && localStorage.getItem('errorMsg')=='获取用户信息失败') {
-				uni.navigateTo({
-					url:'pages/huoquanshibai/huoquanshibai'
-				})
-			}
-			
-		},
-		onShow: function() {
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
-		}
-	}
-</script>
-
-<style lang="scss">
+<script>
+	export default {
+		onLaunch: function() {
+			console.log('App Launch')
+			// if(localStorage.getItem('token')=='null' && localStorage.getItem('errorMsg')=='null') {
+			// 	window.location.href ='https://open.wecard.qq.com/connect/oauth/authorize?app_key=4FD5599032819781&response_type=code&scope=snsapi_userinfo&ocode=1015730314&redirect_uri=https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/hotelUser/weixiaoAuth&state=https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/hotelUser/weixiaoAuth';
+			// } else if (localStorage.getItem('token')=='null' && localStorage.getItem('errorMsg')=='获取用户信息失败') {
+				uni.navigateTo({
+					url:'pages/huoquanshibai/huoquanshibai'
+				})
+			// }
+			
+		},
+		onShow: function() {
+			console.log('App Show')
+		},
+		onHide: function() {
+			console.log('App Hide')
+		}
+	}
+</script>
+
+<style lang="scss">
 	/*每个页面公共css */
 	@import '@/uni_modules/uni-scss/index.scss';
 	/* #ifndef APP-NVUE */
@@ -36,5 +35,5 @@
 		font-size: 14px;
 		color: #333;
 		padding: 10px;
-	}
+	}
 </style>

main.js

@@ -1,33 +1,35 @@
 
-// #ifndef VUE3
-import Vue from 'vue'
-import App from './App'
-import axios from "axios"
-import qs from 'qs'
-import getUrlKey from './utils/getToken.js'
-localStorage.setItem('token',getUrlKey('token'))
-localStorage.setItem('errorMsg',getUrlKey('errorMsg'))
-console.log(localStorage.getItem('token'))
-console.log(localStorage.getItem('errorMsg'))
-
-//引入公共接口
-import {myRequest} from './utils/api.js'
+// #ifndef VUE3
+import Vue from 'vue'
+import App from './App'
+import axios from "axios"
+import qs from 'qs'
+import getUrlKey from './utils/getToken.js'
+localStorage.setItem('token',getUrlKey('token'))
+localStorage.setItem('errorMsg',getUrlKey('errorMsg'))
+localStorage.setItem('openId',getUrlKey('openId'))
+console.log(localStorage.getItem('token'))
+console.log(localStorage.getItem('errorMsg'))
+console.log(localStorage.getItem('openId'))
+
+//引入公共接口
+import http from './utils/request.js'
 //挂载全局
-Vue.prototype.$myRequest = myRequest
-
-Vue.config.productionTip = false
-
-App.mpType = 'app'
-Vue.prototype.$axios = axios;
-Vue.prototype.$qs = qs;
-
-const app = new Vue({
-    ...App
-})
-app.$mount()
+Vue.prototype.$http = http
+
+Vue.config.productionTip = false
+
+App.mpType = 'app'
+Vue.prototype.$axios = axios;
+Vue.prototype.$qs = qs;
+
+const app = new Vue({
+    ...App
+})
+app.$mount()
 // #endif
 
-// #ifdef VUE3
+// #ifdef VUE3
 import { createSSRApp } from 'vue'
 import App from './App.vue'
 export function createApp() {
@@ -35,5 +37,5 @@ export function createApp() {
   return {
     app
   }
-}
+}
 // #endif

manifest.json

@@ -69,7 +69,7 @@
             "disableHostCheck" : true,
             "proxy" : {
                 //使用代理
-				// https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/roomType/list
+                // https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/roomType/list
                 "/hotel/ihotel-api" : {
                     "target" : "https://chtech.ncjti.edu.cn/hotel/ihotel-api", //目标地址
                     "changeOrigin" : true,

pages.json

@@ -1,84 +1,134 @@
-{
-	"pages": [{
-		"path": "pages/index/index",
-		"style": {
-			"navigationBarTitleText": "智慧校园公寓"
-		}
-	},
-	{
-		"path": "pages/myself/myself",
-		"style": {
-			"navigationBarTitleText": "我的"
-		}
-	},
-	{
-		"path": "pages/order_room/order_room",
-		"style": {
-			"navigationBarTitleText": "填写订单"
-		}
-	},
-	{
-		"path": "pages/my_orderlist/my_orderlist",
-		"style": {
-			"navigationBarTitleText": "我的订单"
-		}
-	},
-	{
-		"path": "pages/order_mark/order_mark",
-		"style": {
-			"navigationBarTitleText": "订单详情"
-		}
-	},
-	{
-		"path": "pages/ruzhuxuzhi/ruzhuxuzhi",
-		"style":{
-			"navigationBarTitleText": "入住须知"
-		}
-	},
-	{
-		"path": "pages/zhifuchenggong/zhifuchenggong",
-		"style":{
-			"navigationBarTitleText": "支付成功"
-		}
-	},
-	{
-		"path": "pages/huoquanshibai/huoquanshibai",
-		"style":{
-			"navigationBarTitleText": "获权失败"
-		}
-	},
-	{
-		"path": "pages/gongyuxiangqing/gongyuxiangqing",
-		"style":{
-			"navigationBarTitleText": "公寓详情"
-		}
-	}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#FFFFFF",
-		"backgroundColor": "#FFFFFF",
-		"app-plus": {
-			"background": "#efeff4"
-		}
-	},
-	"tabBar": {//底部导航
-		"color": "#7A7E83",
-		"selectedColor": "#296DE3",
-		"borderStyle": "black",
-		"backgroundColor": "#ffffff",
-		"list": [{
-			"pagePath": "pages/index/index",
-			"iconPath": "static/tabbar/apartment.svg",
-			"selectedIconPath": "static/tabbar/apart_dian.svg",//选中时的图片路径
-			"text": "公寓"
-		}, {
-			"pagePath": "pages/myself/myself",
-			"iconPath": "static/tabbar/myself.svg",
-			"selectedIconPath": "static/tabbar/myself_dian.svg",
-			"text": "我的"
-		}]
-	}
-
+{
+	"pages": [{
+		"path": "pages/index/index",
+		"style": {
+			"navigationBarTitleText": "智慧校园公寓"
+		}
+	},
+	{
+		"path": "pages/myself/myself",
+		"style": {
+			"navigationBarTitleText": "我的"
+		}
+	},
+	{
+		"path": "pages/order_room/order_room",
+		"style": {
+			"navigationBarTitleText": "填写订单"
+		}
+	},
+	{
+		"path": "pages/my_orderlist/my_orderlist",
+		"style": {
+			"navigationBarTitleText": "我的订单",
+			"enablePullDownRefresh":true,//下拉刷新
+			"onReachBottomDistance": 150//上拉触底的距离
+		}
+	},
+	{
+		"path": "pages/liuchengTeacher/liu_teach",
+		"style": {
+			"navigationBarTitleText": "流程管理",
+			"enablePullDownRefresh":true,//下拉刷新
+			"onReachBottomDistance": 150//上拉触底的距离
+		}
+	},
+	{
+		"path": "pages/liuchengTeacher/detail/teach_detail",
+		"style": {
+			"navigationBarTitleText": "详情"
+		}
+	},
+	{
+		"path": "pages/liuchengO/liu_other",
+		"style": {
+			"navigationBarTitleText": "流程管理",
+			"enablePullDownRefresh":true,//下拉刷新
+			"onReachBottomDistance": 150//上拉触底的距离
+		}
+	},
+	{
+		"path": "pages/liuchengO/detail/teach_detail",
+		"style": {
+			"navigationBarTitleText": "详情"
+		}
+	},
+	{
+		"path": "pages/liuchengManger/liu_manage",
+		"style": {
+			"navigationBarTitleText": "流程管理",
+			"enablePullDownRefresh":true,//下拉刷新
+			"onReachBottomDistance": 150//上拉触底的距离
+		}
+	},
+	{
+		"path": "pages/liuchengManger/detail/teach_detail",
+		"style": {
+			"navigationBarTitleText": "详情"
+		}
+	},
+	{
+		"path": "pages/order_mark/order_mark",
+		"style": {
+			"navigationBarTitleText": "订单详情"
+		}
+	},
+	{
+		"path": "pages/ruzhuxuzhi/ruzhuxuzhi",
+		"style":{
+			"navigationBarTitleText": "入住须知"
+		}
+	},
+	{
+		"path": "pages/submit_order/submit_order",
+		"style":{
+			"navigationBarTitleText": "支付订单"
+		}
+	},
+	{
+		"path": "pages/zhifuchenggong/zhifuchenggong",
+		"style":{
+			"navigationBarTitleText": "支付成功"
+		}
+	},
+	{
+		"path": "pages/huoquanshibai/huoquanshibai",
+		"style":{
+			"navigationBarTitleText": "获权失败"
+		}
+	},
+	{
+		"path": "pages/gongyuxiangqing/gongyuxiangqing",
+		"style":{
+			"navigationBarTitleText": "公寓详情"
+		}
+	}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"backgroundColor": "#FFFFFF",
+		"app-plus": {
+			"background": "#efeff4"
+		}
+	},
+	"tabBar": {//底部导航
+		"color": "#7A7E83",
+		"selectedColor": "#296DE3",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+			"pagePath": "pages/index/index",
+			"iconPath": "static/tabbar/apartment.svg",
+			"selectedIconPath": "static/tabbar/apart_dian.svg",//选中时的图片路径
+			"text": "公寓"
+		}, {
+			"pagePath": "pages/myself/myself",
+			"iconPath": "static/tabbar/myself.svg",
+			"selectedIconPath": "static/tabbar/myself_dian.svg",
+			"text": "我的"
+		}]
+	}
+
 }

pages/gongyuxiangqing/gongyuxiangqing.vue

@@ -1,69 +1,80 @@
-<template>
-	<view class="content">
-		<view class="xuzhi">
-			<view class="xiang_title">公寓介绍</view>
-			<view class="xiang_txt">
-				         我们从分享时机、分享形式、分享动机、分享场景4个维度来聊聊「社交分享」的那些事儿。<br>
-				<text style="display: block;text-indent: 56rpx;">所以监听用户的截图操作，提示用户进行分享，既缩短了以前分享截图的操作路径，避免了在之前长路径中的行为流失（比如截图完成后忘记分享或觉得麻烦放弃分享等等），也让用户觉得更加贴心。</text>
-				         <text style="display: block;text-indent: 56rpx;">用户分享内容到社交媒体或好友，不应该是一种粗暴的强制行为，我们应该在保证产品本身内容有吸引力的核心前提下，仔细揣摩用户心理，结合产品本身的特色，在不同情境下提供给用户最合适的分享平台及方式，让用户分享成为一种水到渠。</text>
-				        <text style="display: block;text-indent: 56rpx;">营业时间：24小时</text>
-				         <text style="display: block;text-indent: 56rpx;">联系电话：<text @click="telphone(phone)" style="color:rgba(41, 109, 227, 1);">{{phone}}</text></text>
-			</view>
-		</view>
-		<!-- 第二部分，公寓设施 -->
-		<view class="sheshi">
-			<view class="sheshi_title">公寓设施</view>
-			<view class="sheshi_txt_left">
-				<view style="margin-top: 30rpx;" class="sheshi_txt" v-for="(item,index) in sheshiList" :key="index">
-					<image class="sheshi_icon" src="../../static/gongyuxiangqing/sheshi_icon.png"></image>{{item.list}}
-				</view>
-			</view>
-			<view class="sheshi_txt_right">
-				<view style="margin-top: 30rpx;" v-for="(item,index) in sheshiList2" :key="index">
-					<image class="sheshi_icon" src="../../static/gongyuxiangqing/sheshi_icon.png"></image>{{item.list}}
-				</view>
-			</view>
-		</view>
+<template>
+	<view class="content">
+		<view class="xuzhi">
+			<view class="xiang_title">公寓介绍</view>
+			<view class="xiang_txt">
+				         我们从分享时机、分享形式、分享动机、分享场景4个维度来聊聊「社交分享」的那些事儿。<br>
+				<text style="display: block;text-indent: 56rpx;">所以监听用户的截图操作，提示用户进行分享，既缩短了以前分享截图的操作路径，避免了在之前长路径中的行为流失（比如截图完成后忘记分享或觉得麻烦放弃分享等等），也让用户觉得更加贴心。</text>
+				         <text style="display: block;text-indent: 56rpx;">用户分享内容到社交媒体或好友，不应该是一种粗暴的强制行为，我们应该在保证产品本身内容有吸引力的核心前提下，仔细揣摩用户心理，结合产品本身的特色，在不同情境下提供给用户最合适的分享平台及方式，让用户分享成为一种水到渠。</text>
+				        <text style="display: block;text-indent: 56rpx;">营业时间：24小时</text>
+				         <text style="display: block;text-indent: 56rpx;">联系电话：<text @click="telphone(phone)" style="color:rgba(41, 109, 227, 1);">{{phone}}</text></text>
+			</view>
+		</view>
+		<!-- 第二部分，公寓设施 -->
+		<view class="sheshi">
+			<view class="sheshi_title">公寓设施</view>
+			<view class="sheshi_txt_left">
+				<view style="margin-top: 30rpx;" class="sheshi_txt" v-for="(item,index) in sheshiList" :key="index">
+					<image class="sheshi_icon" src="../../static/gongyuxiangqing/sheshi_icon.png"></image>{{item.list}}
+				</view>
+			</view>
+			<view class="sheshi_txt_right">
+				<view style="margin-top: 30rpx;" v-for="(item,index) in sheshiList2" :key="index">
+					<image class="sheshi_icon" src="../../static/gongyuxiangqing/sheshi_icon.png"></image>{{item.list}}
+				</view>
+			</view>
+		</view>
+		<!-- 第三部分 入住须知 -->
+		<view class="xuzhi">
+			<view class="xiang_title">入住须知</view>
+			<view class="xiang_txt">
+				         我们从分享时机、分享形式、分享动机、分享场景4个维度来聊聊「社交分享」的那些事儿。<br>
+				<text style="display: block;text-indent: 56rpx;">所以监听用户的截图操作，提示用户进行分享，既缩短了以前分享截图的操作路径，避免了在之前长路径中的行为流失（比如截图完成后忘记分享或觉得麻烦放弃分享等等），也让用户觉得更加贴心。</text>
+				         <text style="display: block;text-indent: 56rpx;">用户分享内容到社交媒体或好友，不应该是一种粗暴的强制行为，我们应该在保证产品本身内容有吸引力的核心前提下，仔细揣摩用户心理，结合产品本身的特色，在不同情境下提供给用户最合适的分享平台及方式，让用户分享成为一种水到渠。</text>
+				        <text style="display: block;text-indent: 56rpx;">营业时间：24小时</text>
+				         <text style="display: block;text-indent: 56rpx;">联系电话：<text @click="telphone(phone)" style="color:rgba(41, 109, 227, 1);">{{phone}}</text></text>
+			</view>
+		</view>
 	</view>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				sheshiList:[
-					{id:1,list:'免费洗刷用品'},
-					{id:2,list:'24小时热水'},
-					{id:3,list:'客房wifi覆盖'},
-					{id:4,list:'电视'},
-					{id:5,list:'电吹风'},
-					{id:6,list:'分体式空调'},
-				],
-				sheshiList2:[
-					{id:1,list:'吹风机'},
-					{id:2,list:'宽带上网接口'},
-					{id:3,list:'独立卫生间'},
-					{id:4,list:'拖鞋'},
-					{id:5,list:'电水壶'},
-					{id:6,list:'免费瓶装水'},
-				],
-				phone:'0791-82293574'
-			}
-		},
-		onLoad() {
-			
-		},
-		methods: {
-			//拨打电话
-			telphone(phone){
-				uni.makePhoneCall({ 
-					phoneNumber: phone ,
-				}) // 传参带入号码即可
-			},
-		}
+<script>
+	export default {
+		data() {
+			return {
+				sheshiList:[
+					{id:1,list:'免费洗刷用品'},
+					{id:2,list:'24小时热水'},
+					{id:3,list:'客房wifi覆盖'},
+					{id:4,list:'电视'},
+					{id:5,list:'电吹风'},
+					{id:6,list:'分体式空调'},
+				],
+				sheshiList2:[
+					{id:1,list:'吹风机'},
+					{id:2,list:'宽带上网接口'},
+					{id:3,list:'独立卫生间'},
+					{id:4,list:'拖鞋'},
+					{id:5,list:'电水壶'},
+					{id:6,list:'免费瓶装水'},
+				],
+				phone:'0791-82293574'
+			}
+		},
+		onLoad() {
+			
+		},
+		methods: {
+			//拨打电话
+			telphone(phone){
+				uni.makePhoneCall({ 
+					phoneNumber: phone ,
+				}) // 传参带入号码即可
+			},
+		}
 	}
 </script>
 
-<style>
+<style>
 	@import url("./css/gongyuxiangqing.css");
 </style>

pages/liuchengManger/css/liu_manage.css

@@ -0,0 +1,128 @@
+.content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	background-color: #F2F3F5;
+}
+
+/* 提交记录 */
+.select_submit{
+	width: 750rpx;
+	height: 70rpx;
+	background: rgba(255, 255, 255, 1);
+}
+>>>.uni-select[data-v-6b64008e] {
+    font-size: 14px;
+    border: 0px solid #e5e5e5;
+    box-sizing: border-box;
+    border-radius: 4px;
+    padding: 0 5px;
+    padding-left: 10px;
+    position: relative;
+    display: flex;
+    -webkit-user-select: none;
+    user-select: none;
+    flex-direction: row;
+    align-items: center;
+    border-bottom: solid 0px #e5e5e5;
+    width: 100%;
+    flex: 1;
+    height: 35px;
+}
+/* 不同状态的记录 */
+.submit-list{
+	margin: 11rpx 0 0 20rpx;
+	width: 710rpx;
+	height: 370rpx;
+	opacity: 0.9;
+	border-radius: 10rpx;
+	background: rgba(255, 255, 255, 1);
+	font-weight: 400;
+	font-size: 24rpx;
+	line-height: 35rpx;
+	color: rgba(153, 153, 153, 1);
+}
+.submit-list2{
+	margin: 11rpx 0 0 20rpx;
+	width: 710rpx;
+	height: 432rpx;
+	opacity: 0.9;
+	border-radius: 10rpx;
+	background: rgba(255, 255, 255, 1);
+	font-weight: 400;
+	font-size: 24rpx;
+	line-height: 35rpx;
+	color: rgba(153, 153, 153, 1);
+}
+.submit-title{
+	margin: 20rpx 0 0 19rpx;
+	font-size: 32rpx;
+	line-height: 46px;
+	color: rgba(0, 0, 0, 1);
+}
+.submit-time{
+	margin: 0 0 0 353rpx;
+}
+.submit-line{
+	margin: 0 0 0 21rpx;
+	width: 671rpx;
+	height: 0px;
+	opacity: 1;
+	border: 1rpx solid rgba(230, 230, 230, 1);
+}
+.submit-start{
+	margin: 22rpx 0 0 21rpx;
+}
+.submit-end{
+	margin: 7rpx 0 0 21rpx;
+}
+.submit-teacher{
+	margin: 7rpx 0 0 21rpx;
+}
+.submit-remark{
+	margin: 7rpx 0 0 21rpx;
+}
+.submit-type{
+	margin: 11rpx 0 0 573rpx;
+	width: 118rpx;
+	height: 55rpx;
+	border-radius: 7rpx;
+	background: rgba(225, 245, 244, 1);
+	line-height: 55rpx;
+	color: rgba(9, 101, 98, 1);
+	text-align: center;
+}
+.submit-type1{
+	margin: 11rpx 0 0 573rpx;
+	width: 118rpx;
+	height: 55rpx;
+	border-radius: 7rpx;
+	background: rgba(245, 228, 228, 1);
+	line-height: 55rpx;
+	color: rgba(212, 48, 48, 1);
+	text-align: center;
+}
+.submit-disagree{
+	margin: 46rpx 0 0 24rpx;
+	width: 310rpx;
+	height: 74rpx;
+	border-radius: 12rpx;
+	border: 1rpx solid rgba(0, 97, 255, 1);
+	font-size: 28rpx;
+	line-height: 74rpx;
+	color: rgba(0, 97, 255, 1);
+	text-align: center;
+	float: left;
+}
+.submit-agree{
+	margin: 46rpx 0 0 382rpx;
+	width: 310rpx;
+	height: 74rpx;
+	border-radius: 12rpx;
+	background: rgba(0, 97, 255, 1);
+	font-size: 28rpx;
+	line-height: 74rpx;
+	color: rgba(255, 255, 255, 1);
+	text-align: center;
+}

pages/liuchengManger/detail/teach_detail.css

@@ -0,0 +1,205 @@
+/* 申请类型 */
+.request_type{
+	width: 750rpx;
+	height: 137rpx;
+	opacity: 0.9;
+	background: rgba(255, 255, 255, 1);
+	font-weight: 400;
+}
+.type_title{
+	position: absolute;
+	margin: 20rpx 0 0 20rpx;
+	font-size: 32rpx;
+	line-height: 46rpx;
+	color: rgba(0, 0, 0, 1);
+}
+.type_time{
+	position: absolute;
+	margin: 72rpx 0 0 20rpx;
+	font-size: 24rpx;
+	line-height: 35rpx;
+	color: rgba(153, 153, 153, 1);
+}
+.type_zhuang{
+	position: absolute;
+	margin: 31rpx 0 0 576rpx;
+	width: 154rpx;
+	height: 72rpx;
+	border-radius: 9rpx;
+	background: rgba(225, 245, 244, 1);
+	font-size: 31rpx;
+	line-height: 72rpx;
+	color: rgba(9, 101, 98, 1);
+	text-align: center;
+}
+.type_zhuang2{
+	position: absolute;
+	margin: 31rpx 0 0 576rpx;
+	width: 154rpx;
+	height: 72rpx;
+	border-radius: 9rpx;
+	background: rgba(245, 228, 228, 1);
+	font-size: 31rpx;
+	line-height: 72rpx;
+	color: rgba(212, 48, 48, 1);
+	text-align: center;
+}
+.type_zhuang3{
+	position: absolute;
+	margin: 31rpx 0 0 576rpx;
+	width: 154rpx;
+	height: 72rpx;
+	border-radius: 9rpx;
+	background: rgba(247, 231, 215, 1);
+	font-size: 31rpx;
+	line-height: 72rpx;
+	color: rgba(255, 141, 26, 1);
+	text-align: center;
+}
+/* 申请内容 */
+.request_detail{
+	margin-top: 20rpx;
+	width: 750rpx;
+	height: 428rpx;
+	opacity: 0.9;
+	background: rgba(255, 255, 255, 1);
+}
+>>>.uni-forms{
+	margin-left: 20px;
+}
+>>>.uni-forms-item[data-v-61dfc0d0] {
+    position: relative;
+    display: flex;
+    margin-bottom: 0px;
+    flex-direction: row;
+}
+/* 名称 */
+>>>.uni-forms-item__label {
+    display: contents;
+    flex-direction: row;
+    align-items: center;
+    text-align: left;
+    font-size: 28rpx;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 400;
+    color: rgba(0, 0, 0, 1);
+    height: 46rpx;
+	line-height: 88rpx;
+    padding: 0 12rpx 0 0;
+    vertical-align: middle;
+    flex-shrink: 0;
+    box-sizing: border-box;
+}
+.uni-input{
+	margin-right: 10px;
+	height: 36px;
+	line-height: 44px;
+	text-align: right;
+}
+.form-line{
+	position: absolute;
+	width: 356px;
+	height: 1rpx;
+	background: rgba(230, 230, 230, 1);
+	border-radius: 0px 0px 0px 0px;
+	opacity: 1;
+}
+/* 申请备注 */
+.request_remark{
+	padding-left: 20px;
+	margin-top: 20rpx;
+	width: 750rpx;
+	height: 277rpx;
+	opacity: 0.9;
+	background: rgba(255, 255, 255, 1);
+}
+.liyou{
+	margin-left: 0rpx;
+	margin-top: -10rpx;
+	width: 690rpx;
+	height: 98px;
+	opacity: 1;
+	border-radius: 10rpx;
+}
+.textsrea-txt{
+	position: absolute;
+	margin-left: 317px;
+	margin-top: -57rpx;
+	font-size: 28rpx;
+	font-weight: 400;
+	color: rgba(128, 128, 128, 1);
+}
+/* 审批意见 */
+.option_title{
+	margin:21rpx 0 0 19rpx;
+	font-size: 32rpx;
+	font-weight: 500;
+	color: rgba(0, 0, 0, 1);
+}
+.request_list{
+	margin-top: 27rpx;
+	width: 750rpx;
+	height: 208rpx;
+	opacity: 0.9;
+	background: rgba(255, 255, 255, 1);
+}
+.uni-textarea-placeholder {
+	width: 690rpx;
+	height: 120px;
+    color: grey;
+    left: 0rpx;
+    top: 22rpx;
+    overflow: hidden;
+}
+>>>.uni-textarea-textarea {
+	width: 690rpx;
+	height: 120px;
+    resize: none;
+    background: none;
+    color: rgba(128, 128, 128, 1);
+    opacity: 1;
+    font: inherit;
+    line-height: inherit;
+    letter-spacing: inherit;
+    text-align: inherit;
+    text-indent: inherit;
+    text-transform: inherit;
+    text-shadow: inherit;
+}
+/* textarea框 */
+>>>.is-input-border {
+    display: flex;
+    box-sizing: border-box;
+    flex-direction: row;
+    width: 382px;
+    height: 104px;
+    align-items: baseline;
+	border: 0px solid #F0F0F0;
+    background: #F7F8FA;
+    border-radius: 5rpx 5rpx 5rpx 5rpx;
+    opacity: 1;
+    filter: blur(undefinedpx);
+}
+.submit-disagree{
+	margin: 46rpx 0 0 24rpx;
+	width: 310rpx;
+	height: 74rpx;
+	border-radius: 12rpx;
+	border: 1rpx solid rgba(0, 97, 255, 1);
+	font-size: 28rpx;
+	line-height: 74rpx;
+	color: rgba(0, 97, 255, 1);
+	text-align: center;
+	float: left;
+}
+.submit-agree{
+	margin: 46rpx 0 0 382rpx;
+	width: 310rpx;
+	height: 74rpx;
+	border-radius: 12rpx;
+	background: rgba(0, 97, 255, 1);
+	font-size: 28rpx;
+	line-height: 74rpx;
+	color: rgba(255, 255, 255, 1);
+	text-align: center;
+}

pages/liuchengManger/detail/teach_detail.vue

@@ -0,0 +1,118 @@
+<template>
+	<view class="content">
+		<!-- 申请类型 -->
+		<view class="request_type">
+			<view class="type_title">换课申请</view>
+			<view class="type_time">2023.11.04  12:00</view>
+			<view class="type_zhuang">审批通过</view>
+			<!-- <view class="type_zhuang2">审批通过</view>
+			<view class="type_zhuang3">审批通过</view> -->
+		</view>
+		<!-- 申请内容 -->
+		<view class="request_detail">
+			<uni-forms ref="valiForm" :rules="rules" :modelValue="baseFormData">
+				<uni-forms-item label="类型" name="companyName" required>
+						<view class="uni-input">
+							111
+						</view>
+				</uni-forms-item>
+				<view class="form-line"></view>
+				<uni-forms-item label="开始时间" name="companyName" required>
+					<view class="uni-input">
+						111
+					</view>
+				</uni-forms-item>
+				<view class="form-line"></view>
+				<uni-forms-item label="结束时间" name="companyName" required>
+					<view class="uni-input">
+						111
+					</view>
+				</uni-forms-item>
+				<view class="form-line"></view>
+				<uni-forms-item label="申请部门" name="companyName" required>
+					<view class="uni-input">
+						111
+					</view>
+				</uni-forms-item>
+				<view class="form-line"></view>
+				<uni-forms-item label="换课老师" name="companyName" required>
+					<view class="uni-input">
+						111
+					</view>
+				</uni-forms-item>
+			</uni-forms>
+		</view>
+		<!-- 申请备注 -->
+		<view class="request_remark">
+			<uni-forms-item label="备注" name="companyName" required>
+			</uni-forms-item>
+			<view class="liyou">{{shanchang}}</view>
+			<text class="textsrea-txt">1/200</text>
+		</view>
+		<!-- 审批意见 -->
+		<view class="option_title">审批意见</view>
+		<view class="request_list">
+			<uni-easyinput type="textarea" v-model="option" placeholder="请输入审批意见" @input="input"></uni-easyinput>
+			<text class="textsrea-txt" style="margin-left: 337px;">3/800</text>
+		</view>
+		<view class="submit-disagree" v-if="type==2">驳回</view>
+		<view class="submit-agree" v-if="type==2">同意</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list:[
+					{title:'提交申请',name:'我',time:'2023.11.07  09:00'},
+					{title:'提交申请',name:'我',time:'2023.11.07  09:00'},
+					{title:'提交申请',name:'我',time:'2023.11.07  09:00'},
+					{title:'提交申请',name:'我',time:'2023.11.07  09:00'},
+				],
+				//表单数据
+				baseFormData:{
+					submittype:['住院医师','主任医师','副主任医师','主治医师'],//职称
+					indextype:0,
+					startTime:'',
+					endTime:'',
+					remark:'',//备注
+				},
+				// 校验规则
+				rules: {
+					indextype: {
+						rules: [{
+							required: true,
+							errorMessage: '类型不能为空'
+						}]
+					},
+					age: {
+						rules: [{
+							required: true,
+							errorMessage: '年龄不能为空'
+						}, {
+							format: 'number',
+							errorMessage: '年龄只能输入数字'
+						}]
+					}
+				},
+				option:'',//审批意见
+				type:'2',
+			}
+		},
+		onLoad() {
+		},
+		mounted() {
+		},
+		methods: {
+			//输入审批意见
+			input(e){
+				this.option=e
+			},
+		}
+	}
+</script>
+
+<style>
+	@import url("./teach_detail.css");
+</style>

pages/liuchengManger/liu_manage.vue

@@ -0,0 +1,131 @@
+<template>
+	<view class="content">
+		<!-- 提交记录 -->
+		<view>
+			<view class="select_submit">
+				<view style="width: 80px;margin-left: 9rpx;position: absolute;">
+					<uni-data-select
+						v-model="value"
+						:localdata="zhuangtai"
+						@change="changezhuang"
+					  ></uni-data-select>
+				</view>
+				<view style="width: 80px;margin-left: 196rpx;">
+					<uni-data-select
+						v-model="value2"
+						:localdata="TimeRanges"
+						@change="changetime"
+					  ></uni-data-select>
+				</view>
+				<!-- 不同状态的记录 -->
+				<view :class="item.type==2?'submit-list2':'submit-list'" v-for="(item,index) in submit" :key="index" @click="clickDetail">
+					<text class="submit-title">{{item.title}}</text>
+					<text class="submit-time">{{item.time}}</text>
+					<view class="submit-line"></view>
+					<view class="submit-start">开始时间：{{item.startT}}</view>
+					<view class="submit-end">结束时间：{{item.endT}}</view>
+					<view class="submit-teacher">换课老师：{{item.teacher}}</view>
+					<view class="submit-remark">备注：{{item.remark}}</view>
+					<view class="submit-type" v-if="item.type==0">审批通过</view>
+					<view class="submit-type1" v-if="item.type==1">已拒绝</view>
+					<view class="submit-disagree" v-if="item.type==2">驳回</view>
+					<view class="submit-agree" v-if="item.type==2">同意</view>
+				</view>
+
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				//表单数据
+				baseFormData:{
+					submittype:['住院医师','主任医师','副主任医师','主治医师'],//职称
+					indextype:0,
+					startTime:'',
+					endTime:'',
+					remark:'',//备注
+				},
+				textNum:0,
+				// 校验规则
+				rules: {
+					indextype: {
+						rules: [{
+							required: true,
+							errorMessage: '类型不能为空'
+						}]
+					},
+					age: {
+						rules: [{
+							required: true,
+							errorMessage: '年龄不能为空'
+						}, {
+							format: 'number',
+							errorMessage: '年龄只能输入数字'
+						}]
+					}
+				},
+				// 提交记录 
+				value: 0,
+				zhuangtai: [
+				  { value: 0, text: "篮球篮球" },
+				  { value: 1, text: "足球" },
+				  { value: 2, text: "游泳" },
+				],
+				value2: 0,
+				TimeRanges: [
+				  { value: 0, text: "近一周" },
+				  { value: 1, text: "近一年" },
+				  { value: 2, text: "近两年" },
+				],
+				submit:[
+					{title:'换课申请',time:'2023.11.04  12:00',startT:'2023.11.04  12:00',endT:'2023.11.04  12:00',teacher:'李华',remark:'家中有事',type:'0'},
+					{title:'换课申请',time:'2023.11.04  12:00',startT:'2023.11.04  12:00',endT:'2023.11.04  12:00',teacher:'李华',remark:'家中有事',type:'1'},
+					{title:'换课申请',time:'2023.11.04  12:00',startT:'2023.11.04  12:00',endT:'2023.11.04  12:00',teacher:'李华',remark:'家中有事',type:'2'},
+				]
+			}
+		},
+		onLoad() {
+			
+		},
+		mounted() {
+			
+		},
+		methods: {
+			//切换房型
+			changeType(){
+				this.liutype=!this.liutype
+			},
+			//修改类型
+			bindPickerChangetype: function(e) {
+				this.baseFormData.indextype=e.detail.value
+			},
+			//输入备注
+			input(e){
+				this.baseFormData.remark=e
+			},
+			// 提交记录
+			// 选择审批状态
+			changezhuang(e) {
+			  console.log("e:", e);
+			},
+			// 选择时间
+			changetime(e) {
+			  console.log("e:", e);
+			},
+			// 跳转到详情页面
+			clickDetail(){
+				uni.navigateTo({
+					url: "../liuchengManger/detail/teach_detail"
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url("./css/liu_manage.css");
+</style>

pages/liuchengO/css/liu_other.css

@@ -0,0 +1,328 @@
+.content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	background-color: #F2F3F5;
+}
+/* 切换发起提交与提交记录 */
+.select-type{
+	width: 750rpx;
+	height: 89rpx;
+	margin-left: 5px;
+	background-color: rgba(255, 255, 255, 1);
+	border-radius: 8px;
+}
+.allday{
+	width: 385rpx;
+	height: 89rpx;
+	background-image: url('../../static/index/allday.png');
+	background-size: 100%;
+	float: left;
+	line-height: 41px;
+	text-align: center;
+}
+.hourday_no{
+	background-color: rgba(230, 230, 230, 1);
+	width: 234px;
+	height: 40px;
+	margin-left: 304rpx;
+	border-radius: 8px;
+	line-height: 41px;
+	text-align: center;
+}
+.allday2{
+	width: 234px;
+	height: 40px;
+	border-radius: 8px;
+	background-color: rgba(230, 230, 230, 1);
+	float: left;
+	line-height: 41px;
+	text-align: center;
+}
+.hourday_no2{
+	width: 385rpx;
+	height: 89rpx;
+	z-index: 3;
+	position: absolute;
+	background-image: url('../../static/index/hourday.png');
+	background-size: 100%;
+	margin-left: 170px;
+	line-height: 41px;
+	text-align: center;
+}
+
+/* 发起提交各选项表单 */
+.submit{
+	width: 750rpx;
+	height: 100%;
+	background: rgba(255, 255, 255, 1);
+}
+>>>.uni-forms{
+	margin-left: 20px;
+}
+/* 名称 */
+>>>.uni-forms-item__label {
+    display: contents;
+    flex-direction: row;
+    align-items: center;
+    text-align: left;
+    font-size: 28rpx;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 400;
+    color: rgba(0, 0, 0, 1);
+    height: 46rpx;
+	line-height: 95rpx;
+    padding: 0 12rpx 0 0;
+    vertical-align: middle;
+    flex-shrink: 0;
+    box-sizing: border-box;
+}
+/* 输入框 */
+>>>uni-input {
+    display: block;
+    font-size: 28rpx;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 400;
+    color: rgba(166, 166, 166, 1);
+    line-height: 66rpx;
+    height: 1.4px;
+    min-height: 1.4em;
+    text-align: right;
+	overflow: hidden;
+	margin-right: 40rpx;
+}
+.uni-input-placeholder {
+    position: absolute;
+    top: auto!important;
+    left: 0;
+    color: #CCCCCC;
+    overflow: hidden;
+    text-overflow: clip;
+    white-space: pre;
+    word-break: keep-all;
+    pointer-events: none;
+    line-height: inherit;
+}
+/* picker选择样式 */
+uni-picker {
+    display: block;
+    font-size: 28rpx;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #333333;
+    height: 38px;
+    text-align: right;
+    overflow: hidden;
+    margin-right: 40rpx;
+    cursor: pointer;
+}
+.jiantou{
+	float: right;
+	width: 39rpx;
+	height: 39rpx;
+	border-radius: 0px 0px 0px 0px;
+	opacity: 1;
+	color: #333333;
+}
+.form-line{
+	position: absolute;
+	margin-top: -30rpx;
+	width: 670rpx;
+	height: 1rpx;
+	background: rgba(230, 230, 230, 1);
+	border-radius: 0px 0px 0px 0px;
+	opacity: 1;
+}
+.zhanshi{
+	font-weight: 400;
+	color: #333333;
+	margin-right: 40rpx;
+}
+/* 成立时间样式 */
+>>>.uni-date-x--border[data-v-6e13d7e2] {
+    box-sizing: border-box;
+    border-radius: 4rpx;
+    border: 0px solid #e5e5e5;
+}
+>>>.uni-forms-item__content[data-v-61dfc0d0] {
+    position: relative;
+    font-size: 28rpx;
+	color: #CCCCCC;
+    flex: 1;
+    box-sizing: border-box;
+    flex-direction: row;
+    text-align: right;
+}
+>>>.uni-icons[data-v-a2e81f6e] {
+    font-family: monospace;/*控制时间选择图标*/
+    text-decoration: none;
+    text-align: revert;
+}
+/* textarea框 */
+>>>.is-input-border {
+    display: flex;
+    box-sizing: border-box;
+    flex-direction: row;
+    width: 342px;
+    height: 112px;
+    align-items: baseline;
+    background: #F7F8FA;
+	border: 0px solid #F0F0F0;
+    border-radius: 5rpx 5rpx 5rpx 5rpx;
+    opacity: 1;
+    filter: blur(undefinedpx);
+	margin-top: -30px;
+}
+.liyou{
+	margin-left: 0rpx;
+	margin-top: -60rpx;
+	width: 690rpx;
+	height: 257rpx;
+	opacity: 1;
+	border-radius: 10rpx;
+	background-color: bisque;
+}
+.textsrea-txt{
+	position: absolute;
+	margin-left: 573rpx;
+	margin-top: -57rpx;
+	font-size: 28rpx;
+	font-weight: 400;
+	color: rgba(128, 128, 128, 1);
+}
+.uni-textarea-placeholder {
+	width: 690rpx;
+	height: 120px;
+    color: grey;
+    left: 0rpx;
+    top: 22rpx;
+    overflow: hidden;
+}
+>>>.uni-textarea-textarea {
+	width: 690rpx;
+	height: 120px;
+    resize: none;
+    background: none;
+    color: rgba(128, 128, 128, 1);
+    opacity: 1;
+    font: inherit;
+    line-height: inherit;
+    letter-spacing: inherit;
+    text-align: inherit;
+    text-indent: inherit;
+    text-transform: inherit;
+    text-shadow: inherit;
+}
+.uni-input{
+	/* width: 331px; */
+	height: 36px;
+	line-height: 44px;
+}
+.submit_button{
+	margin: 200rpx 0 0 20rpx;
+	width: 710rpx;
+	height: 96rpx;
+	border-radius: 64rpx;
+	background: rgba(0, 97, 255, 1);
+	font-size: 32rpx;
+	font-weight: 500;
+	line-height: 96rpx;
+	color: rgba(255, 255, 255, 1);
+	text-align: center;
+}
+/* 提交记录 */
+.select_submit{
+	width: 750rpx;
+	height: 70rpx;
+	background: rgba(255, 255, 255, 1);
+}
+>>>.uni-select[data-v-6b64008e] {
+    font-size: 14px;
+    border: 0px solid #e5e5e5;
+    box-sizing: border-box;
+    border-radius: 4px;
+    padding: 0 5px;
+    padding-left: 10px;
+    position: relative;
+    display: flex;
+    -webkit-user-select: none;
+    user-select: none;
+    flex-direction: row;
+    align-items: center;
+    border-bottom: solid 0px #e5e5e5;
+    width: 100%;
+    flex: 1;
+    height: 35px;
+}
+/* 不同状态的记录 */
+.submit-list{
+	margin: 11rpx 0 0 20rpx;
+	width: 710rpx;
+	height: 370rpx;
+	opacity: 0.9;
+	border-radius: 10rpx;
+	background: rgba(255, 255, 255, 1);
+	font-weight: 400;
+	font-size: 24rpx;
+	line-height: 35rpx;
+	color: rgba(153, 153, 153, 1);
+}
+.submit-title{
+	margin: 20rpx 0 0 19rpx;
+	font-size: 32rpx;
+	line-height: 46px;
+	color: rgba(0, 0, 0, 1);
+}
+.submit-time{
+	margin: 0 0 0 353rpx;
+}
+.submit-line{
+	margin: 0 0 0 21rpx;
+	width: 671rpx;
+	height: 0px;
+	opacity: 1;
+	border: 1rpx solid rgba(230, 230, 230, 1);
+}
+.submit-start{
+	margin: 22rpx 0 0 21rpx;
+}
+.submit-end{
+	margin: 7rpx 0 0 21rpx;
+}
+.submit-teacher{
+	margin: 7rpx 0 0 21rpx;
+}
+.submit-remark{
+	margin: 7rpx 0 0 21rpx;
+}
+.submit-type{
+	margin: 11rpx 0 0 573rpx;
+	width: 118rpx;
+	height: 55rpx;
+	border-radius: 7rpx;
+	background: rgba(225, 245, 244, 1);
+	line-height: 55rpx;
+	color: rgba(9, 101, 98, 1);
+	text-align: center;
+}
+.submit-type1{
+	margin: 11rpx 0 0 573rpx;
+	width: 118rpx;
+	height: 55rpx;
+	border-radius: 7rpx;
+	background: rgba(245, 228, 228, 1);
+	line-height: 55rpx;
+	color: rgba(212, 48, 48, 1);
+	text-align: center;
+}
+.submit-type2{
+	margin: 11rpx 0 0 573rpx;
+	width: 118rpx;
+	height: 55rpx;
+	border-radius: 7rpx;
+	background: rgba(247, 231, 215, 1);
+	line-height: 55rpx;
+	color: rgba(255, 141, 26, 1);
+	text-align: center;
+}

pages/liuchengO/detail/teach_detail.css

@@ -0,0 +1,181 @@
+/* 申请类型 */
+.request_type{
+	width: 750rpx;
+	height: 137rpx;
+	opacity: 0.9;
+	background: rgba(255, 255, 255, 1);
+	font-weight: 400;
+}
+.type_title{
+	position: absolute;
+	margin: 20rpx 0 0 20rpx;
+	font-size: 32rpx;
+	line-height: 46rpx;
+	color: rgba(0, 0, 0, 1);
+}
+.type_time{
+	position: absolute;
+	margin: 72rpx 0 0 20rpx;
+	font-size: 24rpx;
+	line-height: 35rpx;
+	color: rgba(153, 153, 153, 1);
+}
+.type_zhuang{
+	position: absolute;
+	margin: 31rpx 0 0 576rpx;
+	width: 154rpx;
+	height: 72rpx;
+	border-radius: 9rpx;
+	background: rgba(225, 245, 244, 1);
+	font-size: 31rpx;
+	line-height: 72rpx;
+	color: rgba(9, 101, 98, 1);
+	text-align: center;
+}
+.type_zhuang2{
+	position: absolute;
+	margin: 31rpx 0 0 576rpx;
+	width: 154rpx;
+	height: 72rpx;
+	border-radius: 9rpx;
+	background: rgba(245, 228, 228, 1);
+	font-size: 31rpx;
+	line-height: 72rpx;
+	color: rgba(212, 48, 48, 1);
+	text-align: center;
+}
+.type_zhuang3{
+	position: absolute;
+	margin: 31rpx 0 0 576rpx;
+	width: 154rpx;
+	height: 72rpx;
+	border-radius: 9rpx;
+	background: rgba(247, 231, 215, 1);
+	font-size: 31rpx;
+	line-height: 72rpx;
+	color: rgba(255, 141, 26, 1);
+	text-align: center;
+}
+/* 申请内容 */
+.request_detail{
+	margin-top: 20rpx;
+	width: 750rpx;
+	height: 428rpx;
+	opacity: 0.9;
+	background: rgba(255, 255, 255, 1);
+}
+>>>.uni-forms{
+	margin-left: 20px;
+}
+>>>.uni-forms-item[data-v-61dfc0d0] {
+    position: relative;
+    display: flex;
+    margin-bottom: 0px;
+    flex-direction: row;
+}
+/* 名称 */
+>>>.uni-forms-item__label {
+    display: contents;
+    flex-direction: row;
+    align-items: center;
+    text-align: left;
+    font-size: 28rpx;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 400;
+    color: rgba(0, 0, 0, 1);
+    height: 46rpx;
+	line-height: 88rpx;
+    padding: 0 12rpx 0 0;
+    vertical-align: middle;
+    flex-shrink: 0;
+    box-sizing: border-box;
+}
+.uni-input{
+	margin-right: 10px;
+	height: 36px;
+	line-height: 44px;
+	text-align: right;
+}
+.form-line{
+	position: absolute;
+	width: 356px;
+	height: 1rpx;
+	background: rgba(230, 230, 230, 1);
+	border-radius: 0px 0px 0px 0px;
+	opacity: 1;
+}
+/* 申请备注 */
+.request_remark{
+	padding-left: 20px;
+	margin-top: 20rpx;
+	width: 750rpx;
+	height: 277rpx;
+	opacity: 0.9;
+	background: rgba(255, 255, 255, 1);
+}
+.liyou{
+	margin-left: 0rpx;
+	margin-top: -10rpx;
+	width: 690rpx;
+	height: 98px;
+	opacity: 1;
+	border-radius: 10rpx;
+}
+.textsrea-txt{
+	position: absolute;
+	margin-left: 317px;
+	margin-top: -57rpx;
+	font-size: 28rpx;
+	font-weight: 400;
+	color: rgba(128, 128, 128, 1);
+}
+/* 审批记录 */
+.request_list{
+	margin-top: 20rpx;
+	width: 750rpx;
+	height: 577rpx;
+	opacity: 0.9;
+	background: rgba(255, 255, 255, 1);
+}
+.list_title{
+	position: absolute;
+	margin: 20rpx 0 0 16rpx;
+	font-size: 32rpx;
+	font-weight: 500;
+	color: rgba(0, 0, 0, 1);
+}
+/* 几级审批 */
+.item_image{
+	position: absolute;
+	margin: 0 0 0 22rpx;
+	width: 60rpx;
+	height: 60rpx;
+	background-color:  rgba(255, 170, 0, 1.0);
+	border-radius: 50%;
+}
+.item_title{
+	position: absolute;
+	margin: 0 0 0 105rpx;
+	font-size: 24rpx;
+	font-weight: 400;
+	color: rgba(0, 0, 0, 1);
+}
+.item_name{
+	position: absolute;
+	margin: 31rpx 0 0 105rpx;
+	font-size: 24rpx;
+	font-weight: 400;
+	color: rgba(128, 128, 128, 1);
+}
+.item_time{
+	margin: 13rpx 0 0 539rpx;
+	font-size: 24rpx;
+	font-weight: 400;
+	color: rgba(166, 166, 166, 1);
+}
+.item_line{
+	margin: 13rpx 0 0 52rpx;
+	height: 50rpx;
+	width: 0px;
+	border: 2rpx solid rgba(204, 204, 204, 1);
+}

pages/liuchengO/detail/teach_detail.vue

@@ -0,0 +1,118 @@
+<template>
+	<view class="content">
+		<!-- 申请类型 -->
+		<view class="request_type">
+			<view class="type_title">换课申请</view>
+			<view class="type_time">2023.11.04  12:00</view>
+			<view class="type_zhuang">审批通过</view>
+			<!-- <view class="type_zhuang2">审批通过</view>
+			<view class="type_zhuang3">审批通过</view> -->
+		</view>
+		<!-- 申请内容 -->
+		<view class="request_detail">
+			<uni-forms ref="valiForm" :rules="rules" :modelValue="baseFormData">
+				<uni-forms-item label="类型" name="companyName" required>
+						<view class="uni-input">
+							111
+						</view>
+				</uni-forms-item>
+				<view class="form-line"></view>
+				<uni-forms-item label="开始时间" name="companyName" required>
+					<view class="uni-input">
+						111
+					</view>
+				</uni-forms-item>
+				<view class="form-line"></view>
+				<uni-forms-item label="结束时间" name="companyName" required>
+					<view class="uni-input">
+						111
+					</view>
+				</uni-forms-item>
+				<view class="form-line"></view>
+				<uni-forms-item label="申请部门" name="companyName" required>
+					<view class="uni-input">
+						111
+					</view>
+				</uni-forms-item>
+				<view class="form-line"></view>
+				<uni-forms-item label="换课老师" name="companyName" required>
+					<view class="uni-input">
+						111
+					</view>
+				</uni-forms-item>
+			</uni-forms>
+		</view>
+		<!-- 申请备注 -->
+		<view class="request_remark">
+			<uni-forms-item label="备注" name="companyName" required>
+			</uni-forms-item>
+			<view class="liyou">{{shanchang}}</view>
+			<text class="textsrea-txt">1/200</text>
+		</view>
+		<!-- 审批记录 -->
+		<view class="request_list">
+			<view class="list_title">审批记录</view>
+			<!-- 几级审批 -->
+			<view style="position: absolute;margin-top: 110rpx;">
+			<view v-for="(item,index) in list" :key="index">
+				<image class="item_image"></image>
+				<view class="item_title">{{item.title}}</view>
+				<view class="item_name">{{item.name}}</view>
+				<view class="item_time">{{item.time}}</view>
+				<view class="item_line" v-if="index<(list.length-1)"></view>
+			</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list:[
+					{title:'提交申请',name:'我',time:'2023.11.07  09:00'},
+					{title:'提交申请',name:'我',time:'2023.11.07  09:00'},
+					{title:'提交申请',name:'我',time:'2023.11.07  09:00'},
+					{title:'提交申请',name:'我',time:'2023.11.07  09:00'},
+				],
+				//表单数据
+				baseFormData:{
+					submittype:['住院医师','主任医师','副主任医师','主治医师'],//职称
+					indextype:0,
+					startTime:'',
+					endTime:'',
+					remark:'',//备注
+				},
+				// 校验规则
+				rules: {
+					indextype: {
+						rules: [{
+							required: true,
+							errorMessage: '类型不能为空'
+						}]
+					},
+					age: {
+						rules: [{
+							required: true,
+							errorMessage: '年龄不能为空'
+						}, {
+							format: 'number',
+							errorMessage: '年龄只能输入数字'
+						}]
+					}
+				},
+			}
+		},
+		onLoad() {
+		},
+		mounted() {
+		},
+		methods: {
+		}
+	}
+</script>
+
+<style>
+	@import url("./teach_detail.css");
+</style>

pages/liuchengO/liu_other.vue

@@ -0,0 +1,182 @@
+<template>
+	<view class="content">
+		<!-- 切换发起提交与提交记录 -->
+		<view class="select-type" v-if="liutype" @click="changeType">
+			<view class="allday">发起提交</view>
+			<view class="hourday_no">提交记录</view>
+		</view>
+		<view class="select-type" v-else @click="changeType">
+			<view class="allday2">发起提交</view>
+			<view class="hourday_no2">提交记录</view>
+		</view>
+		<!-- 发起提交各选项表单 -->
+		<view v-if="liutype">
+			<view class="submit">
+				<!-- 基础表单校验 -->
+				<uni-forms ref="valiForm" :rules="rules" :modelValue="baseFormData">
+					<uni-forms-item label="类型" name="companyName" required>
+						<picker @change="bindPickerChangetype" :value="baseFormData.indextype" :range="baseFormData.submittype">
+							<view class="uni-input">
+								<template v-if="baseFormData.indextype==''">请选择</template>
+								<template v-else>{{baseFormData.submittype[baseFormData.indextype]}}</template>
+								<text class="jiantou">〉</text>
+							</view>
+						</picker>
+					</uni-forms-item>
+					<view class="form-line"></view>
+					<uni-forms-item label="开始时间" name="companyName" required>
+						<uni-datetime-picker type="datetime" return-type="timestamp" v-model="baseFormData.startTime"/>
+					</uni-forms-item>
+					<view class="form-line"></view>
+					<uni-forms-item label="结束时间" name="companyName" required>
+						<uni-datetime-picker type="datetime" return-type="timestamp" v-model="baseFormData.endTime"/>
+					</uni-forms-item>
+					<view class="form-line"></view>
+					<uni-forms-item label="申请部门" name="companyName" required>
+						<picker @change="bindPickerChangetype" :value="baseFormData.indextype" :range="baseFormData.submittype">
+							<view class="uni-input">
+								<template v-if="baseFormData.indextype==''">请选择</template>
+								<template v-else>{{baseFormData.submittype[baseFormData.indextype]}}</template>
+								<text class="jiantou">〉</text>
+							</view>
+						</picker>
+					</uni-forms-item>
+					<view style="width: 750rpx;height: 20rpx;background-color: rgba(242, 243, 245, 1);margin-left: -20px;"></view>
+					<uni-forms-item label="备注" name="companyName" required>
+					</uni-forms-item>
+					<uni-easyinput type="textarea" v-model="baseFormData.remark" placeholder="请输入备注" @input="input"></uni-easyinput>
+					<text class="textsrea-txt">{{textNum}}/800</text>
+					<view style="width:100%;height: 30px;"></view>
+				</uni-forms>
+			</view>
+			<view class="submit_button">提交</view>
+		</view>
+		<!-- 提交记录 -->
+		<view v-else>
+			<view class="select_submit">
+				<view style="width: 80px;margin-left: 9rpx;position: absolute;">
+					<uni-data-select
+						v-model="value"
+						:localdata="zhuangtai"
+						@change="changezhuang"
+					  ></uni-data-select>
+				</view>
+				<view style="width: 80px;margin-left: 196rpx;">
+					<uni-data-select
+						v-model="value2"
+						:localdata="TimeRanges"
+						@change="changetime"
+					  ></uni-data-select>
+				</view>
+				<!-- 不同状态的记录 -->
+				<view class="submit-list" v-for="(item,index) in submit" :key="index" @click="clickDetail">
+					<text class="submit-title">{{item.title}}</text>
+					<text class="submit-time">{{item.time}}</text>
+					<view class="submit-line"></view>
+					<view class="submit-start">开始时间：{{item.startT}}</view>
+					<view class="submit-end">结束时间：{{item.endT}}</view>
+					<view class="submit-teacher">换课老师：{{item.teacher}}</view>
+					<view class="submit-remark">备注：{{item.remark}}</view>
+					<view class="submit-type" v-if="item.type==0">审批通过</view>
+					<view class="submit-type1" v-if="item.type==1">已拒绝</view>
+					<view class="submit-type2" v-if="item.type==2">待审批</view>
+				</view>
+
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				liutype:true,//切换流程状态
+				//表单数据
+				baseFormData:{
+					submittype:['住院医师','主任医师','副主任医师','主治医师'],//职称
+					indextype:0,
+					startTime:'',
+					endTime:'',
+					remark:'',//备注
+				},
+				textNum:0,
+				// 校验规则
+				rules: {
+					indextype: {
+						rules: [{
+							required: true,
+							errorMessage: '类型不能为空'
+						}]
+					},
+					age: {
+						rules: [{
+							required: true,
+							errorMessage: '年龄不能为空'
+						}, {
+							format: 'number',
+							errorMessage: '年龄只能输入数字'
+						}]
+					}
+				},
+				// 提交记录 
+				value: 0,
+				zhuangtai: [
+				  { value: 0, text: "篮球篮球" },
+				  { value: 1, text: "足球" },
+				  { value: 2, text: "游泳" },
+				],
+				value2: 0,
+				TimeRanges: [
+				  { value: 0, text: "近一周" },
+				  { value: 1, text: "近一年" },
+				  { value: 2, text: "近两年" },
+				],
+				submit:[
+					{title:'换课申请',time:'2023.11.04  12:00',startT:'2023.11.04  12:00',endT:'2023.11.04  12:00',teacher:'李华',remark:'家中有事',type:'0'},
+					{title:'换课申请',time:'2023.11.04  12:00',startT:'2023.11.04  12:00',endT:'2023.11.04  12:00',teacher:'李华',remark:'家中有事',type:'1'},
+					{title:'换课申请',time:'2023.11.04  12:00',startT:'2023.11.04  12:00',endT:'2023.11.04  12:00',teacher:'李华',remark:'家中有事',type:'2'},
+				]
+			}
+		},
+		onLoad() {
+			
+		},
+		mounted() {
+			
+		},
+		methods: {
+			//切换房型
+			changeType(){
+				this.liutype=!this.liutype
+			},
+			//修改类型
+			bindPickerChangetype: function(e) {
+				this.baseFormData.indextype=e.detail.value
+			},
+			//输入备注
+			input(e){
+				this.baseFormData.remark=e
+			},
+			// 提交记录
+			// 选择审批状态
+			changezhuang(e) {
+			  console.log("e:", e);
+			},
+			// 选择时间
+			changetime(e) {
+			  console.log("e:", e);
+			},
+			// 跳转到详情页面
+			clickDetail(){
+				uni.navigateTo({
+					url: "../liuchengO/detail/teach_detail"
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url("./css/liu_other.css");
+</style>

pages/liuchengTeacher/css/liu_teach.css

@@ -0,0 +1,328 @@
+.content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	background-color: #F2F3F5;
+}
+/* 切换发起提交与提交记录 */
+.select-type{
+	width: 750rpx;
+	height: 89rpx;
+	margin-left: 5px;
+	background-color: rgba(255, 255, 255, 1);
+	border-radius: 8px;
+}
+.allday{
+	width: 385rpx;
+	height: 89rpx;
+	background-image: url('../../static/index/allday.png');
+	background-size: 100%;
+	float: left;
+	line-height: 41px;
+	text-align: center;
+}
+.hourday_no{
+	background-color: rgba(230, 230, 230, 1);
+	width: 234px;
+	height: 40px;
+	margin-left: 304rpx;
+	border-radius: 8px;
+	line-height: 41px;
+	text-align: center;
+}
+.allday2{
+	width: 234px;
+	height: 40px;
+	border-radius: 8px;
+	background-color: rgba(230, 230, 230, 1);
+	float: left;
+	line-height: 41px;
+	text-align: center;
+}
+.hourday_no2{
+	width: 385rpx;
+	height: 89rpx;
+	z-index: 3;
+	position: absolute;
+	background-image: url('../../static/index/hourday.png');
+	background-size: 100%;
+	margin-left: 170px;
+	line-height: 41px;
+	text-align: center;
+}
+
+/* 发起提交各选项表单 */
+.submit{
+	width: 750rpx;
+	height: 100%;
+	background: rgba(255, 255, 255, 1);
+}
+>>>.uni-forms{
+	margin-left: 20px;
+}
+/* 名称 */
+>>>.uni-forms-item__label {
+    display: contents;
+    flex-direction: row;
+    align-items: center;
+    text-align: left;
+    font-size: 28rpx;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 400;
+    color: rgba(0, 0, 0, 1);
+    height: 46rpx;
+	line-height: 95rpx;
+    padding: 0 12rpx 0 0;
+    vertical-align: middle;
+    flex-shrink: 0;
+    box-sizing: border-box;
+}
+/* 输入框 */
+>>>uni-input {
+    display: block;
+    font-size: 28rpx;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 400;
+    color: rgba(166, 166, 166, 1);
+    line-height: 66rpx;
+    height: 1.4px;
+    min-height: 1.4em;
+    text-align: right;
+	overflow: hidden;
+	margin-right: 40rpx;
+}
+.uni-input-placeholder {
+    position: absolute;
+    top: auto!important;
+    left: 0;
+    color: #CCCCCC;
+    overflow: hidden;
+    text-overflow: clip;
+    white-space: pre;
+    word-break: keep-all;
+    pointer-events: none;
+    line-height: inherit;
+}
+/* picker选择样式 */
+uni-picker {
+    display: block;
+    font-size: 28rpx;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #333333;
+    height: 38px;
+    text-align: right;
+    overflow: hidden;
+    margin-right: 40rpx;
+    cursor: pointer;
+}
+.jiantou{
+	float: right;
+	width: 39rpx;
+	height: 39rpx;
+	border-radius: 0px 0px 0px 0px;
+	opacity: 1;
+	color: #333333;
+}
+.form-line{
+	position: absolute;
+	margin-top: -30rpx;
+	width: 670rpx;
+	height: 1rpx;
+	background: rgba(230, 230, 230, 1);
+	border-radius: 0px 0px 0px 0px;
+	opacity: 1;
+}
+.zhanshi{
+	font-weight: 400;
+	color: #333333;
+	margin-right: 40rpx;
+}
+/* 成立时间样式 */
+>>>.uni-date-x--border[data-v-6e13d7e2] {
+    box-sizing: border-box;
+    border-radius: 4rpx;
+    border: 0px solid #e5e5e5;
+}
+>>>.uni-forms-item__content[data-v-61dfc0d0] {
+    position: relative;
+    font-size: 28rpx;
+	color: #CCCCCC;
+    flex: 1;
+    box-sizing: border-box;
+    flex-direction: row;
+    text-align: right;
+}
+>>>.uni-icons[data-v-a2e81f6e] {
+    font-family: monospace;/*控制时间选择图标*/
+    text-decoration: none;
+    text-align: revert;
+}
+/* textarea框 */
+>>>.is-input-border {
+    display: flex;
+    box-sizing: border-box;
+    flex-direction: row;
+    width: 342px;
+    height: 112px;
+	border: 0px solid #F0F0F0;
+    align-items: baseline;
+    background: #F7F8FA;
+    border-radius: 5rpx 5rpx 5rpx 5rpx;
+    opacity: 1;
+    filter: blur(undefinedpx);
+	margin-top: -30px;
+}
+.liyou{
+	margin-left: 0rpx;
+	margin-top: -60rpx;
+	width: 690rpx;
+	height: 257rpx;
+	opacity: 1;
+	border-radius: 10rpx;
+	background-color: bisque;
+}
+.textsrea-txt{
+	position: absolute;
+	margin-left: 573rpx;
+	margin-top: -57rpx;
+	font-size: 28rpx;
+	font-weight: 400;
+	color: rgba(128, 128, 128, 1);
+}
+.uni-textarea-placeholder {
+	width: 690rpx;
+	height: 120px;
+    color: grey;
+    left: 0rpx;
+    top: 22rpx;
+    overflow: hidden;
+}
+>>>.uni-textarea-textarea {
+	width: 690rpx;
+	height: 120px;
+    resize: none;
+    background: none;
+    color: rgba(128, 128, 128, 1);
+    opacity: 1;
+    font: inherit;
+    line-height: inherit;
+    letter-spacing: inherit;
+    text-align: inherit;
+    text-indent: inherit;
+    text-transform: inherit;
+    text-shadow: inherit;
+}
+.uni-input{
+	/* width: 331px; */
+	height: 36px;
+	line-height: 44px;
+}
+.submit_button{
+	margin: 200rpx 0 0 20rpx;
+	width: 710rpx;
+	height: 96rpx;
+	border-radius: 64rpx;
+	background: rgba(0, 97, 255, 1);
+	font-size: 32rpx;
+	font-weight: 500;
+	line-height: 96rpx;
+	color: rgba(255, 255, 255, 1);
+	text-align: center;
+}
+/* 提交记录 */
+.select_submit{
+	width: 750rpx;
+	height: 70rpx;
+	background: rgba(255, 255, 255, 1);
+}
+>>>.uni-select[data-v-6b64008e] {
+    font-size: 14px;
+    border: 0px solid #e5e5e5;
+    box-sizing: border-box;
+    border-radius: 4px;
+    padding: 0 5px;
+    padding-left: 10px;
+    position: relative;
+    display: flex;
+    -webkit-user-select: none;
+    user-select: none;
+    flex-direction: row;
+    align-items: center;
+    border-bottom: solid 0px #e5e5e5;
+    width: 100%;
+    flex: 1;
+    height: 35px;
+}
+/* 不同状态的记录 */
+.submit-list{
+	margin: 11rpx 0 0 20rpx;
+	width: 710rpx;
+	height: 370rpx;
+	opacity: 0.9;
+	border-radius: 10rpx;
+	background: rgba(255, 255, 255, 1);
+	font-weight: 400;
+	font-size: 24rpx;
+	line-height: 35rpx;
+	color: rgba(153, 153, 153, 1);
+}
+.submit-title{
+	margin: 20rpx 0 0 19rpx;
+	font-size: 32rpx;
+	line-height: 46px;
+	color: rgba(0, 0, 0, 1);
+}
+.submit-time{
+	margin: 0 0 0 353rpx;
+}
+.submit-line{
+	margin: 0 0 0 21rpx;
+	width: 671rpx;
+	height: 0px;
+	opacity: 1;
+	border: 1rpx solid rgba(230, 230, 230, 1);
+}
+.submit-start{
+	margin: 22rpx 0 0 21rpx;
+}
+.submit-end{
+	margin: 7rpx 0 0 21rpx;
+}
+.submit-teacher{
+	margin: 7rpx 0 0 21rpx;
+}
+.submit-remark{
+	margin: 7rpx 0 0 21rpx;
+}
+.submit-type{
+	margin: 11rpx 0 0 573rpx;
+	width: 118rpx;
+	height: 55rpx;
+	border-radius: 7rpx;
+	background: rgba(225, 245, 244, 1);
+	line-height: 55rpx;
+	color: rgba(9, 101, 98, 1);
+	text-align: center;
+}
+.submit-type1{
+	margin: 11rpx 0 0 573rpx;
+	width: 118rpx;
+	height: 55rpx;
+	border-radius: 7rpx;
+	background: rgba(245, 228, 228, 1);
+	line-height: 55rpx;
+	color: rgba(212, 48, 48, 1);
+	text-align: center;
+}
+.submit-type2{
+	margin: 11rpx 0 0 573rpx;
+	width: 118rpx;
+	height: 55rpx;
+	border-radius: 7rpx;
+	background: rgba(247, 231, 215, 1);
+	line-height: 55rpx;
+	color: rgba(255, 141, 26, 1);
+	text-align: center;
+}

pages/liuchengTeacher/detail/teach_detail.css

@@ -0,0 +1,181 @@
+/* 申请类型 */
+.request_type{
+	width: 750rpx;
+	height: 137rpx;
+	opacity: 0.9;
+	background: rgba(255, 255, 255, 1);
+	font-weight: 400;
+}
+.type_title{
+	position: absolute;
+	margin: 20rpx 0 0 20rpx;
+	font-size: 32rpx;
+	line-height: 46rpx;
+	color: rgba(0, 0, 0, 1);
+}
+.type_time{
+	position: absolute;
+	margin: 72rpx 0 0 20rpx;
+	font-size: 24rpx;
+	line-height: 35rpx;
+	color: rgba(153, 153, 153, 1);
+}
+.type_zhuang{
+	position: absolute;
+	margin: 31rpx 0 0 576rpx;
+	width: 154rpx;
+	height: 72rpx;
+	border-radius: 9rpx;
+	background: rgba(225, 245, 244, 1);
+	font-size: 31rpx;
+	line-height: 72rpx;
+	color: rgba(9, 101, 98, 1);
+	text-align: center;
+}
+.type_zhuang2{
+	position: absolute;
+	margin: 31rpx 0 0 576rpx;
+	width: 154rpx;
+	height: 72rpx;
+	border-radius: 9rpx;
+	background: rgba(245, 228, 228, 1);
+	font-size: 31rpx;
+	line-height: 72rpx;
+	color: rgba(212, 48, 48, 1);
+	text-align: center;
+}
+.type_zhuang3{
+	position: absolute;
+	margin: 31rpx 0 0 576rpx;
+	width: 154rpx;
+	height: 72rpx;
+	border-radius: 9rpx;
+	background: rgba(247, 231, 215, 1);
+	font-size: 31rpx;
+	line-height: 72rpx;
+	color: rgba(255, 141, 26, 1);
+	text-align: center;
+}
+/* 申请内容 */
+.request_detail{
+	margin-top: 20rpx;
+	width: 750rpx;
+	height: 428rpx;
+	opacity: 0.9;
+	background: rgba(255, 255, 255, 1);
+}
+>>>.uni-forms{
+	margin-left: 20px;
+}
+>>>.uni-forms-item[data-v-61dfc0d0] {
+    position: relative;
+    display: flex;
+    margin-bottom: 0px;
+    flex-direction: row;
+}
+/* 名称 */
+>>>.uni-forms-item__label {
+    display: contents;
+    flex-direction: row;
+    align-items: center;
+    text-align: left;
+    font-size: 28rpx;
+    font-family: PingFang SC-Regular, PingFang SC;
+    font-weight: 400;
+    color: rgba(0, 0, 0, 1);
+    height: 46rpx;
+	line-height: 88rpx;
+    padding: 0 12rpx 0 0;
+    vertical-align: middle;
+    flex-shrink: 0;
+    box-sizing: border-box;
+}
+.uni-input{
+	margin-right: 10px;
+	height: 36px;
+	line-height: 44px;
+	text-align: right;
+}
+.form-line{
+	position: absolute;
+	width: 356px;
+	height: 1rpx;
+	background: rgba(230, 230, 230, 1);
+	border-radius: 0px 0px 0px 0px;
+	opacity: 1;
+}
+/* 申请备注 */
+.request_remark{
+	padding-left: 20px;
+	margin-top: 20rpx;
+	width: 750rpx;
+	height: 277rpx;
+	opacity: 0.9;
+	background: rgba(255, 255, 255, 1);
+}
+.liyou{
+	margin-left: 0rpx;
+	margin-top: -10rpx;
+	width: 690rpx;
+	height: 98px;
+	opacity: 1;
+	border-radius: 10rpx;
+}
+.textsrea-txt{
+	position: absolute;
+	margin-left: 317px;
+	margin-top: -57rpx;
+	font-size: 28rpx;
+	font-weight: 400;
+	color: rgba(128, 128, 128, 1);
+}
+/* 审批记录 */
+.request_list{
+	margin-top: 20rpx;
+	width: 750rpx;
+	height: 577rpx;
+	opacity: 0.9;
+	background: rgba(255, 255, 255, 1);
+}
+.list_title{
+	position: absolute;
+	margin: 20rpx 0 0 16rpx;
+	font-size: 32rpx;
+	font-weight: 500;
+	color: rgba(0, 0, 0, 1);
+}
+/* 几级审批 */
+.item_image{
+	position: absolute;
+	margin: 0 0 0 22rpx;
+	width: 60rpx;
+	height: 60rpx;
+	background-color:  rgba(255, 170, 0, 1.0);
+	border-radius: 50%;
+}
+.item_title{
+	position: absolute;
+	margin: 0 0 0 105rpx;
+	font-size: 24rpx;
+	font-weight: 400;
+	color: rgba(0, 0, 0, 1);
+}
+.item_name{
+	position: absolute;
+	margin: 31rpx 0 0 105rpx;
+	font-size: 24rpx;
+	font-weight: 400;
+	color: rgba(128, 128, 128, 1);
+}
+.item_time{
+	margin: 13rpx 0 0 539rpx;
+	font-size: 24rpx;
+	font-weight: 400;
+	color: rgba(166, 166, 166, 1);
+}
+.item_line{
+	margin: 13rpx 0 0 52rpx;
+	height: 50rpx;
+	width: 0px;
+	border: 2rpx solid rgba(204, 204, 204, 1);
+}

pages/liuchengTeacher/detail/teach_detail.vue

@@ -0,0 +1,118 @@
+<template>
+	<view class="content">
+		<!-- 申请类型 -->
+		<view class="request_type">
+			<view class="type_title">换课申请</view>
+			<view class="type_time">2023.11.04  12:00</view>
+			<view class="type_zhuang">审批通过</view>
+			<!-- <view class="type_zhuang2">审批通过</view>
+			<view class="type_zhuang3">审批通过</view> -->
+		</view>
+		<!-- 申请内容 -->
+		<view class="request_detail">
+			<uni-forms ref="valiForm" :rules="rules" :modelValue="baseFormData">
+				<uni-forms-item label="类型" name="companyName" required>
+						<view class="uni-input">
+							111
+						</view>
+				</uni-forms-item>
+				<view class="form-line"></view>
+				<uni-forms-item label="开始时间" name="companyName" required>
+					<view class="uni-input">
+						111
+					</view>
+				</uni-forms-item>
+				<view class="form-line"></view>
+				<uni-forms-item label="结束时间" name="companyName" required>
+					<view class="uni-input">
+						111
+					</view>
+				</uni-forms-item>
+				<view class="form-line"></view>
+				<uni-forms-item label="申请部门" name="companyName" required>
+					<view class="uni-input">
+						111
+					</view>
+				</uni-forms-item>
+				<view class="form-line"></view>
+				<uni-forms-item label="换课老师" name="companyName" required>
+					<view class="uni-input">
+						111
+					</view>
+				</uni-forms-item>
+			</uni-forms>
+		</view>
+		<!-- 申请备注 -->
+		<view class="request_remark">
+			<uni-forms-item label="备注" name="companyName" required>
+			</uni-forms-item>
+			<view class="liyou">{{shanchang}}</view>
+			<text class="textsrea-txt">1/200</text>
+		</view>
+		<!-- 审批记录 -->
+		<view class="request_list">
+			<view class="list_title">审批记录</view>
+			<!-- 几级审批 -->
+			<view style="position: absolute;margin-top: 110rpx;">
+			<view v-for="(item,index) in list" :key="index">
+				<image class="item_image"></image>
+				<view class="item_title">{{item.title}}</view>
+				<view class="item_name">{{item.name}}</view>
+				<view class="item_time">{{item.time}}</view>
+				<view class="item_line" v-if="index<(list.length-1)"></view>
+			</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list:[
+					{title:'提交申请',name:'我',time:'2023.11.07  09:00'},
+					{title:'提交申请',name:'我',time:'2023.11.07  09:00'},
+					{title:'提交申请',name:'我',time:'2023.11.07  09:00'},
+					{title:'提交申请',name:'我',time:'2023.11.07  09:00'},
+				],
+				//表单数据
+				baseFormData:{
+					submittype:['住院医师','主任医师','副主任医师','主治医师'],//职称
+					indextype:0,
+					startTime:'',
+					endTime:'',
+					remark:'',//备注
+				},
+				// 校验规则
+				rules: {
+					indextype: {
+						rules: [{
+							required: true,
+							errorMessage: '类型不能为空'
+						}]
+					},
+					age: {
+						rules: [{
+							required: true,
+							errorMessage: '年龄不能为空'
+						}, {
+							format: 'number',
+							errorMessage: '年龄只能输入数字'
+						}]
+					}
+				},
+			}
+		},
+		onLoad() {
+		},
+		mounted() {
+		},
+		methods: {
+		}
+	}
+</script>
+
+<style>
+	@import url("./teach_detail.css");
+</style>

pages/liuchengTeacher/liu_teach.vue

@@ -0,0 +1,192 @@
+<template>
+	<view class="content">
+		<!-- 切换发起提交与提交记录 -->
+		<view class="select-type" v-if="liutype" @click="changeType">
+			<view class="allday">发起提交</view>
+			<view class="hourday_no">提交记录</view>
+		</view>
+		<view class="select-type" v-else @click="changeType">
+			<view class="allday2">发起提交</view>
+			<view class="hourday_no2">提交记录</view>
+		</view>
+		<!-- 发起提交各选项表单 -->
+		<view v-if="liutype">
+			<view class="submit">
+				<!-- 基础表单校验 -->
+				<uni-forms ref="valiForm" :rules="rules" :modelValue="baseFormData">
+					<uni-forms-item label="类型" name="companyName" required>
+						<picker @change="bindPickerChangetype" :value="baseFormData.indextype" :range="baseFormData.submittype">
+							<view class="uni-input">
+								<template v-if="baseFormData.indextype==''">请选择</template>
+								<template v-else>{{baseFormData.submittype[baseFormData.indextype]}}</template>
+								<text class="jiantou">〉</text>
+							</view>
+						</picker>
+					</uni-forms-item>
+					<view class="form-line"></view>
+					<uni-forms-item label="开始时间" name="companyName" required>
+						<uni-datetime-picker type="datetime" return-type="timestamp" v-model="baseFormData.startTime"/>
+					</uni-forms-item>
+					<view class="form-line"></view>
+					<uni-forms-item label="结束时间" name="companyName" required>
+						<uni-datetime-picker type="datetime" return-type="timestamp" v-model="baseFormData.endTime"/>
+					</uni-forms-item>
+					<view class="form-line"></view>
+					<uni-forms-item label="申请部门" name="companyName" required>
+						<picker @change="bindPickerChangetype" :value="baseFormData.indextype" :range="baseFormData.submittype">
+							<view class="uni-input">
+								<template v-if="baseFormData.indextype==''">请选择</template>
+								<template v-else>{{baseFormData.submittype[baseFormData.indextype]}}</template>
+								<text class="jiantou">〉</text>
+							</view>
+						</picker>
+					</uni-forms-item>
+					<view class="form-line"></view>
+					<uni-forms-item label="换课老师" name="companyName" required>
+						<picker @change="bindPickerChangetype" :value="baseFormData.indextype" :range="baseFormData.submittype">
+							<view class="uni-input">
+								<template v-if="baseFormData.indextype==''">请选择</template>
+								<template v-else>{{baseFormData.submittype[baseFormData.indextype]}}</template>
+								<text class="jiantou">〉</text>
+							</view>
+						</picker>
+					</uni-forms-item>
+					<view style="width: 750rpx;height: 20rpx;background-color: rgba(242, 243, 245, 1);margin-left: -20px;"></view>
+					<uni-forms-item label="备注" name="companyName" required>
+					</uni-forms-item>
+					<uni-easyinput type="textarea" v-model="baseFormData.remark" placeholder="请输入备注" @input="input"></uni-easyinput>
+					<text class="textsrea-txt">{{textNum}}/800</text>
+					<view style="width:100%;height: 30px;"></view>
+				</uni-forms>
+			</view>
+			<view class="submit_button">提交</view>
+		</view>
+		<!-- 提交记录 -->
+		<view v-else>
+			<view class="select_submit">
+				<view style="width: 80px;margin-left: 9rpx;position: absolute;">
+					<uni-data-select
+						v-model="value"
+						:localdata="zhuangtai"
+						@change="changezhuang"
+					  ></uni-data-select>
+				</view>
+				<view style="width: 80px;margin-left: 196rpx;">
+					<uni-data-select
+						v-model="value2"
+						:localdata="TimeRanges"
+						@change="changetime"
+					  ></uni-data-select>
+				</view>
+				<!-- 不同状态的记录 -->
+				<view class="submit-list" v-for="(item,index) in submit" :key="index" @click="clickDetail">
+					<text class="submit-title">{{item.title}}</text>
+					<text class="submit-time">{{item.time}}</text>
+					<view class="submit-line"></view>
+					<view class="submit-start">开始时间：{{item.startT}}</view>
+					<view class="submit-end">结束时间：{{item.endT}}</view>
+					<view class="submit-teacher">换课老师：{{item.teacher}}</view>
+					<view class="submit-remark">备注：{{item.remark}}</view>
+					<view class="submit-type" v-if="item.type==0">审批通过</view>
+					<view class="submit-type1" v-if="item.type==1">已拒绝</view>
+					<view class="submit-type2" v-if="item.type==2">待审批</view>
+				</view>
+
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				liutype:true,//切换流程状态
+				//表单数据
+				baseFormData:{
+					submittype:['住院医师','主任医师','副主任医师','主治医师'],//职称
+					indextype:0,
+					startTime:'',
+					endTime:'',
+					remark:'',//备注
+				},
+				textNum:0,
+				// 校验规则
+				rules: {
+					indextype: {
+						rules: [{
+							required: true,
+							errorMessage: '类型不能为空'
+						}]
+					},
+					age: {
+						rules: [{
+							required: true,
+							errorMessage: '年龄不能为空'
+						}, {
+							format: 'number',
+							errorMessage: '年龄只能输入数字'
+						}]
+					}
+				},
+				// 提交记录 
+				value: 0,
+				zhuangtai: [
+				  { value: 0, text: "篮球篮球" },
+				  { value: 1, text: "足球" },
+				  { value: 2, text: "游泳" },
+				],
+				value2: 0,
+				TimeRanges: [
+				  { value: 0, text: "近一周" },
+				  { value: 1, text: "近一年" },
+				  { value: 2, text: "近两年" },
+				],
+				submit:[
+					{title:'换课申请',time:'2023.11.04  12:00',startT:'2023.11.04  12:00',endT:'2023.11.04  12:00',teacher:'李华',remark:'家中有事',type:'0'},
+					{title:'换课申请',time:'2023.11.04  12:00',startT:'2023.11.04  12:00',endT:'2023.11.04  12:00',teacher:'李华',remark:'家中有事',type:'1'},
+					{title:'换课申请',time:'2023.11.04  12:00',startT:'2023.11.04  12:00',endT:'2023.11.04  12:00',teacher:'李华',remark:'家中有事',type:'2'},
+				]
+			}
+		},
+		onLoad() {
+			
+		},
+		mounted() {
+			
+		},
+		methods: {
+			//切换房型
+			changeType(){
+				this.liutype=!this.liutype
+			},
+			//修改类型
+			bindPickerChangetype: function(e) {
+				this.baseFormData.indextype=e.detail.value
+			},
+			//输入备注
+			input(e){
+				this.baseFormData.remark=e
+			},
+			// 提交记录
+			// 选择审批状态
+			changezhuang(e) {
+			  console.log("e:", e);
+			},
+			// 选择时间
+			changetime(e) {
+			  console.log("e:", e);
+			},
+			// 跳转到详情页面
+			clickDetail(){
+				uni.navigateTo({
+					url: "../liuchengTeacher/detail/teach_detail"
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url("./css/liu_teach.css");
+</style>

pages/my_orderlist/css/my_orderlist.css

@@ -1,314 +1,320 @@
-.content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	background-color: #F2F3F5;
-}
+
+.content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	background-color: #F2F3F5;
+	height: 795px;
+	overflow-y: hidden;
+}
 /*切换栏*/
 .inv-h-w {
 	background-color: #FFFFFF;
 	height: 98rpx;
 	display: flex;
 	top: 0;
-	width: 100%;
-	white-space: nowrap;
-	overflow-y: hidden;
-	overflow-x: auto;
+	width: 100%;
+	white-space: nowrap;
+	overflow-y: hidden;
+	overflow-x: auto;
 	border: 1rpx solid #fdfdfc;
-}
+}
 .inv-h-w::-webkit-scrollbar-thumb {
 	/*滚动条里面小方块*/
 	border-radius: 5px;
 	background: blue;
 }
 
-.inv-h {
+.inv-h {
 	display: inline-flex;
 	font-size: 28rpx;
 	flex: 1;
-	text-align: center;
-	margin-left: 5rpx;
-	margin-right: 5rpx;
-	padding-left: 20rpx;
+	text-align: center;
+	margin-left: 5rpx;
+	margin-right: 5rpx;
+	padding-left: 20rpx;
 	padding-right: 20rpx;
 	height: 98rpx;
-	line-height: 98rpx;
+	line-height: 98rpx;
 	color: rgba(128, 128, 128, 1);
 }
 
-.inv-h-se {
+.inv-h-se {
 	/* display: inline-flex; */
-	color: rgba(0, 0, 0, 1);
+	color: rgba(0, 0, 0, 1);
 	font-size: 28rpx;
-	font-weight: bold;
-	height: 92rpx;
+	font-weight: bold;
+	height: 92rpx;
 	line-height: 98rpx;
 	border-bottom: 6rpx solid rgba(41, 109, 227, 1);
 }
-
-/* 订单样式 */
-.room-kuang{
-	display: block; 
-	width: 750rpx;
-	background-color: #FFFFFF;
-	margin-top: 5rpx;
-}
-.room-xinxi{
-	/* display: -webkit-box; */
-	flex-direction: column;
-	align-items: center;
-	width: 710rpx;
-	height: 243rpx;
-	margin-top: 20rpx;
-}
-.room-image{
-	position: absolute;
-	margin-left: 51rpx;
-	margin-top: 10rpx;
-	width: 165rpx;
-	height: 125rpx;
-	border-radius: 5px;
-}
-.room-name{
-	position: absolute;
-	margin-left: 236rpx;
-	margin-top: 10rpx;
-	color: rgba(0, 0, 0, 1);
-	font-size: 34rpx;
-	font-weight: 400;
-}
-.room-time{
-	position: absolute;
-	margin-left: 236rpx;
-	margin-top: 56rpx;
-	color: rgba(166, 166, 166, 1);
-	font-size: 24rpx;
-	font-weight: 400;
-}
-.room-order{
-	position: absolute;
-	margin-left: 236rpx;
-	margin-top: 96rpx;
-	color: rgba(166, 166, 166, 1);
-	font-size: 24rpx;
-	font-weight: 400;
-}
-.room-type{
-	position: absolute;
-	margin-left: 627rpx;
-	color: rgba(128, 128, 128, 1);
-	font-size: 24rpx;
-	font-weight: 400;
-}
-.room-price{
-	position: absolute;
-	margin-left: 601rpx;
-	margin-top: 46rpx;
-	color: rgba(56, 56, 56, 1);
-	font-size: 42rpx;
-	font-weight: 500;
-}
-.room-count{
-	position: absolute;
-	margin-left: 51rpx;
-	margin-top: 155rpx;
-	font-size: 24rpx;
-	font-weight: 400;
-	color:#FF5733;
-}
-.room-count-txt{
-	position: absolute;
-	margin-left: 205rpx;
-	margin-top: 155rpx;
-	color: rgba(128, 128, 128, 1);
-	font-size: 24rpx;
-	font-weight: 400;
-}
-.room-button{
-	position: absolute;
-	margin-left: 381rpx;
-	margin-top: 146rpx;
-	width: 146rpx;
-	height: 56rpx;
-	border: 1px solid rgba(41, 109, 227, 1);
-	border-radius: 4px;
-	text-align: center;
-	line-height: 56rpx;
-	color: rgba(41, 109, 227, 1);
-}
-.room-button2{
-	position: absolute;
-	margin-left: 551rpx;
-	margin-top: 146rpx;
-	width: 146rpx;
-	height: 56rpx;
-	border: 1px solid rgba(41, 109, 227, 1);
-	border-radius: 4px;
-	text-align: center;
-	line-height: 56rpx;
-	color: rgba(41, 109, 227, 1);
-}
-.room-button3{
-	position: absolute;
-	margin-left: 551rpx;
-	margin-top: 146rpx;
-	width: 146rpx;
-	height: 56rpx;
-	background: rgba(41, 109, 227, 1);
-	border-radius: 4px;
-	text-align: center;
-	line-height: 56rpx;
-	color: rgba(255, 255, 255, 1);
-	font-size: 28rpx;
-}
-.room-line{
-	position: absolute;
-	margin-left: 20rpx;
-	margin-top: 225rpx;
-	width: 710rpx;
-	height: 1px;
-	background: rgba(220, 225, 230, 1);
-}
-/* 办理续住弹窗 */
-.popup_bg_xu{
-	width: 650rpx;
-	height: 575rpx;
-	background: rgba(255, 255, 255, 1);
-	border-radius: 6rpx;
-}
-.popup_title{
-	position: absolute;
-	margin-left: 40rpx;
-	margin-top: 20rpx;
-	color: rgba(0, 0, 0, 1);
-	font-size: 32rpx;
-	font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
-	font-weight: 400;
-}
-.popup_error{
-	position: absolute;
-	margin-left: 577rpx;
-	margin-top: 15rpx;
-	width: 32px;
-	height: 32px;
-	background-image: url(../../static/index/swiper_x.svg);
-}
-.select-list{
+
+/* 订单样式 */
+.room-kuang{
+	flex: 1;
+	overflow-y: scroll;
+	display: block; 
+	width: 750rpx;
+	height: auto;
+	background-color: #FFFFFF;
+	margin-top: 5rpx;
+}
+.room-xinxi{
+	/* display: -webkit-box; */
+	flex-direction: column;
+	align-items: center;
+	width: 710rpx;
+	height: 243rpx;
+	margin-top: 20rpx;
+}
+.room-image{
+	position: absolute;
+	margin-left: 51rpx;
+	margin-top: 10rpx;
+	width: 165rpx;
+	height: 125rpx;
+	border-radius: 5px;
+}
+.room-name{
+	position: absolute;
+	margin-left: 236rpx;
+	margin-top: 10rpx;
+	color: rgba(0, 0, 0, 1);
+	font-size: 34rpx;
+	font-weight: 400;
+}
+.room-time{
+	position: absolute;
+	margin-left: 236rpx;
+	margin-top: 56rpx;
+	color: rgba(166, 166, 166, 1);
+	font-size: 24rpx;
+	font-weight: 400;
+}
+.room-order{
+	position: absolute;
+	margin-left: 236rpx;
+	margin-top: 96rpx;
+	color: rgba(166, 166, 166, 1);
+	font-size: 24rpx;
+	font-weight: 400;
+}
+.room-type{
+	position: absolute;
+	margin-left: 627rpx;
+	color: rgba(128, 128, 128, 1);
+	font-size: 24rpx;
+	font-weight: 400;
+}
+.room-price{
+	position: absolute;
+	margin-left: 601rpx;
+	margin-top: 46rpx;
+	color: rgba(56, 56, 56, 1);
+	font-size: 42rpx;
+	font-weight: 500;
+}
+.room-count{
+	position: absolute;
+	margin-left: 51rpx;
+	margin-top: 155rpx;
+	font-size: 24rpx;
+	font-weight: 400;
+	color:#FF5733;
+}
+.room-count-txt{
+	position: absolute;
+	margin-left: 205rpx;
+	margin-top: 155rpx;
+	color: rgba(128, 128, 128, 1);
+	font-size: 24rpx;
+	font-weight: 400;
+}
+.room-button{
+	position: absolute;
+	margin-left: 381rpx;
+	margin-top: 146rpx;
+	width: 146rpx;
+	height: 56rpx;
+	border: 1px solid rgba(41, 109, 227, 1);
+	border-radius: 4px;
+	text-align: center;
+	line-height: 56rpx;
+	color: rgba(41, 109, 227, 1);
+}
+.room-button2{
+	position: absolute;
+	margin-left: 551rpx;
+	margin-top: 146rpx;
+	width: 146rpx;
+	height: 56rpx;
+	border: 1px solid rgba(41, 109, 227, 1);
+	border-radius: 4px;
+	text-align: center;
+	line-height: 56rpx;
+	color: rgba(41, 109, 227, 1);
+}
+.room-button3{
+	position: absolute;
+	margin-left: 551rpx;
+	margin-top: 146rpx;
+	width: 146rpx;
+	height: 56rpx;
+	background: rgba(41, 109, 227, 1);
+	border-radius: 4px;
+	text-align: center;
+	line-height: 56rpx;
+	color: rgba(255, 255, 255, 1);
+	font-size: 28rpx;
+}
+.room-line{
+	position: absolute;
+	margin-left: 20rpx;
+	margin-top: 225rpx;
+	width: 710rpx;
+	height: 1px;
+	background: rgba(220, 225, 230, 1);
+}
+/* 办理续住弹窗 */
+.popup_bg_xu{
+	width: 650rpx;
+	height: 575rpx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 6rpx;
+}
+.popup_title{
+	position: absolute;
+	margin-left: 40rpx;
+	margin-top: 20rpx;
+	color: rgba(0, 0, 0, 1);
+	font-size: 32rpx;
+	font-family: 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
+	font-weight: 400;
+}
+.popup_error{
+	position: absolute;
+	margin-left: 577rpx;
+	margin-top: 15rpx;
+	width: 32px;
+	height: 32px;
+	background-image: url(../../static/index/swiper_x.svg);
+}
+.select-list{
 	color: rgba(153, 153, 153, 1);
 	font-size: 24rpx;
-	font-weight: 400;
-}
-.select-list-time{
-	color: rgba(0, 0, 0, 1);
-	font-size: 34rpx;
-	font-weight: 400;
-}
-.select-center{
-	width: 190rpx;
-	height: 120rpx;
-}
-.select-line1{
-	position: absolute;
-	margin-left: 40px;
-	margin-top: 36px;
-	width: 17rpx;
-	height: 1px;
-	background: rgba(41, 109, 227, 1);
-}
-.select-circle{
-	position: absolute;
-	width: 81rpx;
-	height: 46rpx;
-	margin-left: 49px;
-	margin-top: 24px;
-	background: rgba(240, 242, 245, 1);
-	border: 1px solid rgba(41, 109, 227, 1);
-	border-radius: 33rpx;
-	text-align: center;
-	color: rgba(0, 0, 0, 1);
-	font-size: 24rpx;
-	font-weight: 400;
-}
-.select-line2{
-	position: absolute;
-	margin-left: 94px;
-	margin-top: 36px;
-	width: 17rpx;
-	height: 1px;
-	background: rgba(41, 109, 227, 1);
-}
-.select-time-xu{
-	display: flex;
-	flex-direction: row;
-	justify-content: flex-start;
-	position: absolute;
-	width: 630rpx;
-	height: 120rpx;
-	margin-top: 128rpx;
-	margin-left: 0rpx;
-}
-.select-time-one-xu{
-	margin-top: 32rpx;
-	margin-left: 55rpx;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-}
-.popup_xu_line{
-	position: absolute;
-	margin-left: 0rpx;
-	margin-top: 86rpx;
-	width: 646rpx;
-	height: 0px;
-	background: rgba(204, 204, 204, 1);
-	border: 1rpx solid rgba(229, 229, 229, 1);
-}
-.popup_xu_txt{
-	position: absolute;
-	margin-left: 52rpx;
-	margin-top: 282rpx;
-	color: rgba(166, 166, 166, 1);
-	font-size: 24rpx;
-	font-weight: 400;
-}
-/* 支付框 */
-.fukuan{
-	display: flex;
-	padding-top: 475rpx;
-	width: 650rpx;
-	height: 100rpx;
-	background: rgba(255, 255, 255, 1);
-	box-shadow: inset 0rpx -4rpx 10rpx rgba(0, 0, 0, 0.15);
-	box-sizing: border-box;
-}
-.fu-price{
-	width: 363rpx;
-	color: rgba(255, 87, 51, 1);
-	font-size: 44rpx;
-	font-weight: 500;
-	text-align: center;
-	line-height: 100rpx;
-}
-.fu-zhifu{
-	float: right;
-	width: 288rpx;
-	height: 100rpx;
-	background: rgba(41, 109, 227, 1);
-	color: rgba(255, 255, 255, 1);
-	font-size: 40rpx;
-	font-weight: 400;
-	text-align: center;
-	line-height: 100rpx;
-}
-/* 弹出框 */
-.kuang_txt{
-	align-items: center;
-	justify-content: center;
-	padding: 15rpx;
-	height: 150rpx;
-	/* width: 180rpx; */
-	line-height: 150rpx;
-	text-align: center;
-	background-color: #fff;
+	font-weight: 400;
+}
+.select-list-time{
+	color: rgba(0, 0, 0, 1);
+	font-size: 34rpx;
+	font-weight: 400;
+}
+.select-center{
+	width: 190rpx;
+	height: 120rpx;
+}
+.select-line1{
+	position: absolute;
+	margin-left: 40px;
+	margin-top: 36px;
+	width: 17rpx;
+	height: 1px;
+	background: rgba(41, 109, 227, 1);
+}
+.select-circle{
+	position: absolute;
+	width: 81rpx;
+	height: 46rpx;
+	margin-left: 49px;
+	margin-top: 24px;
+	background: rgba(240, 242, 245, 1);
+	border: 1px solid rgba(41, 109, 227, 1);
+	border-radius: 33rpx;
+	text-align: center;
+	color: rgba(0, 0, 0, 1);
+	font-size: 24rpx;
+	font-weight: 400;
+}
+.select-line2{
+	position: absolute;
+	margin-left: 94px;
+	margin-top: 36px;
+	width: 17rpx;
+	height: 1px;
+	background: rgba(41, 109, 227, 1);
+}
+.select-time-xu{
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-start;
+	position: absolute;
+	width: 630rpx;
+	height: 120rpx;
+	margin-top: 128rpx;
+	margin-left: 0rpx;
+}
+.select-time-one-xu{
+	margin-top: 32rpx;
+	margin-left: 55rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+.popup_xu_line{
+	position: absolute;
+	margin-left: 0rpx;
+	margin-top: 86rpx;
+	width: 646rpx;
+	height: 0px;
+	background: rgba(204, 204, 204, 1);
+	border: 1rpx solid rgba(229, 229, 229, 1);
+}
+.popup_xu_txt{
+	position: absolute;
+	margin-left: 52rpx;
+	margin-top: 282rpx;
+	color: rgba(166, 166, 166, 1);
+	font-size: 24rpx;
+	font-weight: 400;
+}
+/* 支付框 */
+.fukuan{
+	display: flex;
+	padding-top: 475rpx;
+	width: 650rpx;
+	height: 100rpx;
+	background: rgba(255, 255, 255, 1);
+	box-shadow: inset 0rpx -4rpx 10rpx rgba(0, 0, 0, 0.15);
+	box-sizing: border-box;
+}
+.fu-price{
+	width: 363rpx;
+	color: rgba(255, 87, 51, 1);
+	font-size: 44rpx;
+	font-weight: 500;
+	text-align: center;
+	line-height: 100rpx;
+}
+.fu-zhifu{
+	float: right;
+	width: 288rpx;
+	height: 100rpx;
+	background: rgba(41, 109, 227, 1);
+	color: rgba(255, 255, 255, 1);
+	font-size: 40rpx;
+	font-weight: 400;
+	text-align: center;
+	line-height: 100rpx;
+}
+/* 弹出框 */
+.kuang_txt{
+	align-items: center;
+	justify-content: center;
+	padding: 15rpx;
+	height: 150rpx;
+	/* width: 180rpx; */
+	line-height: 150rpx;
+	text-align: center;
+	background-color: #fff;
 }

pages/myself/css/myself.css

@@ -1,127 +1,125 @@
-.content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	background-color: #F2F3F5;
-}
-.person{
-	display: revert;
-	margin-top: 20rpx;
-	margin-left: 20rpx;
-	margin-right: 20rpx;
-	width: 710rpx;
-	height: 190rpx;
-	background: rgba(255, 255, 255, 1);
-	border-radius: 9rpx;
-}
-.person_touxiang{
-	margin-left: 30rpx;
-	margin-top: 40rpx;
-	width: 110rpx;
-	height: 110rpx;
-	border-radius: 55px;
-}
-.person_name{
-	position: absolute;
-	margin-left: 22rpx;
-	margin-top: 50rpx;
-	color: rgba(0, 0, 0, 1);
-	font-size: 36rpx;
-	font-weight: 600;
-}
-.person_identity{
-	position: absolute;
-	margin-left: 14rpx;
-	width: 91rpx;
-	height: 38rpx;
-	background: rgba(41, 109, 227, 1);
-	border-radius: 145rpx;
-	color: rgba(255, 255, 255, 1);
-	font-size: 20rpx;
-	font-weight: 400;
-	line-height: 38rpx;
-	text-align: center;
-}
-.person_phone{
-	position: absolute;
-	margin-left: 22rpx;
-	margin-top: 98rpx;
-	color: rgba(128, 128, 128, 1);
-	font-size: 24rpx;
-	font-weight: 400;
-}
-/* 第二部分，我的订单 */
-.my_order{
-	display: revert;
-	margin-top: 20rpx;
-	margin-left: 20rpx;
-	margin-right: 20rpx;
-	width: 710rpx;
-	height: 397rpx;
-	background: rgba(255, 255, 255, 1);
-	border-radius: 9rpx;
-}
-.order_title{
-	margin-left: 28rpx;
-	margin-top: 30rpx;
-	color: rgba(0, 0, 0, 1);
-	font-size: 32rpx;
-	font-weight: 500;
-}
-.order_all{
-	margin-left: 602rpx;
-	margin-top: -30rpx;
-	color: rgba(128, 128, 128, 1);
-	font-size: 24rpx;
-	font-weight: 400;
-}
-.item-list{
-	display: flex;
-	flex-direction: row;
-	justify-content: flex-start;
-	width: 710rpx;
-	height: 121rpx;
-	margin-top: 20rpx;
-	margin-left: 10rpx;
-	background: rgba(255, 255, 255, 1);
-	border-radius: 10px;
-}
-.item-list-one{
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	width: 150rpx;
-	margin-right: 30rpx;
-	margin-top: 20rpx;
-}
-.img-btn{
-	width: 59rpx;
-	height: 54rpx;
-}
-.list-txt{
-	width: 150rpx;
-	text-align: center;
-	font-size: 28rpx;
-	margin-top: 10rpx;
-	color: rgba(0, 0, 0, 1);
-	font-weight: 400;
-}
-/* 第三部分，我的服务 */
-.my_help{
-	display: revert;
-	margin-top: 20rpx;
-	margin-left: 20rpx;
-	margin-right: 20rpx;
-	width: 710rpx;
-	height: 269rpx;
-	background: rgba(255, 255, 255, 1);
-	border-radius: 9rpx;
-}
-.help_title{
-	margin-left: 28rpx;
-	margin-top: 30rpx;
-	color: rgba(0, 0, 0, 1);
-	font-size: 32rpx;
-	font-weight: 500;
+.content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	background-color: #F2F3F5;
+}
+.person{
+	display: revert;
+	width: 750rpx;
+	height: 423rpx;
+	background-image: url('../../static/my/backage.png');
+	background-size: 100%;
+}
+.person_touxiang{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 40rpx;
+	width: 142rpx;
+	height: 142rpx;
+	border-radius: 55px;
+}
+.person_name{
+	position: absolute;
+	margin-left: 22rpx;
+	margin-top: 50rpx;
+	color: rgba(0, 0, 0, 1);
+	font-size: 36rpx;
+	font-weight: 600;
+}
+.person_identity{
+	position: absolute;
+	margin-left: 14rpx;
+	width: 91rpx;
+	height: 38rpx;
+	background: rgba(41, 109, 227, 1);
+	border-radius: 145rpx;
+	color: rgba(255, 255, 255, 1);
+	font-size: 20rpx;
+	font-weight: 400;
+	line-height: 38rpx;
+	text-align: center;
+}
+.person_phone{
+	position: absolute;
+	margin-left: 22rpx;
+	margin-top: 98rpx;
+	color: rgba(128, 128, 128, 1);
+	font-size: 24rpx;
+	font-weight: 400;
+}
+/* 第二部分，我的订单 */
+.my_order{
+	display: revert;
+	margin-top: -90rpx;
+	margin-left: 31rpx;
+	margin-right: 30rpx;
+	width: 689rpx;
+	height: 397rpx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 9rpx;
+}
+.order_title{
+	margin-left: 28rpx;
+	margin-top: 30rpx;
+	color: rgba(0, 0, 0, 1);
+	font-size: 32rpx;
+	font-weight: 500;
+}
+.order_all{
+	margin-left: 602rpx;
+	margin-top: -30rpx;
+	color: rgba(128, 128, 128, 1);
+	font-size: 24rpx;
+	font-weight: 400;
+}
+.item-list{
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-start;
+	width: 71rpx;
+	height: 121rpx;
+	margin-top: 20rpx;
+	margin-left: 10rpx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10px;
+}
+.item-list-one{
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	width: 150rpx;
+	margin-right: 30rpx;
+	margin-top: 20rpx;
+}
+.img-btn{
+	width: 59rpx;
+	height: 54rpx;
+}
+.list-txt{
+	width: 150rpx;
+	text-align: center;
+	font-size: 28rpx;
+	margin-top: 10rpx;
+	color: rgba(0, 0, 0, 1);
+	font-weight: 400;
+}
+/* 第三部分，我的服务 */
+.my_help{
+	display: revert;
+	margin-top: 20rpx;
+	margin-left: 30rpx;
+	margin-right: 30rpx;
+	width: 689rpx;
+	height: 269rpx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 9rpx;
+}
+.help_title{
+	margin-left: 28rpx;
+	margin-top: 30rpx;
+	color: rgba(0, 0, 0, 1);
+	font-size: 32rpx;
+	font-weight: 500;
 }

pages/myself/myself.vue

@@ -1,161 +1,192 @@
-<template>
-	<view class="content">
-		<view class="person">
-			<image class="person_touxiang" v-if="touxiang==''" src="../../static/my/touxiang.svg"></image>
-			<image class="person_touxiang" v-else :src="touxiang"></image>
-			<text class="person_name">{{cardName}}
-				<text class="person_identity">
-					<text v-if="cardIdentity==0">其他</text>
-					<text v-if="cardIdentity==1">学生</text>
-					<text v-if="cardIdentity==4">教职工</text>
-					<text v-if="cardIdentity==5">校友</text>
-				</text>
-			</text>
-			<text class="person_phone">{{cardNum}}</text>
-		</view>
-		<!-- 第二部分，我的订单 -->
-		<view class="my_order">
-			<view class="order_title">我的订单</view>
-			<view class="order_all" @click="navigateToAll">全部＞</view>
-			<view class="item-list">
-			  <view class="item-list-one" @click="navigateToDaizhifu">
-			    <image src="../../static/my/no_zhifu.svg" class="img-btn"></image>
-			    <text class="list-txt">待支付</text>
-			  </view>
-			  <view class="item-list-one" @click="navigateToDairuzhu">
-			    <image src="../../static/my/dairuzhu.svg" class="img-btn"></image>
-			    <text class="list-txt">待入住</text>
-			  </view>
-			  <view class="item-list-one" @click="navigateToYiruzhu">
-			    <image src="../../static/my/yiruzhu.svg" class="img-btn"></image>
-			    <text class="list-txt">已入住</text>
-			  </view>
-			  <view class="item-list-one" @click="navigateToYiquxiao">
-			    <image src="../../static/my/yiquxiao.svg" class="img-btn"></image>
-			    <text class="list-txt">已取消</text>
-			  </view>
-			</view>
-			<view class="item-list">
-			  <view class="item-list-one" @click="navigateToDaijiezhang">
-			    <image src="../../static/my/no_pay.svg" class="img-btn"></image>
-			    <text class="list-txt">待结账</text>
-			  </view>
-			  <view class="item-list-one" @click="navigateToYiwancheng">
-			    <image src="../../static/my/wancheng.svg" class="img-btn"></image>
-			    <text class="list-txt">已完成</text>
-			  </view>
-			</view>
-		</view>
-		<!-- 第三部分，我的服务 -->
-		<view class="my_help">
-			<view class="help_title">我的服务</view>
-			<view class="item-list">
-			  <view class="item-list-one" @click="telphone(phone)">
-			    <image src="../../static/my/person_phone.svg" class="img-btn"></image>
-			    <text class="list-txt">人工热线</text>
-			  </view>
-			  <!-- <view class="item-list-one" @click="navigateToBaoxiu">
-			    <image src="../../static/my/baoxiu.svg" class="img-btn"></image>
-			    <text class="list-txt">房间报修</text>
-			  </view> -->
-			</view>
-		</view>
+<template>
+	<view class="content">
+		<view class="person">
+			<image class="person_touxiang" v-if="touxiang==''" src="../../static/my/touxiang.png"></image>
+			<image class="person_touxiang" v-else :src="touxiang"></image>
+			<text class="person_name">{{cardName}}
+				<text class="person_identity">
+					<text v-if="cardIdentity==0">其他</text>
+					<text v-if="cardIdentity==1">学生</text>
+					<text v-if="cardIdentity==4">教职工</text>
+					<text v-if="cardIdentity==5">校友</text>
+				</text>
+			</text>
+			<text class="person_phone">{{cardNum}}</text>
+		</view>
+		<!-- 第二部分，我的订单 -->
+		<view class="my_order">
+			<view class="order_title">我的订单</view>
+			<view class="order_all" @click="navigateToAll">全部＞</view>
+			<view class="item-list">
+			  <view class="item-list-one" @click="navigateToDaizhifu">
+			    <image src="../../static/my/no_zhifu.svg" class="img-btn"></image>
+			    <text class="list-txt">待支付</text>
+			  </view>
+			  <view class="item-list-one" @click="navigateToDairuzhu">
+			    <image src="../../static/my/dairuzhu.svg" class="img-btn"></image>
+			    <text class="list-txt">待入住</text>
+			  </view>
+			  <view class="item-list-one" @click="navigateToYiruzhu">
+			    <image src="../../static/my/yiruzhu.svg" class="img-btn"></image>
+			    <text class="list-txt">已入住</text>
+			  </view>
+			  <view class="item-list-one" @click="navigateToYiquxiao">
+			    <image src="../../static/my/yiquxiao.svg" class="img-btn"></image>
+			    <text class="list-txt">已取消</text>
+			  </view>
+			</view>
+			<view class="item-list">
+			  <view class="item-list-one" @click="navigateToDaijiezhang">
+			    <image src="../../static/my/no_pay.svg" class="img-btn"></image>
+			    <text class="list-txt">待结账</text>
+			  </view>
+			  <view class="item-list-one" @click="navigateToYiwancheng">
+			    <image src="../../static/my/wancheng.svg" class="img-btn"></image>
+			    <text class="list-txt">已完成</text>
+			  </view>
+			</view>
+		</view>
+		<!-- 第三部分，我的服务 -->
+		<view class="my_help">
+			<view class="help_title">我的服务</view>
+			<view class="item-list">
+			  <view class="item-list-one" @click="telphone(phone)">
+			    <image src="../../static/my/person_phone.svg" class="img-btn"></image>
+			    <text class="list-txt">人工热线</text>
+			  </view>
+			  <view class="item-list-one" @click="navigateToLiucheng">
+			    <image src="../../static/my/liucheng.png" class="img-btn"></image>
+			    <text class="list-txt">流程管理</text>
+			  </view>
+			</view>
+		</view>
 	</view>
 </template>
 
-<script>
-	export default {
-		data() {
-			return {
-				phone:'0791-82293574',//客服热线电话
-				cardName:'',//用户名
-				cardIdentity:'',//身份
-				cardNum:'',//卡号
-				touxiang:'',
-			}
-		},
-		onLoad() {
-			this.getUserInfo()
-		},
-		methods: {
-			// 获取用户信息
-			getUserInfo() {
-				  let _self = this
-				  this.$axios.get("/hotel/ihotel-api/ihotel/hotelUser/userInfo",
-				  {
-					  headers:{
-						  'user_token':localStorage.getItem('token')
-					  }
-				  }).then(res => {
-					res = res.data
-					if (res.success) {
-						if (res.data.statu == '1') {
-						  _self.cardName=res.data.name
-						  _self.cardIdentity=res.data.identityType
-						  _self.cardNum=res.data.telPhone
-						  _self.touxiang=res.data.headImage
-						}else {
-							alert('您没有权限，请联系客服')
-						}
-					} else {
-					  console.log('获取用户信息失败')
-					}
-				  });
-			},
-			//跳转到全部订单
-			navigateToAll(){
-				uni.navigateTo({
-					url:"../my_orderlist/my_orderlist?Inv=6"
-				})
-			},
-			//跳转到待支付订单
-			navigateToDaizhifu(){
-				uni.navigateTo({ 
-					url: "../my_orderlist/my_orderlist?Inv=1",
-				})
-			},
-			//跳转到待入住订单
-			navigateToDairuzhu(){
-				uni.navigateTo({ 
-					url: "../my_orderlist/my_orderlist?Inv=2"
-				})
-			},
-			//跳转到已入住订单
-			navigateToYiruzhu(){
-				uni.navigateTo({ 
-					url: "../my_orderlist/my_orderlist?Inv=3"
-				})
-			},
-			//跳转到已取消订单
-			navigateToYiquxiao(){
-				uni.navigateTo({ 
-					url: "../my_orderlist/my_orderlist?Inv=0"
-				})
-			},
-			//跳转到待结账订单
-			navigateToDaijiezhang(){
-				uni.navigateTo({ 
-					url: "../my_orderlist/my_orderlist?Inv=4"
-				})
-			},
-			//跳转到已完成订单
-			navigateToYiwancheng(){
-				uni.navigateTo({ 
-					url: "../my_orderlist/my_orderlist?Inv=5"
-				})
-			},
-			//拨打人工热线
-			telphone(phone){
-				uni.makePhoneCall({ phoneNumber: phone }) // 传参带入号码即可
-			},
-			//跳转到房间报修
-			navigateToBaoxiu(){
-				window.location.href='https://jtishfw.ncjti.edu.cn/baoxiu/repair-h5/#/'
-			}
-		}
+<script>
+	import {
+		getuserinfo
+	} from '../../utils/api_hotel.js'
+	export default {
+		data() {
+			return {
+				phone:'0791-82293574',//客服热线电话
+				cardName:'',//用户名
+				cardIdentity:'',//身份
+				cardNum:'',//卡号
+				touxiang:'',
+			}
+		},
+		onLoad() {
+			this.getUserInfo()
+		},
+		mounted() {
+			// window.location.href ='https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa46ef222053a1047&redirect_uri=https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/hotelUser/weixinAuth&response_type=code&scope=snsapi_base&state=pages/index/index#wechat_redirect';
+		},
+		methods: {
+			// 获取用户信息
+			getUserInfo() {
+				  let _self = this
+				  getuserinfo().then((res) => {
+					if (res.success) {
+						if (res.data.statu == '1') {
+						  _self.cardName=res.data.name
+						  _self.cardIdentity=res.data.identityType
+						  _self.cardNum=res.data.telPhone
+						  _self.touxiang=res.data.headImage
+						}else {
+							alert('您没有权限，请联系客服')
+						}
+						return;
+					} else {
+						console.log('获取用户信息失败')
+					}
+				}).catch((err) => {
+					this.$message.error(err.message)
+				});
+				 //  this.$axios.get("/hotel/ihotel-api/ihotel/hotelUser/userInfo",
+				 //  {
+					//   headers:{
+					// 	  'user_token':localStorage.getItem('token')
+					//   }
+				 //  }).then(res => {
+					// res = res.data
+					// if (res.success) {
+					// 	if (res.data.statu == '1') {
+					// 	  _self.cardName=res.data.name
+					// 	  _self.cardIdentity=res.data.identityType
+					// 	  _self.cardNum=res.data.telPhone
+					// 	  _self.touxiang=res.data.headImage
+					// 	}else {
+					// 		alert('您没有权限，请联系客服')
+					// 	}
+					// } else {
+					//   console.log('获取用户信息失败')
+					// }
+				 //  });
+			},
+			//跳转到全部订单
+			navigateToAll(){
+				uni.navigateTo({
+					url:"../my_orderlist/my_orderlist?Inv=6"
+				})
+			},
+			//跳转到待支付订单
+			navigateToDaizhifu(){
+				uni.navigateTo({ 
+					url: "../my_orderlist/my_orderlist?Inv=1",
+				})
+			},
+			//跳转到待入住订单
+			navigateToDairuzhu(){
+				uni.navigateTo({ 
+					url: "../my_orderlist/my_orderlist?Inv=2"
+				})
+			},
+			//跳转到已入住订单
+			navigateToYiruzhu(){
+				uni.navigateTo({ 
+					url: "../my_orderlist/my_orderlist?Inv=3"
+				})
+			},
+			//跳转到已取消订单
+			navigateToYiquxiao(){
+				uni.navigateTo({ 
+					url: "../my_orderlist/my_orderlist?Inv=0"
+				})
+			},
+			//跳转到待结账订单
+			navigateToDaijiezhang(){
+				uni.navigateTo({ 
+					url: "../my_orderlist/my_orderlist?Inv=4"
+				})
+			},
+			//跳转到已完成订单
+			navigateToYiwancheng(){
+				uni.navigateTo({ 
+					url: "../my_orderlist/my_orderlist?Inv=5"
+				})
+			},
+			//拨打人工热线
+			telphone(phone){
+				uni.makePhoneCall({ phoneNumber: phone }) // 传参带入号码即可
+			},
+			//跳转到流程管理
+			navigateToLiucheng(){
+				uni.navigateTo({
+					// url: "../liuchengTeacher/liu_teach"
+					// url: "../liuchengO/liu_other"
+					url:"../liuchengManger/liu_manage"
+				})
+			},
+			//跳转到房间报修
+			navigateToBaoxiu(){
+				window.location.href='https://jtishfw.ncjti.edu.cn/baoxiu/repair-h5/#/'
+			}
+		}
 	}
 </script>
 
-<style>
+<style>
 	@import url("./css/myself.css");
 </style>

pages/order_mark/css/order_mark.css

@@ -1,258 +1,266 @@
-.content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	background-color: #F2F3F5;
-}
-/* 第一层模块 */
-.one-order3{
-	width: 750rpx;
-	height: 438rpx;
-	background: rgba(41, 109, 227, 1);
-}
-.room-button-6{
-	position: absolute;
-	margin-left: 159rpx;
-	margin-top: 250rpx;
-	width: 175rpx;
-	height: 82rpx;
-	border: 1px solid rgba(255, 255, 255, 1);
-	border-radius: 9px;
-	color: rgba(255, 255, 255, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-	text-align: center;
-	line-height: 82rpx;
-}
-.room-button2-6{
-	position: absolute;
-	margin-left: 410rpx;
-	margin-top: 250rpx;
-	width: 175rpx;
-	height: 82rpx;
-	border: 1px solid rgba(255, 255, 255, 1);
-	border-radius: 9px;
-	color: rgba(255, 255, 255, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-	text-align: center;
-	line-height: 82rpx;
-}
-.one-order{
-	width: 750rpx;
-	height: 646rpx;
-	background: rgba(41, 109, 227, 1);
-}
-.one-order-title{
-	position: absolute;
-	width: 720rpx;
-	margin-left: 30rpx;
-	margin-top: 34rpx;
-	color: rgba(255, 255, 255, 1);
-	font-size: 34rpx;
-	font-weight: 400;
-	line-height: 62rpx;
-}
-.all-price{
-	float: right;
-	margin-right: 29rpx;
-	font-size: 32rpx;
-}
-.one-order-menshi{
-	position: absolute;
-	width: 720rpx;
-	margin-left: 30rpx;
-	margin-top: 135rpx;
-	color: rgba(255, 255, 255, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-	line-height: 41rpx;
-}
-.menshi-price{
-	float: right;
-	margin-right: 28rpx;
-}
-.one-order-fuli{
-	position: absolute;
-	width: 720rpx;
-	margin-left: 30rpx;
-	margin-top: 196rpx;
-	color: rgba(255, 255, 255, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-	line-height: 41rpx;
-}
-.fuli-price{
-	float: right;
-	margin-right: 28rpx;
-}
-.one-order-yufukuan{
-	position: absolute;
-	width: 720rpx;
-	margin-left: 30rpx;
-	margin-top: 257rpx;
-	color: rgba(255, 255, 255, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-	line-height: 41rpx;
-}
-.yufukuan-price{
-	float: right;
-	margin-right: 28rpx;
-}
-.one-order-zhu{
-	position: absolute;
-	margin-left: 32rpx;
-	margin-right: 29rpx;
-	margin-top: 341rpx;
-	color: rgba(255, 255, 255, 1);
-	font-size: 24rpx;
-	font-weight: 400;
-}
-.room-button{
-	position: absolute;
-	margin-left: 164rpx;
-	margin-top: 491rpx;
-	width: 175rpx;
-	height: 82rpx;
-	border: 1px solid rgba(255, 255, 255, 1);
-	border-radius: 9px;
-	color: rgba(255, 255, 255, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-	text-align: center;
-	line-height: 82rpx;
-}
-.room-button2{
-	position: absolute;
-	margin-left: 415rpx;
-	margin-top: 491rpx;
-	width: 175rpx;
-	height: 82rpx;
-	border: 1px solid rgba(255, 255, 255, 1);
-	border-radius: 9px;
-	color: rgba(255, 255, 255, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-	text-align: center;
-	line-height: 82rpx;
-}
-.buttonNo{
-	margin-left: 285rpx;
-}
-/* 第二层模块 */
-.two-order{
-	margin-top: -30rpx;
-	width: 690rpx;
-	height: 459rpx;
-	background: rgba(255, 255, 255, 1);
-	border-radius: 7px;
-	color: rgba(166, 166, 166, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-}
-.two-order3{
-	margin-top: -30rpx;
-	width: 690rpx;
-	height: 618rpx;
-	background: rgba(255, 255, 255, 1);
-	border-radius: 7px;
-	color: rgba(166, 166, 166, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-}
-.two-order4{
-	margin-top: -30rpx;
-	width: 690rpx;
-	height: 673rpx;
-	background: rgba(255, 255, 255, 1);
-	border-radius: 7px;
-	color: rgba(166, 166, 166, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-}
-.two-order-title{
-	position: absolute;
-	margin-left: 30rpx;
-	margin-top: 30rpx;
-	color: rgba(0, 0, 0, 1);
-	font-size: 32rpx;
-	font-weight: 400;
-}
-.two-order-name{
-	position: absolute;
-	margin-left: 30rpx;
-	margin-top: 101rpx;
-}
-.two-order-phone{
-	position: absolute;
-	margin-left: 30rpx;
-	margin-top: 156rpx;
-}
-.two-order-count{
-	position: absolute;
-	margin-left: 30rpx;
-	margin-top: 211rpx;
-}
-.two-order-time{
-	position: absolute;
-	margin-left: 30rpx;
-	margin-top: 266rpx;
-}
-.two-order-xing{
-	position: absolute;
-	margin-left: 30rpx;
-	margin-top: 321rpx;
-}
-.two-order-zhuTime{
-	position: absolute;
-	margin-left: 30rpx;
-	margin-top: 376rpx;
-}
-.two-order-txt{
-	color: rgba(102, 102, 102, 1);
-}
-.two-order-shui{
-	position: absolute;
-	margin-left: 30rpx;
-	margin-top: 431rpx;
-}
-.two-order-dian{
-	position: absolute;
-	margin-left: 30rpx;
-	margin-top: 486rpx;
-}
-.two-order-secret{
-	position: absolute;
-	margin-left: 30rpx;
-	margin-top: 541rpx;
-}
-.two-order-shui2{
-	position: absolute;
-	margin-left: 30rpx;
-	margin-top: 541rpx;
-}
-.two-order-dian2{
-	position: absolute;
-	margin-left: 30rpx;
-	margin-top: 596rpx;
-}
-.order-mark{
-	margin-top: 174rpx;
-	text-align: center;
-	color: rgba(204, 204, 204, 1);
-	font-size: 20rpx;
-	font-weight: 400;
-}
-/* 弹出框 */
-.kuang_txt{
-	align-items: center;
-	justify-content: center;
-	padding: 15rpx;
-	height: 150rpx;
-	/* width: 180rpx; */
-	line-height: 150rpx;
-	text-align: center;
-	background-color: #fff;
+.content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	background-color: #F2F3F5;
+}
+/* 第一层模块 */
+.one-order3{
+	width: 750rpx;
+	height: 438rpx;
+	background: rgba(41, 109, 227, 1);
+}
+.room-button-6{
+	position: absolute;
+	margin-left: 159rpx;
+	margin-top: 250rpx;
+	width: 175rpx;
+	height: 82rpx;
+	border: 1px solid rgba(255, 255, 255, 1);
+	border-radius: 9px;
+	color: rgba(255, 255, 255, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+	text-align: center;
+	line-height: 82rpx;
+}
+.room-button2-6{
+	position: absolute;
+	margin-left: 410rpx;
+	margin-top: 250rpx;
+	width: 175rpx;
+	height: 82rpx;
+	border: 1px solid rgba(255, 255, 255, 1);
+	border-radius: 9px;
+	color: rgba(255, 255, 255, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+	text-align: center;
+	line-height: 82rpx;
+}
+.one-order{
+	width: 750rpx;
+	height: 646rpx;
+	background: rgba(41, 109, 227, 1);
+}
+.one-order-title{
+	position: absolute;
+	width: 720rpx;
+	margin-left: 30rpx;
+	margin-top: 34rpx;
+	color: rgba(255, 255, 255, 1);
+	font-size: 34rpx;
+	font-weight: 400;
+	line-height: 62rpx;
+}
+.all-price{
+	float: right;
+	margin-right: 29rpx;
+	font-size: 32rpx;
+}
+.one-order-menshi{
+	position: absolute;
+	width: 720rpx;
+	margin-left: 30rpx;
+	margin-top: 135rpx;
+	color: rgba(255, 255, 255, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+	line-height: 41rpx;
+}
+.menshi-price{
+	float: right;
+	margin-right: 28rpx;
+}
+.one-order-fuli{
+	position: absolute;
+	width: 720rpx;
+	margin-left: 30rpx;
+	margin-top: 196rpx;
+	color: rgba(255, 255, 255, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+	line-height: 41rpx;
+}
+.fuli-price{
+	float: right;
+	margin-right: 28rpx;
+}
+.one-order-yufukuan{
+	position: absolute;
+	width: 720rpx;
+	margin-left: 30rpx;
+	margin-top: 257rpx;
+	color: rgba(255, 255, 255, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+	line-height: 41rpx;
+}
+.yufukuan-price{
+	float: right;
+	margin-right: 28rpx;
+}
+.one-order-zhu{
+	position: absolute;
+	margin-left: 32rpx;
+	margin-right: 29rpx;
+	margin-top: 341rpx;
+	color: rgba(255, 255, 255, 1);
+	font-size: 24rpx;
+	font-weight: 400;
+}
+.room-button{
+	position: absolute;
+	margin-left: 164rpx;
+	margin-top: 491rpx;
+	width: 175rpx;
+	height: 82rpx;
+	border: 1px solid rgba(255, 255, 255, 1);
+	border-radius: 9px;
+	color: rgba(255, 255, 255, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+	text-align: center;
+	line-height: 82rpx;
+}
+.room-button2{
+	position: absolute;
+	margin-left: 415rpx;
+	margin-top: 491rpx;
+	width: 175rpx;
+	height: 82rpx;
+	border: 1px solid rgba(255, 255, 255, 1);
+	border-radius: 9px;
+	color: rgba(255, 255, 255, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+	text-align: center;
+	line-height: 82rpx;
+}
+.buttonNo{
+	margin-left: 285rpx;
+}
+/* 第二层模块 */
+.two-order{
+	margin-top: -30rpx;
+	width: 690rpx;
+	height: 500rpx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 7px;
+	color: rgba(166, 166, 166, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+}
+.two-order3{
+	margin-top: -30rpx;
+	width: 690rpx;
+	height: 673rpx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 7px;
+	color: rgba(166, 166, 166, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+}
+.two-order4{
+	margin-top: -30rpx;
+	width: 690rpx;
+	height: 738rpx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 7px;
+	color: rgba(166, 166, 166, 1);
+	font-size: 28rpx;
+	line-height: 28rpx;
+	font-weight: 400;
+}
+.two-order-title{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 30rpx;
+	color: rgba(0, 0, 0, 1);
+	font-size: 32rpx;
+	font-weight: 400;
+}
+.two-order-name{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 101rpx;
+}
+.two-order-phone{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 156rpx;
+}
+.two-order-count{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 211rpx;
+}
+.two-order-time{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 266rpx;
+}
+.two-order-xing{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 321rpx;
+}
+.two-order-zhuTime{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 376rpx;
+	width: 480rpx;
+}
+.two-order-txt{
+	color: rgba(102, 102, 102, 1);
+	line-height: 55rpx;
+}
+.two-order-shui{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 486rpx;
+}
+.two-order-dian{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 541rpx;
+}
+.two-order-secret{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 596rpx;
+}
+.two-order-shui2{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 596rpx;
+}
+.two-order-dian2{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 651rpx;
+}
+.two-order-lidian2{
+	position: absolute;
+	margin-left: 30rpx;
+	margin-top: 706rpx;
+}
+.order-mark{
+	margin-top: 174rpx;
+	text-align: center;
+	color: rgba(204, 204, 204, 1);
+	font-size: 20rpx;
+	font-weight: 400;
+}
+/* 弹出框 */
+.kuang_txt{
+	align-items: center;
+	justify-content: center;
+	padding: 15rpx;
+	height: 150rpx;
+	/* width: 180rpx; */
+	line-height: 150rpx;
+	text-align: center;
+	background-color: #fff;
 }

pages/order_mark/order_mark.vue

@@ -1,316 +1,422 @@
-<template>
-	<view class="content">
-		<!-- 第一层模块 -->
-		<view class="one-order3" v-if="orderList.orderStatu == 5">
-			<view class="one-order-title">订单已完成 / 期待您再次光临<text class="all-price">￥{{orderList.shouldFree}}</text></view>
-			<view class="one-order-menshi">水电扣除<text class="menshi-price">￥{{orderList.totalFree}}</text></view>
-			<view class="room-button-6"@click="getOrderDelete(orderList.orderId)">
-				<text>删除订单</text>
-			</view>
-			<view class="room-button2-6" @click="navigateToWanchengZaici(orderList.roomTypeId)">
-				<text>再次预定</text>
-			</view>
-		</view>
-		<view class="one-order3" v-else-if="orderList.orderStatu == 4">
-			<view class="one-order-title">待结账</view>
-			<view class="one-order-menshi" v-if="billXin.flag==1">
-				预退款<text class="menshi-price">￥{{billXin.refundFee}}</text>
-			</view>
-			<view class="one-order-menshi" v-if="billXin.flag==2">
-				预补缴<text class="menshi-price">￥{{billXin.supperFee}}</text>
-			</view>
-			<view class="room-button-6">
-				<text>删除订单</text>
-			</view>
-			<view class="room-button2-6" v-if="billXin.flag==1">
-				<text>退款</text>
-			</view>
-			<view class="room-button2-6" v-if="billXin.flag==2">
-				<text>补缴</text>
-			</view>
-		</view>
-		<view class="one-order" v-else>
-			<view class="one-order-title">
-				<text v-if="orderList.orderStatu == 0">订单已取消 / 期待您再次光临</text>
-				<text v-if="orderList.orderStatu == 1">请在10分钟之内支付</text>
-				<text v-if="orderList.orderStatu == 2">预定成功 / 等待您的入住</text>
-				<text v-if="orderList.orderStatu == 3">办理成功 / 期待您的到来</text>
-				<text class="all-price">￥{{orderList.payAmount}}</text>
-			</view>
-			<view class="one-order-menshi">门市价<text class="menshi-price">￥{{orderList.roomTypeUsualPrice}}</text></view>
-			<view class="one-order-fuli">教师福利<text class="fuli-price">￥{{orderList.roomTypeDiscountPrice}}</text></view>
-			<view class="one-order-yufukuan">
-				预付款<text class="yufukuan-price">￥{{orderList.payAmount}}</text>
-			</view>
-			<!-- <view class="one-order-zhu">
+<template>
+	<view class="content">
+		<!-- 第一层模块 -->
+		<view class="one-order3" v-if="orderList.orderStatu == 5">
+			<view class="one-order-title">订单已完成 / 期待您再次光临<text class="all-price">￥{{orderList.shouldFree}}</text></view>
+			<view class="one-order-menshi">水电扣除<text class="menshi-price">￥{{orderList.totalFree}}</text></view>
+			<view class="room-button-6"@click="getOrderDelete(orderList.orderId)">
+				<text>删除订单</text>
+			</view>
+			<view class="room-button2-6" @click="navigateToWanchengZaici(orderList.roomTypeId)">
+				<text>再次预定</text>
+			</view>
+		</view>
+		<view class="one-order3" v-else-if="orderList.orderStatu == 4">
+			<view class="one-order-title">待结账</view>
+			<view class="one-order-menshi" v-if="billXin.flag==1">
+				预退款<text class="menshi-price">￥{{billXin.refundFee}}</text>
+			</view>
+			<view class="one-order-menshi" v-if="billXin.flag==2">
+				预补缴<text class="menshi-price">￥{{billXin.supperFee}}</text>
+			</view>
+			<view class="room-button-6">
+				<text>删除订单</text>
+			</view>
+			<view class="room-button2-6" v-if="billXin.flag==1">
+				<text>退款</text>
+			</view>
+			<view class="room-button2-6" v-if="billXin.flag==2">
+				<text>补缴</text>
+			</view>
+		</view>
+		<view class="one-order" v-else>
+			<view class="one-order-title">
+				<text v-if="orderList.orderStatu == 0">订单已取消 / 期待您再次光临</text>
+				<text v-if="orderList.orderStatu == 1">请在10分钟之内支付</text>
+				<text v-if="orderList.orderStatu == 2">预定成功 / 等待您的入住</text>
+				<text v-if="orderList.orderStatu == 3">办理成功 / 期待您的到来</text>
+				<text class="all-price">￥{{orderList.payAmount}}</text>
+			</view>
+			<view class="one-order-menshi">门市价<text class="menshi-price">￥{{orderList.roomTypeUsualPrice}}</text></view>
+			<view class="one-order-fuli">教师福利<text class="fuli-price">￥{{orderList.roomTypeDiscountPrice}}</text></view>
+			<view class="one-order-yufukuan">
+				预付款<text class="yufukuan-price">￥{{orderList.payAmount}}</text>
+			</view>
+			<!-- <view class="one-order-zhu">
 				注：水费为0.62元/吨，电费为1.1元/度；补助吨数为3吨，补助度
 				数为10度，超出标准需在预付款中扣除，未超出原路返回预
-				付款
-			</view> -->
-			<view class="room-button" v-if="orderList.orderStatu != 2&& orderList.orderStatu != 3">
-				<text v-if="orderList.orderStatu == 0" @click="navigateToZaici(orderList.enableStartTime,orderList.enableEndTime,orderList.roomTypeId)">再次预定</text>
-				<text v-if="orderList.orderStatu == 1" @click="openQu()(orderList.orderId,'warn')">取消订单</text>
-				<!-- <text v-if="orderList.orderStatu == 3">办理续住</text> -->
-			</view>
-			<view class="room-button2" :class="{'buttonNo': orderList.orderStatu == 3 || orderList.orderStatu == 2}">
-				<text v-if="orderList.orderStatu == 0" @click="openDel(orderList.orderId,'warn')">删除</text>
-				<text v-if="orderList.orderStatu == 1" @click="getOrderPay(orderList.orderId)">支付</text>
-				<text v-if="orderList.orderStatu == 3" @click="openTui(orderList.orderId,'warn')">办理退房</text>
-				<text v-if="orderList.orderStatu == 2" @click="openRu(orderList.orderId,'warn')">办理入住</text>
-			</view>
-		</view>
-		<!-- 第二层模块 -->
-		<view class="two-order" :class="{'two-order3': orderList.orderStatu == 3,'two-order4': orderList.orderStatu == 5||orderList.orderStatu == 4}">
-			<view class="two-order-title">订单信息</view>
-			<view class="two-order-name">预定信息：<text class="two-order-txt">{{orderList.userName}}</text></view>
-			<view class="two-order-phone">手机号码：<text class="two-order-txt">{{orderList.userPhone}}</text></view>
-			<view class="two-order-count">订  单  号：<text class="two-order-txt">{{orderList.orderId}}</text></view>
-			<view class="two-order-time">下单时间：<text class="two-order-txt">{{orderList.createTime}}</text></view>
-			<view class="two-order-xing">户         型：<text class="two-order-txt">{{orderList.roomNo}}</text></view>
-			<view class="two-order-zhuTime">入离时间：<text class="two-order-txt" v-if="orderList.enableStartTime,orderList.enableEndTime">入住日{{orderList.enableStartTime.substring(11,16)}}后   离店日{{orderList.enableEndTime.substring(11,16)}}前</text></view>
-			<view class="two-order-secret" v-if="orderList.orderStatu ==3">房间门锁密码：{{orderList.lockRealtimePassword}}</view>
-			<view class="two-order-shui" v-if="orderList.orderStatu == 5||orderList.orderStatu ==4||orderList.orderStatu ==3">水起码：{{orderList.startOfWater}}吨</view>
-			<view class="two-order-dian" v-if="orderList.orderStatu == 5||orderList.orderStatu ==4||orderList.orderStatu ==3">电起码：{{orderList.startOfElectric}}度</view>
-			<view class="two-order-shui2" v-if="orderList.orderStatu == 5||orderList.orderStatu == 4">水起码：{{orderList.startOfWater}}吨</view>
-			<view class="two-order-dian2" v-if="orderList.orderStatu == 5||orderList.orderStatu == 4">电起码：{{orderList.startOfElectric}}度</view>
-		</view>
-		
-		<view class="order-mark">您的满意是我们最大的追求</view>
-		<!-- 提示时弹框 -->
-		<uni-popup ref="popup_order2" type="dialog">
-			<uni-popup-dialog :type="msgType2" cancelText="关闭" confirmText="确定" :content='order_txt2' @confirm="dialogConfirm"
-				@close="dialogClose"></uni-popup-dialog>
-		</uni-popup>
-		<uni-popup ref="popup_order" type="dialog">
-			<uni-popup-dialog :type="msgType" cancelText="关闭" :content='order_txt'></uni-popup-dialog>
-		</uni-popup>
+				付款
+			</view> -->
+			<view class="room-button" v-if="orderList.orderStatu != 2&& orderList.orderStatu != 3">
+				<text v-if="orderList.orderStatu == 0" @click="navigateToZaici(orderList.enableStartTime,orderList.enableEndTime,orderList.roomTypeId)">再次预定</text>
+				<text v-if="orderList.orderStatu == 1" @click="openQu()(orderList.orderId,'warn')">取消订单</text>
+				<!-- <text v-if="orderList.orderStatu == 3">办理续住</text> -->
+			</view>
+			<view class="room-button2" :class="{'buttonNo': orderList.orderStatu == 3 || orderList.orderStatu == 2}">
+				<text v-if="orderList.orderStatu == 0" @click="openDel(orderList.orderId,'warn')">删除</text>
+				<text v-if="orderList.orderStatu == 1" @click="getOrderPay(orderList.orderId)">支付</text>
+				<text v-if="orderList.orderStatu == 3" @click="openTui(orderList.orderId,'warn')">办理退房</text>
+				<text v-if="orderList.orderStatu == 2" @click="openRu(orderList.orderId,'warn')">办理入住</text>
+			</view>
+		</view>
+		<!-- 第二层模块 -->
+		<view class="two-order" :class="{'two-order3': orderList.orderStatu == 3,'two-order4': orderList.orderStatu == 5||orderList.orderStatu == 4}">
+			<view class="two-order-title">订单信息</view>
+			<view class="two-order-name">预定信息：<text class="two-order-txt">{{orderList.userName}}</text></view>
+			<view class="two-order-phone">手机号码：<text class="two-order-txt">{{orderList.userPhone}}</text></view>
+			<view class="two-order-count">订  单  号：<text class="two-order-txt">{{orderList.orderId}}</text></view>
+			<view class="two-order-time">下单时间：<text class="two-order-txt">{{orderList.createTime}}</text></view>
+			<view class="two-order-xing">户         型：<text class="two-order-txt">{{orderList.roomNo}}</text></view>
+			<view class="two-order-zhuTime">入离时间：<text class="two-order-txt" v-if="orderList.enableStartTime,orderList.enableEndTime">入住日{{orderList.enableStartTime}}后   离店日{{orderList.enableEndTime}}前</text></view>
+			<view class="two-order-secret" v-if="orderList.orderStatu ==3">房间门锁密码：{{orderList.lockRealtimePassword}}</view>
+			<view class="two-order-shui" v-if="orderList.orderStatu == 5||orderList.orderStatu ==4||orderList.orderStatu ==3">水起码：{{orderList.startOfWater}}吨</view>
+			<view class="two-order-dian" v-if="orderList.orderStatu == 5||orderList.orderStatu ==4||orderList.orderStatu ==3">电起码：{{orderList.startOfElectric}}度</view>
+			<view class="two-order-shui2" v-if="orderList.orderStatu == 5||orderList.orderStatu == 4">水止码：{{orderList.endOfWater}}吨</view>
+			<view class="two-order-dian2" v-if="orderList.orderStatu == 5||orderList.orderStatu == 4">电止码：{{orderList.endOfElectric}}度</view>
+			<view class="two-order-lidian2" v-if="orderList.orderStatu == 5">退房时间：{{}}</view>
+		</view>
+		
+		<view class="order-mark">您的满意是我们最大的追求</view>
+		<!-- 提示时弹框 -->
+		<uni-popup ref="popup_order2" type="dialog">
+			<uni-popup-dialog :type="msgType2" cancelText="关闭" confirmText="确定" :content='order_txt2' @confirm="dialogConfirm"
+				@close="dialogClose"></uni-popup-dialog>
+		</uni-popup>
+		<uni-popup ref="popup_order" type="dialog">
+			<uni-popup-dialog :type="msgType" cancelText="关闭" :content='order_txt'></uni-popup-dialog>
+		</uni-popup>
 	</view>
 </template>
 
-<script>
-	export default {
-		data(){
-			return {
-				orderList:'',//订单整体
-				orderId:'',//订单号
-				billXin:'',//结账信息
-				order_txt:'',//弹框提示信息
-				msgType:'warn',
-				msgType2:'warn',
-				order_txt:'',//
-				order_txt2:'',//
-				tankuang:false,//弹框是否确定
-				order_txt_id:'',
-			}
-		},
-		onShow() {
-			// 获取当前小程序的页面栈
-			let pages = getCurrentPages();
-			// 数组中索引最大的页面--当前页面
-			let currentPage = pages[pages.length-1];
-			// 打印出当前页面中的 options
-			this.orderId=currentPage.options.orderId
-			this.getOrderInfo(this.orderId)
-			this.getOrderBill(this.orderId)
-		},
-		onload(option){
-			console.log('不能执行onload')
-		},
-		methods:{
-			//获取每个订单详情
-			getOrderInfo() {
-				  let _self = this
-				  _self.orderList = []
-				  this.$axios.get(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/${this.orderId}`,
-				  {
-					  headers:{
-					  		'user_token':localStorage.getItem('token')
-					  }
-				  }
-				  ).then(res => {
-					res = res.data
-					if (res.success) {
-						console.log(res)
-						this.orderList=res.data
-					} else {
-					  console.log('获取订单列表失败')
-					}
-				  });
-			},
-			//待确认的弹框操作
-			dialogConfirm() {
-				this.$refs.popup_order2.close()
-				this.tankuang=true
-				if(this.tankuang==true) {
-					if(this.order_txt2=='确定删除？') {
-						this.getOrderDelete(this.order_txt_id)
-					} else if(this.order_txt2=='确定退房？') {
-						this.getOrderReturn(this.order_txt_id)
-					} else if(this.order_txt2=='确定入住？') {
-						this.getOrderHold(this.order_txt_id)
-					} else if(this.order_txt2=='确定取消订单？') {
-						this.getOrderCancel(this.order_txt_id)
-					}
-				} 
-			},
-			dialogClose(){
-				this.$refs.popup_order2.close()
-			},
-			//删除弹框
-			openDel(orderId,type){
-				this.order_txt_id=orderId
-				this.msgType2 = type
-				this.order_txt2='确定删除？'
-				this.$refs.popup_order2.open()
-			},
-			//退房弹框
-			openTui(orderId,type) {
-				this.order_txt_id=orderId
-				this.msgType2 = type
-				this.order_txt2='确定退房？'
-				this.$refs.popup_order2.open()
-			},
-			//入住弹框
-			openRu(orderId,type) {
-				this.order_txt_id=orderId
-				this.msgType2 = type
-				this.order_txt2='确定入住？'
-				this.$refs.popup_order2.open()
-			},
-			//取消订单弹框
-			openQu(orderId,type) {
-				this.order_txt_id=orderId
-				this.msgType2 = type
-				this.order_txt2='确定取消订单？'
-				this.$refs.popup_order2.open()
-			},
-			// 订单结账信息
-			getOrderBill() {
-				  let _self = this
-				  this.$axios.get(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/bill/${this.orderId}`,
-				  {
-					  headers:{
-						  'user_token':localStorage.getItem('token')
-					  }
-				  }).then(res => {
-					res = res.data
-					if (res.success) {
-						// console.log(res)
-						if(res.data.flag!='3') {
-							this.billXin=res.data
-						}
-						
-					} else {
-					  console.log('获取结账信息失败')
-					}
-				  });
-			},
-			// 订单取消再次预订
-			navigateToZaici(enableStartTime,enableEndTime,roomTypeId){
-				uni.navigateTo({
-					url:"../order_room/order_room?enableStartTime="+enableStartTime+"&enableEndTime="+enableEndTime+"&startTime="+enableStartTime.substring(5,7)+'月'+enableStartTime.substring(8,10)+'日'+"&endTime="+enableEndTime.substring(5,7)+'月'+enableEndTime.substring(8,10)+'日'+"&roomTypeId="+roomTypeId
-				})
-			},
-			// 待支付取消订单
-			getOrderCancel(order_txt_id) {
-				let _self = this
-				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.put(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/cancel/${this.order_txt_id}`,).then(res => {
-					res = res.data
-					if (res.success) {
-						this.order_txt='取消成功'
-						this.$refs.popup_order.open()
-						this.getOrderInfo()
-					} else {
-						this.order_txt=res.message
-						this.$refs.popup_order.open()
-					}
-				});
-			},
-			// 支付订单
-			getOrderPay(orderId) {
-				  let _self = this
-				  this.$axios.get(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/pay/${orderId}`,
-				  {
-					  headers:{
-						  'user_token':localStorage.getItem('token')
-					  }
-				  }).then(res => {
-					res = res.data
-					if (res.success) {
-						if(res.data.payAmount==0) {
-							uni.navigateTo({
-								url: '../zhifuchenggong/zhifuchenggong?orderId='+res.data.orderId
-							})
-						} else {
-							window.location.href = res.data.payUrl;
-						}
-					} else {
-						this.order_txt=res.message
-						this.$refs.popup_order.open()
-						console.log('支付失败')
-					}
-				  });
-			},
-			// 删除订单
-			getOrderDelete(order_txt_id) {
-				let _self = this
-				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.delete(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/${this.order_txt_id}`,).then(res => {
-					res = res.data
-					if (res.success) {
-						this.order_txt='删除订单成功'
-						this.$refs.popup_order.open()
-						this.getOrderInfo()
-					} else {
-						this.order_txt=res.message
-						this.$refs.popup_order.open()
-					}
-				});
-			},
-			// 订单已完成再次预订
-			navigateToWanchengZaici(roomTypeId){
-				uni.navigateTo({
-					url:'../order_room/order_room?roomTypeId='+roomTypeId
-				})
-			},
-			// 办理入住
-			getOrderHold(order_txt_id) {
-				let _self = this
-				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.put(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/hold/${this.order_txt_id}`,).then(res => {
-					res = res.data
-					if (res.success) {
-						this.order_txt='办理入住成功'
-						this.$refs.popup_order.open()
-						this.getOrderInfo()
-					} else {
-						this.order_txt=res.message
-						this.$refs.popup_order.open()
-					}
-				});
-			},
-			// 办理退房
-			getOrderReturn(order_txt_id) {
-				let _self = this
-				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.put(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/return/${this.order_txt_id}`,).then(res => {
-					res = res.data
-					if (res.success) {
-						this.order_txt='退房成功'
-						this.$refs.popup_order.open()
-						this.getOrderInfo()
-						this.getOrderBill()
-					} else {
-						this.order_txt=res.message
-						this.$refs.popup_order.open()
-					}
-				});
-			},
-		}
+<script>
+	import {
+		getorderxiang,
+		getorderbill,
+		getordercancel,
+		getorderpay,
+		getorderdelete,
+		getorderhold,
+		getorderreturn
+	} from '../../utils/api_hotel.js'
+	export default {
+		data(){
+			return {
+				orderList:'',//订单整体
+				orderId:'',//订单号
+				billXin:'',//结账信息
+				order_txt:'',//弹框提示信息
+				msgType:'warn',
+				msgType2:'warn',
+				order_txt:'',//
+				order_txt2:'',//
+				tankuang:false,//弹框是否确定
+				order_txt_id:'',
+			}
+		},
+		onShow() {
+			// 获取当前小程序的页面栈
+			let pages = getCurrentPages();
+			// 数组中索引最大的页面--当前页面
+			let currentPage = pages[pages.length-1];
+			// 打印出当前页面中的 options
+			this.orderId=currentPage.options.orderId
+			this.getOrderInfo(this.orderId)
+			this.getOrderBill(this.orderId)
+		},
+		onload(option){
+			console.log('不能执行onload')
+		},
+		methods:{
+			//获取每个订单详情
+			getOrderInfo() {
+				  let _self = this
+				  _self.orderList = []
+				  var data=_self.orderId
+				  getorderxiang(data).then((res) => {
+					if (res.success) {
+						_self.orderList=res.data
+						return;
+						} else {
+							console.log('获取订单列表失败')
+						}
+					}).catch((err) => {
+						this.$message.error(err.message)
+					});
+				 //  this.$axios.get(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/${this.orderId}`,
+				 //  {
+					//   headers:{
+					//   		'user_token':localStorage.getItem('token')
+					//   }
+				 //  }
+				 //  ).then(res => {
+					// res = res.data
+					// if (res.success) {
+					// 	console.log(res)
+					// 	this.orderList=res.data
+					// } else {
+					//   console.log('获取订单列表失败')
+					// }
+				 //  });
+			},
+			//待确认的弹框操作
+			dialogConfirm() {
+				this.$refs.popup_order2.close()
+				this.tankuang=true
+				if(this.tankuang==true) {
+					if(this.order_txt2=='确定删除？') {
+						this.getOrderDelete(this.order_txt_id)
+					} else if(this.order_txt2=='确定退房？') {
+						this.getOrderReturn(this.order_txt_id)
+					} else if(this.order_txt2=='确定入住？') {
+						this.getOrderHold(this.order_txt_id)
+					} else if(this.order_txt2=='确定取消订单？') {
+						this.getOrderCancel(this.order_txt_id)
+					}
+				} 
+			},
+			dialogClose(){
+				this.$refs.popup_order2.close()
+			},
+			//删除弹框
+			openDel(orderId,type){
+				this.order_txt_id=orderId
+				this.msgType2 = type
+				this.order_txt2='确定删除？'
+				this.$refs.popup_order2.open()
+			},
+			//退房弹框
+			openTui(orderId,type) {
+				this.order_txt_id=orderId
+				this.msgType2 = type
+				this.order_txt2='确定退房？'
+				this.$refs.popup_order2.open()
+			},
+			//入住弹框
+			openRu(orderId,type) {
+				this.order_txt_id=orderId
+				this.msgType2 = type
+				this.order_txt2='确定入住？'
+				this.$refs.popup_order2.open()
+			},
+			//取消订单弹框
+			openQu(orderId,type) {
+				this.order_txt_id=orderId
+				this.msgType2 = type
+				this.order_txt2='确定取消订单？'
+				this.$refs.popup_order2.open()
+			},
+			// 订单结账信息
+			getOrderBill() {
+				  let _self = this
+				  var data=_self.orderId
+				  getorderbill(data).then((res) => {
+					if (res.success) {
+						if(res.data.flag!='3') {
+							this.billXin=res.data
+						}
+						return;
+						} else {
+							console.log('获取结账信息失败')
+						}
+					}).catch((err) => {
+						this.$message.error(err.message)
+					});
+				 //  this.$axios.get(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/bill/${this.orderId}`,
+				 //  {
+					//   headers:{
+					// 	  'user_token':localStorage.getItem('token')
+					//   }
+				 //  }).then(res => {
+					// res = res.data
+					// if (res.success) {
+					// 	// console.log(res)
+					// 	if(res.data.flag!='3') {
+					// 		this.billXin=res.data
+					// 	}
+						
+					// } else {
+					//   console.log('获取结账信息失败')
+					// }
+				 //  });
+			},
+			// 订单取消再次预订
+			navigateToZaici(enableStartTime,enableEndTime,roomTypeId){
+				uni.navigateTo({
+					url:"../order_room/order_room?enableStartTime="+enableStartTime+"&enableEndTime="+enableEndTime+"&startTime="+enableStartTime.substring(5,7)+'月'+enableStartTime.substring(8,10)+'日'+"&endTime="+enableEndTime.substring(5,7)+'月'+enableEndTime.substring(8,10)+'日'+"&roomTypeId="+roomTypeId
+				})
+			},
+			// 待支付取消订单
+			getOrderCancel(order_txt_id) {
+				let _self = this
+				var data=_self.order_txt_id
+				getordercancel(data).then((res) => {
+					if (res.success) {
+						this.order_txt='取消成功'
+						this.$refs.popup_order.open()
+						this.getOrderInfo()
+						return;
+						} else {
+							this.order_txt=res.message
+							this.$refs.popup_order.open()
+						}
+					}).catch((err) => {
+						this.$message.error(err.message)
+					});
+				// this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
+				// this.$axios.put(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/cancel/${this.order_txt_id}`,).then(res => {
+				// 	res = res.data
+				// 	if (res.success) {
+				// 		this.order_txt='取消成功'
+				// 		this.$refs.popup_order.open()
+				// 		this.getOrderInfo()
+				// 	} else {
+				// 		this.order_txt=res.message
+				// 		this.$refs.popup_order.open()
+				// 	}
+				// });
+			},
+			// 支付订单
+			getOrderPay(orderId) {
+				  let _self = this
+				  getorderpay(orderId).then((res) => {
+					if (res.success) {
+						if(res.data.payAmount==0) {
+							uni.navigateTo({
+								url: '../zhifuchenggong/zhifuchenggong?orderId='+res.data.orderId
+							})
+						} else {
+							window.location.href = res.data.payUrl;
+						}
+						return;
+						} else {
+							this.order_txt=res.message
+							this.$refs.popup_order.open()
+							console.log('支付失败')
+						}
+					}).catch((err) => {
+						this.$message.error(err.message)
+					});
+				 //  this.$axios.get(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/pay/${orderId}`,
+				 //  {
+					//   headers:{
+					// 	  'user_token':localStorage.getItem('token')
+					//   }
+				 //  }).then(res => {
+					// res = res.data
+					// if (res.success) {
+					// 	if(res.data.payAmount==0) {
+					// 		uni.navigateTo({
+					// 			url: '../zhifuchenggong/zhifuchenggong?orderId='+res.data.orderId
+					// 		})
+					// 	} else {
+					// 		window.location.href = res.data.payUrl;
+					// 	}
+					// } else {
+					// 	this.order_txt=res.message
+					// 	this.$refs.popup_order.open()
+					// 	console.log('支付失败')
+					// }
+				 //  });
+			},
+			// 删除订单
+			getOrderDelete(order_txt_id) {
+				let _self = this
+				getorderdelete(_self.order_txt_id).then((res) => {
+					if (res.success) {
+						this.order_txt='删除订单成功'
+						this.$refs.popup_order.open()
+						this.getOrderInfo()
+						return;
+						} else {
+							this.order_txt=res.message
+							this.$refs.popup_order.open()
+						}
+					}).catch((err) => {
+						this.$message.error(err.message)
+					});
+				// this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
+				// this.$axios.delete(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/${this.order_txt_id}`,).then(res => {
+				// 	res = res.data
+				// 	if (res.success) {
+				// 		this.order_txt='删除订单成功'
+				// 		this.$refs.popup_order.open()
+				// 		this.getOrderInfo()
+				// 	} else {
+				// 		this.order_txt=res.message
+				// 		this.$refs.popup_order.open()
+				// 	}
+				// });
+			},
+			// 订单已完成再次预订
+			navigateToWanchengZaici(roomTypeId){
+				uni.navigateTo({
+					url:'../order_room/order_room?roomTypeId='+roomTypeId
+				})
+			},
+			// 办理入住
+			getOrderHold(order_txt_id) {
+				let _self = this
+				getorderhold(_self.order_txt_id).then((res) => {
+					if (res.success) {
+						this.order_txt='办理入住成功'
+						this.$refs.popup_order.open()
+						this.getOrderInfo()
+						return;
+						} else {
+							this.order_txt=res.message
+							this.$refs.popup_order.open()
+						}
+					}).catch((err) => {
+						this.$message.error(err.message)
+					});
+				// this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
+				// this.$axios.put(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/hold/${this.order_txt_id}`,).then(res => {
+				// 	res = res.data
+				// 	if (res.success) {
+				// 		this.order_txt='办理入住成功'
+				// 		this.$refs.popup_order.open()
+				// 		this.getOrderInfo()
+				// 	} else {
+				// 		this.order_txt=res.message
+				// 		this.$refs.popup_order.open()
+				// 	}
+				// });
+			},
+			// 办理退房
+			getOrderReturn(order_txt_id) {
+				let _self = this
+				getorderreturn(_self.order_txt_id).then((res) => {
+					if (res.success) {
+						this.order_txt='退房成功'
+						this.$refs.popup_order.open()
+						this.getOrderInfo()
+						this.getOrderBill()
+						return;
+					} else {
+						this.order_txt=res.message
+						this.$refs.popup_order.open()
+					}
+					}).catch((err) => {
+						this.$message.error(err.message)
+					});
+				// this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
+				// this.$axios.put(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/return/${this.order_txt_id}`,).then(res => {
+				// 	res = res.data
+				// 	if (res.success) {
+				// 		this.order_txt='退房成功'
+				// 		this.$refs.popup_order.open()
+				// 		this.getOrderInfo()
+				// 		this.getOrderBill()
+				// 	} else {
+				// 		this.order_txt=res.message
+				// 		this.$refs.popup_order.open()
+				// 	}
+				// });
+			},
+		}
 	}
 </script>
 
-<style>
+<style>
 	@import url("./css/order_mark.css");
 </style>

pages/order_room/css/order_room.css

@@ -1,305 +1,326 @@
-.content {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	background-color: #F2F3F5;
-}
-/* 背景图 */
-.index_bg {
-	width: 750rpx;
-	height: 320rpx;
-	margin: 0 auto;
-	background-image: url(../../static/order_room/order_bg.jpg);
-	background-size: 100% 100%;
-	background-attachment: inherit;
-	background-repeat: no-repeat;
-	margin-top: 0px;
-}
-/* 欢迎光临 */
-.welcome{
-	width: 163px;
-	height: 60px;
-	background: rgba(255, 255, 255, 0.4);
-	backdrop-filter: blur(5px);
-}
-.welcome_img{
-	position: absolute;
-	margin-left: 20px;
-	margin-top: 8px;
-	width: 125px;
-	height: 44px;
-}
-/* 第一层标题 */
-.touming_bg{
-	margin-top: -120rpx;
-	margin-bottom:0px;
-	width: 750rpx;
-	height: 115rpx;
-	background: rgba(255, 255, 255, 0.4);
-	backdrop-filter: blur(4rpx);
-}
-.touming_title{
-	margin-left: 20rpx;
-	margin-top: 13rpx;
-	color: rgba(0, 0, 0, 1);
-	font-size: 34rpx;
-	font-weight: 600;
-	font-family: 'Franklin Gothic Medium', 'Arial Narrow', Arial, sans-serif;
-}
-.touming_txt{
-	margin-left: 20rpx;
-	margin-top: 5rpx;
-	color: rgba(0, 0, 0, 1);
-	font-size: 24rpx;
-	font-weight: 400;
-}
-/* 第二层表单 */
-.two_all{
-	margin-top: 0rpx;
-	width: 750rpx;
-	height: 655rpx;
-	background: rgba(255, 255, 255, 1);
-}
-/* 选择住房日期 */
-.select-time{
-	display: flex;
-	flex-direction: row;
-	justify-content: flex-start;
-	position: absolute;
-	width: 750rpx;
-	height: 144rpx;
-	margin: 0;
-	background: rgba(255, 255, 255, 1);
-}
-.select-time-one{
-	margin-top: 32rpx;
-	margin-left: 90rpx;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-}
-.select-list{
+.content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	background-color: #F2F3F5;
+}
+/* 第二层表单 */
+.two_all{
+	margin: 20rpx 0 0 0rpx;
+	width: 710rpx;
+	height: 254rpx;
+	background: rgba(255, 255, 255, 1);
+}
+/* 选择住房日期 */
+.select-time{
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-start;
+	position: absolute;
+	height: 38px;
+	margin-top: 20rpx;
+	background: rgba(255, 255, 255, 1);
+}
+.select-time-one{
+	margin: 20rpx 0 0 30rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+.select-list{
 	color: rgba(153, 153, 153, 1);
 	font-size: 24rpx;
-	font-weight: 400;
-}
-.select-list-time{
-	color: rgba(0, 0, 0, 1);
-	font-size: 34rpx;
-	font-weight: 400;
-}
-.select-center{
-	width: 190rpx;
-	height: 120rpx;
-}
-.select-line1{
-	position: absolute;
-	margin-left: 37px;
-	margin-top: 46px;
-	width: 17rpx;
-	height: 1px;
-	background: rgba(41, 109, 227, 1);
-}
-.select-circle{
-	position: absolute;
-	width: 81rpx;
-	height: 46rpx;
-	margin-left: 46px;
-	margin-top: 34px;
-	background: rgba(240, 242, 245, 1);
-	border: 1px solid rgba(41, 109, 227, 1);
-	border-radius: 33rpx;
-	text-align: center;
-	color: rgba(0, 0, 0, 1);
-	font-size: 24rpx;
-	font-weight: 400;
-}
-.select-line2{
-	position: absolute;
-	margin-left: 91px;
-	margin-top: 46px;
-	width: 17rpx;
-	height: 1px;
-	background: rgba(41, 109, 227, 1);
-}
-.form_bg{
-	margin-left: 21rpx;
-	width: 709rpx;
-	height: 621rpx;
-	background: rgba(247, 249, 250, 1);
-	border-radius: 5rpx;
-}
-.form_title{
-	position: absolute;
-	margin-left: 29rpx;
-	margin-top: 166rpx;
-	color: rgba(128, 128, 128, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-}
-.form-name{
-	position: absolute;
-	margin-left: 29rpx;
-	margin-top: 238rpx;
-	color: rgba(0, 0, 0, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-}
-.form-line{
-	position: absolute;
-	margin-left: 29rpx;
-	margin-top: 301rpx;
-	width: 650rpx;
-	background: rgba(204, 204, 204, 1);
-	border: 1px solid rgba(230, 230, 230, 1);
-}
-.form-phone{
-	position: absolute;
-	margin-left: 29rpx;
-	margin-top: 326rpx;
-	color: rgba(0, 0, 0, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-}
-.uni-list-cell-db{
-	position: absolute;
-	width: 670rpx;
-	margin-left: 29rpx;
-	margin-top: 414rpx;
-	color: rgba(0, 0, 0, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-}
-.jiantou{
-	float: right;
-	margin-top: -44rpx;
-	width: 39rpx;
-	height: 39rpx;
-}
-.uni-textarea{
-	position: absolute;
-	margin-left: 29rpx;
-	margin-top: 502rpx;
-}
-.textsrea-txt{
-	position: absolute;
-	margin-left: 575rpx;
-	margin-top: 574rpx;
-}
-/* 第三层表单 */
-.three_all{
-	margin-top: 20rpx;
-	width: 750rpx;
-	height: 263rpx;
-	background: rgba(255, 255, 255, 1);
-}
-.three-title{
-	position: absolute;
-	margin-left: 20rpx;
-	margin-top: 30rpx;
-	color: rgba(51, 51, 51, 1);
-	font-size: 32rpx;
-	font-weight: 400;
-}
-.three-mark{
-	position: absolute;
-	margin-left: 20rpx;
-	margin-top: 83rpx;
-	color: rgba(102, 102, 102, 1);
-	font-size: 28rpx;
-	font-weight: 400;
-}
-.three-zhu{
-	position: absolute;
-	margin-left: 20rpx;
-	margin-top: 152rpx;
-	width: 700rpx;
-	color: rgba(153, 153, 153, 1);
-	font-size: 24rpx;
-	font-weight: 400;
-}
-/* 注释 */
-.zhushi{
-	display: flex;
-	margin-top: 50rpx;
-	color: rgba(153, 153, 153, 1);
-	font-size: 20rpx;
-	font-weight: 400;
-	text-align: center;
-}
-.zhushi-mark{
-	margin-left: 20rpx;
-}
-.zhushi-circle{
-	margin-left: 30rpx;
-	position: absolute;
-	width: 8rpx;
-	height: 8rpx;
-	border-radius: 50px;
-	background: rgba(153, 153, 153, 1);
-}
-/* 支付框 */
-.fukuan{
-	display: flex;
-	margin-top: 38rpx;
-	width: 750rpx;
-	height: 100rpx;
-	background: rgba(255, 255, 255, 1);
-	box-shadow: 0rpx -4rpx 10rpx rgba(0, 0, 0, 0.15);
-}
-.fu-price{
-	width: 463rpx;
-	color: rgba(255, 87, 51, 1);
-	font-size: 44rpx;
-	font-weight: 500;
-	text-align: center;
-	line-height: 100rpx;
-}
-.fu-zhifu{
-	float: right;
-	width: 287rpx;
-	height: 100rpx;
-	background: rgba(41, 109, 227, 1);
-	color: rgba(255, 255, 255, 1);
-	font-size: 40rpx;
-	font-weight: 400;
-	text-align: center;
-	line-height: 100rpx;
-}
-.room-button2{
-	float: right;
-	width: 287rpx;
-	height: 100rpx;
-	background: rgba(128, 127, 131, 0.5);
-	color: rgba(255, 255, 255, 1);
-	font-size: 40rpx;
-	font-weight: 400;
-	text-align: center;
-	line-height: 100rpx;
-}
-/* 日期选择器弹窗 */
-.popup_bg_picker{
-	width: 700rpx;
-	height: 800rpx;
-	background: rgba(255, 255, 255, 1);
-	border-radius: 6rpx;
-}
-/* uni-calendar选中背景色 */
-
+	font-weight: 400;
+}
+.select-list-time{
+	color: rgba(0, 0, 0, 1);
+	font-size: 34rpx;
+	font-weight: 400;
+}
+.select-center{
+	width: 70px;
+	height: 120rpx;
+}
+.select-line1{
+	position: absolute;
+	margin-left: 12px;
+	margin-top: 24px;
+	width: 17rpx;
+	height: 1px;
+	background: rgba(41, 109, 227, 1);
+}
+.select-circle{
+	position: absolute;
+	width: 81rpx;
+	height: 46rpx;
+	margin-left: 23px;
+	margin-top: 12px;
+	background: rgba(240, 242, 245, 1);
+	border: 1px solid rgba(41, 109, 227, 1);
+	border-radius: 33rpx;
+	text-align: center;
+	color: rgba(0, 0, 0, 1);
+	font-size: 24rpx;
+	font-weight: 400;
+}
+.select-line2{
+	position: absolute;
+	margin-left: 70px;
+	margin-top: 24px;
+	width: 17rpx;
+	height: 1px;
+	background: rgba(41, 109, 227, 1);
+}
+.select_name{
+	margin: 81rpx 0 0 31rpx;
+	font-size: 28rpx;
+	font-weight: 500;
+	color: rgba(0, 0, 0, 1);
+}
+.select_type{
+	margin: 14rpx 0 0 30rpx;
+	width: 116rpx;
+	height: 41rpx;
+	border-radius: 34rpx;
+	background: rgba(0, 97, 255, 1);
+	font-size: 24rpx;
+	font-weight: 400;
+	line-height: 41rpx;
+	color: rgba(255, 255, 255, 1);
+	text-align: center;
+}
+.select_detail{
+	margin: 14rpx 0 0 30rpx;
+	font-size: 24rpx;
+	font-weight: 400;
+	color: rgba(128, 128, 128, 1);
+}
+/* 第二层基本信息 */
+.second_basic{
+	margin: 21rpx 0 0 20rpx;
+	width: 710rpx;
+	height: 481rpx;
+	opacity: 0.9;
+	border-radius: 15rpx;
+	background: rgba(255, 255, 255, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+	color: rgba(0, 0, 0, 1);
+}
+.form_title{
+	position: absolute;
+	margin: 22rpx 0 0 26rpx;
+	font-weight: 500;
+	color: rgba(0, 0, 0, 1);
+}
+.form-line1{
+	position: absolute;
+	margin-left: 26rpx;
+	margin-top: 87rpx;
+	width: 650rpx;
+	background: rgba(204, 204, 204, 1);
+	border: 1rpx solid rgba(230, 230, 230, 1);
+}
+.form-num{
+	position: absolute;
+	margin-left: 28rpx;
+	margin-top: 113rpx;
+	color: rgba(128, 128, 128, 1);
+}
+.form-name{
+	position: absolute;
+	margin-left: 28rpx;
+	margin-top: 210rpx;
+	color: rgba(128, 128, 128, 1);
+}
+.form-line2{
+	position: absolute;
+	margin-left: 26rpx;
+	margin-top: 184rpx;
+	width: 650rpx;
+	background: rgba(204, 204, 204, 1);
+	border: 1px solid rgba(230, 230, 230, 1);
+}
+.form-line{
+	position: absolute;
+	margin-left: 26rpx;
+	margin-top: 281rpx;
+	width: 650rpx;
+	background: rgba(204, 204, 204, 1);
+	border: 1px solid rgba(230, 230, 230, 1);
+}
+.form-phone{
+	position: absolute;
+	margin-left: 28rpx;
+	margin-top: 310rpx;
+	color: rgba(128, 128, 128, 1);
+}
+/* 里层text */
+.list-text{
+	margin-left: 32rpx;
+	color: rgba(0, 0, 0, 1);
+}
+.uni-list-cell-db{
+	position: absolute;
+	width: 670rpx;
+	margin-left: 28rpx;
+	margin-top: 410rpx;
+	color: rgba(128, 128, 128, 1);
+}
+.jiantou{
+	float: right;
+	margin-top: -44rpx;
+	width: 39rpx;
+	height: 39rpx;
+}
+/* 第三层表单 */
+.third_basic{
+	margin: 21rpx 0 0 20rpx;
+	width: 710rpx;
+	height: 197rpx;
+	opacity: 0.9;
+	border-radius: 15rpx;
+	background: rgba(255, 255, 255, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+	color: rgba(0, 0, 0, 1);
+}
+.third_title{
+	position: absolute;
+	margin: 22rpx 0 0 26rpx;
+	font-weight: 500;
+	color: rgba(0, 0, 0, 1);
+}
+.third-line1{
+	position: absolute;
+	margin-left: 26rpx;
+	margin-top: 92rpx;
+	width: 650rpx;
+	border: 1rpx solid rgba(230, 230, 230, 1);
+}
+.third-num{
+	position: absolute;
+	margin-left: 28rpx;
+	margin-top: 121rpx;
+	color: rgba(128, 128, 128, 1);
+}
+.third-text{
+	margin-left: 309rpx;
+	color: rgba(0, 0, 0, 1);
+}
+.third-text2{
+	font-size: 24rpx;
+	color: rgba(255, 87, 51, 1);
+}
+/* 第四层房费 */
+.four_basic{
+	margin: 21rpx 0 0 20rpx;
+	width: 710rpx;
+	height: 252rpx;
+	opacity: 0.9;
+	border-radius: 15rpx;
+	background: rgba(255, 255, 255, 1);
+	font-size: 28rpx;
+	font-weight: 400;
+	color: rgba(0, 0, 0, 1);
+}
+.four_title{
+	position: absolute;
+	margin: 22rpx 0 0 26rpx;
+	font-weight: 500;
+	color: rgba(0, 0, 0, 1);
+}
+.four-line1{
+	position: absolute;
+	margin-left: 26rpx;
+	margin-top: 92rpx;
+	width: 650rpx;
+	border: 1rpx solid rgba(230, 230, 230, 1);
+}
+.four-num{
+	position: absolute;
+	margin-left: 28rpx;
+	margin-top: 121rpx;
+	color: rgba(128, 128, 128, 1);
+}
+.four-num2{
+	position: absolute;
+	margin-left: 28rpx;
+	margin-top: 184rpx;
+	color: rgba(128, 128, 128, 1);
+}
+.four-all{
+	position: absolute;
+	margin-left: 579rpx;
+	margin-top: 158rpx;
+	color: rgba(0, 0, 0, 1);
+}
+/* 支付框 */
+.fukuan{
+	display: flex;
+	margin-top: 38rpx;
+	width: 750rpx;
+	height: 126rpx;
+	background: rgba(255, 255, 255, 1);
+}
+.fu-price{
+	width: 240px;
+	padding-left: 20rpx;
+	color: rgba(255, 87, 51, 1);
+	font-size: 24rpx;
+	font-weight: 500;
+	text-align: center;
+	line-height: 126rpx;
+}
+.fu-zhifu{
+	float: right;
+	margin-top: 26rpx;
+	width: 238rpx;
+	height: 80rpx;
+	background: rgba(41, 109, 227, 1);
+	color: rgba(255, 255, 255, 1);
+	font-size: 40rpx;
+	font-weight: 400;
+	border-radius: 64rpx;
+	text-align: center;
+	line-height: 80rpx;
+}
+.room-button2{
+	float: right;
+	margin-top: 26rpx;
+	width: 238rpx;
+	height: 80rpx;
+	background: rgba(128, 127, 131, 0.5);
+	color: rgba(255, 255, 255, 1);
+	font-size: 40rpx;
+	font-weight: 400;
+	border-radius: 64rpx;
+	text-align: center;
+	line-height: 80rpx;
+}
+/* 日期选择器弹窗 */
+.popup_bg_picker{
+	width: 700rpx;
+	height: 800rpx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 6rpx;
+}
+/* uni-calendar选中背景色 */
+
 >>>.uni-calendar-item--isDay[data-v-6097fd5b] {
     background-color: #fff;
     opacity: 0.8;
     color: #2979ff;
-}
+}
 >>>.uni-calendar-item--before-checked[data-v-6097fd5b] {
     background-color: #0055ff;
-    color: #fff;
+    color: #fff;
 	opacity: 1;
-}
-
+}
+
 >>>.uni-calendar-item--after-checked[data-v-6097fd5b] {
     background-color: #0055ff;
-    color: #fff;
+    color: #fff;
 	opacity: 1;
 }

pages/order_room/order_room.vue

@@ -1,356 +1,451 @@
-<template>
-	<view class="content">
-		<!-- 背景图 -->
-		<view class="index_bg">
-			<view class="welcome"><image class="welcome_img" src="../../static/index/welcome.png"></image></view>
-		</view>
-		<!-- 第一层标题 -->
-		<view class="touming_bg">
-			<view class="touming_title">墨轩湖姬子公寓（南昌交通学院）</view>
-			<view class="touming_txt">尊敬的老师，您辛苦了，欢迎入住！</view>
-		</view>
-		<!-- 第二层表单 -->
-		<view class="two_all">
-			<view class="select-time" @click="openCalendar">
-				<view class="select-time-one">
-				  <text class="select-list">{{startWeek}}入住</text>
-				  <text class="select-list-time">{{startTime}}</text>
-				</view>
-				<view class="select-center">
-					<view class="select-line1"></view>
-					<view class="select-circle">{{ruzhu_num}}晚</view>
-					<view class="select-line2"></view>
-				</view>
-				<view class="select-time-one">
-				  <text class="select-list">{{endWeek}}离店</text>
-				  <text class="select-list-time">{{endTime}}</text>
-				</view>
-			</view>
-			<uni-popup ref="popup_picker" :mask-click="true">
-				<view class=popup_bg_picker>
-				<uni-calendar :selected="info.selected" class="uni-calendar--hook" :clear-date="true" :date="info.date" :insert="info.insert" :lunar="info.lunar" :startDate="info.startDate"
-				:endDate="info.endDate" :range="info.range" @change="change"/>
-				</view>
-			</uni-popup>
-			<view class="form_bg">
-				<view class="form_title">{{typeName}}</view>
-				<!-- 自定义表单 -->
-				<view class="form-name">{{cardName}}</view>
-				<view class="form-line"></view>
-				<view class="form-phone">{{cardPhone}}</view>
-				<view class="form-line" style="margin-top: 389rpx;"></view>
-				<view class="uni-list-cell-db">
-					<picker @change="bindPickerChange" :value="index" :range="array">
-						<view class="uni-input">{{array[index]}}</view>
-						<text class="jiantou">〉</text>
-					</picker>
-				</view>
-				<view class="form-line" style="margin-top: 477rpx;"></view>
-				<view class="uni-textarea">
-					<textarea @blur="bindTextAreaBlur" placeholder="在此填写您的要求" maxlength="50" auto-height />
-				</view>
-				<text class="textsrea-txt">{{textNum}}/50</text>
-			</view>
-		</view>
-		<!-- 第三层表单 -->
-		<view class="three_all">
-			<view class="three-title">
-				您是【
-				<text v-if="cardIdentity==4">教师</text>
-				<text v-if="cardIdentity==0">其他</text>
-				<text v-if="cardIdentity==1">学生</text>
-				<text v-if="cardIdentity==5">校友</text>
-				】
-			</view>
-			<view class="three-mark">本人可以免费入住，需要预交费<text style="color: rgba(255, 87, 51, 1);">{{payMount}}</text>元，即可享受权益</view>
-			<!-- <view class="three-zhu">注：水费为0.62元/吨，电费为1.1元/度；补助吨数为3吨，补助度数
-         为10度，超出标准需在预付款中扣除，未超出原路返回预付款</view> -->
-		</view>
-		<!-- 注释 -->
-		<view class="zhushi">
-			<text class="zhushi-mark"><text class="zhushi-circle"></text>低价保证</text> 
-			<text class="zhushi-mark"><text class="zhushi-circle"></text>入住免房费</text> 
-			<text class="zhushi-mark"><text class="zhushi-circle"></text>提前选好房</text>
-		</view>
-		<!-- 支付框 -->
-		<view class="fukuan">
-			<view class="fu-price"><text style="font-size: 28rpx;">总计：</text>¥{{payMount}}</view>
-			<view class="fu-zhifu" :class="{'room-button2': freeRoom == 0}">
-				<text v-if="freeRoom==0">房间已满</text>
-				<text v-else @click="getOrderSubmit('warn')">立即支付</text>
-			</view>
-		</view>
-		<!-- 提交订单时弹框 -->
-		<uni-popup ref="popup_order" type="dialog">
-			<uni-popup-dialog :type="msgType" cancelText="关闭" confirmText="确定" :content="order_txt" @confirm="dialogConfirm"
-				@close="dialogClose"></uni-popup-dialog>
-		</uni-popup>
-		
-	</view>
-</template>
-
-<script>
-	/**
-	 * 获取任意时间
-	 */
-	function getDate(date, AddDayCount = 0) {
-		if (!date) {
-			date = new Date()
-		}
-		if (typeof date !== 'object') {
-			date = date.replace(/-/g, '/')
-		}
-		const dd = new Date(date)
-	
-		dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
-	
-		var a = new Array("日", "一", "二", "三", "四", "五", "六");  
-		var week = new Date().getDay();    
-		var week2 = new Date().getDay()+1;    
-		const y = dd.getFullYear()
-		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
-		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
-		const h = dd.getHours() < 10 ? '0' + dd.getHours() : dd.getHours()
-		const f = dd.getMinutes() < 10 ? '0' + dd.getMinutes() : dd.getMinutes()
-		const s = dd.getSeconds() < 10 ? '0' + dd.getSeconds() : dd.getSeconds()
-		return {
-			fullDate: y + '-' + m + '-' + d,
-			fullDate2: y + '-' + m + '-' + d+' '+h+':'+f+':'+s,
-			fullTime: m + '月' + d + '日',
-			year: y,
-			month: m,
-			date: d,
-			day: dd.getDay(),
-			sWeek:"周"+ a[week],
-			eWeek:"周"+ a[week2]
-		}
-	}
-	export default {
-		data() {
-			return {
-				showCalendar: false,
-				info: {
-					lunar: true,
-					range: true,
-					insert: true,
-					selected: [],
-					startDate:'',
-					date:'',
-					endDate:''
-				},
-				startTime:'',//到店日期
-				endTime:'',//离店日期
-				startDate:'',//默认到店日期接口数据
-				endDate:'',//默认离店日期接口数据
-				startWeek:'',// 默认入店日
-				endWeek:'',// 默认离店
-				array: ['18:00前到店', '19:00前到店', '20:00前到店', '21:00前到店'],
-				index: 0,
-				mayTime:'',// 预计到店时间
-				typeName:'',//户型名
-				textNum:0,//输入框当前字数
-				cardName:'',//用户名
-				cardPhone:'',//用户电话
-				cardIdentity:'',//身份
-				submitToken:'',//请求令牌
-				roomTypeId:'',//房间类型id
-				remark:'',//备注要求
-				payMount:0,//应付金额
-				freeRoom:0,//剩余房间
-				ruzhu_num:1,//入住夜晚
-				order_txt:'',//提交订单时信息
-				msgType:'warn',
-			}
-		},
-		onLoad(option) {
-			console.log(option)
-			// this.payMount=Number(option.payMount)
-			// this.ruzhu_num=option.ruzhu_num
-			// this.freeRoom=option.freeRoom
-			this.roomTypeId=option.roomTypeId
-			this.typeName=option.typeName
-			this.startTime=option.startTime
-			this.endTime=option.endTime
-			this.startDate=option.enableStartTime.substring(0,11)+"12:00:00"
-			this.endDate=option.enableEndTime.substring(0,11)+"14:00:00"
-			this.startWeek=this.getweekday(this.startDate)
-			this.endWeek=this.getweekday(this.endDate)
-			this.mayTime=this.startDate.substring(0,11)+"18:00:00"
-			// console.log(this.getweekday(this.startDate))
-			this.getTokenSubmit()
-		},
-		mounted() {
-			this.getUserInfo()
-			this.getOrderConfirm('warn')
-		},
-		onReady() {
-			this.$nextTick(() => {
-				this.showCalendar = true
-			})
-			// TODO 模拟请求异步同步数据
-			setTimeout(() => {
-				this.info.date = getDate(new Date()).fullDate
-				this.info.startDate = getDate(new Date()).fullDate
-				this.info.endDate =  getDate(new Date(),6).fullDate
-				this.startTime = getDate(new Date()).fullTime
-				this.endTime = getDate(new Date(),1).fullTime
-				this.startWeek = getDate(new Date()).sWeek
-				this.endWeek = getDate(new Date(),1).eWeek
-				this.ruzhu_num=1
-			}, 20)
-		},
-		methods: {
-			// 获取请求令牌
-			getTokenSubmit() {
-				  let _self = this
-				  this.$axios.get("/hotel/ihotel-api/ihotel/hotelOrder/user/submit/token",
-				  {
-					  headers:{
-						  'user_token':localStorage.getItem('token')
-					  }
-				  }).then(res => {
-					res = res.data
-					if (res.success) {
-						this.submitToken=res.data.submitToken
-					} else {
-					  console.log('获取请求令牌失败')
-					}
-				  });
-			},
-			// 获取用户信息
-			getUserInfo() {
-				  let _self = this
-				  this.$axios.get("/hotel/ihotel-api/ihotel/hotelUser/userInfo",
-				  {
-					  headers:{
-						  'user_token':localStorage.getItem('token')
-					  }
-				  }).then(res => {
-					res = res.data
-					if (res.success) {
-						if (res.data.statu == '1') {
-						  _self.cardName=res.data.name
-						  _self.cardPhone=res.data.telPhone
-						  _self.cardIdentity=res.data.identityType
-						}else {
-							alert('您没有权限，请联系客服')
-						}
-					} else {
-					  console.log('获取用户信息失败')
-					}
-				  });
-			},
-			// 确认订单
-			getOrderConfirm(type) {
-				let _self = this
-				this.$axios.get("/hotel/ihotel-api/ihotel/hotelOrder/user/order/confirm?startTime="+this.startDate.substring(0,10)+"&endTime="+this.endDate.substring(0,10)+'&roomTypeId='+this.roomTypeId).then(res => {
-					res = res.data
-					if (res.success) {
-					  this.payMount=res.data.totalAmount
-					  this.freeRoom=res.data.freeNum
-					  this.ruzhu_num=res.data.nums
-					} else {
-						this.msgType = type
-						this.order_txt=res.message
-						this.$refs.popup_order.open()
-					}
-				});
-			},
-			// 提交订单
-			getOrderSubmit(type) {
-				this.payUrl=''
-				let _self = this
-				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.defaults.headers.common['request_token'] = this.submitToken;
-				this.$axios.defaults.headers.common['Content-Type'] ='application/json'
-				this.$axios.post("/hotel/ihotel-api/ihotel/hotelOrder/user/order/submit",
-				{
-					"enableStartTime":this.startDate,//入住时间
-					"enableEndTime":this.endDate,//离店时间
-					"roomTypeId":this.roomTypeId,//房间类型id
-					"payAmount":this.payMount,//需支付金额
-					"userName":this.cardName,
-					"userPhone":this.cardPhone,
-					"mayIntoTime":this.mayTime,
-					"remark":this.remark,
-				}
-				).then(res => {
-					res = res.data
-					if (res.success) {
-						if(res.data.payAmount==0) {
-							uni.navigateTo({
-								url:'../zhifuchenggong/zhifuchenggong?orderId='+res.data.orderId
-							})
-						} else {
-							window.location.href = res.data.payUrl;
-						}
-						
-					} else {
-						this.msgType = type
-						this.order_txt=res.message
-						this.$refs.popup_order.open()
-					}
-				});
-			},
-			// 计算指定时间是周几
-			getweekday(date){
-			   // date例如:'2022-03-05'
-				var weekArray = new Array("周日","周一", "周二", "周三", "周四", "周五", "周六")
-				var weeka  = weekArray[new Date(date).getDay()]
-				return weeka
-			},
-			//日历选择器
-			openCalendar() {
-				this.$refs.popup_picker.open()
-			},
-			change(e) {
-				console.log('1change 返回:', e)
-				// 模拟动态打卡
-				// if (this.info.selected.length > 5) return
-				this.info.selected=[
-					{
-						date: e.range.before,
-						info: '到店'
-					},
-					{
-						date: e.range.after,
-						info: '离店'
-					}
-				]
-				if(e.range.before!=''&&e.range.after=='') {
-					this.startWeek='周'+e.lunar.ncWeek.substring(2,3)
-				} else if(e.range.before!=''&&e.range.after!=''){
-					if((new Date(e.range.after).getTime())<(new Date(e.range.before).getTime())) {
-						this.order_txt='离店日期不能小于到店日期'
-						this.$refs.popup_order.open()
-					}else{
-						this.endWeek='周'+e.lunar.ncWeek.substring(2,3)
-						this.startTime=e.range.before.substring(5,7)+'月'+e.range.before.substring(8,10)+'日'
-						this.endTime=e.range.after.substring(5,7)+'月'+e.range.after.substring(8,10)+'日'
-						this.startDate = e.range.before +' 14:00:00'
-						this.endDate =  e.range.after +' 12:00:00'
-						this.ruzhu_num=parseInt(((new Date(e.range.after).getTime())-(new Date(e.range.before).getTime()))/1000/60/60/24)
-					}
-				}
-			},
-			//选择器
-			bindPickerChange: function(e) {
-				console.log('picker发送选择改变，携带值为', e.detail.value)
-				this.index = e.detail.value
-				this.mayTime = this.startDate.substring(0,11)+this.array[this.index].substring(0,5)+":00"
-				// console.log(this.mayTime)
-			},
-			// 输入框
-			bindTextAreaBlur: function (e) {
-				// console.log(e.detail.cursor)
-				// console.log(e.detail.value)
-				this.textNum=e.detail.cursor
-				this.remark=e.detail.value
-			}
-		}
-	}
-</script>
-
-<style>
-	@import url("./css/order_room.css");
+<template>
+	<view class="content">
+		<!-- 第一层表单 -->
+		<view class="two_all">
+			<view class="select-time" @click="openCalendar">
+				<view class="select-time-one">
+				  <text class="select-list-time">{{startTime}}
+					<text class="select-list">{{startWeek}}</text>
+				  </text>
+				</view>
+				<view class="select-center">
+					<view class="select-line1"></view>
+					<view class="select-circle">{{ruzhu_num}}晚</view>
+					<view class="select-line2"></view>
+				</view>
+				<view class="select-time-one">
+				  <text class="select-list-time">{{endTime}}
+					<text class="select-list">{{endWeek}}</text>
+				  </text>
+				</view>
+			</view>
+			<!-- 房型信息 -->
+			<view class="select_name">大床房</view>
+			<view class="select_type">包吃住型</view>
+			<view class="select_detail">
+				16-20㎡
+				<text style="margin-left: 20px;">双人床</text>
+				<text style="margin-left: 20px;">窗户位于走廊/窗户较小</text>
+			</view>
+			<uni-popup ref="popup_picker" :mask-click="true">
+				<view class=popup_bg_picker>
+				<uni-calendar :selected="info.selected" class="uni-calendar--hook" :clear-date="true" :date="info.date" :insert="info.insert" :lunar="info.lunar" :startDate="info.startDate"
+				:endDate="info.endDate" :range="info.range" @change="change"/>
+				</view>
+			</uni-popup>
+		</view>
+		<!-- 第二层基本信息 -->
+		<view class="second_basic">
+			<view class="form_title">入住信息</view>
+			<view class="form-line1"></view>
+			<view class="form-num">房间数量：
+			<text class="list-text">1间</text></view>
+			<view class="form-line2"></view>
+			<view class="form-name">住客姓名：
+			<text class="list-text">{{cardName}}</text></view>
+			<view class="form-line"></view>
+			<view class="form-phone">联系电话：
+			<text class="list-text">{{cardPhone}}</text></view>
+			<view class="form-line" style="margin-top: 381rpx;"></view>
+			<view class="uni-list-cell-db">预计到店：
+				<picker style="margin-left: 70px;margin-top: -22px;"
+				 @change="bindPickerChange" :value="index" :range="array">
+					<view class="uni-input" style="color: rgba(0, 0, 0, 1);">{{array[index]}}</view>
+					<text class="jiantou">〉</text>
+				</picker>
+			</view>
+		</view>
+		<!-- 第三层表单 -->
+		<view class="third_basic">
+			<view class="third_title">费用明细</view>
+			<view class="third-line1"></view>
+			<view class="third-num">在线支付：
+				<text class="third-text">1间1晚</text>
+				<text style="margin-left: 10rpx;">共
+					<text class="third-text2">¥280.00</text>
+				</text>
+			</view>
+		</view>
+		<!-- 第四层房费 -->
+		<view class="four_basic">
+			<view class="four_title">房费
+				<text style="margin-left: 533rpx;">¥280</text>
+			</view>
+			<view class="four-line1"></view>
+			<view class="four-num">2023-08-01</view>
+			<view class="four-num2">2023-08-02</view>
+			<view class="four-all">1 x ¥280</view>
+		</view>
+		<!-- 支付框 -->
+		<view class="fukuan">
+			<view class="fu-price">¥{{payMount}}</view>
+			<view class="fu-zhifu" :class="{'room-button2': freeRoom == 0}">
+				<text v-if="freeRoom==0">房间已满</text>
+				<text v-else @click="getOrderSubmit('warn')">立即支付</text>
+			</view>
+		</view>
+		<!-- 提交订单时弹框 -->
+		<uni-popup ref="popup_order" type="dialog">
+			<uni-popup-dialog :type="msgType" cancelText="关闭" confirmText="确定" :content="order_txt" @confirm="dialogConfirm"
+				@close="dialogClose"></uni-popup-dialog>
+		</uni-popup>
+		
+	</view>
+</template>
+
+<script>
+	import {
+		getsubmittoken,
+		getorderconfirm,
+		getuserinfo,
+		getsubmit
+	} from '../../utils/api_hotel.js'
+	/**
+	 * 获取任意时间
+	 */
+	function getDate(date, AddDayCount = 0) {
+		if (!date) {
+			date = new Date()
+		}
+		if (typeof date !== 'object') {
+			date = date.replace(/-/g, '/')
+		}
+		const dd = new Date(date)
+	
+		dd.setDate(dd.getDate() + AddDayCount) // 获取AddDayCount天后的日期
+	
+		var a = new Array("日", "一", "二", "三", "四", "五", "六");  
+		var week = new Date().getDay();    
+		var week2 = new Date().getDay()+1;    
+		const y = dd.getFullYear()
+		const m = dd.getMonth() + 1 < 10 ? '0' + (dd.getMonth() + 1) : dd.getMonth() + 1 // 获取当前月份的日期，不足10补0
+		const d = dd.getDate() < 10 ? '0' + dd.getDate() : dd.getDate() // 获取当前几号，不足10补0
+		const h = dd.getHours() < 10 ? '0' + dd.getHours() : dd.getHours()
+		const f = dd.getMinutes() < 10 ? '0' + dd.getMinutes() : dd.getMinutes()
+		const s = dd.getSeconds() < 10 ? '0' + dd.getSeconds() : dd.getSeconds()
+		return {
+			fullDate: y + '-' + m + '-' + d,
+			fullDate2: y + '-' + m + '-' + d+' '+h+':'+f+':'+s,
+			fullTime: m + '月' + d + '日',
+			year: y,
+			month: m,
+			date: d,
+			day: dd.getDay(),
+			sWeek:"周"+ a[week],
+			eWeek:"周"+ a[week2]
+		}
+	}
+	export default {
+		data() {
+			return {
+				showCalendar: false,
+				info: {
+					lunar: true,
+					range: true,
+					insert: true,
+					selected: [],
+					startDate:'',
+					date:'',
+					endDate:''
+				},
+				startTime:'',//到店日期
+				endTime:'',//离店日期
+				startDate:'',//默认到店日期接口数据
+				endDate:'',//默认离店日期接口数据
+				startWeek:'',// 默认入店日
+				endWeek:'',// 默认离店
+				array: ['18:00前到店', '19:00前到店', '20:00前到店', '21:00前到店'],
+				index: 0,
+				mayTime:'',// 预计到店时间
+				typeName:'',//户型名
+				textNum:0,//输入框当前字数
+				cardName:'',//用户名
+				cardPhone:'',//用户电话
+				cardIdentity:'',//身份
+				submitToken:'',//请求令牌
+				roomTypeId:'',//房间类型id
+				remark:'',//备注要求
+				payMount:0,//应付金额
+				freeRoom:0,//剩余房间
+				ruzhu_num:1,//入住夜晚
+				order_txt:'',//提交订单时信息
+				msgType:'warn',
+			}
+		},
+		onLoad(option) {
+			console.log(option)
+			// this.payMount=Number(option.payMount)
+			// this.ruzhu_num=option.ruzhu_num
+			// this.freeRoom=option.freeRoom
+			localStorage.setItem('roomTypeId',option.roomTypeId)
+			localStorage.setItem('typeName',option.typeName)
+			localStorage.setItem('startTime',option.startTime)
+			localStorage.setItem('endTime',option.endTime)
+			localStorage.setItem('enableStartTime',option.enableStartTime)
+			localStorage.setItem('enableEndTime',option.enableEndTime)
+			
+		},
+		mounted() {
+			this.roomTypeId=localStorage.getItem('roomTypeId')
+			this.typeName=localStorage.getItem('typeName')
+			this.startTime=localStorage.getItem('startTime')
+			this.endTime=localStorage.getItem('endTime')
+			this.startDate=localStorage.getItem('enableStartTime').substring(0,11)+"12:00:00"
+			this.endDate=localStorage.getItem('enableEndTime').substring(0,11)+"14:00:00"
+			this.startWeek=this.getweekday(this.startDate)
+			this.endWeek=this.getweekday(this.endDate)
+			this.mayTime=this.startDate.substring(0,11)+"18:00:00"
+			// console.log(this.getweekday(this.startDate))
+			this.getTokenSubmit()
+			// window.location.href ='https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa46ef222053a1047&redirect_uri=https://chtech.ncjti.edu.cn/hotel/ihotel-api/ihotel/hotelUser/weixinAuth&response_type=code&scope=snsapi_base&state=pages/order_room/order_room#wechat_redirect';
+			this.getUserInfo()
+			this.getOrderConfirm('warn')
+		},
+		onReady() {
+			this.$nextTick(() => {
+				this.showCalendar = true
+			})
+			// TODO 模拟请求异步同步数据
+			setTimeout(() => {
+				this.info.date = getDate(new Date()).fullDate
+				this.info.startDate = getDate(new Date()).fullDate
+				this.info.endDate =  getDate(new Date(),6).fullDate
+				this.startTime = getDate(new Date()).fullTime
+				this.endTime = getDate(new Date(),1).fullTime
+				this.startWeek = getDate(new Date()).sWeek
+				this.endWeek = getDate(new Date(),1).eWeek
+				this.ruzhu_num=1
+			}, 20)
+		},
+		methods: {
+			// 获取请求令牌
+			getTokenSubmit() {
+				  let _self = this
+				  getsubmittoken().then((res) => {
+					if (res.success) {
+						this.submitToken=res.data.submitToken
+						return;
+					} else {
+						console.log('获取请求令牌失败')
+					}
+					}).catch((err) => {
+						this.$message.error(err.message)
+					});
+				 //  this.$axios.get("/hotel/ihotel-api/ihotel/hotelOrder/user/submit/token",
+				 //  {
+					//   headers:{
+					// 	  'user_token':localStorage.getItem('token')
+					//   }
+				 //  }).then(res => {
+					// res = res.data
+					// if (res.success) {
+					// 	this.submitToken=res.data.submitToken
+					// } else {
+					//   console.log('获取请求令牌失败')
+					// }
+				 //  });
+			},
+			// 获取用户信息
+			getUserInfo() {
+				  let _self = this
+				  getuserinfo().then((res) => {
+					if (res.success) {
+						if (res.data.statu == '1') {
+						  _self.cardName=res.data.name
+						  _self.cardPhone=res.data.telPhone
+						  _self.cardIdentity=res.data.identityType
+						}else {
+							alert('您没有权限，请联系客服')
+						}
+						return;
+					} else {
+						console.log('获取用户信息失败')
+					}
+					}).catch((err) => {
+						this.$message.error(err.message)
+					});
+				 //  this.$axios.get("/hotel/ihotel-api/ihotel/hotelUser/userInfo",
+				 //  {
+					//   headers:{
+					// 	  'user_token':localStorage.getItem('token')
+					//   }
+				 //  }).then(res => {
+					// res = res.data
+					// if (res.success) {
+					// 	if (res.data.statu == '1') {
+					// 	  _self.cardName=res.data.name
+					// 	  _self.cardPhone=res.data.telPhone
+					// 	  _self.cardIdentity=res.data.identityType
+					// 	}else {
+					// 		alert('您没有权限，请联系客服')
+					// 	}
+					// } else {
+					//   console.log('获取用户信息失败')
+					// }
+				 //  });
+			},
+			// 确认订单
+			getOrderConfirm(type) {
+				let _self = this
+				var data="?startTime="+this.startDate.substring(0,10)+
+				"&endTime="+this.endDate.substring(0,10)+
+				'&roomTypeId='+this.roomTypeId
+				getorderconfirm(data).then((res) => {
+					if (res.success) {
+						this.payMount=res.data.totalAmount
+						this.freeRoom=res.data.freeNum
+						this.ruzhu_num=res.data.nums
+						return;
+					} else {
+						this.msgType = type
+						this.order_txt=res.message
+						this.$refs.popup_order.open()
+					}
+					}).catch((err) => {
+						this.$message.error(err.message)
+					});
+				// this.$axios.get("/hotel/ihotel-api/ihotel/hotelOrder/user/order/confirm?startTime="+this.startDate.substring(0,10)+"&endTime="+this.endDate.substring(0,10)+'&roomTypeId='+this.roomTypeId).then(res => {
+				// 	res = res.data
+				// 	if (res.success) {
+				// 	  this.payMount=res.data.totalAmount
+				// 	  this.freeRoom=res.data.freeNum
+				// 	  this.ruzhu_num=res.data.nums
+				// 	} else {
+				// 		this.msgType = type
+				// 		this.order_txt=res.message
+				// 		this.$refs.popup_order.open()
+				// 	}
+				// });
+			},
+			// 提交订单
+			getOrderSubmit(type) {
+				uni.navigateTo({
+					url:'/pages/submit_order/submit_order'
+				})
+				this.payUrl=''
+				let _self = this
+				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
+				this.$axios.defaults.headers.common['request_token'] = this.submitToken;
+				this.$axios.defaults.headers.common['Content-Type'] ='application/json'
+				var data={
+					"enableStartTime":this.startDate,//入住时间
+					"enableEndTime":this.endDate,//离店时间
+					"roomTypeId":this.roomTypeId,//房间类型id
+					"payAmount":this.payMount,//需支付金额
+					"userName":this.cardName,
+					"userPhone":this.cardPhone,
+					"mayIntoTime":this.mayTime,
+					"remark":this.remark,
+				}
+				getsubmit(data).then((res) => {
+					if (res.success) {
+						uni.navigateTo({
+							url:'/pages/submit_order/submit_order'
+						})
+						// if(res.data.payAmount==0) {
+						// 	uni.navigateTo({
+						// 		url:'../zhifuchenggong/zhifuchenggong?orderId='+res.data.orderId
+						// 	})
+						// } else {
+						// 	window.location.href = res.data.payUrl;
+						// }
+						// return;
+					} else {
+						this.msgType = type
+						this.order_txt=res.message
+						this.$refs.popup_order.open()
+					}
+				}).catch((err) => {
+					this.$message.error(err.message)
+				});
+				// this.$axios.post("/hotel/ihotel-api/ihotel/hotelOrder/user/order/submit",
+				// {
+				// 	"enableStartTime":this.startDate,//入住时间
+				// 	"enableEndTime":this.endDate,//离店时间
+				// 	"roomTypeId":this.roomTypeId,//房间类型id
+				// 	"payAmount":this.payMount,//需支付金额
+				// 	"userName":this.cardName,
+				// 	"userPhone":this.cardPhone,
+				// 	"mayIntoTime":this.mayTime,
+				// 	"remark":this.remark,
+				// }
+				// ).then(res => {
+				// 	res = res.data
+				// 	if (res.success) {
+				// 		if(res.data.payAmount==0) {
+				// 			uni.navigateTo({
+				// 				url:'../zhifuchenggong/zhifuchenggong?orderId='+res.data.orderId
+				// 			})
+				// 		} else {
+				// 			window.location.href = res.data.payUrl;
+				// 		}
+						
+				// 	} else {
+				// 		this.msgType = type
+				// 		this.order_txt=res.message
+				// 		this.$refs.popup_order.open()
+				// 	}
+				// });
+			},
+			// 计算指定时间是周几
+			getweekday(date){
+			   // date例如:'2022-03-05'
+				var weekArray = new Array("周日","周一", "周二", "周三", "周四", "周五", "周六")
+				var weeka  = weekArray[new Date(date).getDay()]
+				return weeka
+			},
+			//日历选择器
+			openCalendar() {
+				this.$refs.popup_picker.open()
+			},
+			change(e) {
+				console.log('1change 返回:', e)
+				// 模拟动态打卡
+				// if (this.info.selected.length > 5) return
+				this.info.selected=[
+					{
+						date: e.range.before,
+						info: '到店'
+					},
+					{
+						date: e.range.after,
+						info: '离店'
+					}
+				]
+				if(e.range.before!=''&&e.range.after=='') {
+					this.startWeek='周'+e.lunar.ncWeek.substring(2,3)
+				} else if(e.range.before!=''&&e.range.after!=''){
+					if((new Date(e.range.after).getTime())<(new Date(e.range.before).getTime())) {
+						this.order_txt='离店日期不能小于到店日期'
+						this.$refs.popup_order.open()
+					}else{
+						this.endWeek='周'+e.lunar.ncWeek.substring(2,3)
+						this.startTime=e.range.before.substring(5,7)+'月'+e.range.before.substring(8,10)+'日'
+						this.endTime=e.range.after.substring(5,7)+'月'+e.range.after.substring(8,10)+'日'
+						this.startDate = e.range.before +' 14:00:00'
+						this.endDate =  e.range.after +' 12:00:00'
+						this.ruzhu_num=parseInt(((new Date(e.range.after).getTime())-(new Date(e.range.before).getTime()))/1000/60/60/24)
+					}
+				}
+			},
+			//选择器
+			bindPickerChange: function(e) {
+				console.log('picker发送选择改变，携带值为', e.detail.value)
+				this.index = e.detail.value
+				this.mayTime = this.startDate.substring(0,11)+this.array[this.index].substring(0,5)+":00"
+				// console.log(this.mayTime)
+			},
+			// 输入框
+			bindTextAreaBlur: function (e) {
+				// console.log(e.detail.cursor)
+				// console.log(e.detail.value)
+				this.textNum=e.detail.cursor
+				this.remark=e.detail.value
+			}
+		}
+	}
+</script>
+
+<style>
+	@import url("./css/order_room.css");
 </style>

pages/submit_order/css/submit_order.css

@@ -0,0 +1,173 @@
+.content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-weight: 400;
+	}
+	/* 支付剩余时间 */
+	.break_time{
+		margin: 24rpx 0 0 0;
+		width: 750rpx;
+		text-align: center;
+		font-size: 24rpx;
+		color: rgba(128, 128, 128, 1);
+	}
+	.break_money{
+		margin: 10px 0 0 0;
+		width: 750rpx;
+		height: 72rpx;
+		text-align: center;
+		font-size: 24px;
+		font-weight: 700;
+		color: rgba(0, 0, 0, 1);
+		
+	}
+	/* 住房信息 */
+	.zhufang{
+		margin: 14rpx 0 0 0;
+		width: 750rpx;
+		padding-left: 20rpx;
+		font-size: 24rpx;
+		color: rgba(128, 128, 128, 1);
+	}
+	.two_all{
+		margin: 20rpx 0 0 0rpx;
+		width: 710rpx;
+		height: 254rpx;
+		border-radius: 15rpx;
+		background: rgba(255, 255, 255, 1);
+	}
+	/* 选择住房日期 */
+	.select-time{
+		display: flex;
+		flex-direction: row;
+		justify-content: flex-start;
+		position: absolute;
+		height: 38px;
+		margin-top: 20rpx;
+		background: rgba(255, 255, 255, 1);
+	}
+	.select-time-one{
+		margin: 20rpx 0 0 30rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.select-list{
+		color: rgba(153, 153, 153, 1);
+		font-size: 24rpx;
+		font-weight: 400;
+	}
+	.select-list-time{
+		color: rgba(0, 0, 0, 1);
+		font-size: 34rpx;
+		font-weight: 400;
+	}
+	.select-center{
+		width: 70px;
+		height: 120rpx;
+	}
+	.select-line1{
+		position: absolute;
+		margin-left: 12px;
+		margin-top: 24px;
+		width: 17rpx;
+		height: 1px;
+		background: rgba(41, 109, 227, 1);
+	}
+	.select-circle{
+		position: absolute;
+		width: 81rpx;
+		height: 46rpx;
+		margin-left: 23px;
+		margin-top: 12px;
+		background: rgba(240, 242, 245, 1);
+		border: 1px solid rgba(41, 109, 227, 1);
+		border-radius: 33rpx;
+		text-align: center;
+		color: rgba(0, 0, 0, 1);
+		font-size: 24rpx;
+		font-weight: 400;
+	}
+	.select-line2{
+		position: absolute;
+		margin-left: 70px;
+		margin-top: 24px;
+		width: 17rpx;
+		height: 1px;
+		background: rgba(41, 109, 227, 1);
+	}
+	.select_name{
+		margin: 81rpx 0 0 31rpx;
+		font-size: 28rpx;
+		font-weight: 500;
+		color: rgba(0, 0, 0, 1);
+	}
+	.select_type{
+		margin: 14rpx 0 0 30rpx;
+		width: 116rpx;
+		height: 41rpx;
+		border-radius: 34rpx;
+		background: rgba(0, 97, 255, 1);
+		font-size: 24rpx;
+		font-weight: 400;
+		line-height: 41rpx;
+		color: rgba(255, 255, 255, 1);
+		text-align: center;
+	}
+	.select_detail{
+		margin: 14rpx 0 0 30rpx;
+		font-size: 24rpx;
+		font-weight: 400;
+		color: rgba(128, 128, 128, 1);
+	}
+	/* 支付方式 */
+	.pay-way{
+		margin: 24rpx 0 0 0;
+		width: 750rpx;
+		padding-left: 20rpx;
+		font-size: 24rpx;
+		color: rgba(128, 128, 128, 1);
+	}
+	.pay-list{
+		margin: 17rpx 0 0 0rpx;
+		width: 710rpx;
+		height: 100%;
+		border-radius: 15rpx;
+		background: rgba(255, 255, 255, 1);
+	}
+	.iconweixin {
+		float: left;
+		margin: 30rpx 0 0 31rpx;
+		width: 40rpx;
+		height: 40rpx;
+		background-size: 100%;
+		background-image: url('../../static/pay/weixin_icon.png');
+		color: #36cb59;
+	}
+	.item{
+		margin-left: 45px;
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 50px;
+		color: rgba(0, 0, 0, 1);
+	}
+	.radio{
+		position: absolute;
+		margin-left: 320px;
+		margin-top: -35px;
+	}
+	/* 确认支付 */
+	.quwer{
+		margin-top: 683rpx;
+		width: 710rpx;
+		height: 96rpx;
+		border-radius: 64rpx;
+		background: rgba(0, 97, 255, 1);
+		font-size: 32rpx;
+		font-weight: 500;
+		line-height: 96rpx;
+		color: rgba(255, 255, 255, 1);
+		text-align: center;
+	}

pages/submit_order/submit_order.vue

@@ -0,0 +1,73 @@
+<template>
+	<view class="content">
+		<!-- 支付剩余时间 -->
+		<view class="break_time">交易剩余时间15:00</view>
+		<view class="break_money">¥280.00</view>
+		<!-- 住房信息 -->
+		<view class="zhufang">住房信息</view>
+		<view class="two_all">
+			<view class="select-time">
+				<view class="select-time-one">
+				  <text class="select-list-time">{{startTime}}
+					<text class="select-list">{{startWeek}}</text>
+				  </text>
+				</view>
+				<view class="select-center">
+					<view class="select-line1"></view>
+					<view class="select-circle">{{ruzhu_num}}晚</view>
+					<view class="select-line2"></view>
+				</view>
+				<view class="select-time-one">
+				  <text class="select-list-time">{{endTime}}
+					<text class="select-list">{{endWeek}}</text>
+				  </text>
+				</view>
+			</view>
+			<!-- 房型信息 -->
+			<view class="select_name">大床房</view>
+			<view class="select_type">包吃住型</view>
+			<view class="select_detail">
+				16-20㎡
+				<text style="margin-left: 20px;">双人床</text>
+				<text style="margin-left: 20px;">窗户位于走廊/窗户较小</text>
+			</view>
+		</view>
+		<!-- 支付方式 -->
+		<view class="pay-way">支付方式</view>
+		<view class="pay-list">
+			<view class="iconweixin"></view>
+			<view class="item">微信支付</view>
+			<label class="radio">
+				<radio value="" color="rgba(0, 97, 255, 1)" :checked="pay_way == '微信支付'" :disabled="money <= 0" />
+				</radio>
+			</label>
+		</view>
+		<!-- 确认支付 -->
+		<view class="quwer">确认支付</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				orderId:'',//订单id
+				startTime:'7月6日',//到店日期
+				endTime:'7月7日',//离店日期
+				startWeek:'今天',// 默认入店日
+				endWeek:'明天',// 默认离店
+				ruzhu_num:1,//入住夜晚
+				pay_way: '微信支付',
+			}
+		},
+		onLoad(option) {
+			this.orderId=option.orderId
+		},
+		methods: {
+		}
+	}
+</script>
+
+<style>
+	@import url("./css/submit_order.css");
+</style>

project.config.json

@@ -0,0 +1,28 @@
+{
+  "appid": "wx6ed9ba84890a38e9",
+  "compileType": "miniprogram",
+  "libVersion": "2.28.1",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "enhance": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmRelationList": [],
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    }
+  },
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
+}

project.private.config.json

@@ -0,0 +1,7 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "School_apartment",
+  "setting": {
+    "compileHotReLoad": true
+  }
+}

unpackage/dist/dev/mp-weixin/app.js

@@ -0,0 +1,4 @@
+
+require('./common/runtime.js')
+require('./common/vendor.js')
+require('./common/main.js')

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

@@ -0,0 +1,46 @@
+{
+  "pages": [
+    "pages/index/index",
+    "pages/myself/myself",
+    "pages/order_room/order_room",
+    "pages/my_orderlist/my_orderlist",
+    "pages/order_mark/order_mark",
+    "pages/ruzhuxuzhi/ruzhuxuzhi",
+    "pages/zhifuchenggong/zhifuchenggong",
+    "pages/huoquanshibai/huoquanshibai",
+    "pages/gongyuxiangqing/gongyuxiangqing"
+  ],
+  "subPackages": [],
+  "window": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uni-app",
+    "navigationBarBackgroundColor": "#FFFFFF",
+    "backgroundColor": "#FFFFFF"
+  },
+  "tabBar": {
+    "color": "#7A7E83",
+    "selectedColor": "#296DE3",
+    "borderStyle": "black",
+    "backgroundColor": "#ffffff",
+    "list": [
+      {
+        "pagePath": "pages/index/index",
+        "iconPath": "static/tabbar/apartment.svg",
+        "selectedIconPath": "static/tabbar/apart_dian.svg",
+        "text": "公寓"
+      },
+      {
+        "pagePath": "pages/myself/myself",
+        "iconPath": "static/tabbar/myself.svg",
+        "selectedIconPath": "static/tabbar/myself_dian.svg",
+        "text": "我的"
+      }
+    ]
+  },
+  "permission": {
+    "scope.userLocation": {
+      "desc": "需要获取您的地理位置，请确认授权，否则地图功能将无法使用"
+    }
+  },
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/app.wxss

@@ -0,0 +1,3 @@
+@import './common/main.wxss';
+
+[data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}

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

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "公寓详情",
+  "usingComponents": {}
+}