From f12825af5ff3003b9f30d3290b5ca35e8ff0e740 Mon Sep 17 00:00:00 2001
From: sundalingg <1036752192@qq.com>
Date: Fri, 29 Dec 2023 15:23:40 +0800
Subject: [PATCH] feat:fix bugs
---
script/1.7/schema/2.create_network.sql | 2 +-
weapp/package/AIOTOverview/AIOTOverview.wxml | 2 +-
weapp/package/advisoryNotice/advisoryNotice.js | 2 ++
weapp/package/advisoryNotice/detail/detail.wxml | 2 +-
weapp/pages/myInfo/myInfo.js | 6 ++++--
weapp/pages/myInfo/myInfo.wxml | 4 +++-
.../components/addAdvisoryNoticeModal.js | 6 +++---
.../advisoryNotice/containers/advisoryNotice.js | 12 ++++++++++--
.../src/sections/deviceManage/containers/network.js | 2 +-
9 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/script/1.7/schema/2.create_network.sql b/script/1.7/schema/2.create_network.sql
index 510da6c..9e4eff2 100644
--- a/script/1.7/schema/2.create_network.sql
+++ b/script/1.7/schema/2.create_network.sql
@@ -16,7 +16,7 @@ comment on table network is '宽带专网';
comment on column network.name is '专网名称';
-comment on column network.type is '专网类型/*1.专网,2.内网*/';
+comment on column network.type is '专网类型/*1.外网,2.内网*/';
comment on column network.account is '账号';
diff --git a/weapp/package/AIOTOverview/AIOTOverview.wxml b/weapp/package/AIOTOverview/AIOTOverview.wxml
index 2c2442f..adef815 100644
--- a/weapp/package/AIOTOverview/AIOTOverview.wxml
+++ b/weapp/package/AIOTOverview/AIOTOverview.wxml
@@ -80,7 +80,7 @@
欠费
- {{count.abnormal+'个'}}
+ {{count.abnormal+'个'}}
diff --git a/weapp/package/advisoryNotice/advisoryNotice.js b/weapp/package/advisoryNotice/advisoryNotice.js
index 33f5456..337d5dd 100644
--- a/weapp/package/advisoryNotice/advisoryNotice.js
+++ b/weapp/package/advisoryNotice/advisoryNotice.js
@@ -41,6 +41,8 @@ Page({
},()=>{
wx.hideLoading()
})
+ }else{
+ wx.hideLoading()
}
})
},
diff --git a/weapp/package/advisoryNotice/detail/detail.wxml b/weapp/package/advisoryNotice/detail/detail.wxml
index fe21df3..3ce592f 100644
--- a/weapp/package/advisoryNotice/detail/detail.wxml
+++ b/weapp/package/advisoryNotice/detail/detail.wxml
@@ -1,8 +1,8 @@
{{detailData.title}}
+ {{time}}
{{detailData.content}}
- 发布时间:{{time}}
diff --git a/weapp/pages/myInfo/myInfo.js b/weapp/pages/myInfo/myInfo.js
index f6ae1fa..5bcda7b 100644
--- a/weapp/pages/myInfo/myInfo.js
+++ b/weapp/pages/myInfo/myInfo.js
@@ -8,7 +8,7 @@ Page({
* 页面的初始数据
*/
data: {
-
+ vis:false
},
bindClick () {
@@ -51,8 +51,10 @@ toDetail(){
onLoad (options) {
let that = this;
let userInfo = wx.getStorageSync('userInfo');
+ let userRole = wx.getStorageSync('userRole');
that.setData({
- userInfo
+ userInfo,
+ vis:userRole?.includes('管理')|| userInfo.username==='SuperAdmin'
})
},
diff --git a/weapp/pages/myInfo/myInfo.wxml b/weapp/pages/myInfo/myInfo.wxml
index c850055..c47bc9c 100644
--- a/weapp/pages/myInfo/myInfo.wxml
+++ b/weapp/pages/myInfo/myInfo.wxml
@@ -38,10 +38,12 @@
-
+
+
资讯公告
+