李振 / PlaneMiniClient · 提交

转到一个项目

作者 李振
提交 b5c91ca4775701beb03a52c10fd14e43a01c422b 1 个父辈 26a880a0

commit

内嵌 并排对比
正在显示 5 个修改的文件 包含 17 行增加 和 11 行删除
1 // var baseUrl = "https://huanjing.brofirst.cn/"; 1 // var baseUrl = "https://huanjing.brofirst.cn/";
2 -var baseUrl = "https://plane1.brofirst.cn/" 2 +var baseUrl = "https://plane4.brofirst.cn/"
3 3
4 // 应用接口 4 // 应用接口
5 5
@@ -210,9 +210,13 @@ Page({ @@ -210,9 +210,13 @@ Page({
210 date: that.data.firstDate 210 date: that.data.firstDate
211 }, 211 },
212 success: function (res) { 212 success: function (res) {
  213 + var fname = res.data.data.up[0].fname;
  214 + var name = res.data.data.up[0].name;
213 that.setData({ 215 that.setData({
214 up: res.data.data.up, 216 up: res.data.data.up,
215 - down: res.data.data.down 217 + down: res.data.data.down,
  218 + fname:fname,
  219 + name:name
216 }) 220 })
217 wx.hideLoading({ 221 wx.hideLoading({
218 success: (res) => {}, 222 success: (res) => {},
@@ -72,8 +72,8 @@ @@ -72,8 +72,8 @@
72 <view class="morning">上午</view> 72 <view class="morning">上午</view>
73 <view class="planemsg"> 73 <view class="planemsg">
74 <view class="list">时间</view> 74 <view class="list">时间</view>
75 - <view class="list">飞机一</view>  
76 - <view class="list">飞机二</view> 75 + <view class="list">{{name}}</view>
  76 + <view class="list">{{fname}}</view>
77 </view> 77 </view>
78 <view class="planemsg" wx:for="{{up}}" wx:key="index"> 78 <view class="planemsg" wx:for="{{up}}" wx:key="index">
79 <view class="list">{{item.title}}</view> 79 <view class="list">{{item.title}}</view>
@@ -118,8 +118,8 @@ @@ -118,8 +118,8 @@
118 <view class="morning">下午</view> 118 <view class="morning">下午</view>
119 <view class="planemsg"> 119 <view class="planemsg">
120 <view class="list">时间</view> 120 <view class="list">时间</view>
121 - <view class="list">飞机一</view>  
122 - <view class="list">飞机二</view> 121 + <view class="list">{{name}}</view>
  122 + <view class="list">{{fname}}</view>
123 </view> 123 </view>
124 <view class="planemsg" wx:for="{{down}}" wx:key="index"> 124 <view class="planemsg" wx:for="{{down}}" wx:key="index">
125 <view class="list">{{item.title}}</view> 125 <view class="list">{{item.title}}</view>
@@ -168,7 +168,7 @@ @@ -168,7 +168,7 @@
168 <view class="top"> 168 <view class="top">
169 <view class="sure">预约确认</view> 169 <view class="sure">预约确认</view>
170 <view> 您当前预约时间段为{{time}}</view> 170 <view> 您当前预约时间段为{{time}}</view>
171 - <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> 171 + <!-- <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> -->
172 </view> 172 </view>
173 <view class="bottom"> 173 <view class="bottom">
174 <view class="cancel" bindtap="bindcancel">取消</view> 174 <view class="cancel" bindtap="bindcancel">取消</view>
@@ -128,6 +128,8 @@ page { @@ -128,6 +128,8 @@ page {
128 .list { 128 .list {
129 width: 33.33%; 129 width: 33.33%;
130 text-align: center; 130 text-align: center;
  131 + overflow: hidden;
  132 + white-space: nowrap;
131 } 133 }
132 134
133 .planemsg .planeStatus { 135 .planemsg .planeStatus {
@@ -210,11 +212,11 @@ page { @@ -210,11 +212,11 @@ page {
210 .subscribe { 212 .subscribe {
211 position: fixed; 213 position: fixed;
212 width: 622rpx; 214 width: 622rpx;
213 - height: 444rpx; 215 + /* height: 444rpx; */
214 left: 64rpx; 216 left: 64rpx;
215 z-index: 10000; 217 z-index: 10000;
216 background-color: #ffffff; 218 background-color: #ffffff;
217 - top: 300rpx; 219 + top: 400rpx;
218 border-radius: 8rpx 8rpx 0px 0px; 220 border-radius: 8rpx 8rpx 0px 0px;
219 text-align: center; 221 text-align: center;
220 } 222 }
@@ -231,7 +233,7 @@ page { @@ -231,7 +233,7 @@ page {
231 233
232 .top { 234 .top {
233 padding: 48rpx 48rpx 60rpx; 235 padding: 48rpx 48rpx 60rpx;
234 - height: 240rpx; 236 + height: 126rpx;
235 display: flex; 237 display: flex;
236 flex-flow: column; 238 flex-flow: column;
237 justify-content: space-between; 239 justify-content: space-between;
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 }, 32 },
33 "compileType": "miniprogram", 33 "compileType": "miniprogram",
34 "libVersion": "2.12.2", 34 "libVersion": "2.12.2",
35 - "appid": "wx243943911c16fbfc", 35 + "appid": "wxa7a9912415b69ce9",
36 "projectname": "PlaneMiniClient", 36 "projectname": "PlaneMiniClient",
37 "debugOptions": { 37 "debugOptions": {
38 "hidedInDevtools": [] 38 "hidedInDevtools": []