更新线上地址

App.vue

@@ -4,7 +4,7 @@
 			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=http%3A%2F%2Fchuanghai-dev.natapp1.cc%2Fihotel%2FhotelUser%2FweixiaoAuth&state=http%3A%2F%2Fchuanghai-dev.natapp1.cc%2Fihotel%2FhotelUser%2FweixiaoAuth';
+				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'

manifest.json

@@ -69,13 +69,15 @@
             "disableHostCheck" : true,
             "proxy" : {
                 //使用代理
-                "/ihotel" : {
-                    "target" : "http://192.168.161.230:8089/ihotel", //目标地址
+				// 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,
-                    "secure" : false,
+                    "secure" : true, // 设置支持https协议的代理
+
                     // 设置地址重定向，把程序中/api开头的路径替换成:http://t.yushu.im"
                     "pathRewrite" : {
-                        "/ihotel" : "" // 设置/api路径重定向
+                        "/hotel/ihotel-api" : "" // 设置/api路径重定向
                     }
                 }
             }
@@ -88,7 +90,7 @@
             }
         },
         "router" : {
-            "base" : "/ihotel/"
+            "base" : "/hotel/h5"
         }
     }
 }

pages/index/css/index.css

@@ -10,7 +10,7 @@
 	width: 750rpx;
 	height: 320rpx;
 	margin: 0 auto;
-	background-image: url(../../static/index/index_bg.svg);
+	background-image: url(../../static/index/index_bg.jpg);
 	background-size: 100% 100%;
 	background-attachment: inherit;
 	background-repeat: no-repeat;

pages/index/index.vue

