fix: 注释按钮,首页字体取消加粗

main
liyingang 10 months ago
parent 462aeb6350
commit 79168086df
  1. 4
      common/globalJs/globalJs.js
  2. 5
      manifest.json
  3. 67
      pages/index/detail.vue
  4. 8
      pages/index/index.vue

@ -2,8 +2,8 @@
// #ifdef APP-PLUS || MP // #ifdef APP-PLUS || MP
// const baseUrl = "http://116.62.210.143:9002"; // const baseUrl = "http://116.62.210.143:9002";
// const baseUrl = "http://118.89.79.160:8800/HiatmpPro"; // 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:8800/HiatmpPro";
// const baseUrl = "http://219.147.31.25:30001/tht-app-api/HiatmpPro"; const baseUrl = "http://219.147.31.25:30001/tht-app-api/HiatmpPro";
const chatUrl = "http://219.147.31.25:30001/hitap"; const chatUrl = "http://219.147.31.25:30001/hitap";
// #endif // #endif
// #ifdef H5 // #ifdef H5

@ -1,6 +1,6 @@
{ {
"name" : "隐患排查", "name" : "隐患排查",
"appid" : "__UNI__9736764", "appid" : "__UNI__F12FECC",
"description" : "", "description" : "",
"versionName" : "1.0.0", "versionName" : "1.0.0",
"versionCode" : "100", "versionCode" : "100",
@ -43,7 +43,8 @@
}, },
/* ios */ /* ios */
"ios" : { "ios" : {
"dSYMs" : false "dSYMs" : false,
"idfa" : false
}, },
/* SDK */ /* SDK */
"sdkConfigs" : { "sdkConfigs" : {

@ -512,23 +512,23 @@
data.reference data.reference
); );
} }
if (JSON.stringify(data.reference) != '{}') { // if (JSON.stringify(data.reference) != '{}') {
if (data.reference.content != null && data.reference.title != null) { // if (data.reference.content != null && data.reference.title != null) {
this.isShowYindao = true // this.isShowYindao = true
this.$nextTick(() => { // this.$nextTick(() => {
this.msgList.forEach(item => { // this.msgList.forEach(item => {
if (item.isOver) { // if (item.isOver) {
item.data = item.data + // item.data = item.data +
`<img src=${yindaoPng} width=20px height=20px class=yindao/>` // `<img src=${yindaoPng} width=20px height=20px class=yindao/>`
} // }
}) // })
}) // })
} else { // } else {
this.isShowYindao = false // this.isShowYindao = false
} // }
} else { // } else {
this.isShowYindao = false // this.isShowYindao = false
} // }
this.loading = false; this.loading = false;
if (this.isExpanded) { if (this.isExpanded) {
this.isExpanded = !this.isExpanded; this.isExpanded = !this.isExpanded;
@ -626,10 +626,11 @@
this.scrollBottom(); this.scrollBottom();
if (newdata == data) { if (newdata == data) {
this.msgList[this.msgList.length - 1].data +=
`<image src="../../static/nav/yindao.png" style="height: 40rpx; width: 40rpx;"></image>` // this.msgList[this.msgList.length - 1].data +=
console.log('this.msgList[this.msgList.length - 1].data', this.msgList[this.msgList // `<image src="../../static/nav/yindao.png" style="height: 40rpx; width: 40rpx;"></image>`
.length - 1].data) // console.log('this.msgList[this.msgList.length - 1].data', this.msgList[this.msgList
// .length - 1].data)
if (optionType == 0 || optionType == 1) { if (optionType == 0 || optionType == 1) {
this.msgList[this.msgList.length - 1].optionType = optionType; this.msgList[this.msgList.length - 1].optionType = optionType;
this.msgList[this.msgList.length - 1].answerOptions = this.msgList[this.msgList.length - 1].answerOptions =
@ -640,6 +641,29 @@
} else { } else {
this.msgList[this.msgList.length - 1].options = answerOptions; 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 +
// `<img src=${yindaoPng} width=20 height=20 class=yindao />` +
// '\n\n'
// } else {
// str = str + item + '\n\n'
// }
// return str
// }, '')
// } else {
// item.data = item.data +
// `<img src=${yindaoPng} width=20px height=20px class=yindao/>`
// }
// }
// })
clearInterval(timer); clearInterval(timer);
this.msgList[this.msgList.length - 1].isOver = true this.msgList[this.msgList.length - 1].isOver = true
} }
@ -655,6 +679,7 @@
]; ];
this.scrollBottom(); this.scrollBottom();
} }
this.msgList.forEach(item => { this.msgList.forEach(item => {
delete item.answerOptions delete item.answerOptions
}) })

@ -159,7 +159,8 @@
} }
this.loadmorestatus = 'loading' this.loadmorestatus = 'loading'
this.$request.globalRequest( 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 => { .then(res => {
this.loadmorestatus = 'loadmore' this.loadmorestatus = 'loadmore'
if (res.code === 200) { if (res.code === 200) {
@ -187,7 +188,8 @@
} else { } else {
this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId=' + row.sectionCode + this.$.open('/pages/map/index?businessId=' + row.businessId + '&sectionId=' + row.sectionCode +
'&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name + '&operator=' + row.operator + '&deptId=' + row.handleDept + '&taskName=' + row.name +
'&pcType' + row.pcType + '&sectionName=' + row.sectionName + '&sectionCode=' + row.sectionCode+ '&enumname=' + row.enumname+ '&deadlineStatus=' + row.deadlineStatus) '&pcType' + row.pcType + '&sectionName=' + row.sectionName + '&sectionCode=' + row
.sectionCode + '&enumname=' + row.enumname + '&deadlineStatus=' + row.deadlineStatus)
} }
}, },
konw() { konw() {
@ -253,7 +255,7 @@
.title { .title {
font-family: 'Tensentype-MeiHeiJ-Bold'; font-family: 'Tensentype-MeiHeiJ-Bold';
font-weight: bold; // font-weight: bold;
font-size: 24px; font-size: 24px;
line-height: 28px; line-height: 28px;
letter-spacing: 2px; letter-spacing: 2px;

Loading…
Cancel
Save