程志平 3 years ago
parent
commit
56fd22299f
3 changed files with 18 additions and 16 deletions
  1. 8 8
      pagesAir/addAir/addAir.vue
  2. 8 6
      pagesAir/shareAir/shareAir.vue
  3. 2 2
      pagesAir/stdBookMgr/stdBookMgr.vue

+ 8 - 8
pagesAir/addAir/addAir.vue

@@ -17,9 +17,9 @@
 				<view class="item-school" v-for="(item0, index0) in treeData" :key="index0">
 					<view class="school" :id="item0.id" @tap="handle_toggle_items">
 						<view>{{item0.label}}</view>
-						<uni-icons type="bottom" size="22" color="#ffffff"
+						<uni-icons type="top" size="22" color="#ffffff"
 							:style="{display: item0.isShow ? '' : 'none'}"></uni-icons>
-						<uni-icons type="top" size="22" color="#ffffff" :style="{display: item0.isShow ? 'none' : ''}">
+						<uni-icons type="bottom" size="22" color="#ffffff" :style="{display: item0.isShow ? 'none' : ''}">
 						</uni-icons>
 					</view>
 					<!-- 楼栋 -->
@@ -33,9 +33,9 @@
 									:style="{display: item1.isShow ? '' : 'none'}"></uni-icons>
 								<view class="txt-loudong">{{item1.label}}</view>
 							</view>
-							<uni-icons type="bottom" size="22" color="#2979ff"
-								:style="{display: item1.isShow ? '' : 'none'}"></uni-icons>
 							<uni-icons type="top" size="22" color="#2979ff"
+								:style="{display: item1.isShow ? '' : 'none'}"></uni-icons>
+							<uni-icons type="bottom" size="22" color="#2979ff"
 								:style="{display: item1.isShow ? 'none' : ''}">
 							</uni-icons>
 						</view>
@@ -50,9 +50,9 @@
 										:style="{display: item2.isShow ? '' : 'none'}"></uni-icons>
 									<view class="txt-loucheng">{{item2.label}}</view>
 								</view>
-								<uni-icons type="bottom" size="22" color="#2979ff"
-									:style="{display: item2.isShow ? '' : 'none'}"></uni-icons>
 								<uni-icons type="top" size="22" color="#2979ff"
+									:style="{display: item2.isShow ? '' : 'none'}"></uni-icons>
+								<uni-icons type="bottom" size="22" color="#2979ff"
 									:style="{display: item2.isShow ? 'none' : ''}"></uni-icons>
 							</view>
 							<!-- 教室、房间 -->
@@ -67,9 +67,9 @@
 											:style="{display: item3.isShow ? '' : 'none'}"></uni-icons>
 										<view class="txt-jiaoshi">{{item3.label}}</view>
 									</view>
-									<uni-icons type="bottom" size="22" color="#2979ff"
-										:style="{display: item3.isShow ? '' : 'none'}"></uni-icons>
 									<uni-icons type="top" size="22" color="#2979ff"
+										:style="{display: item3.isShow ? '' : 'none'}"></uni-icons>
+									<uni-icons type="bottom" size="22" color="#2979ff"
 										:style="{display: item3.isShow ? 'none' : ''}"></uni-icons>
 								</view>
 								<!-- 空调 -->

+ 8 - 6
pagesAir/shareAir/shareAir.vue

@@ -301,14 +301,16 @@
 					if (data.is_on == 1) {
 						if (typeof data.order_num === 'undefined') {
 							// 提示返回信息
-							uni.showToast({
-								icon: 'none',
-								title: '订单号为空,却是开启状态!',
-								duration: 3000
-							})
+							// uni.showToast({
+							// 	icon: 'none',
+							// 	title: '其他人员使用中!',
+							// 	duration: 3000
+							// })
+							tmpAirs[index].time = '未知(其他人员使用中)'
+						} else {
+							tmpAirs[index].time = data.start_time
 						}
 						tmpAirs[index].on = true
-						tmpAirs[index].time = data.start_time
 						tmpAirs[index].order_num = data.order_num
 					} else {
 						tmpAirs[index].on = false

+ 2 - 2
pagesAir/stdBookMgr/stdBookMgr.vue

@@ -110,7 +110,7 @@
 			}, 1000)
 		},
 		mounted() {
-			// 暂无走势图数据
+			// 走势图数据
 			this.getRechargeRecord()
 		},
 		methods: {
@@ -213,7 +213,7 @@
 				}
 			},
 			/**
-			 * 获取消费走势图数据
+			 * 获取消费走势图数据
 			 */
 			async getRechargeRecord() {
 				let res = await this.$myRequest({