From 26c133389e980306f98e92872bf9a8a4fe6105b8 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Tue, 31 Dec 2024 17:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
page_components/bindszthr.vue | 2 +-
page_fenbao/statulist/taocanlist/addtaocan/index.vue | 7 +++++++
page_fenbao/zhuce.vue | 4 ++--
page_user/skzh.vue | 2 +-
page_user/wifijoint/index.vue | 2 +-
pages/index/index.vue | 9 +++++++--
6 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/page_components/bindszthr.vue b/page_components/bindszthr.vue
index 64d5994..abada08 100644
--- a/page_components/bindszthr.vue
+++ b/page_components/bindszthr.vue
@@ -296,7 +296,7 @@
},
btntc() {
uni.navigateTo({
- url: '/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.id
+ url: '/page_fenbao/statulist/taocanlist/addtaocan/index?id=' + this.id + '&modevalue=' + 4
})
},
btnlyqx() {
diff --git a/page_fenbao/statulist/taocanlist/addtaocan/index.vue b/page_fenbao/statulist/taocanlist/addtaocan/index.vue
index 6a29505..727ec66 100644
--- a/page_fenbao/statulist/taocanlist/addtaocan/index.vue
+++ b/page_fenbao/statulist/taocanlist/addtaocan/index.vue
@@ -710,6 +710,7 @@
})
setTimeout(() => {
this.btnmsk = false
+ console.log(this.modevalue);
if (this.modevalue == 1) {
uni.reLaunch({
url: '/page_fenbao/statulist/taocanlist/index?id=' +
@@ -727,6 +728,12 @@
this.deviceId + '&modevalue=' + this.modevalue +
'&sn=' + this.sn
})
+ }else if(this.modevalue == 4){
+ uni.reLaunch({
+ url: '/page_components/bindszthr?id=' +
+ this.deviceId + '&modevalue=' + this.modevalue +
+ '&sn=' + this.sn
+ })
}
}, 1000)
} else {
diff --git a/page_fenbao/zhuce.vue b/page_fenbao/zhuce.vue
index 5018d9d..ebe5b37 100644
--- a/page_fenbao/zhuce.vue
+++ b/page_fenbao/zhuce.vue
@@ -53,8 +53,8 @@
<button @click="btnyc">好的</button>
</view>
- <view v-if="mengcflag" class="mengc"
- style="width: 100%;height: 100vh;background-color: #000;opacity: .5;position: fixed;top: 0;left: 0;"></view>
+ <!-- <view v-if="mengcflag" class="mengc"
+ style="width: 100%;height: 100vh;background-color: #000;opacity: .5;position: fixed;top: 0;left: 0;"></view> -->
<!-- 选择蓝牙型号 -->
<u-select v-model="shows" :list="arr" @confirm="confirm"></u-select>
diff --git a/page_user/skzh.vue b/page_user/skzh.vue
index 6e1f630..3c168c7 100644
--- a/page_user/skzh.vue
+++ b/page_user/skzh.vue
@@ -55,7 +55,7 @@
</view>
</view>
- <view class="tip">注意：缴费收入将直接结算至收款账户，请谨慎填写 </view>
+ <view class="tip">注意：该账号为微信对应的商户号，提现后将自动打款至微信钱包 </view>
</view>
</view>
</template>
diff --git a/page_user/wifijoint/index.vue b/page_user/wifijoint/index.vue
index 92f7cdb..3bf1dbb 100644
--- a/page_user/wifijoint/index.vue
+++ b/page_user/wifijoint/index.vue
@@ -25,7 +25,7 @@
电压：{{obj.voltage == undefined ? '--' : obj.voltage}}V
</view>
<view class="machao">
- 功率：{{obj.realTimePower == undefined ? '--' : obj.realTimePower}}KW
+ 功率：{{obj.realTimePower == undefined ? '--' : obj.realTimePower}}W
</view>
<view class="machao">
电流：{{obj.electricity == undefined ? '--' : obj.electricity}}A
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d495637..147ff2b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -962,8 +962,13 @@
title: '修改成功',
icon: 'success',
duration: 2000
- });
-
+ })
+ }else{
+ uni.showToast({
+ title: res.msg,
+ icon: 'success',
+ duration: 2000
+ })
}
})
},