123
This commit is contained in:
parent
de61f9db80
commit
afdf4267a2
File diff suppressed because it is too large
Load Diff
@ -99,8 +99,8 @@
|
|||||||
<view class="about-shadow tn-margin-top-xl tn-padding-top-sm tn-padding-bottom-sm tn-bg-white">
|
<view class="about-shadow tn-margin-top-xl tn-padding-top-sm tn-padding-bottom-sm tn-bg-white">
|
||||||
|
|
||||||
<!-- 方式12 start-->
|
<!-- 方式12 start-->
|
||||||
<view class="tn-flex tn-flex-row-center tn-radius tn-padding-top">
|
<view class="tn-flex tn-radius tn-padding-top" style="justify-content: space-around;">
|
||||||
<view class="tn-padding-sm tn-margin-xs tn-radius" @click="goTo('/pages/wrong/index')">
|
<!-- <view class="tn-padding-sm tn-margin-xs tn-radius" @click="goTo('/pages/wrong/index')">
|
||||||
<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
|
<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
|
||||||
<view
|
<view
|
||||||
class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-blue--light">
|
class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-blue--light">
|
||||||
@ -110,8 +110,18 @@
|
|||||||
<text class="tn-text-ellipsis">我的错题</text>
|
<text class="tn-text-ellipsis">我的错题</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
</view> -->
|
||||||
|
<view v-if="classesShow==1" class="tn-padding-sm tn-margin-xs tn-radius" @click="goTo('/pagesSubject/video/index')">
|
||||||
|
<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
|
||||||
|
<view
|
||||||
|
class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-blue--light">
|
||||||
|
<view class="tn-color-wallpaper tn-icon-video-square"></view>
|
||||||
|
</view>
|
||||||
|
<view class="tn-text-center" style="font-size: 28rpx;">
|
||||||
|
<text class="tn-text-ellipsis">课程中心</text>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="tn-padding-sm tn-margin-xs tn-radius" @click="goTo('/pages/collect/index')">
|
<view class="tn-padding-sm tn-margin-xs tn-radius" @click="goTo('/pages/collect/index')">
|
||||||
<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
|
<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
|
||||||
<view
|
<view
|
||||||
@ -147,7 +157,7 @@
|
|||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view> -->
|
</view> -->
|
||||||
<view class="tn-padding-sm tn-margin-xs tn-radius" @click="goTo('/pages/paper/grade')">
|
<!-- <view class="tn-padding-sm tn-margin-xs tn-radius" @click="goTo('/pages/paper/grade')">
|
||||||
<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
|
<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
|
||||||
<view
|
<view
|
||||||
class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-blue--light">
|
class="icon12__item--icon tn-flex tn-flex-row-center tn-flex-col-center tn-bg-blue--light">
|
||||||
@ -157,7 +167,7 @@
|
|||||||
<text class="tn-text-ellipsis">考试成绩</text>
|
<text class="tn-text-ellipsis">考试成绩</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view> -->
|
||||||
<view class="tn-padding-sm tn-margin-xs tn-radius" @click="goTo('/pagesSubject/video/user')">
|
<view class="tn-padding-sm tn-margin-xs tn-radius" @click="goTo('/pagesSubject/video/user')">
|
||||||
<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
|
<view class="tn-flex tn-flex-direction-column tn-flex-row-center tn-flex-col-center">
|
||||||
<view
|
<view
|
||||||
@ -433,6 +443,10 @@
|
|||||||
type: Array,
|
type: Array,
|
||||||
default: () => []
|
default: () => []
|
||||||
},
|
},
|
||||||
|
classesShow:{
|
||||||
|
type: String,
|
||||||
|
default: () => null
|
||||||
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
/**
|
/**
|
||||||
@ -517,7 +531,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
openPhone(){
|
openPhone() {
|
||||||
uni.makePhoneCall({
|
uni.makePhoneCall({
|
||||||
phoneNumber: '18903795988' //仅为示例
|
phoneNumber: '18903795988' //仅为示例
|
||||||
});
|
});
|
||||||
|
@ -39,6 +39,7 @@
|
|||||||
|
|
||||||
<swiper :current="swiperIndex - 1" @change="swiperChange" class="questions-cont">
|
<swiper :current="swiperIndex - 1" @change="swiperChange" class="questions-cont">
|
||||||
<swiper-item v-for="(item, index) in list" :key="index" class="swiper-item">
|
<swiper-item v-for="(item, index) in list" :key="index" class="swiper-item">
|
||||||
|
<!-- <view>{{item.id}}</view> -->
|
||||||
<view v-if="Math.abs(swiperIndex - 1 - index) <= 30">
|
<view v-if="Math.abs(swiperIndex - 1 - index) <= 30">
|
||||||
<block v-if="index == swiperIndex - 1">
|
<block v-if="index == swiperIndex - 1">
|
||||||
<!-- 材料题标题 -->
|
<!-- 材料题标题 -->
|
||||||
|
@ -149,7 +149,7 @@
|
|||||||
}, {
|
}, {
|
||||||
"path": "pages/index/news-detail",
|
"path": "pages/index/news-detail",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "关于我们",
|
"navigationBarTitleText": "详情",
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
|
@ -8,23 +8,25 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- 地图区域 -->
|
<!-- 地图区域 -->
|
||||||
<view class="mapSection margin-top-lg">
|
<view v-if="id==1">
|
||||||
<view class="mapTitle text-xl text-black text-bold margin-bottom-sm">
|
<view class="mapSection margin-top-lg">
|
||||||
<text class="cuIcon-locationfill text-blue margin-right-xs"></text>
|
<view class="mapTitle text-xl text-black text-bold margin-bottom-sm">
|
||||||
我们的位置
|
<text class="cuIcon-locationfill text-blue margin-right-xs"></text>
|
||||||
|
我们的位置
|
||||||
|
</view>
|
||||||
|
<view class="mapContainer">
|
||||||
|
<map :latitude="mapData.latitude" :longitude="mapData.longitude" :markers="mapData.markers"
|
||||||
|
:scale="mapData.scale" :show-location="true" @markertap="handleMarkerTap"
|
||||||
|
@callouttap="handleCalloutTap" class="map"></map>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="mapContainer">
|
<view style="padding-bottom: 30rpx;margin-top: 50rpx;">
|
||||||
<map :latitude="mapData.latitude" :longitude="mapData.longitude" :markers="mapData.markers"
|
<tn-button fontColor="#ffffff" type="primary" width="100%" height="88rpx" @click="openBm"
|
||||||
:scale="mapData.scale" :show-location="true" @markertap="handleMarkerTap"
|
:loading="submitting" backgroundColor="#1A73E8">
|
||||||
@callouttap="handleCalloutTap" class="map"></map>
|
预约报名
|
||||||
|
</tn-button>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view style="padding-bottom: 30rpx;margin-top: 50rpx;">
|
|
||||||
<tn-button fontColor="#ffffff" type="primary" width="100%" height="88rpx" @click="openBm"
|
|
||||||
:loading="submitting" backgroundColor="#1A73E8">
|
|
||||||
预约报名
|
|
||||||
</tn-button>
|
|
||||||
</view>
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<!-- <view class="cu-bar justify-left bg-white margin-top-sm">
|
<!-- <view class="cu-bar justify-left bg-white margin-top-sm">
|
||||||
@ -102,11 +104,13 @@ export default {
|
|||||||
display: 'ALWAYS'
|
display: 'ALWAYS'
|
||||||
}
|
}
|
||||||
}]
|
}]
|
||||||
}
|
},
|
||||||
|
id:0
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onLoad(option) {
|
onLoad(option) {
|
||||||
console.log(option)
|
console.log(option)
|
||||||
|
this.id=option.id;
|
||||||
this.getData(option.id);
|
this.getData(option.id);
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
@ -34,6 +34,34 @@ export default {
|
|||||||
ajax(){
|
ajax(){
|
||||||
this.getQuestion()
|
this.getQuestion()
|
||||||
},
|
},
|
||||||
|
|
||||||
|
// 筛选options_json中value为空的题目ID
|
||||||
|
getEmptyValueQuestionIds(dataArray) {
|
||||||
|
if (!Array.isArray(dataArray)) {
|
||||||
|
return ''
|
||||||
|
}
|
||||||
|
|
||||||
|
const emptyValueQuestions = dataArray.filter(item => {
|
||||||
|
// 检查是否有options_json数组
|
||||||
|
if (!item.options_json || !Array.isArray(item.options_json)) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// 检查options_json中是否有任何选项的value为空
|
||||||
|
return item.options_json.some(option => {
|
||||||
|
const value = option.value
|
||||||
|
// 检查value是否为空:null、undefined、空字符串或仅包含空白字符
|
||||||
|
return value.length==0 ||value === null ||
|
||||||
|
value === undefined ||
|
||||||
|
value === '' ||
|
||||||
|
(typeof value === 'string' && value.trim() === '')
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
// 提取ID并用逗号连接
|
||||||
|
const ids = emptyValueQuestions.map(item => item.id).filter(id => id !== undefined && id !== null)
|
||||||
|
return ids.join(',')
|
||||||
|
},
|
||||||
// 获取试题(包括延迟获取)
|
// 获取试题(包括延迟获取)
|
||||||
getQuestion (page = 1, callback = null) {
|
getQuestion (page = 1, callback = null) {
|
||||||
console.log('getQuestion', page, this.currentPage, this.lastPage)
|
console.log('getQuestion', page, this.currentPage, this.lastPage)
|
||||||
@ -52,6 +80,15 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.http('question/train', params).then(res => {
|
this.http('question/train', params).then(res => {
|
||||||
|
|
||||||
|
|
||||||
|
// 获取options_json中value为空的题目ID
|
||||||
|
// console.log(res.data.data);
|
||||||
|
// const emptyValueIds = this.getEmptyValueQuestionIds(res.data.data)
|
||||||
|
// if (emptyValueIds) {
|
||||||
|
// console.log('value为空的题目ID:', emptyValueIds)
|
||||||
|
// }
|
||||||
|
|
||||||
if (res.code == 1) {
|
if (res.code == 1) {
|
||||||
// 默认分页方式
|
// 默认分页方式
|
||||||
if (this.mode == 'normal') {
|
if (this.mode == 'normal') {
|
||||||
|
@ -18,6 +18,7 @@
|
|||||||
<kz-page-my-color-1
|
<kz-page-my-color-1
|
||||||
:user="user"
|
:user="user"
|
||||||
:friendApps="friendApps"
|
:friendApps="friendApps"
|
||||||
|
:classesShow="classes_show"
|
||||||
@login="login"
|
@login="login"
|
||||||
@goTo="goTo"
|
@goTo="goTo"
|
||||||
@clearStorage="clearStorage"
|
@clearStorage="clearStorage"
|
||||||
@ -56,9 +57,11 @@ export default {
|
|||||||
user: null,
|
user: null,
|
||||||
ad: {},
|
ad: {},
|
||||||
pageStyle: "",
|
pageStyle: "",
|
||||||
|
system:{},
|
||||||
showMonster: false,
|
showMonster: false,
|
||||||
isLogin: false,
|
isLogin: false,
|
||||||
friendApps: [],
|
friendApps: [],
|
||||||
|
classes_show:'',
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
onLoad() {
|
onLoad() {
|
||||||
@ -128,6 +131,7 @@ export default {
|
|||||||
|
|
||||||
getSetting() {
|
getSetting() {
|
||||||
this.http("common/index", "", "get").then((res) => {
|
this.http("common/index", "", "get").then((res) => {
|
||||||
|
console.log(res);
|
||||||
if (!res.code) {
|
if (!res.code) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: "获取数据失败,请刷新重试",
|
title: "获取数据失败,请刷新重试",
|
||||||
@ -135,7 +139,7 @@ export default {
|
|||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
this.classes_show=res.data.classes_show;
|
||||||
// 系统配置数据
|
// 系统配置数据
|
||||||
let system = res.data.system;
|
let system = res.data.system;
|
||||||
if (system) {
|
if (system) {
|
||||||
|
@ -581,18 +581,20 @@ export default {
|
|||||||
// 打开用户服务协议
|
// 打开用户服务协议
|
||||||
openUserAgreement() {
|
openUserAgreement() {
|
||||||
// 这里可以跳转到用户服务协议页面
|
// 这里可以跳转到用户服务协议页面
|
||||||
uni.showToast({
|
// uni.showToast({
|
||||||
title: '打开用户服务协议',
|
// title: '打开用户服务协议',
|
||||||
icon: 'none'
|
// icon: 'none'
|
||||||
|
// })
|
||||||
|
uni.navigateTo({
|
||||||
|
url:"/pages/index/news-detail?id=3"
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
// 打开隐私政策
|
// 打开隐私政策
|
||||||
openPrivacyPolicy() {
|
openPrivacyPolicy() {
|
||||||
// 这里可以跳转到隐私政策页面
|
// 这里可以跳转到隐私政策页面
|
||||||
uni.showToast({
|
uni.navigateTo({
|
||||||
title: '打开隐私政策',
|
url:"/pages/index/news-detail?id=4"
|
||||||
icon: 'none'
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user