From 0e15ecbf7bb0a1b443559dfecccd7fcb966aa490 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Wed, 18 Sep 2024 18:00:38 +0800
Subject: [PATCH] 111
---
common/http.interceptor.js | 4 +--
page_components/eletj.vue | 20 +++++++++++---
page_components/fuwu/index.vue | 27 +++++++++++++++++++
.../statulist/taocanlist/addtaocan/index.vue | 17 ++++++++++--
pages/index/index.vue | 10 +++----
5 files changed, 64 insertions(+), 14 deletions(-)
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index dec621d..9c734f5 100644
--- a/common/http.interceptor.js
+++ b/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: 'https://kg.chuangtewl.com/prod-api',
+ // baseUrl: 'http://192.168.2.81:10002',
+ baseUrl: 'https://kg.chuangtewl.com/prod-api',
// loadingText: '努力加载中~',
// loadingTime: 1000,
// 设置自定义头部content-type
diff --git a/page_components/eletj.vue b/page_components/eletj.vue
index d1b6868..74ad8e4 100644
--- a/page_components/eletj.vue
+++ b/page_components/eletj.vue
@@ -177,9 +177,7 @@
- -->
-
-
+ v-if="detaobj.isFinished == false" -->
立即支付
@@ -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,7 +607,13 @@
});
}
})
- }
+ }else{
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ }
})
} else {
let data = {
diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index 69038fa..f358003 100644
--- a/page_components/fuwu/index.vue
+++ b/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
+ })
}
})
}
diff --git a/page_fenbao/statulist/taocanlist/addtaocan/index.vue b/page_fenbao/statulist/taocanlist/addtaocan/index.vue
index 28e0658..2e893b9 100644
--- a/page_fenbao/statulist/taocanlist/addtaocan/index.vue
+++ b/page_fenbao/statulist/taocanlist/addtaocan/index.vue
@@ -86,7 +86,6 @@
-
@@ -275,7 +274,19 @@
-->
-
+
+
+
+ 低功率输出时自动断电
+
+
+ 最低 瓦
+
+
+ 该功能仅在在线状态下才能正常使用！
+
+
+
应用设备
@@ -312,6 +323,8 @@
export default {
data() {
return {
+ power:'',
+ checked:false,
btnmsk: false,
deviceId: '',
name: '',
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1ac865d..009c8a7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -33,7 +33,7 @@
-
+
@@ -83,8 +83,8 @@
-
-
+
@@ -189,7 +189,6 @@
-
@@ -264,7 +263,6 @@
bluetoothflag: false,
shibaiflag: false,
deviceInfo: {},
- loadings: false,
info: '',
checked: false,
focus: false,
@@ -284,7 +282,7 @@
}
},
onLoad() {
-
+
},
onShow() {