@@ -341,7 +341,8 @@
 			getRoomType() {
 			  let _self = this
 			  _self.roomType = []
-			  this.$axios.get("/ihotel/roomType/list?startDate="+this.startDate.substring(0,10)+"&endDate="+this.endDate.substring(0,10)).then(res => {
+			  
+			  this.$axios.get("/hotel/ihotel-api/ihotel/roomType/list?startDate="+this.startDate.substring(0,10)+"&endDate="+this.endDate.substring(0,10)).then(res => {
 				res = res.data
 				if (res.success) {
 					// console.log(res)
@@ -360,7 +361,7 @@
 			  let _self = this
 			  _self.typeText=''
 			  _self.img=[]
-			  this.$axios.get(`/ihotel/roomType/info/${id}`).then(res => {
+			  this.$axios.get(`/hotel/ihotel-api/ihotel/roomType/info/${id}`).then(res => {
 				res = res.data
 				if (res.success) {
 					// console.log(res)
@@ -378,7 +379,7 @@
 			  _self.xuzhu_type=[]
 			  _self.tui_type=[]
 			  _self.dai_type=[]
-			  this.$axios.get("/ihotel/hotelOrder/user/order/page?curPage=1&pageSize=100",
+			  this.$axios.get("/hotel/ihotel-api/ihotel/hotelOrder/user/order/page?curPage=1&pageSize=100",
 			  {
 				  headers:{
 					  'user_token':localStorage.getItem('token')

pages/my_orderlist/my_orderlist.vue

@@ -215,7 +215,7 @@
 				  if (this.Inv==6) {
 					  Inv2=''
 				  }
-				  this.$axios.get("/ihotel/hotelOrder/user/order/page?curPage=1&pageSize=100&statu="+Inv2,
+				  this.$axios.get("/hotel/ihotel-api/ihotel/hotelOrder/user/order/page?curPage=1&pageSize=100&statu="+Inv2,
 				  {
 					  headers:{
 						  'user_token':localStorage.getItem('token')
@@ -283,7 +283,7 @@
 			// 支付订单
 			getOrderPay(id) {
 				  let _self = this
-				  this.$axios.get(`/ihotel/hotelOrder/user/order/pay/${id}`,
+				  this.$axios.get(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/pay/${id}`,
 				  {
 					  headers:{
 						  'user_token':localStorage.getItem('token')
@@ -310,7 +310,7 @@
 			getOrderReturn(order_txt_id) {
 				let _self = this
 				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.put(`/ihotel/hotelOrder/user/order/return/${this.order_txt_id}`,).then(res => {
+				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='退房成功'
@@ -328,7 +328,7 @@
 			getOrderHold(order_txt_id) {
 				let _self = this
 				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.put(`/ihotel/hotelOrder/user/order/hold/${this.order_txt_id}`,).then(res => {
+				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='办理入住成功'
@@ -344,7 +344,7 @@
 			getOrderDelete(order_txt_id) {
 				let _self = this
 				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.delete(`/ihotel/hotelOrder/user/order/${this.order_txt_id}`,).then(res => {
+				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='删除订单成功'
@@ -361,7 +361,7 @@
 			getOrderCancel(order_txt_id) {
 				let _self = this
 				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.put(`/ihotel/hotelOrder/user/order/cancel/${this.order_txt_id}`,).then(res => {
+				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='取消成功'

pages/myself/myself.vue

@@ -81,7 +81,7 @@
 			// 获取用户信息
 			getUserInfo() {
 				  let _self = this
-				  this.$axios.get("/ihotel/hotelUser/userInfo",
+				  this.$axios.get("/hotel/ihotel-api/ihotel/hotelUser/userInfo",
 				  {
 					  headers:{
 						  'user_token':localStorage.getItem('token')

pages/order_mark/order_mark.vue

@@ -121,7 +121,7 @@
 			getOrderInfo() {
 				  let _self = this
 				  _self.orderList = []
-				  this.$axios.get(`/ihotel/hotelOrder/user/order/${this.orderId}`,
+				  this.$axios.get(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/${this.orderId}`,
 				  {
 					  headers:{
 					  		'user_token':localStorage.getItem('token')
@@ -187,7 +187,7 @@
 			// 订单结账信息
 			getOrderBill() {
 				  let _self = this
-				  this.$axios.get(`/ihotel/hotelOrder/user/order/bill/${this.orderId}`,
+				  this.$axios.get(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/bill/${this.orderId}`,
 				  {
 					  headers:{
 						  'user_token':localStorage.getItem('token')
@@ -215,7 +215,7 @@
 			getOrderCancel(order_txt_id) {
 				let _self = this
 				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.put(`/ihotel/hotelOrder/user/order/cancel/${this.order_txt_id}`,).then(res => {
+				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='取消成功'
@@ -230,7 +230,7 @@
 			// 支付订单
 			getOrderPay(orderId) {
 				  let _self = this
-				  this.$axios.get(`/ihotel/hotelOrder/user/order/pay/${orderId}`,
+				  this.$axios.get(`/hotel/ihotel-api/ihotel/hotelOrder/user/order/pay/${orderId}`,
 				  {
 					  headers:{
 						  'user_token':localStorage.getItem('token')
@@ -256,7 +256,7 @@
 			getOrderDelete(order_txt_id) {
 				let _self = this
 				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.delete(`/ihotel/hotelOrder/user/order/${this.order_txt_id}`,).then(res => {
+				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='删除订单成功'
@@ -278,7 +278,7 @@
 			getOrderHold(order_txt_id) {
 				let _self = this
 				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.put(`/ihotel/hotelOrder/user/order/hold/${this.order_txt_id}`,).then(res => {
+				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='办理入住成功'
@@ -294,7 +294,7 @@
 			getOrderReturn(order_txt_id) {
 				let _self = this
 				this.$axios.defaults.headers.common['user_token'] = localStorage.getItem('token');
-				this.$axios.put(`/ihotel/hotelOrder/user/order/return/${this.order_txt_id}`,).then(res => {
+				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='退房成功'

pages/order_room/css/order_room.css

@@ -10,7 +10,7 @@
 	width: 750rpx;
 	height: 320rpx;
 	margin: 0 auto;
-	background-image: url(../../static/order_room/order_bg.svg);
+	background-image: url(../../static/order_room/order_bg.jpg);
 	background-size: 100% 100%;
 	background-attachment: inherit;
 	background-repeat: no-repeat;
@@ -183,8 +183,9 @@
 	margin-top: 502rpx;
 }
 .textsrea-txt{
+	position: absolute;
 	margin-left: 575rpx;
-	margin-top: 4rpx;
+	margin-top: 574rpx;
 }
 /* 第三层表单 */
 .three_all{
@@ -228,12 +229,10 @@
 	text-align: center;
 }
 .zhushi-mark{
-	position: inherit;
-	margin-left: 40rpx;
+	margin-left: 20rpx;
 }
 .zhushi-circle{
-	margin-left: -20rpx;
-	margin-top: 20rpx;
+	margin-left: 30rpx;
 	position: absolute;
 	width: 8rpx;
 	height: 8rpx;
@@ -303,15 +302,4 @@
     background-color: #0055ff;
     color: #fff;
 	opacity: 1;
-}
-/* 弹出框 */
-.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_room/order_room.vue

@@ -47,8 +47,9 @@
 				</view>
 				<view class="form-line" style="margin-top: 477rpx;"></view>
 				<view class="uni-textarea">
-					<textarea @blur="bindTextAreaBlur" placeholder="在此填写您的要求" maxlength="50" auto-height /><text class="textsrea-txt">{{textNum}}/50</text>
+					<textarea @blur="bindTextAreaBlur" placeholder="在此填写您的要求" maxlength="50" auto-height />
 				</view>
+				<text class="textsrea-txt">{{textNum}}/50</text>
 			</view>
 		</view>
 		<!-- 第三层表单 -->
@@ -202,7 +203,7 @@
 			// 获取请求令牌
 			getTokenSubmit() {
 				  let _self = this
-				  this.$axios.get("/ihotel/hotelOrder/user/submit/token",
+				  this.$axios.get("/hotel/ihotel-api/ihotel/hotelOrder/user/submit/token",
 				  {
 					  headers:{
 						  'user_token':localStorage.getItem('token')
@@ -219,7 +220,7 @@
 			// 获取用户信息
 			getUserInfo() {
 				  let _self = this
-				  this.$axios.get("/ihotel/hotelUser/userInfo",
+				  this.$axios.get("/hotel/ihotel-api/ihotel/hotelUser/userInfo",
 				  {
 					  headers:{
 						  'user_token':localStorage.getItem('token')
@@ -242,7 +243,7 @@
 			// 确认订单
 			getOrderConfirm(type) {
 				let _self = this
-				this.$axios.get("/ihotel/hotelOrder/user/order/confirm?startTime="+this.startDate.substring(0,10)+"&endTime="+this.endDate.substring(0,10)+'&roomTypeId='+this.roomTypeId).then(res => {
+				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
@@ -262,7 +263,7 @@
 				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("/ihotel/hotelOrder/user/order/submit",
+				this.$axios.post("/hotel/ihotel-api/ihotel/hotelOrder/user/order/submit",
 				{
 					"enableStartTime":this.startDate,//入住时间
 					"enableEndTime":this.endDate,//离店时间

unpackage/dist/build/h5/static/customicons.css

@@ -0,0 +1,20 @@
+@font-face {
+  font-family: "customicons"; /* Project id 2878519 */
+  src:url('/static/customicons.ttf') format('truetype');
+}
+
+.customicons {
+  font-family: "customicons" !important;
+}
+
+.youxi:before {
+  content: "\e60e";
+}
+
+.wenjian:before {
+  content: "\e60f";
+}
+
+.zhuanfa:before {
+  content: "\e610";
+}

unpackage/公寓测试.txt

@@ -0,0 +1,6 @@
+选择开灯 弹窗现实关灯成功
+统计报表时间筛选 失败 例如：8.1-9.20
+系统设置 每人补助水量 每人补助 填写数字 例如 9 会报错body为空
+
+填写订单 的再次填写您的要求部分 字数超过一定数量 布局会乱 
+订房支付 现实为非法用户