From 98ea49bff85d17004a7d1512545340f8e18be854 Mon Sep 17 00:00:00 2001 From: guanxiaohan Date: Tue, 13 Aug 2024 14:36:10 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E9=AA=81=E7=BF=B0=5F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/globalJs/globalJs.js | 4 +- manifest.json | 4 +- pages/index/detail.vue | 71 +++++++++++++++++++++++++++++------- static/nav/yindao.png | Bin 0 -> 1182 bytes 4 files changed, 62 insertions(+), 17 deletions(-) create mode 100644 static/nav/yindao.png 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 0000000000000000000000000000000000000000..403605d0dea96ba374379df8baf49544686b7ff7 GIT binary patch literal 1182 zcmV;P1Y!G$P)6P5boai%%5OY#1el5PY^so%n8I3NKT;Z1)>*l$qB?0 z1WzD2fp`KpKZFufCH@JD%A|W>VOSR2M`KypDoQPxng06m^JB&461hDMX$yGYew6s1BT-O@-tzl=%lN2x!01Iz{ zI*zJA$?tav#ErdL8n@?I0B=EfPv}V?0s*`w;RkU6+d=L$0-zVLXOccoiR*-toJ*X) z2?$@}xERL-1@?wNutxx-ovU+6w&}pk#*Lk>dP1j;n4fZIv0c{Sxp75Mk zvIzl@72dCN0jL3xN%!c7lVsD^UhCxs4M3WCUIPr*OUy`^log@~ORRK96#5~`nn~Y% zfW;*g&$6v%_T5HF_VFhzN&XMA1hWwXsKib0r)W8(X110wlqHEDoB8Wbv z%LfyLE+r(3Ici=;dhBWWKLgRl9RHF&x~d}L=R|=_{z(46Y3{)j4hx>ny8#Dx3UNH&E zrDPKeu!T)AQ1rWyg6Gr|EL0_X?vbXR57lE8MK>mKJEnjP+}&3X3|RBAZgEDaQ)?e{ zUb!wh*m|ZufIBbm&|VDiuwW>;B_a!eAxn>r7Lzklg#wnx9o}VMLU{+vg9^nF0Et~m zOx)p(x`8`z9q+&Y-+0|aCO)l5V427l9B&Ck>?tgb={;c+GyoPu3619xikQUd(*N;Z}fQJ&*+nIzj#mVU);M0DM$k8 zx{IP$4Xjcat(!7M1~70ddP4>7^Qh?6gP5+xuAF4C=JZV@ wmkz!`fo{M7n>6sHQUmE#g2hT)p-mb70lFDL+c10n_W%F@07*qoM6N<$f`4})Jpcdz literal 0 HcmV?d00001