commit

 // var baseUrl = "https://huanjing.brofirst.cn/";
-var baseUrl = "https://plane1.brofirst.cn/"
+var baseUrl = "https://plane4.brofirst.cn/"
 
 // 应用接口
 

@@ -210,9 +210,13 @@ Page({
         date: that.data.firstDate
       },
       success: function (res) {
+        var fname = res.data.data.up[0].fname;
+        var name = res.data.data.up[0].name;
         that.setData({
           up: res.data.data.up,
-          down: res.data.data.down
+          down: res.data.data.down,
+          fname:fname,
+          name:name
         })
         wx.hideLoading({
           success: (res) => {},

@@ -72,8 +72,8 @@
 		<view class="morning">上午</view>
 		<view class="planemsg">
 			<view class="list">时间</view>
-			<view class="list">飞机一</view>
-			<view class="list">飞机二</view>
+			<view class="list">{{name}}</view>
+			<view class="list">{{fname}}</view>
 		</view>
 		<view class="planemsg" wx:for="{{up}}" wx:key="index">
 			<view class="list">{{item.title}}</view>
@@ -118,8 +118,8 @@
 		<view class="morning">下午</view>
 		<view class="planemsg">
 			<view class="list">时间</view>
-			<view class="list">飞机一</view>
-			<view class="list">飞机二</view>
+			<view class="list">{{name}}</view>
+			<view class="list">{{fname}}</view>
 		</view>
 		<view class="planemsg" wx:for="{{down}}" wx:key="index">
 			<view class="list">{{item.title}}</view>
@@ -168,7 +168,7 @@
 	<view class="top">
 		<view class="sure">预约确认</view>
 		<view> 您当前预约时间段为{{time}}</view>
-		<view class="{{item.id == otherTime?'active':''}}" bindtap="bindselectTime" wx:for="{{appointment}}" wx:key="index" data-id="{{item.id}}"><text class="iconfont {{item.id == otherTime?'icon-danxuan':'icon-danxuan1'}}"></text>还可预约时间段为{{item.title}}</view>
+		<!-- <view class="{{item.id == otherTime?'active':''}}" bindtap="bindselectTime" wx:for="{{appointment}}" wx:key="index" data-id="{{item.id}}"><text class="iconfont {{item.id == otherTime?'icon-danxuan':'icon-danxuan1'}}"></text>还可预约时间段为{{item.title}}</view> -->
 	</view>
 	<view class="bottom">
 		<view class="cancel" bindtap="bindcancel">取消</view>

@@ -128,6 +128,8 @@ page {
 .list {
   width: 33.33%;
   text-align: center;
+  overflow: hidden;
+  white-space: nowrap;
 }
 
 .planemsg .planeStatus {
@@ -210,11 +212,11 @@ page {
 .subscribe {
   position: fixed;
   width: 622rpx;
-  height: 444rpx;
+  /* height: 444rpx; */
   left: 64rpx;
   z-index: 10000;
   background-color: #ffffff;
-  top: 300rpx;
+  top: 400rpx;
   border-radius: 8rpx 8rpx 0px 0px;
   text-align: center;
 }
@@ -231,7 +233,7 @@ page {
 
 .top {
   padding: 48rpx 48rpx 60rpx;
-  height: 240rpx;
+  height: 126rpx;
   display: flex;
   flex-flow: column;
   justify-content: space-between;

@@ -32,7 +32,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.12.2",
-	"appid": "wx243943911c16fbfc",
+	"appid": "wxa7a9912415b69ce9",
 	"projectname": "PlaneMiniClient",
 	"debugOptions": {
 		"hidedInDevtools": []