Skip to content

C
confucius
Commit 50699a19 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 7ad7585a
Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 232 deletions
src/components/activity/active-from.vue
View file @ 50699a19
<template>
<div>
<div class="addactivetype">
<!-- <q-card-section>
<div class="text-h6">{{(saveObj&&saveObj.Id>0)?"修改活动":"新增活动"}}</div>
</q-card-section> -->
<div class="page-search row items-center flex">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-6">
<q-input filled stack-label maxlength="20" :dense="false" v-model="addMsg.ActivityName" ref="Name"
......@@ -24,7 +19,7 @@
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<div class="q-gutter-md row items-start">
<q-date v-model="addMsg.StartTime" mask="YYYY-MM-DD HH:mm:ss"></q-date>
<q-date v-model="addMsg.StartTime" mask="YYYY-MM-DD HH:mm:ss"></q-date>
<q-time v-model="addMsg.StartTime" format24h mask="YYYY-MM-DD HH:mm:ss" />
</div>
<q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
......@@ -40,7 +35,7 @@
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<div class="q-gutter-md row items-start">
<q-date v-model="addMsg.EndTimeStr" mask="YYYY-MM-DD HH:mm:ss" @input="edate"></q-date>
<q-date v-model="addMsg.EndTimeStr" mask="YYYY-MM-DD HH:mm:ss" @input="edate"></q-date>
<q-time v-model="addMsg.EndTimeStr" format24h mask="YYYY-MM-DD HH:mm:ss" @input="etime" />
</div>
<q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
......@@ -56,7 +51,7 @@
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<div class="q-gutter-md row items-start">
<q-date v-model="addMsg.SignStartTimeStr" mask="YYYY-MM-DD HH:mm:ss" @input="date" />
<q-date v-model="addMsg.SignStartTimeStr" mask="YYYY-MM-DD HH:mm:ss" @input="date" />
<q-time v-model="addMsg.SignStartTimeStr" format24h mask="YYYY-MM-DD HH:mm:ss" @input="time" />
</div>
<q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
......@@ -72,7 +67,7 @@
<q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale">
<div class="q-gutter-md row items-start">
<q-date v-model="addMsg.SignEndTimeStr" mask="YYYY-MM-DD HH:mm:ss" @input="endDate" />
<q-date v-model="addMsg.SignEndTimeStr" mask="YYYY-MM-DD HH:mm:ss" @input="endDate" />
<q-time v-model="addMsg.SignEndTimeStr" format24h mask="YYYY-MM-DD HH:mm:ss" @input="endTime" />
</div>
<q-btn v-close-popup label="关闭" color="primary" flat style="float:right" />
......@@ -92,7 +87,6 @@
<template v-slot:after>
<q-btn round color="black" icon="my_location" @click="getMapShow" />
</template>
</q-input>
<!-- 地图选址 -->
<el-dialog title="地图展示" :visible.sync="isShowMap" width="960px" style="zIndex:999999">
......@@ -117,7 +111,6 @@
<q-toggle v-model="addMsg.Distinguish" :true-value="0" :false-value="1"
@input='addMsg.ManNum=0,addMsg.WoManNum=0' />
</div>
<div class="col-6" v-if=" addMsg.Distinguish===1">
<q-input filled stack-label maxlength="20" type="number" :dense="false" v-model="addMsg.ManNum" ref="ManNum"
class="col-12 q-pb-lg" label="总人数" :rules="[val => !!val || '请填写总人数']" suffix="人">
......@@ -131,7 +124,6 @@
class="col-12 q-pb-lg" label="男性" :rules="[val => !!val || '请填写男性人数']" suffix="人">
</q-input>
</div>
<div class="col-6" v-if="addMsg.Distinguish==0">
<q-input filled stack-label maxlength="20" type="number" :dense="false" v-model="addMsg.WoManNum"
ref="WoManNum" class="col-12 q-pb-lg" label="女性" :rules="[val => !!val || '请填写女性人数']" suffix="人">
......@@ -158,8 +150,6 @@
<div>报名取消确认：</div>
<q-toggle v-model="addMsg.IsCancelConfirm" :true-value="1" :false-value="2" />
</div>
<div class="col-6">
<q-uploader :style="{ backgroundImage: 'url(' + addMsg.CoverImg + ')' }"
style="width:auto;height:300px;background-repeat:no-repeat;background-size:cover; border:1px solid #eee"
......@@ -168,7 +158,6 @@
</div>
</div>
</div>
<div class="page-search row items-center flex">
<div class="q-mt-lg q-mb-sm">活动特色</div>
<div class="col-12">
......@@ -176,17 +165,9 @@
:isShowInsertImage="false" :isShowAttachment="false" :isShowVoice="false"></Ueditor>
</div>
</div>
<!-- <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeRuleForm" />
<q-btn label="保存" color="accent q-px-md" style="font-weight:400 !important" @click="saveRule" />
</q-card-actions> -->
</div>
</div>
</template>
<script>
import {
UploadSelfFile
......@@ -203,7 +184,6 @@
type: Array,
default: null
}
},
components: {
Ueditor,
......@@ -284,9 +264,6 @@
this.addMsg.LnsideLimit = this.saveObj.LnsideLimit
this.addMsg.LonLat = this.saveObj.LonLat
this.addMsg.LocationName = this.saveObj.LocationName
// this.addMsg.ActivityName=this.saveObj.ActivityName
// this.addMsg.ActivityName=this.saveObj.ActivityName
// this.addMsg.TypeContent=this.saveObj.TypeContent
this.setVal(this.addMsg.ActivityInfo);
}
},
......@@ -329,9 +306,6 @@
this.addMsg.LnsideLimit = this.saveObj.LnsideLimit
this.addMsg.LonLat = this.saveObj.LonLat
this.addMsg.LocationName = this.saveObj.LocationName
// this.addMsg.ActivityName=this.saveObj.ActivityName
// this.addMsg.ActivityName=this.saveObj.ActivityName
// this.addMsg.TypeContent=this.saveObj.TypeContent
this.setVal(this.addMsg.ActivityInfo);
} else {
this.addMsg = {
......@@ -396,36 +370,36 @@
this.addMsg.EndAge = val.max
},
//限制活动开始时间小于结束时间
StartTimeOptions(date){
let endTime="2050/1/1"
if(this.addMsg.EndTime){
endTime=this.addMsg.EndTime
StartTimeOptions(date) {
let endTime = "2050/1/1"
if (this.addMsg.EndTime) {
endTime = this.addMsg.EndTime
}
return Date.parse(date) <= Date.parse(endTime)
},
//限制活动结束时间大于开始时间
EndTimeOptions(date){
let startTime="2000/1/1"
if(this.addMsg.StartTime){
startTime=this.addMsg.StartTime
//限制活动结束时间大于开始时间
EndTimeOptions(date) {
let startTime = "2000/1/1"
if (this.addMsg.StartTime) {
startTime = this.addMsg.StartTime
}
return Date.parse(date) >= Date.parse(startTime)
return Date.parse(date) >= Date.parse(startTime)
},
//限制活动报名开始时间小于报名结束时间
SignStartTimeOptions(date){
let endTime="2050/1/1"
if(this.addMsg.SignEndTime){
endTime=this.addMsg.SignEndTime
SignStartTimeOptions(date) {
let endTime = "2050/1/1"
if (this.addMsg.SignEndTime) {
endTime = this.addMsg.SignEndTime
}
return Date.parse(date) <= Date.parse(endTime)
return Date.parse(date) <= Date.parse(endTime)
},
//限制活动报名结束时间大于报名开始时间
SignEndTimeOptions(date){
let startTime="2000/1/1"
if(this.addMsg.SignStartTime){
startTime=this.addMsg.SignStartTime
//限制活动报名结束时间大于报名开始时间
SignEndTimeOptions(date) {
let startTime = "2000/1/1"
if (this.addMsg.SignStartTime) {
startTime = this.addMsg.SignStartTime
}
return Date.parse(date) >= Date.parse(startTime)
return Date.parse(date) >= Date.parse(startTime)
},
uploadFile(files) {
UploadSelfFile("course", files[0], res => {
......@@ -471,7 +445,6 @@
},
},
}
</script>
<style>
.input-new-tag {
......@@ -500,5 +473,4 @@
.el-dialog {
z-index: 99999;
}
</style>
</style>
\ No newline at end of file
src/components/activity/activeDetail-item.vue
View file @ 50699a19
......@@ -44,7 +44,6 @@
<el-tooltip class="item" effect="dark" content="删除当前活动" placement="top" v-if="index>0">
<i class="iconfont icon-img_delete_small q-ml-sm" @click="delCurActuve(index)"></i>
</el-tooltip>
</div>
<div class="item-name">
活动内容
......@@ -59,36 +58,34 @@
<Map @map-submit="mapEvent($event,index)" :address="item.LocationName"></Map>
</el-dialog>
<div class="active-con">
<!-- <q-input v-model="item.TripContent" filled type="textarea" placeholder="输入活动内容..." ref="TripContent"
:rules="[val => !!val || '请填写活动名称']" /> -->
<Ueditor :value="item.TripContent" :config="ueditor.config" @input="setVal($event,index)" ref="ue" no-margin
:isShowInsertImage="false" :isShowAttachment="false" :isShowVoice="false"></Ueditor>
<Ueditor :value="item.TripContent" :config="ueditor.config" @input="setVal($event,index)" ref="ue" no-margin
:isShowInsertImage="false" :isShowAttachment="false" :isShowVoice="false"></Ueditor>
</div>
<div class="item-name">
活动图片
</div>
<div class="active-con">
<div style="display:flex;flex-wrap: wrap;">
<div v-if="item.TripPicList&&item.TripPicList.length>0" v-for="(_item,_index) in item.TripPicList">
<div class="ItemImgDiv">
<q-img :src="_item" spinner-color="white" style="height: 100%;height:100%" />
<q-btn size="7px" @click="deleteItemImg(index,_index)" style="position:absolute;right:-5px;top:-5px;" round
color="red" icon="iconfont icon-guanbi1" />
<template v-if="item.TripPicList&&item.TripPicList.length>0">
<div v-for="(_item,_index) in item.TripPicList" :key="_index">
<div class="ItemImgDiv">
<q-img :src="_item" spinner-color="white" style="height: 100%;height:100%" />
<q-btn size="7px" @click="deleteItemImg(index,_index)" style="position:absolute;right:-5px;top:-5px;"
round color="red" icon="iconfont icon-guanbi1" />
</div>
</div>
</div>
</template>
<el-upload class="avatar-uploader addDutyMain" action="" :http-request="(files)=>{uploadFile(files,index)}"
:show-file-list="false">
<i class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</div>
</div>
</div>
<div class=" q-mt-lg q-mb-lg" style="margin-left:28px">
<q-btn color="accent" size="sm" class="" icon="add" label="添加当日活动" @click="addCurActuve" />
</div>
</div>
</div>
</template>
<script>
......@@ -117,8 +114,8 @@
handler(val) {
if (val) {
this.itemMsg = val
if(!this.itemMsg.ActivityPlanList){
this.itemMsg.ActivityPlanList=[]
if (!this.itemMsg.ActivityPlanList) {
this.itemMsg.ActivityPlanList = []
}
}
},
......@@ -130,9 +127,7 @@
},
deep: true
},
},
data() {
return {
isShowMap: false, //是否显示地图弹窗
......@@ -153,7 +148,7 @@
}
]
},
//富文本
//富文本
ueditor: {
value: "",
config: {
......@@ -161,15 +156,15 @@
initialFrameHeight: 100,
autoHeightEnabled: true,
enableContextMenu: false,
zIndex:900
zIndex: 900
}
},
}
},
mounted() {
if (this.itemData) {
this.itemMsg = this.itemData
}
if (this.itemData) {
this.itemMsg = this.itemData
}
},
methods: {
goBack() {
......@@ -178,7 +173,6 @@
taggleDown() {
this.isDropdown = !this.isDropdown
},
uploadFile(files, index) {
UploadSelfFile('activeImg', files.file, res => {
if (res.Code == 1) {
......@@ -219,53 +213,44 @@
ruleVerification() {
let hasErr = []
this.$refs.Title.validate();
if(this.$refs.Title.hasError){
hasErr.push(this.$refs.Title.hasError)
}
if (this.$refs.Title.hasError) {
hasErr.push(this.$refs.Title.hasError)
}
this.$refs.StartTime.map(item => {
item.validate()
if(item.hasError){
if (item.hasError) {
hasErr.push(item.hasError)
}
})
this.$refs.Duration.map(item => {
item.validate()
if(item.hasError){
if (item.hasError) {
hasErr.push(item.hasError)
}
})
this.$refs.TripTitle.map(item => {
item.validate()
if(item.hasError){
if (item.hasError) {
hasErr.push(item.hasError)
}
})
// this.$refs.TripContent.map(item => {
// item.validate()
// if(item.hasError){
// hasErr.push(item.hasError)
// }
// })
if(hasErr.length>0){
if (hasErr.length > 0) {
return false
} else{
} else {
return true
}
},
// 富文本
setVal(val,index) {
//富文本
setVal(val, index) {
this.itemMsg.ActivityPlanList[index].TripContent = val;
// this.ueditor.value = decodeURIComponent(val);
},
}
}
</script>
<style lang="scss" scoped>
.activeDetail-item {
.up {
width: 700px;
// height: 55px;
display: flex;
align-items: center;
margin-bottom: 20px;
......@@ -303,7 +288,6 @@
.down {
width: 640px;
margin-left: 61px;
// height: 100px;
border-left: 1px dashed #DCDCDC;
.down-item {
......@@ -330,10 +314,8 @@
background-color: #F2F2F2;
border-radius: 4px;
flex-grow: 2;
// padding: 10px 0;
display: flex;
.starttime {
width: 140px;
margin-right: 10px;
......@@ -392,7 +374,8 @@
margin: 0 10px 10px 0;
display: inline-block;
}
.activeDetail-item .el-dialog__body{
max-height: none !important;
}
</style>
.activeDetail-item .el-dialog__body {
max-height: none !important;
}
</style>
\ No newline at end of file
src/components/activity/activeType-from.vue
View file @ 50699a19
<template>
<q-dialog v-model="persistent" persistent content-class="bg-grey-1" transition-show="scale" transition-hide="scale" class="addactivetype">
<q-dialog v-model="persistent" persistent content-class="bg-grey-1" transition-show="scale" transition-hide="scale"
class="addactivetype">
<q-card style="width: 450px;max-width:500px;">
<q-card-section>
<div class="text-h6">{{(saveObj&&saveObj.Id>0)?"修改活动类型":"新增活动类型"}}</div>
......@@ -13,13 +14,14 @@
</div>
<div class="row wrap">
<div class="col-12">
<q-uploader :style="{ backgroundImage: 'url(' + addMsg.CoverImage + ')' }" style="width:auto;height:500px;background-repeat:no-repeat;background-size:cover; border:1px solid #eee" flat
hide-upload-btn max-files="1" label="封面图" accept=".jpg, image/*" :factory="uploadFile" auto-upload>
<q-uploader :style="{ backgroundImage: 'url(' + addMsg.CoverImage + ')' }"
style="width:auto;height:500px;background-repeat:no-repeat;background-size:cover; border:1px solid #eee"
flat hide-upload-btn max-files="1" label="封面图" accept=".jpg, image/*" :factory="uploadFile" auto-upload>
</q-uploader>
</div>
</div>
<div class="row wrap">
<div class="q-mt-lg q-mb-sm">标签</div>
<div class="q-mt-lg q-mb-sm">标签</div>
<div class="col-12 q-gutter-sm row">
<el-tag :key="index" v-for="(tag,index) in dynamicTags" closable :disable-transitions="false"
@close="handleClose(tag)">
......@@ -32,18 +34,10 @@
</div>
</div>
<div class="row wrap">
<div class="q-mt-lg q-mb-sm">简介</div>
<div class="q-mt-lg q-mb-sm">简介</div>
<div class="col-12">
<Ueditor
:value="ueditor.value"
:config="ueditor.config"
@input="setVal"
ref="ue"
no-margin
:isShowInsertImage="false"
:isShowAttachment="false"
:isShowVoice="false"
></Ueditor>
<Ueditor :value="ueditor.value" :config="ueditor.config" @input="setVal" ref="ue" no-margin
:isShowInsertImage="false" :isShowAttachment="false" :isShowVoice="false"></Ueditor>
</div>
</div>
</q-card-section>
......@@ -56,7 +50,7 @@
</template>
<script>
import {
import {
UploadSelfFile
} from "../../api/common/common";
import Ueditor from "../editor/UeEditor";
......@@ -67,15 +61,17 @@ import {
default: null
},
},
components: { Ueditor },
components: {
Ueditor
},
data() {
return {
addMsg: {
Id: 0,
TypeName: "",
CoverImage:"",
LableNameList:[],
TypeContent:"",
CoverImage: "",
LableNameList: [],
TypeContent: "",
},
persistent: true,
//标签
......@@ -84,35 +80,35 @@ import {
inputValue: '',
//富文本
ueditor: {
value: "",
config: {
initialFrameWidth: null,
initialFrameHeight: 100,
autoHeightEnabled: true,
enableContextMenu: false
}
},
value: "",
config: {
initialFrameWidth: null,
initialFrameHeight: 100,
autoHeightEnabled: true,
enableContextMenu: false
}
},
}
},
mounted() {
if (this.saveObj && this.saveObj.Id > 0) {
this.addMsg.Id=this.saveObj.Id
this.addMsg.CoverImage=this.saveObj.CoverImage
this.dynamicTags=this.saveObj.LableNameList
this.addMsg.TypeName=this.saveObj.TypeName
this.addMsg.TypeContent=this.saveObj.TypeContent
this.addMsg.Id = this.saveObj.Id
this.addMsg.CoverImage = this.saveObj.CoverImage
this.dynamicTags = this.saveObj.LableNameList
this.addMsg.TypeName = this.saveObj.TypeName
this.addMsg.TypeContent = this.saveObj.TypeContent
this.setVal(this.addMsg.TypeContent);
}else{
this.addMsg.Id=0
this.addMsg.CoverImage=""
this.dynamicTags=[]
this.addMsg.TypeName=""
this.addMsg.TypeContent=""
} else {
this.addMsg.Id = 0
this.addMsg.CoverImage = ""
this.dynamicTags = []
this.addMsg.TypeName = ""
this.addMsg.TypeContent = ""
this.setVal("");
}
},
methods: {
uploadFile(files) {
uploadFile(files) {
UploadSelfFile("course", files[0], res => {
if (res.Code == 1) {
this.addMsg.CoverImage = res.FileUrl;
......@@ -123,16 +119,16 @@ import {
saveRule() {
this.$refs.Name.validate();
if (!this.$refs.Name.hasError) {
this.addMsg.LableNameList = this.dynamicTags;
this.apipostDS("/api/Education/SetCommerceActivityType",this.addMsg,(res)=>{
if(res.data.resultCode===1){
this.Success(res.data.message);
this.closeRuleForm();
this.$emit('success');
}else{
this.Error(res.data.message);
}
})
this.addMsg.LableNameList = this.dynamicTags;
this.apipostDS("/api/Education/SetCommerceActivityType", this.addMsg, (res) => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.closeRuleForm();
this.$emit('success');
} else {
this.Error(res.data.message);
}
})
}
},
//关闭窗口
......@@ -140,8 +136,8 @@ import {
this.$emit('close');
this.persistent = false
},
// 标签
handleInputConfirm() {
// 标签
handleInputConfirm() {
let inputValue = this.inputValue;
if (inputValue) {
this.dynamicTags.push(inputValue);
......@@ -159,16 +155,15 @@ import {
handleClose(tag) {
this.dynamicTags.splice(this.dynamicTags.indexOf(tag), 1);
},
// 富文本
// 富文本
setVal(val) {
this.addMsg.TypeContent = val;
this.ueditor.value = decodeURIComponent(val);
},
this.addMsg.TypeContent = val;
this.ueditor.value = decodeURIComponent(val);
},
},
}
</script>
<style scoped>
<style scoped>
.input-new-tag {
width: 90px;
margin-left: 10px;
......@@ -176,17 +171,19 @@ import {
margin-right: 5px;
}
.el-tag {
.el-tag {
margin-right: 5px;
}
.el-form-item__content {
.el-form-item__content {
line-height: 0;
}
.el-button{
line-height: 30px;
padding-top: 0;
padding-bottom: 0;
height: 32px;
margin-top: 8px;
.el-button {
line-height: 30px;
padding-top: 0;
padding-bottom: 0;
height: 32px;
margin-top: 8px;
}
</style>
</style>
\ No newline at end of file
src/components/activity/advmanager-form.vue
View file @ 50699a19
......@@ -21,16 +21,9 @@
<div class="row wrap" v-show='addMsg.IsFee==1'>
<div class="col-12">
<q-input filled stack-label maxlength="20" :dense="false" v-model="addMsg.ChargeAmount" ref="ChargeAmount"
stack-label class="col-12 q-pb-lg" label="收费金额" :rules="[val => !!val || '请填写收费金额']" />
class="col-12 q-pb-lg" label="收费金额" :rules="[val => !!val || '请填写收费金额']" />
</div>
</div>
<!-- <div class="row wrap">
<div class="col-12">
<q-uploader :style="{ backgroundImage: 'url(' + addMsg.CoverImage + ')' }" style="width:auto;height:500px;background-repeat:no-repeat;background-size:cover; border:1px solid #eee" flat
hide-upload-btn max-files="1" label="封面图" accept=".jpg, image/*" :factory="uploadFile" auto-upload>
</q-uploader>
</div>
</div> -->
<div class="row wrap">
<div class="q-mt-sm q-mb-sm">标签</div>
<div class="col-12 q-gutter-sm row">
......@@ -44,21 +37,6 @@
<el-button v-else class="button-new-tag" size="small" @click="showInput">+ 标签</el-button>
</div>
</div>
<!-- <div class="row wrap">
<div class="q-mt-lg q-mb-sm">简介</div>
<div class="col-12">
<Ueditor
:value="ueditor.value"
:config="ueditor.config"
@input="setVal"
ref="ue"
no-margin
:isShowInsertImage="false"
:isShowAttachment="false"
:isShowVoice="false"
></Ueditor>
</div>
</div> -->
<div class="row wrap q-mt-lg">
<div class="col-12">
<q-uploader :style="{ backgroundImage: 'url(' + addMsg.PictureUrl + ')' }"
......@@ -191,8 +169,6 @@
})
return
}
// this.$refs.Name.validate();
// if (!this.$refs.Name.hasError) {
this.addMsg.LableList = this.dynamicTags;
SetAdvertising(this.addMsg).then(res => {
if (res.Code === 1) {
......@@ -203,7 +179,6 @@
this.Error(res.Message);
}
})
// }
},
//关闭窗口
closeRuleForm() {
......@@ -231,7 +206,6 @@
},
},
}
</script>
<style scoped>
.input-new-tag {
......@@ -256,5 +230,4 @@
height: 32px;
margin-top: 8px;
}
</style>
</style>
\ No newline at end of file
src/components/activity/commonMap.vue
View file @ 50699a19
......@@ -212,13 +212,12 @@
},
},
mounted() {
this.newAddress = this.address ? this.address : '';
this.mapKeyword = this.newAddress;
this.initMap();
if(this.mapKeyword!=''){
this.mapSearch();
}
this.newAddress = this.address ? this.address : '';
this.mapKeyword = this.newAddress;
this.initMap();
if (this.mapKeyword != '') {
this.mapSearch();
}
}
};
</script>
</script>
\ No newline at end of file
src/components/attachment/app-attachment.vue
View file @ 50699a19
......@@ -183,5 +183,4 @@
},
},
};
</script>
</script>
\ No newline at end of file
src/components/common/ext-editor.vue
View file @ 50699a19
......@@ -113,5 +113,4 @@
},
}
}
</script>
</script>
\ No newline at end of file
src/components/common/select-search.vue
View file @ 50699a19
......@@ -111,7 +111,6 @@
},
}
}
</script>
<style scoped>
......
src/components/course/category-form.vue
View file @ 50699a19
......@@ -9,12 +9,11 @@
<div class="row wrap">
<q-input filled stack-label maxlength="30" :dense="false" v-model="objOption.CateName" ref="CateName"
class="col-6 q-pr-lg q-pb-lg" label="系列名称" :rules="[val => !!val || '系列名称']" />
<q-select filled class="col-6 q-pr-lg q-pb-lg" v-model="objOption.CourseSubject"
:options="CourseSubjectList" option-label="SubjectName" option-value="Id" emit-value map-options label="所属科目"
clearable />
<q-select filled class="col-6 q-pr-lg q-pb-lg" v-model="objOption.CourseSubject" :options="CourseSubjectList"
option-label="SubjectName" option-value="Id" emit-value map-options label="所属科目" clearable />
</div>
<div class="row wrap">
<q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.SortNum" ref="SortNum"
<q-input filled stack-label maxlength="5" :dense="false" v-model="objOption.SortNum" ref="SortNum"
class="col-6 q-pr-lg q-pb-lg" label="排序" @keyup.native="checkInteger(objOption,'SortNum')" />
</div>
<div class="col-12 q-pr-lg q-pb-lg q-pt-lg">
......@@ -55,14 +54,14 @@
CateName: "", //系列名称
SortNum: 0, //排序
Status: 0, //状态(0-正常,1-禁用)},
CourseSubject:''
CourseSubject: ''
},
optionTitle: "",
//树形课程分类列表
TreeCategoryList: [],
saveLoading: false,
chooseCategroyArray: [],
CourseSubjectList:[]
CourseSubjectList: []
}
},
mounted() {
......@@ -154,5 +153,4 @@
}
}
}
</script>
</script>
\ No newline at end of file
src/components/course/changestatus-form.vue
View file @ 50699a19
<style>
</style>
<template>
<q-dialog v-model="persistent" content-class="bg-grey-1" persistent transition-show="scale" transition-hide="scale">
<q-card style="width: 500px;max-width:500px;">
......@@ -195,5 +192,4 @@
},
}
}
</script>
</script>
\ No newline at end of file
src/components/course/chapter-form.vue
View file @ 50699a19
......@@ -147,13 +147,10 @@
}).catch(e=>{
this.saveLoading=false
})
}
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
src/pages/test.vue
View file @ 50699a19
......@@ -21,7 +21,7 @@
</td>
<td class="tdRight">
<table class="parameterList">
<tr v-for="(item,index) in parameterList">
<tr v-for="(item,index) in parameterList" :key="index">
<td>
参数名:
</td>
......@@ -157,7 +157,7 @@
data = JSON.parse(tempStr);
}
data = {
};
var tempMsg = {
Msg: data
......
src/pages/user/login.vue
View file @ 50699a19
......@@ -160,7 +160,6 @@ export default {
};
},
created() {
console.log(process.env.NODE_ENV);
if (!this.$route.query.code) {
let autoLogin = localStorage.autoLogin
? JSON.parse(localStorage.autoLogin)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment