111

common/http.interceptor.js

@@ -19,8 +19,8 @@ const install = (Vue, vm) => {
 	// 	},
 	// }); 
 	Vue.prototype.$u.http.setConfig({ 
-			baseUrl: 'http://192.168.2.81:10002',
+			// baseUrl: 'http://192.168.2.81:10002',
-			// baseUrl: 'https://kg.chuangtewl.com/prod-api',
+			baseUrl: 'https://kg.chuangtewl.com/prod-api',
 			// loadingText: '努力加载中~',
 			// loadingTime: 1000,
 			// 设置自定义头部content-type

page_components/eletj.vue

@@ -177,9 +177,7 @@
            	  </view>
 			  <u-switch v-model="checkeds" active-color="#8883f0"></u-switch>
            </view>
-		</view> -->
+		</view>  v-if="detaobj.isFinished == false" -->
-
-
 		<view class="">
 			<view class="jieshu" v-if="jieshuflag">
 				<text v-if="detaobj.status == 1">立即支付</text>
@@ -304,6 +302,8 @@
 				} else if (this.timeday.minutes > 0) {
 					// 展示分钟和秒  
 					return `${this.timeday.minutes}分钟${this.timeday.seconds}秒`
+				} else if(this.timeday.seconds == 0){
+					this.getDevice()
 				} else {
 					// 展示秒或0（如果秒也为0）  
 					return this.timeday.seconds > 0 ? `${this.timeday.seconds}秒` : '0'
@@ -410,6 +410,12 @@
 								});
 							}
 						})
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						})
 					}
 				})
 			},
@@ -601,6 +607,12 @@
 											});
 										}
 									})
+								}else{
+						       uni.showToast({
+							   title: res.msg,
+							   icon: 'none',
+							   duration: 2000
+						})
 					}
 							})
 						} else {

page_components/fuwu/index.vue

@@ -490,6 +490,11 @@
 										})
 									}else{
 										this.zhifuflag = true
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration: 2000
+										})
 									}
 								})
 							}else{
@@ -532,6 +537,11 @@
 											})
 									}else{
 										this.zhifuflag = true
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration: 2000
+										})
 									}
 								})
 							}
@@ -671,6 +681,12 @@
 																					duration: 2000
 																				});
 																			}
+																		}else{
+																			uni.showToast({
+																				title: res.msg,
+																				icon: 'none',
+																				duration: 2000
+																			})
 																		}
 																	})
 															// }
@@ -790,6 +806,12 @@
 																												url:'/page_components/eletj?id=' + that.orderno
 																											})
 																										},1000)
+																									}else{
+																										uni.showToast({
+																											title: res.msg,
+																											icon: 'none',
+																											duration: 2000
+																										})
 																									}
 																								})
 																					} else {
@@ -821,6 +843,11 @@
 												})
 										}else{
 											this.zhifuflag = true
+											uni.showToast({
+												title: res.msg,
+												icon: 'none',
+												duration: 2000
+											})
 										}
 									})
 								}

page_fenbao/statulist/taocanlist/addtaocan/index.vue

@@ -86,7 +86,6 @@
 							</u-radio-group>
 						</view>
 					</view>
-
 				</view>
 				<view class="feems" v-if="duflag">
 					<view class="feelt">
@@ -275,6 +274,18 @@
 				<textarea style="height: 120rpx !important;margin-top: 40rpx;margin-bottom: 40rpx;"
 					v-model="description" placeholder="输入说明解释" auto-height="true" />
 			</view> -->
+			<!-- 自动断点 #8883F0-->
+            <view class="shebei">
+             	<view class="sbarr" style="align-items: center;">
+             		<view class="" style="font-size:30rpx">低功率输出时自动断电</view> <u-switch active-color="#8883F0" v-model="checked"></u-switch>
+             	</view>
+				<view class="sbarr" style="display: flex; align-items: center;margin-top: 30rpx;" v-if="checked == true">
+					<view class="">最低</view> <input type="text" v-model="power" style="text-align: right;width: 380rpx;" placeholder="低于该值将结束订单并断电"/>瓦
+				</view>
+				<view class="" style="color: #FF4444;margin-top: 20rpx;">
+				    该功能仅在在线状态下才能正常使用！
+				</view>
+             </view>
 			 
 			<!-- 应用设备 -->
 			<view class="shebei">
@@ -312,6 +323,8 @@
 	export default {
 		data() {
 			return {
+				power:'',
+				checked:false,
 				btnmsk: false,
 				deviceId: '',
 				name: '',

pages/index/index.vue

@@ -33,7 +33,7 @@
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uO9UFjzbzS9YlabzL4HV" mode=""></image>
 			</view>
 			
-			<view class="fd_top">
+			<view class="fd_top u-skeleton-fillet">
 				<view class="fd_da">
 					<view class="fd_lt"
 						:style="{ transform: `translateX(${-curtitidx * 100 > -300 ? 0 : -curtitidx * 120}rpx)`}">
@@ -83,8 +83,8 @@
 
 			<swiper class="swiper" style="height: 100%;" :current='curtitidx' @change="swiperchange"
 				@touchstart="touchStart" @touchend="touchEnd">
-				<swiper-item v-for="(items,index) in groupLists" :key="index">
+				<swiper-item v-for="(items,index) in groupLists" :key="index" class="">
-					<view class="" v-if="items.wateringList.length == 0"
+					<view class="" v-if="items && items.wateringList && items.wateringList.length == 0"
 						style="width: 100%;height: 200rpx;margin: auto;margin-top: 230rpx;text-align: center;">
 						<image style="width: 200rpx;height: 200rpx;"
 							src="https://api.ccttiot.com/smartmeter/img/static/uZFUpcz0YZZ4f4RjvGg2" mode=""></image>
@@ -189,7 +189,6 @@
         <view v-if="btnmsk"
         	style="width: 100%;height: 100vh;position: fixed;top: 0;left: 0;background-color: #000;opacity: .1;z-index: 999;">
         </view>
-
 	</view>
 </template>
 
@@ -264,7 +263,6 @@
 				bluetoothflag: false,
 				shibaiflag: false,
 				deviceInfo: {},
-				loadings: false,
 				info: '',
 				checked: false,
 				focus: false,