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