diff --git a/common/globalJs/globalJs.js b/common/globalJs/globalJs.js
index 7d7038c..53afbf5 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://49.235.207.167:8800/HiatmpPro";
-const baseUrl = "http://219.147.31.25:30001/tht-app-api/HiatmpPro";
+const baseUrl = "http://49.235.207.167: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 2d21d1f..98c10e0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -135,8 +135,8 @@
"https" : false,
"proxy" : {
"/HiatmpPro" : {
- // "target" : "http://49.235.207.167:8800",
- "target" : "http://219.147.31.25:30001/tht-app-api",
+ "target" : "http://49.235.207.167:8800",
+ // "target" : "http://219.147.31.25:30001/tht-app-api",
"changeOrigin" : true,
"secure" : false,
"pathRewrite" : {
diff --git a/pages/index/detail.vue b/pages/index/detail.vue
index 8f6bd5b..7270c62 100644
--- a/pages/index/detail.vue
+++ b/pages/index/detail.vue
@@ -58,9 +58,7 @@
-
+
@@ -109,6 +107,10 @@
确认
清空
+
+
+
+
@@ -138,6 +140,15 @@
-->
+
+
+ {{ dataYinDao.title }}
+
+
+
+ {{ dataYinDao.content }}
+
+
@@ -192,6 +203,8 @@
tabkey: 0,
radiovalue1: "",
checkboxValue1: [],
+ showYinDao: false,
+ dataYinDao: ''
};
},
onLoad(options) {
@@ -255,6 +268,7 @@
methods: {
clickYinDao(data) {
console.log('data12121 ========>',data)
+ this.showYinDao = true
// let newData = data.content + data.reference.content
// const timer = setInterval(() => {
// data.content += data.reference.content
@@ -264,14 +278,14 @@
// }
// }, 50);
// console.log('data ========>',data)
- let newdata = data
- const timer = setInterval(() => {
- data += data.reference ? data.reference.content :''
+ this.dataYinDao = data
+ // const timer = setInterval(() => {
+ // data += data.reference ? data.reference.content :''
- if (newdata == data.content) {
- clearInterval(timer);
- }
- }, 50);
+ // if (this.dataYinDao == data.content) {
+ // clearInterval(timer);
+ // }
+ // }, 50);
// uni.showToast({
// title: data,
// icon: "none",
@@ -490,11 +504,16 @@
data.answerId || "1",
data.content,
data.optionType,
- data.answerOptions
+ data.answerOptions,
+ data.reference
);
}
if(JSON.stringify(data.reference) != '{}'){
- this.isShowYindao = true
+ if(data.reference.content != null && data.reference.title != null) {
+ this.isShowYindao = true
+ } else {
+ this.isShowYindao = false
+ }
}else{
this.isShowYindao = false
}
@@ -562,7 +581,7 @@
}
},
// 更新列表信息
- changeMsgList(answerId, data, optionType, answerOptions) {
+ changeMsgList(answerId, data, optionType, answerOptions, reference) {
let id = 1;
data = data.replace("undefined", '')
data = data.replace("null", '')
@@ -601,10 +620,12 @@
answerOptions || [];
this.msgList[this.msgList.length - 1].checkboxValue1 = [];
this.msgList[this.msgList.length - 1].radiovalue1 = "";
+ this.msgList[this.msgList.length - 1].reference = reference;
} else {
this.msgList[this.msgList.length - 1].options = answerOptions;
}
clearInterval(timer);
+ this.msgList[this.msgList.length - 1].isOver = true
}
}, 50);
} else {
@@ -971,4 +992,28 @@
word-spacing: 0.1em;
color: rgba(0, 102, 255, 1)
}
+ .custom-pop-head {
+ width: 100%;
+ padding: 20rpx 0;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ border-bottom: 1px solid #E6E6E6;
+ margin-bottom: 20rpx;
+ .left {
+ color: #666666;
+ font-size: 16px;
+ margin-right: 20rpx;
+ }
+ .title {
+ font-size: 18px;
+ margin-left: 20rpx;
+ }
+ }
+ .custom-pop-content{
+ margin: 20rpx;
+ font-size: 16px;
+ line-height: 2.3;
+ word-spacing: 0.1em;
+ }
\ No newline at end of file
diff --git a/static/nav/yindao.png b/static/nav/yindao.png
new file mode 100644
index 0000000..403605d
Binary files /dev/null and b/static/nav/yindao.png differ