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/pages/index/index.vue b/pages/index/index.vue index 4b59f3f..52a3a08 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -155,10 +155,11 @@ let datas = { nuserid: this.$.getData('token'), status: '10', + // approve: '1' } this.loadmorestatus = 'loading' this.$request.globalRequest( - `/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}`, datas, 'POST') + `/hiddenDanger/highDanger/getHigDangerDealt?pageNum=${this.page}&pageSize=${10}&approve=${'1'}`, datas, 'POST') .then(res => { this.loadmorestatus = 'loadmore' if (res.code === 200) { diff --git a/pages/knowledge/index.vue b/pages/knowledge/index.vue index f039f84..3fda7fd 100644 --- a/pages/knowledge/index.vue +++ b/pages/knowledge/index.vue @@ -37,8 +37,17 @@ - - + + + + @@ -157,7 +166,7 @@ } }, methods: { - clickIcon(type) { + async clickIcon(type, qaId) { if(this.iconsType == '') { this.iconsType = type } else { @@ -176,11 +185,28 @@ } } const params = { - qaId: '', + qaId, feedbackStatus : this.iconsType == '' ? 0 : (this.iconsType == 'handUp' ? 1 : 2), feedbackInfo: '' } - // this.$request.globalRequest('/hitapChat/hitap/feadBack', params, 'POST').then(res => {}) + // this.$request.globalRequest('/hitap/feadBack', params, 'POST').then(res => { + + // }) + const [err, res] = await uni.request({ + url: this.$.chatUrl + "/feadBack", + dataType: "json", + method: "POST", + headers: { + "content-type": "application/json", + }, + data: params + }) + + uni.showToast({ + title: res.data.result, + // icon: 'success', + duration: 2000 + }); }, handleTouchStart(e) { // 获取触摸开始时的坐标 @@ -280,7 +306,7 @@ // this.active = data.tabkey - 1 > 0 ? data.tabkey - 1 : 0; // } if (res.data.result) { - this.changeMsgList("1", res.data.result); + this.changeMsgList("1", res.data.result, res.data.qaId); } this.loading = false; } else { @@ -320,7 +346,7 @@ this.inputValue = ""; }, // 更新列表信息 - changeMsgList(answerId, data) { + changeMsgList(answerId, data, qaId) { data = data.replace("undefined", '') data = data.replace("null", '') let id = 1; @@ -339,6 +365,7 @@ { id, answerId, + qaId, data: newdata, isSuccess: true, },