diff --git a/page_user/kefu.vue b/page_user/kefu.vue
index 54980bb..4cb2fe3 100644
--- a/page_user/kefu.vue
+++ b/page_user/kefu.vue
@@ -105,7 +105,7 @@
},
// 点击拨打
call() {
- let phoneNumber = '15523256562'
+ let phoneNumber = this.tel
uni.makePhoneCall({
phoneNumber: phoneNumber,
success: function(res) {
@@ -142,7 +142,7 @@
let data = {
classifyId:this.classifyId
}
- this.$u.get("/app/article/list?pageNum=1&pageSize=999").then(res => {
+ this.$u.get(`/app/article/list?pageNum=1&pageSize=999&classifyId=${this.classifyId}`).then(res => {
if(res.code == 200){
this.wzlist = res.rows
}
@@ -243,15 +243,15 @@
margin: auto;
margin-top: 34rpx;
width: 644rpx;
- height: 526rpx;
+ max-height: 800rpx;
background: #FFFFFF;
box-shadow: 0rpx 6rpx 64rpx 0rpx rgba(0,0,0,0.08);
border-radius: 20rpx;
padding: 36rpx 32rpx;
box-sizing: border-box;
.list{
- height: 360rpx;
- overflow: scroll;
+ height: 100%;
+ // overflow: scroll;
.list_val{
display: flex;
justify-content: space-between;
diff --git a/page_user/opinion.vue b/page_user/opinion.vue
index d08525b..ed1e372 100644
--- a/page_user/opinion.vue
+++ b/page_user/opinion.vue
@@ -155,9 +155,9 @@
btn() {
let _this = this
let math = 'static/' + _this.$u.guid(20)
- uni.chooseMessageFile({
+ uni.chooseImage({
count: 9,
- type: 'all',
+ type: 'image',
success(res) {
const tempFilePaths = res.tempFiles
wx.uploadFile({
diff --git a/page_user/photoxq.vue b/page_user/photoxq.vue
index 07cd14f..2dab4eb 100644
--- a/page_user/photoxq.vue
+++ b/page_user/photoxq.vue
@@ -40,9 +40,10 @@
养护重点
-
+ {{list.maintenanceFocus == undefined ? '' : list.maintenanceFocus}}
+
@@ -107,9 +108,9 @@
} else if(this.list.complexity == 6){
this.text = '非常困难'
}
- if(res.data.maintenanceFocus != null || res.data.maintenanceFocus.length > 0){
- this.parseData(res.data.maintenanceFocus)
- }
+ // if(res.data.maintenanceFocus != null || res.data.maintenanceFocus.length > 0){
+ // this.parseData(res.data.maintenanceFocus)
+ // }
} else {
uni.showToast({
title: res.msg,
@@ -119,19 +120,19 @@
}
})
},
- parseData(text) {
- // 根据换行符分割文本为数组
- const items = text.split('\n')
- // 遍历每个条目，并添加序号
- items.forEach((item, index) => {
- // 去除条目前后的空白字符
- const trimmedItem = item.trim()
- // 如果条目不为空，则添加到格式化列表中，并添加序号
- if (trimmedItem) {
- this.formattedList.push(`${trimmedItem}`)
- }
- })
- },
+ // parseData(text) {
+ // // 根据换行符分割文本为数组
+ // const items = text.split('\n')
+ // // 遍历每个条目，并添加序号
+ // items.forEach((item, index) => {
+ // // 去除条目前后的空白字符
+ // const trimmedItem = item.trim()
+ // // 如果条目不为空，则添加到格式化列表中，并添加序号
+ // if (trimmedItem) {
+ // this.formattedList.push(`${trimmedItem}`)
+ // }
+ // })
+ // },
}
}
diff --git a/page_user/upload.vue b/page_user/upload.vue
index 9c292a7..f8ded50 100644
--- a/page_user/upload.vue
+++ b/page_user/upload.vue
@@ -14,21 +14,24 @@
型号 {{user.model == undefined ? '--' : user.model}}
- MAC {{user.mac == undefined ? '--' : user.mac}}
+ MAC
+ {{user.mac == undefined ? '--' : user.mac}}
-
+
息屏
- {{xptxt}}
+ {{xptxt}}
+
固件更新
- {{gjtxt}}
+ {{gjtxt}}
+
@@ -37,18 +40,22 @@
-
- 修改名称
-
-
-
-
- 取消
-
+
+ 修改名称
+
+
+
+
+ 取消
+
确定
-
+
+
+
+
+
@@ -62,12 +69,12 @@
return {
xpshow: false,
gjshow: false,
- xptxt:'永不',
- gjtxt:'v2.1.2',
- nameflag:false,
+ xptxt: '',
+ gjtxt: 'v2.1.2',
+ nameflag: false,
xplist: [{
value: '1',
- label: '永不'
+ label: '30秒'
},
{
value: '2',
@@ -80,7 +87,8 @@
{
value: '2',
label: '五分钟'
- }],
+ }
+ ],
gjlist: [{
value: '1',
label: 'v2.1.2'
@@ -88,10 +96,11 @@
{
value: '2',
label: 'v2.1.3'
- }],
- deviceid:'',
- user:{},
- namesb:''
+ }
+ ],
+ deviceid: '',
+ user: {},
+ namesb: ''
}
},
// 分享到好友（会话）
@@ -110,51 +119,83 @@
}
},
onLoad(option) {
- this.deviceid = option.deviceid
+ this.deviceid = option.deviceid
this.getshebxq()
},
methods: {
+ // 解绑设备按钮
+ btnjiebang() {
+ let that = this
+ uni.showModal({
+ title: '提示',
+ content: '您确定要解绑当前设备吗？',
+ success: function(res) {
+ if (res.confirm) {
+ that.$u.delete(`//app/device/unbind/${that.deviceid}`).then(res => {
+ if (res.code == 200) {
+ uni.showToast({
+ title: '解绑成功',
+ icon: 'success',
+ duration: 2000
+ })
+ setTimeout(() => {
+ uni.navigateBack()
+ }, 2000)
+ } else {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none',
+ duration: 2000
+ })
+ }
+ })
+ } else if (res.cancel) {
+
+ }
+ }
+ })
+ },
// 获取设备信息
- getshebxq(){
+ getshebxq() {
this.$u.get(`/app/getDeviceInfo/${this.deviceid}`).then(res => {
- if(res.code == 200){
+ if (res.code == 200) {
this.user = res.data
}
})
},
// 点击显示修改名称弹框
- btnxianshi(){
+ btnxianshi() {
this.nameflag = true
this.namesb = this.user.deviceName
},
// 选择息屏时间
- xpconfirm(e){
+ xpconfirm(e) {
this.xptxt = e[0].label
},
- // 选择固件版本
- gjconfirm(e){
+ // 选择固件版本
+ gjconfirm(e) {
this.gjtxt = e[0].label
},
// 点击取消修改设备名称
- btnqx(){
+ btnqx() {
this.nameflag = false
},
// 点击确定修改设备名称
- btnqd(){
+ btnqd() {
this.$u.put(`/app/editDeviceName?deviceId=${this.deviceid}&deviceName=${this.namesb}`).then(res => {
- if(res.code == 200){
+ if (res.code == 200) {
this.nameflag = false
this.user.deviceName = this.namesb
uni.showToast({
title: '修改成功',
icon: 'success',
- duration:2000
+ duration: 2000
})
- }else{
+ } else {
uni.showToast({
title: res.msg,
icon: 'none',
- duration:2000
+ duration: 2000
})
}
})
@@ -164,13 +205,30 @@