diff --git a/pages/controller/controller.vue b/pages/controller/controller.vue
index ec622c1..bdbfe77 100644
--- a/pages/controller/controller.vue
+++ b/pages/controller/controller.vue
@@ -742,25 +742,25 @@
 							<image class="fan-img" v-if="coldWarmFanStatus.status[0] == 1" src="../../static/supplementLight.png" alt="" style="width: 26rpx;height: 24rpx;animation: unset;">
 							</image>
 							<image v-else src="../../static/fan-off.png" alt="" style="width: 20rpx;height: 20rpx;"></image>
-							<span style="font-size: 22rpx;margin-left: 5rpx;">1#通道</span>
+							<span style="font-size: 22rpx;margin-left: 5rpx;">1#风机</span>
 						</view>
 						<view class="btn" :class="coldWarmFanStatus.status[1] == 1 ? 'btn-on' : 'btn-off'" style="width: 140rpx;height: 66rpx;">
 							<image class="fan-img" v-if="coldWarmFanStatus.status[1] == 1" src="../../static/supplementLight.png" alt="" style="width: 26rpx;height: 24rpx;animation: unset;">
 							</image>
 							<image v-else src="../../static/fan-off.png" alt="" style="width: 20rpx;height: 20rpx;"></image> 
-							<span style="font-size: 22rpx;margin-left: 5rpx;">2#通道</span>
+							<span style="font-size: 22rpx;margin-left: 5rpx;">2#风机</span>
 						</view>
 						<view class="btn" :class="coldWarmFanStatus.status[2] == 1 ? 'btn-on' : 'btn-off'" style="width: 140rpx;height: 66rpx;">
 							<image class="fan-img" v-if="coldWarmFanStatus.status[2] == 1" src="../../static/supplementLight.png" alt="" style="width: 26rpx;height: 24rpx;animation: unset;">
 							</image>
 							<image v-else src="../../static/fan-off.png" alt="" style="width: 20rpx;height: 20rpx;"></image> 
-							<span style="font-size: 22rpx;margin-left: 5rpx;">3#通道</span>
+							<span style="font-size: 22rpx;margin-left: 5rpx;">3#风机</span>
 						</view>
 						<view class="btn" :class="coldWarmFanStatus.status[3] == 1 ? 'btn-on' : 'btn-off'" style="width: 140rpx;height: 66rpx;">
 							<image class="fan-img" v-if="coldWarmFanStatus.status[3] == 1" src="../../static/supplementLight.png" alt="" style="width: 26rpx;height: 24rpx;animation: unset;">
 							</image>
 							<image v-else src="../../static/fan-off.png" alt="" style="width: 20rpx;height: 20rpx;"></image> 
-							<span style="font-size: 22rpx;margin-left: 5rpx;">4#通道</span>
+							<span style="font-size: 22rpx;margin-left: 5rpx;">4#风机</span>
 						</view>
 					</view>
 				</view>
@@ -1141,7 +1141,7 @@
 			</view>
 		</u-popup>
 	<!-- 冷暖风机弹框 -->
-		<u-popup v-model="coldWarmFanShow" mode="center" :mask-close-able='true' width="640rpx" height="620rpx"
+		<u-popup v-model="coldWarmFanShow" mode="center" :mask-close-able='true' width="640rpx" height="700rpx"
 			:closeable='false'>
 			<view class="contentPop lishui-item">
 				<view class="contentPop_box padding-none">
@@ -1173,16 +1173,16 @@
 					</view>
 					<view class="lishui-grid" style="grid-template-columns: repeat(4, 1fr);grid-row-gap: 20rpx;grid-column-gap: 20rpx;">
 						<view class="btn" @click="changeLightOpen(0)" :class="coldWarmFanList[0]=='1'?'btn-on':'btn-off'" style="width: 130rpx !important;height: 66rpx;">
-							<span style="font-size: 24rpx;">1#通道</span>
+							<span style="font-size: 24rpx;">1#风机</span>
 						</view>
 						<view class="btn" @click="changeLightOpen(1)" :class="coldWarmFanList[1]=='1'?'btn-on':'btn-off'" style="width: 130rpx !important;height: 66rpx;">
-							<span style="font-size: 24rpx;">2#通道</span>
+							<span style="font-size: 24rpx;">2#风机</span>
 						</view>
 						<view class="btn" @click="changeLightOpen(2)" :class="coldWarmFanList[2]=='1'?'btn-on':'btn-off'" style="width: 130rpx !important;height: 66rpx;">
-							<span style="font-size: 24rpx;">3#通道</span>
+							<span style="font-size: 24rpx;">3#风机</span>
 						</view>
 						<view class="btn" @click="changeLightOpen(3)" :class="coldWarmFanList[3]=='1'?'btn-on':'btn-off'" style="width: 130rpx !important;height: 66rpx;">
-							<span style="font-size: 24rpx;">4#通道</span>
+							<span style="font-size: 24rpx;">4#风机</span>
 						</view>
 					</view>
 					<view class="" style="width: 100%;height: 1rpx;background: #DDDDDD;margin-top: 30rpx;"></view>