Skip to content

P
pica.cloud.web-education-admin
提交 837a63b8 编写于 作者: 杨广俊's avatar 杨广俊
浏览文件
操作

排序问题

上级 368de114
隐藏空白字符变更
内嵌 并排
正在显示 包含 283 行增加 和 18 行删除
src/components/business/group-title.1.vue 0 → 100644
浏览文件 @ 837a63b8
<template>
<section class="group-title">
<span class="group-title-name">{{groupTitle}} </span>
<span v-show="isShowNum"> ({{groupNum}})</span>
</section>
</template>
<script>
export default {
data() {
return {
}
},
props: {
groupTitle: {
type: String,
default: '课程'
},
isShowNum: {
type: Boolean,
default: true
},
groupNum: {
type: String,
default: "0"
}
}
}
</script>
<style lang="scss" scoped>
@import '../../style/mixin.scss';
.group-title {
margin-left: px2rem(15px);
display: flex;
flex-direction: row;
&-name {
margin-right: px2rem(6px);
}
span {
padding: px2rem(20px) 0 px2rem(15px);
font-size: px2rem(18px);
font-weight: 500;
color: #28344C;
}
}
</style>
src/components/business/history-labels.vue
浏览文件 @ 837a63b8
......@@ -3,7 +3,7 @@
<section class="history-labels-title">
<span>{{title}}</span>
<span v-show="showDelete" class="history-labels-title-all">
<span @click="deleteLabels(true)">全部删除</span><span>|</span><span @click="toggleDelete">取消</span>
<span @click="showConfirm=true">全部删除</span><span>|</span><span @click="toggleDelete">取消</span>
</span>
<img @click="toggleDelete" v-show="!showDelete" src="../../images/sousuo/recicle.png" alt="删除">
</section>
......@@ -18,10 +18,12 @@
>
</span>
</section>
<ConfirmTip v-show="showConfirm" @cancle="showConfirm=false" @confirm="confirm"/>
</article>
</template>
<script>
import ConfirmTip from '@/components/common/confirm-tip'
export default {
name: 'HistoryLabels',
props: {
......@@ -33,10 +35,14 @@ export default {
default: '历史搜索'
}
},
components: {
ConfirmTip
},
data () {
return {
allLabels: [],
showDelete: false
showDelete: false,
showConfirm: false
}
},
mounted(){
......@@ -93,6 +99,9 @@ export default {
})
},
confirm() {
this.deleteLabels(true)
},
toggleDelete() {
this.showDelete = !this.showDelete
}
......
src/components/common/confirm-tip.1.vue 0 → 100644
浏览文件 @ 837a63b8
<template>
<section class="xb-pop-wrap">
<div v-if="show" class="img-content">
<img src="https://pica-pro.oss-cn-shanghai.aliyuncs.com/xbdzz/xb_pop.png"/>
<span @click="goSearch"></span>
<img class="close" @click="close" src="https://pica-pro.oss-cn-shanghai.aliyuncs.com/xbdzz/xb_close.png"/>
</div>
<div v-if="show" @click="close" class="shadow"></div>
</section>
</template>
<script>
export default {
data() {
return {
show: true
}
},
methods: {
// 关闭xb弹框
close() {
this.show = false
},
// 去看看
goSearch() {
this.$router.push({path:'xb',query:{pop:true}})
}
}
}
</script>
<style lang="scss" scoped>
@import '../../style/mixin';
.xb-pop-wrap {
.img-content {
position: fixed;
left: px2rem(61px);
top: px2rem(192px);
z-index: 9999999999;
width: px2rem(250px);
img {
width: 100%;
}
img.close {
display: block;
width: px2rem(30px);
margin: 0 auto;
}
span {
position: absolute;
left: px2rem(46px);
bottom: px2rem(41px);
display: block;
width: px2rem(158px);
height: px2rem(46px);
}
}
.shadow {
position: fixed;
left: 0;
top: 0;
z-index: 999999999;
background: #000;
opacity: 0.5;
width: 100%;
height: 100%;
}
}
</style>
src/components/common/confirm-tip.vue 0 → 100644
浏览文件 @ 837a63b8
<template>
<section class="loader loader--style3" title="2">
<div class="loader-mask"></div>
<article class="confirm-content">
<span class="confirm-content-title">{{confirmTitle}}</span>
<div class="confirm-content-split"></div>
<div class="confirm-content-btn">
<span class="confirm-content-btn-confirm" @click="confirm">{{confirmBtnText}}</span>
<span class="confirm-content-btn-split"></span>
<span class="confirm-content-btn-concle" @click="cancle">{{concleBtnText}}</span>
</div>
</article>
</section>
</template>
<script>
export default {
data() {
return {
}
},
props: {
confirmTitle: {
type: String,
default: '确认删除所有搜索历史'
},
confirmBtnText: {
type: String,
default: '删除'
},
concleBtnText: {
type: String,
default: '再想想'
}
},
methods: {
confirm() {
this.$emit('confirm')
},
cancle() {
this.$emit('cancle')
}
}
}
</script>
<style lang="scss" scoped>
@import '../../style/mixin';
.loader {
&-mask {
position: fixed;
top: 0;
left: 0;
bottom: 0;
right: 0;
z-index: 100;
background: rgba(205,205,205, 0.6);
}
.confirm-content {
position: absolute;
top: px2rem(280px);
left: px2rem(52.5px);
z-index: 101;
width: px2rem(270px);
height: px2rem(116px);
border-radius: px2rem(6px);
text-align: center;
font-weight: 400;
background: #fff;
&-title {
display: inline-flex;
height: px2rem(70px);
line-height: px2rem(70px);
font-size: px2rem(17px);
color: rgba(102,102,102,1);
}
&-split {
border-top: 1px solid #F0F0F0;
}
&-btn {
display: flex;
padding-top: px2rem(14px);
justify-content: center;
font-size: px2rem(15px);
&-confirm {
color: #999;
}
&-split {
margin: 0 px2rem(50px);
border-left: 1px solid #F0F0F0;
}
&-concle {
color: #4A9E8F;
}
}
}
}
</style>
src/components/common/loading-new.1.vue 0 → 100644
浏览文件 @ 837a63b8
<template>
<div class="loader loader--style3" title="2">
<div class="loader-mask"></div>
<svg version="1.1" id="loader-1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
width="40px" height="40px" viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
<path fill="#000" d="M43.935,25.145c0-10.318-8.364-18.683-18.683-18.683c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615c8.072,0,14.615,6.543,14.615,14.615H43.935z">
<animateTransform attributeType="xml"
attributeName="transform"
type="rotate"
from="0 25 25"
to="360 25 25"
dur="0.6s"
repeatCount="indefinite"/>
</path>
</svg>
</div>
</template>
<style lang="scss" scoped>
@import '../../style/mixin';
.loader {
margin: 0 0 2em;
height: 100px;
width: 20%;
text-align: center;
padding: 1em;
margin: 0 auto 1em;
display: inline-block;
vertical-align: top;
&-mask {
position: fixed;
top: 0;
left: 0;
bottom: 0;
right: 0;
z-index: 100;
background: rgba(205,205,205, 0.8);
}
svg {
position: absolute;
top: px2rem(280px);
left: px2rem(166px);
z-index: 101;
}
}
svg path, svg rect{
fill: #449284;
}
</style>
src/components/common/loading-new.vue
浏览文件 @ 837a63b8
......@@ -20,14 +20,6 @@
<style lang="scss" scoped>
@import '../../style/mixin';
.loader {
margin: 0 0 2em;
height: 100px;
width: 20%;
text-align: center;
padding: 1em;
margin: 0 auto 1em;
display: inline-block;
vertical-align: top;
&-mask {
position: fixed;
top: 0;
......
src/utils/index.js
浏览文件 @ 837a63b8
......@@ -228,7 +228,7 @@ export function jumpEvaluatPage(){
// dev地址
// const baseUrl = 'http://192.168.140.14:10201/'
const baseUrl = 'http://10.177.10.149:10201/'
const baseUrl = 'http://10.177.10.110:10201/'
// const baseUrl = 'http://192.168.140.14:10201/'
// const baseUrl = 'https://dev-sc.yunqueyi.com/'
const apiUrl = 'https://dev-api.yunqueyi.com/'
......
src/views/result.vue
浏览文件 @ 837a63b8
......@@ -64,11 +64,11 @@
<NoMoreItem/>
</div>
</article>
<Loading v-show="showLoading"/>
</section>
</template>
<script>
// import SearchHeader from '../components/business/search-header';
import SplitLine from '../components/business/split-line';
import NoMoreItem from '../components/business/no-more-item';
import ShowAllItem from '../components/business/show-all-item';
......@@ -80,12 +80,14 @@ import TeacherList from '@/components/business/teacher-list';
import HealthComics from '@/components/business/health-comics';
import CourseAdjust from '../components/business/course-adjust';
import NoResultPage from '@/components/business/no-result-page'
import { Navbar, TabItem } from 'mint-ui';
import Loading from '@/components/common/loading-new'
import ConfirmTip from '@/components/common/confirm-tip'
export default {
data() {
return {
navIndex: '0',
showLoading: false,
hasResult: true,
searchText: '',
// selected: '0',
......@@ -109,10 +111,7 @@ export default {
}
},
components: {
// SearchHeader,
SplitLine,
Navbar,
TabItem,
NoMoreItem,
ShowAllItem,
GroupTitle,
......@@ -122,7 +121,8 @@ export default {
TeacherList,
HealthComics,
NoResultPage,
Loading
Loading,
ConfirmTip
},
watch: {
// selected(val) {
......@@ -135,7 +135,7 @@ export default {
console.log(this.searchText)
},
mounted(){
// this.search(this.searchText)
this.search(this.searchText)
// this.searchAll(this.searchText, '1', 'contentAppModels', 'contentAppModelsAll')
},
methods: {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或