diff --git a/manifest.json b/manifest.json
index 60d65b1..abfe794 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "灿能物联",
"appid" : "__UNI__88BC25B",
"description" : "",
- "versionName" : "1.3.1",
- "versionCode" : 131,
+ "versionName" : "1.3.2",
+ "versionCode" : 132,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
@@ -58,7 +58,13 @@
},
/* ios打包配置 */
"ios" : {
- "dSYMs" : false
+ "dSYMs" : false,
+ "privacyDescription" : {
+ "NSPhotoLibraryUsageDescription" : "上传拓扑图、更改头像、扫码模块需要读取相册内容，是否允许读取相册内容",
+ "NSCameraUsageDescription" : "设备移交和分享需要用到摄像头扫码，是否允许使用摄像头",
+ "NSPhotoLibraryAddUsageDescription" : "下载图片需要保存到相册，是否允许保存照片到相册",
+ "NSLocationAlwaysAndWhenInUseUsageDescription" : "获取定位信息记录项目数据"
+ }
},
/* SDK配置 */
"sdkConfigs" : {
diff --git a/pages/device/APF/comp/basic.vue b/pages/device/APF/comp/basic.vue
index 2ce9fe4..09f7588 100644
--- a/pages/device/APF/comp/basic.vue
+++ b/pages/device/APF/comp/basic.vue
@@ -24,7 +24,7 @@
{{ item.phase }}
{{ item['Apf_PhV_Sys(V)'] || '-' }}
{{ item['Apf_Freq(Hz)'] || '-' }}
- {{ item['Apf_ThdU(%)'] || '-' }}
+ {{ item['Apf_ThdU_Sys(%)'] || '-' }}
@@ -99,6 +99,9 @@ export default {
case 'Apf_Freq(Hz)':
key = '电网电压'
break
+ case 'Apf_ThdU_Sys(%)':
+ key = '电网电压'
+ break
case 'Apf_RmsI_Load(A)':
key = '负载电流'
break
diff --git a/pages/message/report.vue b/pages/message/report.vue
index 316aa87..71824fb 100644
--- a/pages/message/report.vue
+++ b/pages/message/report.vue
@@ -37,7 +37,7 @@ export default {
async init() {
let dictData = await this.$util.getDictData('app_event')
console.log(dictData)
- this.store = this.DataSource('/cs-harmonic-boot/event/queryEventList')
+ this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
this.store.params.type = 3
this.store.firstCallBack = (res) => {
// this.store.data.forEach((item) => {
diff --git a/pages/message/run.vue b/pages/message/run.vue
index 2dc2347..b6e74bc 100644
--- a/pages/message/run.vue
+++ b/pages/message/run.vue
@@ -36,7 +36,7 @@ export default {
async init() {
let dictData = await this.$util.getDictData('app_event')
console.log(dictData)
- this.store = this.DataSource('/cs-harmonic-boot/event/queryEventList')
+ this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
this.store.params.type = 2
this.store.firstCallBack = (res) => {
this.loading = false
diff --git a/pages/message/steady.vue b/pages/message/steady.vue
index 1d3eeb6..9e87d03 100644
--- a/pages/message/steady.vue
+++ b/pages/message/steady.vue
@@ -37,7 +37,7 @@ export default {
async init() {
let dictData = await this.$util.getDictData('app_event')
console.log(dictData)
- this.store = this.DataSource('/cs-harmonic-boot/event/queryEventList')
+ this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
this.store.params.type = 1
this.store.firstCallBack = (res) => {
// this.store.data.forEach((item) => {
diff --git a/pages/message/transient.vue b/pages/message/transient.vue
index 073c8b7..7a5009a 100644
--- a/pages/message/transient.vue
+++ b/pages/message/transient.vue
@@ -40,7 +40,7 @@ export default {
async init() {
let dictData = await this.$util.getDictData('app_event')
console.log(dictData)
- this.store = this.DataSource('/cs-harmonic-boot/event/queryEventList')
+ this.store = this.DataSource('/cs-harmonic-boot/eventUser/queryEventpage')
this.store.params.type = 0
this.store.firstCallBack = (res) => {
// this.store.data.forEach((item) => {
diff --git a/pages/mine/setup.vue b/pages/mine/setup.vue
index b2bb24f..df8684d 100644
--- a/pages/mine/setup.vue
+++ b/pages/mine/setup.vue
@@ -1,11 +1,11 @@
-
+
更换手机号
-
+
修改密码
@@ -13,11 +13,11 @@
消息配置
-->
-
+
用户协议
-
+
个人信息保护政策
@@ -41,12 +41,12 @@
意见反馈
-->
-
+
关于我们
-
- 退出登录
+
+ 退出登录
@@ -57,36 +57,43 @@ import { queryPersonSet } from '@/common/api/mine.js'
export default {
data() {
return {
- loading: false
+ loading: false,
}
},
methods: {
- async init() {
- },
+ async init() {},
jump(type) {
switch (type) {
case 'changePwd':
uni.navigateTo({
- url: `/pages/user/changePwd`
+ url: `/pages/user/changePwd`,
})
- break;
+ break
case 'changePhone':
uni.navigateTo({
- url: `/pages/user/changePhone`
+ url: `/pages/user/changePhone`,
})
- break;
+ break
case 'layout':
- uni.reLaunch({
- url: `/pages/user/login`
+ uni.showModal({
+ title: '提示',
+ content: '确定退出登录吗？',
+ success: (res) => {
+ if (res.confirm) {
+ uni.reLaunch({
+ url: `/pages/user/login`,
+ })
+ }
+ },
})
- break;
+ break
default:
uni.navigateTo({
- url: `/pages/mine/${type}`
+ url: `/pages/mine/${type}`,
})
- break;
+ break
}
- }
+ },
},
onLoad() {
this.init()
@@ -146,4 +153,4 @@ export default {
}
}
}
-
\ No newline at end of file
+
diff --git a/static/logo.png b/static/logo.png
index f66cf7d..7e36c20 100644
Binary files a/static/logo.png and b/static/logo.png differ
diff --git a/static/logo_2.png b/static/logo_2.png
new file mode 100644
index 0000000..f66cf7d
Binary files /dev/null and b/static/logo_2.png differ