|
|
@@ -1,10 +1,10 @@
|
|
|
<template>
|
|
|
- <div style="width: 90%; margin:0 auto" >
|
|
|
- <div class="zhiyuan-filter" >
|
|
|
+ <div style="width: 90%; margin:0 auto">
|
|
|
+ <div class="zhiyuan-filter">
|
|
|
<div class="header">
|
|
|
<h3 class="f-666">您的选考科目为：<em>{{ formSubject.firstSubject }}<em v-for="item in formSubject.lastSubject"
|
|
|
- >,{{ item }}</em> </em>， <span class="mr20">总分：<em class="f-primary">{{ formSubject.score }}</em></span>
|
|
|
- <span class="mr20">位次：<em class="f-primary">{{ formSubject.rank.lowestRank }}</em></span>请手动选择志愿</h3>
|
|
|
+ >,{{ item }}</em> </em>， <span class="mr20">总分：<em class="f-primary">{{ formSubject.score }}</em></span>
|
|
|
+ <span class="mr20">位次：<em class="f-primary">{{ formSubject.rank.lowestRank }}</em></span>请手动选择志愿</h3>
|
|
|
</div>
|
|
|
<div class="filters">
|
|
|
<!-- 院校筛选条件 -->
|
|
|
@@ -30,21 +30,24 @@
|
|
|
</div>
|
|
|
<div class="items fx-row">
|
|
|
<div class="no_limited">
|
|
|
- <el-checkbox @change="changeAll" v-model="isAll">全部</el-checkbox>
|
|
|
+ <el-checkbox @change="changeAll" v-model="isAll">全部</el-checkbox>
|
|
|
</div>
|
|
|
<el-checkbox-group v-model="checkedList" :max="10">
|
|
|
- <el-checkbox v-for="item in childrenMajors" :label="item.name" :key="item.name">{{item.name}}</el-checkbox>
|
|
|
+ <el-checkbox v-for="item in childrenMajors" :label="item.name" :key="item.name">{{ item.name }}
|
|
|
+ </el-checkbox>
|
|
|
</el-checkbox-group>
|
|
|
</div>
|
|
|
</el-row>
|
|
|
</div>
|
|
|
<div class="selected">
|
|
|
- <span class="f14 f-666">您已选择：</span>
|
|
|
- <div class="tags" style="width: 100%">
|
|
|
- <el-tag @close="handleClose(item)" type="success" class="mr5 mb5" closable v-for="item in checkedListName">{{item.name}}</el-tag>
|
|
|
- </div>
|
|
|
- <el-button plain size="mini" @click="confirm">确认</el-button>
|
|
|
- <el-button plain size="mini" @click="clear">清除</el-button>
|
|
|
+ <span class="f14 f-666">您已选择：</span>
|
|
|
+ <div class="tags" style="width: 100%">
|
|
|
+ <el-tag @close="handleClose(item)" type="success" class="mr5 mb5" closable v-for="item in checkedListName">
|
|
|
+ {{ item.name }}
|
|
|
+ </el-tag>
|
|
|
+ </div>
|
|
|
+ <el-button plain size="mini" @click="confirm">确认</el-button>
|
|
|
+ <el-button plain size="mini" @click="clear">清除</el-button>
|
|
|
</div>
|
|
|
<div class="radioInput">
|
|
|
<!--其他筛选 -->
|
|
|
@@ -54,7 +57,8 @@
|
|
|
</div>
|
|
|
<el-radio-group v-model="filter_form.pickType">
|
|
|
<el-radio-button label="">所有</el-radio-button>
|
|
|
- <el-radio-button v-for="item in localFilters.picks" :key="item.value" :label="item.value" style="margin-bottom:10px"
|
|
|
+ <el-radio-button v-for="item in localFilters.picks" :key="item.value" :label="item.value"
|
|
|
+ style="margin-bottom:10px"
|
|
|
>
|
|
|
{{ item.label }}
|
|
|
</el-radio-button>
|
|
|
@@ -67,7 +71,7 @@
|
|
|
<div class="zhiyuan-list">
|
|
|
<zhiyuan-list :loading="loading" :tableList="rows" @apply="apply" :cols="cols" @expand="expand"></zhiyuan-list>
|
|
|
</div>
|
|
|
- <div :class="{'active':show,'right_cart': true}" >
|
|
|
+ <div :class="{'active':show,'right_cart': true}">
|
|
|
<div class="btn-wrap" @click="show = !show">
|
|
|
当前志愿表
|
|
|
</div>
|
|
|
@@ -78,19 +82,19 @@
|
|
|
<div class="list-item" v-for="(college,collegeIndex) in this.formatZhiyuan">
|
|
|
<div class="head-college f16">
|
|
|
<el-tag type="success" size="mini" class="mr12">{{ collegeIndex + 1 }}</el-tag>
|
|
|
- {{ `${college.university.name}(${college.recruitPlan.collegeCode })` }}
|
|
|
+ {{ `${college.university.name}(${college.recruitPlan.collegeCode})` }}
|
|
|
</div>
|
|
|
<div class="majors f12">
|
|
|
<div class="major mt10" v-for="(major,majorIndex) in college.majors">
|
|
|
- <span class="mr12 ml10">{{majorIndex + 1}}</span>
|
|
|
- {{major.marjorName}}
|
|
|
- <i class="el-icon-delete delete-icon" @click="deleteMajor(major)"></i>
|
|
|
+ <span class="mr12 ml10">{{ majorIndex + 1 }}</span>
|
|
|
+ {{ major.marjorName }}
|
|
|
+ <i class="el-icon-delete delete-icon" @click="deleteMajor(major)"></i>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="btn">
|
|
|
- <el-button style="width: 100%;height: 30px" type="primary" @click="save">保存志愿表</el-button>
|
|
|
+ <el-button style="width: 100%;height: 30px" type="primary" @click="save">保存志愿表</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</transition>
|
|
|
@@ -98,10 +102,17 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
-import FilterForm from '@/views/career/components/FilterForm';
|
|
|
-import ZhiyuanList from '@/views/career/zhiyuan/components/zhiyuan-list';
|
|
|
-import { allMajor,getRecommendVoluntary,getVoluntaryMarjors,getVoluntaryHeaders,saveZhiyuan } from '@/api/webApi/professlib'
|
|
|
+import FilterForm from '@/views/career/components/FilterForm'
|
|
|
+import ZhiyuanList from '@/views/career/zhiyuan/components/zhiyuan-list'
|
|
|
+import {
|
|
|
+ allMajor,
|
|
|
+ getRecommendVoluntary,
|
|
|
+ getVoluntaryHeaders,
|
|
|
+ getVoluntaryMarjors,
|
|
|
+ saveZhiyuan
|
|
|
+} from '@/api/webApi/professlib'
|
|
|
import MxSearchGroup from '@/components/MxSearch/mx-search-group'
|
|
|
+
|
|
|
export default {
|
|
|
props: {
|
|
|
formSubject: {
|
|
|
@@ -113,43 +124,43 @@ export default {
|
|
|
default: {}
|
|
|
}
|
|
|
},
|
|
|
- components:{
|
|
|
+ components: {
|
|
|
FilterForm,
|
|
|
ZhiyuanList,
|
|
|
MxSearchGroup
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
- indeterminate:false,
|
|
|
- checkedList:[],
|
|
|
- filter_form:{
|
|
|
- location:'',
|
|
|
- natureTypeCN:'',
|
|
|
- type:'',
|
|
|
- features:'',
|
|
|
- pickType:'',
|
|
|
- name:''
|
|
|
+ indeterminate: false,
|
|
|
+ checkedList: [],
|
|
|
+ filter_form: {
|
|
|
+ location: '',
|
|
|
+ natureTypeCN: '',
|
|
|
+ type: '',
|
|
|
+ features: '',
|
|
|
+ pickType: '',
|
|
|
+ name: ''
|
|
|
},
|
|
|
- name:'',
|
|
|
- currentMajor:'',
|
|
|
- majorList:[],
|
|
|
+ name: '',
|
|
|
+ currentMajor: '',
|
|
|
+ majorList: [],
|
|
|
show: false,
|
|
|
localFilters: {
|
|
|
picks: [
|
|
|
- { label: '冲刺型', value:0 },
|
|
|
- { label: '稳妥型', value:1 },
|
|
|
- { label: '保守型', value:2 }
|
|
|
+ { label: '冲刺型', value: 0 },
|
|
|
+ { label: '稳妥型', value: 1 },
|
|
|
+ { label: '保守型', value: 2 }
|
|
|
]
|
|
|
},
|
|
|
pageForm: {
|
|
|
pageSize: 10,
|
|
|
- pageNum:1
|
|
|
+ pageNum: 1
|
|
|
},
|
|
|
total: 0,
|
|
|
rows: [],
|
|
|
cols: [],
|
|
|
- selectedList:[],
|
|
|
- loading:false
|
|
|
+ selectedList: [],
|
|
|
+ loading: false
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -160,29 +171,33 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
mounted() {
|
|
|
- let dom = document.querySelector(".el-table__body-wrapper");
|
|
|
+ let dom = document.querySelector('.el-table__body-wrapper')
|
|
|
console.log(dom)
|
|
|
- dom.addEventListener("scroll", (v) => {
|
|
|
- const scrollDistance = dom.scrollHeight - dom.scrollTop - dom.clientHeight;
|
|
|
+ dom.addEventListener('scroll', (v) => {
|
|
|
+ const scrollDistance = dom.scrollHeight - dom.scrollTop - dom.clientHeight
|
|
|
// 判断是否到底，可以加载下一页
|
|
|
if (scrollDistance <= 0.5) {
|
|
|
this.load()
|
|
|
}
|
|
|
- });
|
|
|
+ })
|
|
|
},
|
|
|
- watch:{
|
|
|
- filter_form:{
|
|
|
- deep:true,
|
|
|
- handler(){
|
|
|
+ watch: {
|
|
|
+ filter_form: {
|
|
|
+ deep: true,
|
|
|
+ handler() {
|
|
|
this.confirm()
|
|
|
}
|
|
|
},
|
|
|
- selectedList:{
|
|
|
- deep:true,
|
|
|
- handler(selectedList){
|
|
|
- const index= selectedList.findIndex(item => { return item.majors.filter(major =>{ return major.selected }).length <= 0 })
|
|
|
- if(index != -1) {
|
|
|
- this.selectedList.splice(index,1)
|
|
|
+ selectedList: {
|
|
|
+ deep: true,
|
|
|
+ handler(selectedList) {
|
|
|
+ const index = selectedList.findIndex(item => {
|
|
|
+ return item.majors.filter(major => {
|
|
|
+ return major.selected
|
|
|
+ }).length <= 0
|
|
|
+ })
|
|
|
+ if (index != -1) {
|
|
|
+ this.selectedList.splice(index, 1)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -192,7 +207,7 @@ export default {
|
|
|
majorAllChildren() {
|
|
|
let arr = []
|
|
|
this.majorList.map(item => {
|
|
|
- arr = [...arr,...item.children]
|
|
|
+ arr = [...arr, ...item.children]
|
|
|
})
|
|
|
return arr
|
|
|
},
|
|
|
@@ -202,40 +217,44 @@ export default {
|
|
|
}) || []
|
|
|
},
|
|
|
childrenMajors() {
|
|
|
- if(!this.currentMajor) return []
|
|
|
+ if (!this.currentMajor) return []
|
|
|
return this.majorList.find(item => {
|
|
|
return item.code == this.currentMajor
|
|
|
}).children || []
|
|
|
},
|
|
|
formatZhiyuan() {
|
|
|
- if(!this.selectedList.length) return []
|
|
|
+ if (!this.selectedList.length) return []
|
|
|
return this.selectedList.map(item => {
|
|
|
return {
|
|
|
university: item.university,
|
|
|
- majors:item.majors.filter(major =>{ return major.selected }),
|
|
|
+ majors: item.majors.filter(major => {
|
|
|
+ return major.selected
|
|
|
+ }),
|
|
|
recruitPlan: item.recruitPlan
|
|
|
}
|
|
|
}).filter(item => {
|
|
|
- return item.majors.length > 0
|
|
|
+ return item.majors.length > 0
|
|
|
})
|
|
|
},
|
|
|
- isAll:{
|
|
|
- get(){
|
|
|
+ isAll: {
|
|
|
+ get() {
|
|
|
// 当前children 全选
|
|
|
let count = 0
|
|
|
const childrenMajors = this.childrenMajors
|
|
|
this.checkedList.forEach(item => {
|
|
|
- if(childrenMajors.findIndex(major => {return major.name == item}) != -1){
|
|
|
+ if (childrenMajors.findIndex(major => {
|
|
|
+ return major.name == item
|
|
|
+ }) != -1) {
|
|
|
count++
|
|
|
}
|
|
|
})
|
|
|
- console.log('选中数',count)
|
|
|
+ console.log('选中数', count)
|
|
|
return count == childrenMajors.length
|
|
|
},
|
|
|
- set(){
|
|
|
+ set() {
|
|
|
|
|
|
}
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
methods: {
|
|
|
getListByName() {
|
|
|
@@ -246,90 +265,94 @@ export default {
|
|
|
this.getList()
|
|
|
//在执行完跳转页码的数据请求后
|
|
|
this.$nextTick(() => {
|
|
|
- document.querySelector(".el-table__body-wrapper").scrollTop = 0;
|
|
|
+ document.querySelector('.el-table__body-wrapper').scrollTop = 0
|
|
|
})
|
|
|
},
|
|
|
load() {
|
|
|
if (Math.ceil(this.total / this.pageForm.pageSize) > this.pageForm.pageNum) {
|
|
|
// 标识正在请求
|
|
|
// 加载下一页方法
|
|
|
- if(!this.loading){
|
|
|
+ if (!this.loading) {
|
|
|
//当前页数小于总页数就请求
|
|
|
- this.pageForm.pageNum++; //当前页数自增
|
|
|
+ this.pageForm.pageNum++ //当前页数自增
|
|
|
this.getList('push')
|
|
|
}
|
|
|
- }else {
|
|
|
- this.$message.warning("已经见底了 ～");
|
|
|
+ } else {
|
|
|
+ this.$message.warning('已经见底了 ～')
|
|
|
}
|
|
|
},
|
|
|
- save(){
|
|
|
- const wishes = this.selectedList.map(item =>{
|
|
|
+ save() {
|
|
|
+ const wishes = this.selectedList.map(item => {
|
|
|
return {
|
|
|
- universityId:item.university.id,
|
|
|
+ universityId: item.university.id,
|
|
|
collegeCode: item.recruitPlan.collegeCode,
|
|
|
- code:item.university.code,
|
|
|
- name:item.university.name,
|
|
|
- marjors:item.majors.filter(major => {return major.selected}).map(major=> {
|
|
|
+ code: item.university.code,
|
|
|
+ name: item.university.name,
|
|
|
+ pickType: item.pickType,
|
|
|
+ marjors: item.majors.filter(major => {
|
|
|
+ return major.selected
|
|
|
+ }).map(major => {
|
|
|
return {
|
|
|
id: major.id,
|
|
|
code: major.marjorBelongs,
|
|
|
name: major.marjorName,
|
|
|
+ pickType: item.pickType,
|
|
|
+ submitMajorId: major.history.id
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
- if(wishes.length < 3) {
|
|
|
+ if (wishes.length < 3) {
|
|
|
this.$message.warning('至少选择三个专业组')
|
|
|
- return
|
|
|
+ return
|
|
|
}
|
|
|
const data = {
|
|
|
batch: this.batch.batch,
|
|
|
- detail:{
|
|
|
- batch:{
|
|
|
- batch:this.batch.batch,
|
|
|
- name:this.batch.name,
|
|
|
+ detail: {
|
|
|
+ batch: {
|
|
|
+ batch: this.batch.batch,
|
|
|
+ name: this.batch.name,
|
|
|
recommand: true,
|
|
|
- scores:[],
|
|
|
- wishes:wishes,
|
|
|
+ scores: [],
|
|
|
+ wishes: wishes
|
|
|
},
|
|
|
- mode:`${this.formSubject.firstSubject},${this.formSubject.lastSubject}`,
|
|
|
- score:this.formSubject.score
|
|
|
+ mode: `${this.formSubject.firstSubject},${this.formSubject.lastSubject}`,
|
|
|
+ score: this.formSubject.score
|
|
|
},
|
|
|
id: 0,
|
|
|
name: ''
|
|
|
}
|
|
|
- saveZhiyuan(data).then(res =>{
|
|
|
- this.$router.push({ name:'VolunteerList' })
|
|
|
+ saveZhiyuan(data).then(res => {
|
|
|
+ this.$router.push({ name: 'VolunteerList' })
|
|
|
})
|
|
|
},
|
|
|
- apply(item,index) {
|
|
|
+ apply(major, recommend) {
|
|
|
// 有无院校 ？
|
|
|
- const codeFlag = this.selectedList.find(item => item.recruitPlan.collegeCode == this.rows[index].recruitPlan.collegeCode)
|
|
|
- console.log(!codeFlag)
|
|
|
- if(!codeFlag){
|
|
|
- this.selectedList.push(this.rows[index])
|
|
|
+ const codeFlag = this.selectedList.find(item => item == recommend)
|
|
|
+ if (!codeFlag) {
|
|
|
+ this.selectedList.push(recommend)
|
|
|
}
|
|
|
- item.selected = !item.selected
|
|
|
+ major.selected = !major.selected
|
|
|
},
|
|
|
- deleteMajor(major){
|
|
|
+ deleteMajor(major) {
|
|
|
major.selected = false
|
|
|
},
|
|
|
expand(item) {
|
|
|
console.log(item)
|
|
|
- if(item.isExpand) {
|
|
|
+ if (item.isExpand) {
|
|
|
// 取消
|
|
|
return
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
item.isExpand = true
|
|
|
this.getVoluntaryMarjors(item)
|
|
|
}
|
|
|
},
|
|
|
getCols() {
|
|
|
getVoluntaryHeaders({
|
|
|
- mode:`${this.formSubject.firstSubject},${this.formSubject.lastSubject}`,
|
|
|
+ mode: `${this.formSubject.firstSubject},${this.formSubject.lastSubject}`,
|
|
|
year: this.batch.year
|
|
|
}).then(res => {
|
|
|
- this.cols = res.data
|
|
|
+ this.cols = res.data
|
|
|
})
|
|
|
},
|
|
|
getList(type) {
|
|
|
@@ -340,10 +363,10 @@ export default {
|
|
|
majors: this.checkedList,
|
|
|
mode: `${this.formSubject.firstSubject},${this.formSubject.lastSubject}`,
|
|
|
// mode1: string,
|
|
|
- pickType: this.filter_form.pickType,
|
|
|
+ pickType: this.filter_form.pickType,
|
|
|
// "rank": 0,
|
|
|
score: this.formSubject.score,
|
|
|
- batchMinScore:this.batch.score2 || this.batch.score1,
|
|
|
+ batchMinScore: this.batch.score2 || this.batch.score1,
|
|
|
university: {
|
|
|
// "code": "string",
|
|
|
features: this.filter_form.features,
|
|
|
@@ -351,12 +374,12 @@ export default {
|
|
|
location: this.filter_form.location,
|
|
|
type: this.filter_form.type,
|
|
|
natureTypeCN: this.filter_form.natureTypeCN,
|
|
|
- name:this.filter_form.name,
|
|
|
+ name: this.filter_form.name
|
|
|
// "status": 0,
|
|
|
// "type": "string"
|
|
|
- },
|
|
|
+ }
|
|
|
}
|
|
|
- getRecommendVoluntary({ ...data }, { ...this.pageForm }).then(res =>{
|
|
|
+ getRecommendVoluntary({ ...data }, { ...this.pageForm }).then(res => {
|
|
|
console.log(res)
|
|
|
this.total = res.total
|
|
|
let rows = {}
|
|
|
@@ -366,19 +389,19 @@ export default {
|
|
|
return item
|
|
|
})
|
|
|
// 回显
|
|
|
- if(this.selectedList.length) {
|
|
|
+ if (this.selectedList.length) {
|
|
|
rows = rows.map(row => {
|
|
|
- const flagIndex = this.selectedList.findIndex(selected => {
|
|
|
+ const flagIndex = this.selectedList.findIndex(selected => {
|
|
|
return selected.recruitPlan.collegeCode == row.recruitPlan.collegeCode
|
|
|
})
|
|
|
- if(flagIndex == -1) {
|
|
|
+ if (flagIndex == -1) {
|
|
|
return row
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
return this.selectedList[flagIndex]
|
|
|
}
|
|
|
})
|
|
|
}
|
|
|
- if(type == 'push') {
|
|
|
+ if (type == 'push') {
|
|
|
this.rows.push(...rows)
|
|
|
return
|
|
|
}
|
|
|
@@ -394,7 +417,8 @@ export default {
|
|
|
collegeCode: item.recruitPlan.collegeCode,
|
|
|
mode: this.formSubject.firstSubject,
|
|
|
universityId: item.recruitPlan.universityId,
|
|
|
- year: item.recruitPlan.year,}
|
|
|
+ year: item.recruitPlan.year
|
|
|
+ }
|
|
|
).then(res => {
|
|
|
item.majors = res.data.map(item => {
|
|
|
item.selected = false
|
|
|
@@ -405,32 +429,32 @@ export default {
|
|
|
},
|
|
|
handleClose(item) {
|
|
|
const index = this.checkedList.findIndex(code => code == item.code)
|
|
|
- this.checkedList.splice(index,1)
|
|
|
+ this.checkedList.splice(index, 1)
|
|
|
},
|
|
|
clear() {
|
|
|
- if(!this.checkedList.length) return
|
|
|
+ if (!this.checkedList.length) return
|
|
|
this.checkedList = []
|
|
|
this.getList()
|
|
|
},
|
|
|
- changeAll(val){
|
|
|
- const checkedList = this.checkedList
|
|
|
+ changeAll(val) {
|
|
|
+ const checkedList = this.checkedList
|
|
|
|
|
|
- if(val) {
|
|
|
+ if (val) {
|
|
|
// 添加
|
|
|
this.childrenMajors.forEach(item => {
|
|
|
- if(this.checkedList.length >= 10) {
|
|
|
+ if (this.checkedList.length >= 10) {
|
|
|
this.$message.warning('最多选择10个专业')
|
|
|
throw Error('最多选择10个专业')
|
|
|
}
|
|
|
- if(this.checkedList.findIndex(code => code == item.code) == -1 ){
|
|
|
+ if (this.checkedList.findIndex(code => code == item.code) == -1) {
|
|
|
this.checkedList.push(item.code)
|
|
|
}
|
|
|
})
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
// 移除
|
|
|
this.childrenMajors.forEach(item => {
|
|
|
for (let i = 0; i < checkedList.length; i++) {
|
|
|
- if(item.code == checkedList[i]){
|
|
|
+ if (item.code == checkedList[i]) {
|
|
|
this.checkedList.remove(item.code)
|
|
|
}
|
|
|
}
|
|
|
@@ -440,17 +464,17 @@ export default {
|
|
|
console.log(val)
|
|
|
},
|
|
|
handleCheckAllChange(val) {
|
|
|
- this.isIndeterminate = false;
|
|
|
+ this.isIndeterminate = false
|
|
|
},
|
|
|
- getAllMajor(){
|
|
|
+ getAllMajor() {
|
|
|
allMajor({
|
|
|
- level:2,
|
|
|
- batch:this.batch.batch
|
|
|
+ level: 2,
|
|
|
+ batch: this.batch.batch
|
|
|
}).then(res => {
|
|
|
this.majorList = res.data
|
|
|
console.log(res)
|
|
|
})
|
|
|
- },
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
@@ -459,26 +483,30 @@ export default {
|
|
|
.more span {
|
|
|
margin-right: 10px;
|
|
|
}
|
|
|
-.selected{
|
|
|
+
|
|
|
+.selected {
|
|
|
display: flex;
|
|
|
align-items: center;
|
|
|
justify-content: space-between;
|
|
|
padding: 10px;
|
|
|
margin-bottom: 20px;
|
|
|
background: #42b98340;
|
|
|
- span{
|
|
|
+
|
|
|
+ span {
|
|
|
flex-shrink: 0;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.filters {
|
|
|
padding: 10px 0px;
|
|
|
border: 1px solid #eee;
|
|
|
}
|
|
|
|
|
|
-.delete-icon{
|
|
|
+.delete-icon {
|
|
|
float: right;
|
|
|
cursor: pointer;
|
|
|
}
|
|
|
+
|
|
|
.filter_name {
|
|
|
box-sizing: border-box;
|
|
|
width: 70px;
|
|
|
@@ -530,7 +558,10 @@ em {
|
|
|
}
|
|
|
|
|
|
.radioInput ::v-deep {
|
|
|
- background-color: #ffffff;font-size: 14px;padding:5px;
|
|
|
+ background-color: #ffffff;
|
|
|
+ font-size: 14px;
|
|
|
+ padding: 5px;
|
|
|
+
|
|
|
.el-radio {
|
|
|
.el-radio__input {
|
|
|
display: none;
|
|
|
@@ -562,21 +593,25 @@ em {
|
|
|
margin-right: 10px;
|
|
|
}
|
|
|
}
|
|
|
-.right_cart{
|
|
|
+
|
|
|
+.right_cart {
|
|
|
position: fixed;
|
|
|
top: 50%;
|
|
|
right: -320px;
|
|
|
- transform: translate(0%,-50%);
|
|
|
+ transform: translate(0%, -50%);
|
|
|
transition: all 1s ease;
|
|
|
}
|
|
|
-.active{
|
|
|
+
|
|
|
+.active {
|
|
|
right: 0;
|
|
|
}
|
|
|
-.right_cart{
|
|
|
+
|
|
|
+.right_cart {
|
|
|
display: flex;
|
|
|
z-index: 9999;
|
|
|
}
|
|
|
-.right_cart .btn-wrap{
|
|
|
+
|
|
|
+.right_cart .btn-wrap {
|
|
|
cursor: pointer;
|
|
|
align-self: baseline;
|
|
|
border-radius: 5px 0 0 5px;
|
|
|
@@ -587,7 +622,8 @@ em {
|
|
|
font-size: 16px;
|
|
|
padding: 7px;
|
|
|
}
|
|
|
-.content-wrap{
|
|
|
+
|
|
|
+.content-wrap {
|
|
|
padding: 10px 0;
|
|
|
background: #fff;
|
|
|
width: 320px;
|
|
|
@@ -597,28 +633,30 @@ em {
|
|
|
|
|
|
border: 1px solid #f2f2f2;
|
|
|
}
|
|
|
-.content{
|
|
|
+
|
|
|
+.content {
|
|
|
height: 100%;
|
|
|
overflow-y: auto;
|
|
|
padding: 0 20px
|
|
|
}
|
|
|
|
|
|
|
|
|
-.content-wrap .input{
|
|
|
+.content-wrap .input {
|
|
|
padding: 0 15px;
|
|
|
}
|
|
|
|
|
|
-.content-wrap .btn{
|
|
|
- width: 100% ;
|
|
|
+.content-wrap .btn {
|
|
|
+ width: 100%;
|
|
|
padding: 0 15px;
|
|
|
}
|
|
|
-.list-item{
|
|
|
+
|
|
|
+.list-item {
|
|
|
margin-bottom: 10px;
|
|
|
border-bottom: 1px solid #e6e6e6;
|
|
|
padding-bottom: 20px;
|
|
|
}
|
|
|
|
|
|
-.mask{
|
|
|
+.mask {
|
|
|
z-index: 2009;
|
|
|
position: absolute;
|
|
|
top: 0;
|
