From 2f0a4e42f62935aee62a06f24e9693fb6792cf74 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Tue, 15 Nov 2022 18:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../recommend-index/recommend-index.vue | 21 +++++++++++--------
components/system-news/system-news.vue | 2 +-
pages/resource/qaDetail.vue | 20 ++++++++++++------
pages/resource/search.vue | 17 +++++++++++----
4 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/components/recommend-index/recommend-index.vue b/components/recommend-index/recommend-index.vue
index b081896..fdebd42 100644
--- a/components/recommend-index/recommend-index.vue
+++ b/components/recommend-index/recommend-index.vue
@@ -189,15 +189,18 @@
url: '/pages/study/studydetail?id='+citem.id+'&type='+citem.type
});
} else {
- if (citem.type == 10) {
- uni.navigateTo({
- url: '/pages/resource/microDetail?id=' + citem.id
- });
- } else if (citem.type == 20) {
- uni.navigateTo({
- url: '/pages/resource/courseDetail?id=' +citem.id
- });
- }
+ uni.navigateTo({
+ url: '/pages/study/courseStudy?id=' + citem.id
+ });
+ // if (citem.type == 10) {
+ // uni.navigateTo({
+ // url: '/pages/resource/microDetail?id=' + citem.id
+ // });
+ // } else if (citem.type == 20) {
+ // uni.navigateTo({
+ // url: '/pages/resource/courseDetail?id=' +citem.id
+ // });
+ // }
}
},
...mapActions({
diff --git a/components/system-news/system-news.vue b/components/system-news/system-news.vue
index 633d1f9..c08c63a 100644
--- a/components/system-news/system-news.vue
+++ b/components/system-news/system-news.vue
@@ -9,7 +9,7 @@
-
+
diff --git a/pages/resource/qaDetail.vue b/pages/resource/qaDetail.vue
index e09d885..a84dfe8 100644
--- a/pages/resource/qaDetail.vue
+++ b/pages/resource/qaDetail.vue
@@ -62,7 +62,7 @@
最佳答案
- 设置为最佳答案
+ 设置为最佳答案
@@ -362,6 +362,8 @@ export default {
uni.showLoading({title:'加载中...'})
let $this=this;
apiQa.detail(id).then(res => {
+ console.log(res,'res')
+ setTimeout(function(){ uni.hideLoading() },100);
if (res.status == 200) {
//处理图片
let imgArray=[];
@@ -377,6 +379,7 @@ export default {
this.getAnswerList(id);
this.autoCheck(res.result.sysCreateAid);
apiUser.getByIds([res.result.sysCreateAid]).then(rs=>{
+
setTimeout(function(){ uni.hideLoading() },100);
if(rs.status==200){
if(rs.result!='' && rs.result.length>0){
@@ -396,7 +399,6 @@ export default {
$this.detailData = res.result;
}
})
- setTimeout(function(){ uni.hideLoading() },100);
let event = {
key: "ReadQuestion",//后台的事件key 发布文章且审核通过
title: "阅读问题",//事件的标题
@@ -411,9 +413,15 @@ export default {
source:2,
}
apiStat.sendEvent(event);
+ } else {
+ uni.showToast({
+ icon: 'error',
+ title:res.message
+ })
}
})
.catch(err => {
+ setTimeout(function(){ uni.hideLoading() },100);
uni.showToast({
icon: 'none',
title:"获取数据失败"
@@ -533,9 +541,9 @@ export default {
})
},
//设置最佳答案接口
- setBest() {
+ setBest(an) {
//userInfo.aid == an.sysCreateAid因为身份信息为空，所以为了接接口没有加这个判断，但是实际上要加的
- apiQa.isBest(this.curItem.id).then(res => {
+ apiQa.isBest(an.id).then(res => {
if (res.status == 200) {
this.$set(this.detailData, 'isResolve', true);
uni.showToast({title:"设置成功" ,duration: 2000})
@@ -546,9 +554,9 @@ export default {
let event = {
key: "AnswerBest",//设置为最佳答案
title: "回答被选为最佳答案",//
- parameters:"author:"+this.curItem.sysCreateAid,//内容的作者
+ parameters:"author:"+an.sysCreateAid,//内容的作者
content: '回答被选为最佳答案',//事件的内容
- objId: this.curItem.id,//关联的id
+ objId: an.id,//关联的id
objType: '5',//关联的类型
objInfo: '设置最佳答案',
aid: this.userInfo.aid, //当前登录人的id
diff --git a/pages/resource/search.vue b/pages/resource/search.vue
index dd68f4a..bbede9a 100644
--- a/pages/resource/search.vue
+++ b/pages/resource/search.vue
@@ -12,7 +12,8 @@
:focus="true"
shape="round"
@clear="clearSearch"
- @search="searchList"
+ @search="searchList"
+ @custom="searchList"
search-icon="search"
:showAction="true"
actionText="搜索"
@@ -182,7 +183,11 @@
-
抱歉暂时没有找到相关内容,
是否要去“提个意见”呢
+
+
+
@@ -233,11 +238,15 @@
-
+
+
+