From 79168086dfe603d760ae875e90e437f4e0ccb0c8 Mon Sep 17 00:00:00 2001
From: liyingang <1345836061@qq.com>
Date: Tue, 13 Aug 2024 23:15:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B3=A8=E9=87=8A=E6=8C=89=E9=92=AE?=
=?UTF-8?q?=EF=BC=8C=E9=A6=96=E9=A1=B5=E5=AD=97=E4=BD=93=E5=8F=96=E6=B6=88?=
=?UTF-8?q?=E5=8A=A0=E7=B2=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/globalJs/globalJs.js | 4 +--
manifest.json | 5 +--
pages/index/detail.vue | 67 +++++++++++++++++++++++++------------
pages/index/index.vue | 8 +++--
4 files changed, 56 insertions(+), 28 deletions(-)
diff --git a/common/globalJs/globalJs.js b/common/globalJs/globalJs.js
index 1a3e408..e4fd856 100644
--- a/common/globalJs/globalJs.js
+++ b/common/globalJs/globalJs.js
@@ -2,8 +2,8 @@
// #ifdef APP-PLUS || MP
// const baseUrl = "http://116.62.210.143:9002";
// const baseUrl = "http://118.89.79.160:8800/HiatmpPro";
-const baseUrl = "http://219.147.31.25:8800/HiatmpPro";
-// const baseUrl = "http://219.147.31.25:30001/tht-app-api/HiatmpPro";
+// const baseUrl = "http://219.147.31.25:8800/HiatmpPro";
+const baseUrl = "http://219.147.31.25:30001/tht-app-api/HiatmpPro";
const chatUrl = "http://219.147.31.25:30001/hitap";
// #endif
// #ifdef H5
diff --git a/manifest.json b/manifest.json
index 374670e..960baa6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "隐患排查",
- "appid" : "__UNI__9736764",
+ "appid" : "__UNI__F12FECC",
"description" : "",
"versionName" : "1.0.0",
"versionCode" : "100",
@@ -43,7 +43,8 @@
},
/* ios打包配置 */
"ios" : {
- "dSYMs" : false
+ "dSYMs" : false,
+ "idfa" : false
},
/* SDK配置 */
"sdkConfigs" : {
diff --git a/pages/index/detail.vue b/pages/index/detail.vue
index 920c4c3..5ab0022 100644
--- a/pages/index/detail.vue
+++ b/pages/index/detail.vue
@@ -512,23 +512,23 @@
data.reference
);
}
- if (JSON.stringify(data.reference) != '{}') {
- if (data.reference.content != null && data.reference.title != null) {
- this.isShowYindao = true
- this.$nextTick(() => {
- this.msgList.forEach(item => {
- if (item.isOver) {
- item.data = item.data +
- `
`
- }
- })
- })
- } else {
- this.isShowYindao = false
- }
- } else {
- this.isShowYindao = false
- }
+ // if (JSON.stringify(data.reference) != '{}') {
+ // if (data.reference.content != null && data.reference.title != null) {
+ // this.isShowYindao = true
+ // this.$nextTick(() => {
+ // this.msgList.forEach(item => {
+ // if (item.isOver) {
+ // item.data = item.data +
+ // ``
+ // }
+ // })
+ // })
+ // } else {
+ // this.isShowYindao = false
+ // }
+ // } else {
+ // this.isShowYindao = false
+ // }
this.loading = false;
if (this.isExpanded) {
this.isExpanded = !this.isExpanded;
@@ -626,10 +626,11 @@
this.scrollBottom();
if (newdata == data) {
- this.msgList[this.msgList.length - 1].data +=
- ``
- console.log('this.msgList[this.msgList.length - 1].data', this.msgList[this.msgList
- .length - 1].data)
+
+ // this.msgList[this.msgList.length - 1].data +=
+ // ``
+ // console.log('this.msgList[this.msgList.length - 1].data', this.msgList[this.msgList
+ // .length - 1].data)
if (optionType == 0 || optionType == 1) {
this.msgList[this.msgList.length - 1].optionType = optionType;
this.msgList[this.msgList.length - 1].answerOptions =
@@ -640,6 +641,29 @@
} else {
this.msgList[this.msgList.length - 1].options = answerOptions;
}
+ // this.msgList.forEach(item => {
+ // if (typeof item.reference === 'object' && item.reference.title && item
+ // .reference
+ // .content) {
+ // if (item.data.includes('\n\n')) {
+ // const strArr = item.data.split('\n\n')
+ // console.log(strArr, 'strArr')
+ // item.data = strArr.reduce((str, item, index) => {
+ // if (index === 0) {
+ // str = str + item +
+ // `` +
+ // '\n\n'
+ // } else {
+ // str = str + item + '\n\n'
+ // }
+ // return str
+ // }, '')
+ // } else {
+ // item.data = item.data +
+ // ``
+ // }
+ // }
+ // })
clearInterval(timer);
this.msgList[this.msgList.length - 1].isOver = true
}
@@ -655,6 +679,7 @@
];
this.scrollBottom();
}
+
this.msgList.forEach(item => {
delete item.answerOptions
})
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6950b38..a35ea31 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -159,7 +159,8 @@
}
this.loadmorestatus = 'loading'
this.$request.globalRequest(
- `/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}&approve=${'1'}`, datas, 'POST')
+ `/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}&approve=${'1'}`,
+ datas, 'POST')
.then(res => {
this.loadmorestatus = 'loadmore'
if (res.code === 200) {
@@ -187,7 +188,8 @@
} else {
this.$.open('/pages/map/index?businessId=' + row.businessId + '§ionId=' + row.sectionCode +
'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
- '&pcType' + row.pcType + '§ionName=' + row.sectionName + '§ionCode=' + row.sectionCode+ '&enumname=' + row.enumname+ '&deadlineStatus=' + row.deadlineStatus)
+ '&pcType' + row.pcType + '§ionName=' + row.sectionName + '§ionCode=' + row
+ .sectionCode + '&enumname=' + row.enumname + '&deadlineStatus=' + row.deadlineStatus)
}
},
konw() {
@@ -253,7 +255,7 @@
.title {
font-family: 'Tensentype-MeiHeiJ-Bold';
- font-weight: bold;
+ // font-weight: bold;
font-size: 24px;
line-height: 28px;
letter-spacing: 2px;