mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-mobile.git
synced 2025-12-07 09:56:45 +08:00
Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/mobile into stat
This commit is contained in:
@@ -16,7 +16,7 @@ if(process.env.NODE_ENV === 'development'){
|
|||||||
oldApiBaseUrl = '/uboeApi';
|
oldApiBaseUrl = '/uboeApi';
|
||||||
statApiBaseUrl='/statApi';
|
statApiBaseUrl='/statApi';
|
||||||
socialApiBaseUrl='/socialApi';
|
socialApiBaseUrl='/socialApi';
|
||||||
fileUrl = 'http:/192.168.0.11:9090/cdn/upload';
|
fileUrl = 'http://192.168.0.11:9090/cdn/upload';
|
||||||
loginPath='/pages/login/login';
|
loginPath='/pages/login/login';
|
||||||
}else if(process.env.NODE_ENV === 'preview'){
|
}else if(process.env.NODE_ENV === 'preview'){
|
||||||
// 预发布环境,当前配置未使用上
|
// 预发布环境,当前配置未使用上
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
<view class="assess-info-content">
|
<view class="assess-info-content">
|
||||||
<img :src="coverFilter(item.cover)">
|
<img :src="coverFilter(item.cover)">
|
||||||
<view class="assess-text">
|
<view class="assess-text">
|
||||||
<view class="assess-text-title">{{item.title}}</view>
|
<view class="assess-text-title" v-html="$keywordActiveShow(item.title,keyword)"></view>
|
||||||
<view class="assess-text-text">完成时间:{{item.date}}</view>
|
<view class="assess-text-text">完成时间:{{item.date}}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
@@ -6,8 +6,8 @@
|
|||||||
<view>
|
<view>
|
||||||
<u-search
|
<u-search
|
||||||
:clearabled="true"
|
:clearabled="true"
|
||||||
@search="findData(true)"
|
@search="search()"
|
||||||
@clear="findData(true)"
|
@clear="search()"
|
||||||
placeholder="搜索"
|
placeholder="搜索"
|
||||||
:height="36"
|
:height="36"
|
||||||
v-model="keyword"
|
v-model="keyword"
|
||||||
@@ -25,7 +25,7 @@
|
|||||||
<view style="" class="artical-tit" @click="toDetail(put)">
|
<view style="" class="artical-tit" @click="toDetail(put)">
|
||||||
<text class="qa-basic qa-solve" v-if="put.isResolve">【已解决】</text>
|
<text class="qa-basic qa-solve" v-if="put.isResolve">【已解决】</text>
|
||||||
<text class="qa-basic qa-unSolve" v-else >【待解决】</text>
|
<text class="qa-basic qa-unSolve" v-else >【待解决】</text>
|
||||||
{{put.title}}
|
<text v-html="$keywordActiveShow(put.title,keyword)"></text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="qa-author-time">
|
<view class="qa-author-time">
|
||||||
@@ -72,7 +72,7 @@
|
|||||||
">
|
">
|
||||||
<text class="qa-basic qa-solve" v-if="item.isResolve">【已解决】</text>
|
<text class="qa-basic qa-solve" v-if="item.isResolve">【已解决】</text>
|
||||||
<text class="qa-basic qa-unSolve" v-else >【待解决】</text>
|
<text class="qa-basic qa-unSolve" v-else >【待解决】</text>
|
||||||
{{item.title}}
|
<text v-html="$keywordActiveShow(item.title,keyword)"></text>
|
||||||
</view>
|
</view>
|
||||||
<view class="articl-box-cont">
|
<view class="articl-box-cont">
|
||||||
<view>
|
<view>
|
||||||
@@ -196,6 +196,15 @@
|
|||||||
|
|
||||||
|
|
||||||
methods:{
|
methods:{
|
||||||
|
search() {
|
||||||
|
if(this.active == 1) {
|
||||||
|
this.putList.pageIndex = 1;
|
||||||
|
this.findData(true);
|
||||||
|
} else {
|
||||||
|
this.answerList.pageIndex=1;
|
||||||
|
this.findAnData(true);
|
||||||
|
}
|
||||||
|
},
|
||||||
//展示全部
|
//展示全部
|
||||||
displayAll(item) {
|
displayAll(item) {
|
||||||
// let content = '';
|
// let content = '';
|
||||||
@@ -337,8 +346,8 @@
|
|||||||
pageSize:this.answerList.pageSize,
|
pageSize:this.answerList.pageSize,
|
||||||
isResolve:this.answerList.isResolve,
|
isResolve:this.answerList.isResolve,
|
||||||
};
|
};
|
||||||
if (this.answerList.keyWord) {
|
if (this.keyWord) {
|
||||||
params.keyWord = this.answerList.keyWord;
|
params.keyWord = this.keyWord;
|
||||||
}
|
}
|
||||||
let $this=this;
|
let $this=this;
|
||||||
apiQa.queryAnswer(params).then(async res => {
|
apiQa.queryAnswer(params).then(async res => {
|
||||||
@@ -372,10 +381,11 @@
|
|||||||
let params = {
|
let params = {
|
||||||
pageIndex: this.putList.pageIndex,
|
pageIndex: this.putList.pageIndex,
|
||||||
pageSize: this.putList.pageSize,
|
pageSize: this.putList.pageSize,
|
||||||
|
keyWord:'',
|
||||||
isResolve: this.putList.isResolve
|
isResolve: this.putList.isResolve
|
||||||
};
|
};
|
||||||
if (this.keyWord) {
|
if (this.keyWord != '') {
|
||||||
params.keyWord = this.keyWord;
|
params.keyWord = this.keyword;
|
||||||
}
|
}
|
||||||
apiQa.queryQuestion(params).then(async rs => {
|
apiQa.queryQuestion(params).then(async rs => {
|
||||||
if (rs.status == 200) {
|
if (rs.status == 200) {
|
||||||
@@ -437,6 +447,7 @@
|
|||||||
|
|
||||||
},
|
},
|
||||||
tabsClick(tab) {
|
tabsClick(tab) {
|
||||||
|
this.keyword = '';
|
||||||
this.active=tab
|
this.active=tab
|
||||||
},
|
},
|
||||||
highlightedFilter(value) {
|
highlightedFilter(value) {
|
||||||
|
|||||||
Reference in New Issue
Block a user