|
@@ -62,7 +62,12 @@
|
|
|
</view>
|
|
|
<view class="text-status">{{item.zhuangtai}}</view>
|
|
|
</view>
|
|
|
- <view class="content-text-row">{{item.jiguan}}</view>
|
|
|
+ <view class="content-text-row">{{item.jiguan}}</view>
|
|
|
+ <view>
|
|
|
+ <view v-for="item2 in item.leixing" :key="item2">
|
|
|
+ <text>{{item2}}</text>
|
|
|
+ </view>
|
|
|
+ </view>
|
|
|
<!-- <view class="content-text-row">{{item.jiguan}}</view> -->
|
|
|
</view>
|
|
|
</view>
|
|
@@ -74,7 +79,7 @@
|
|
|
</scroll-view>
|
|
|
</view>
|
|
|
<view>
|
|
|
- <search-dialog ref="searchDialogRef" @search-btn="dialogSearchBtn"
|
|
|
+ <search-dialog ref="searchDialogRef" @search-btn="dialogSearchBtn"
|
|
|
@reset-search="dialogSearchReset"></search-dialog>
|
|
|
</view>
|
|
|
<customTabbarAdminVue :current-tab="1"></customTabbarAdminVue>
|
|
@@ -110,7 +115,7 @@
|
|
|
userName: '',
|
|
|
weidu: '',
|
|
|
jingdu: '',
|
|
|
- id:'',
|
|
|
+ id: '',
|
|
|
list: [], // 考试列表
|
|
|
loading: false,
|
|
|
state: 'more',
|
|
@@ -182,7 +187,7 @@
|
|
|
data.page = 0;
|
|
|
refreshData()
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
function juliClick() {
|
|
|
data.sortType = 3
|
|
|
const isFirst = isFirstClickjuli.value == 'true';
|
|
@@ -310,6 +315,13 @@
|
|
|
|
|
|
getJiazhengList(opt).then(res => {
|
|
|
data.list = data.list.concat(res.data.data);
|
|
|
+ data.list = data.list.map(item => {
|
|
|
+ const newItem = {
|
|
|
+ ...item
|
|
|
+ };
|
|
|
+ newItem.leixing = item.leixing.split(',');
|
|
|
+ return newItem;
|
|
|
+ })
|
|
|
data.loading = false;
|
|
|
|
|
|
if (res.data.total > data.list.length) {
|
|
@@ -343,6 +355,14 @@
|
|
|
opt.page = data.page;
|
|
|
getJiazhengList(opt).then(res => {
|
|
|
data.list = data.list.concat(res.data.data);
|
|
|
+ data.list = data.list.map(item => {
|
|
|
+ const newItem = {
|
|
|
+ ...item
|
|
|
+ };
|
|
|
+ newItem.leixing = item.leixing.split(',');
|
|
|
+ return newItem;
|
|
|
+ })
|
|
|
+ console.log('data.list', data.list);
|
|
|
data.loading = false;
|
|
|
|
|
|
if (res.data.total > data.list.length) {
|
|
@@ -375,8 +395,8 @@
|
|
|
}));
|
|
|
return newList
|
|
|
}
|
|
|
-
|
|
|
- function getCurrentWeizhi(){
|
|
|
+
|
|
|
+ function getCurrentWeizhi() {
|
|
|
console.log('1231231');
|
|
|
uni.getLocation({
|
|
|
type: 'gcj02',
|