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
c75a26db
Commit
c75a26db
authored
Dec 16, 2020
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
9f2b0389
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
355 additions
and
14 deletions
+355
-14
class.js
src/api/course/class.js
+25
-3
myOrder-form.vue
src/components/sale/myOrder-form.vue
+2
-2
classHourReward.vue
src/pages/course/classHourReward.vue
+319
-0
japaneseTrain.vue
src/pages/sale/japaneseTrain.vue
+4
-9
routes.js
src/router/routes.js
+5
-0
No files found.
src/api/course/class.js
View file @
c75a26db
...
...
@@ -145,3 +145,25 @@ export function queryClassLogPageList(data) {
data
});
}
/**
* 教师课时奖励 分页列表
*/
export
function
getTeachingBonusPageList
(
data
)
{
return
request
({
url
:
'/TeachingRewards/GetTeachingBonusPageList'
,
method
:
'post'
,
data
});
}
/**
* 教师奖励状态 枚举
*/
export
function
getBonusStateEnumList
(
data
)
{
return
request
({
url
:
'/TeachingRewards/GetBonusStateEnumList'
,
method
:
'post'
,
data
});
}
src/components/sale/myOrder-form.vue
View file @
c75a26db
...
...
@@ -167,7 +167,7 @@
</q-td>
</
template
>
<
template
v-slot:body-cell-CostTypeList=
"props"
>
<q-td
:props=
"props"
v-for=
"(s,si) in props.row.CostTypeList"
:
index
=
"si"
>
<q-td
:props=
"props"
v-for=
"(s,si) in props.row.CostTypeList"
:
key
=
"si"
>
<span
style=
"background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;margin-right: 4px;"
>
{{
s
}}
</span>
</q-td>
</
template
>
...
...
@@ -228,7 +228,7 @@
</q-td>
</
template
>
<
template
v-slot:body-cell-CostTypeList=
"props"
>
<q-td
:props=
"props"
v-for=
"(s,si) in props.row.CostTypeList"
:
index
=
"si"
>
<q-td
:props=
"props"
v-for=
"(s,si) in props.row.CostTypeList"
:
key
=
"si"
>
<span
style=
"background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #646464;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;margin-right: 4px;"
>
{{
s
}}
</span>
</q-td>
</
template
>
...
...
src/pages/course/classHourReward.vue
0 → 100644
View file @
c75a26db
This diff is collapsed.
Click to expand it.
src/pages/sale/japaneseTrain.vue
View file @
c75a26db
...
...
@@ -50,9 +50,9 @@
<div
class=
"di-c"
><img
src=
"../../assets/images/administration/period.png"
alt=
""
style=
"width: 14px;height: 14px;margin-right: 5px;"
>
{{item.ClassHours?item.ClassHours:'0'}}课时
</div>
</div>
<div
class=
"d2"
>
<div>
<span
class=
"d2-n"
>
带课老师
</span><img
:src=
"item.TeacherHead"
alt=
""
style=
"width: 26px;height: 26px;border-radius: 4px;margin-right: 5px;color: #2961FE"
>
{{item.TeacherName}}
</div>
<div
class=
"row"
style=
"align-items: center"
>
<span
class=
"d2-n"
>
带课老师
</span><img
:src=
"item.TeacherHead"
alt=
""
style=
"width: 26px;height: 26px;border-radius: 4px;margin-right: 5px;color: #2961FE"
>
{{item.TeacherName}}
</div>
<div><span
class=
"d2-n"
>
上课教室
</span>
{{item.RoomName}}
</div>
<div><span
class=
"d2-n"
>
上课时间
</span><span
style=
"text-decoration:underline;color:#111111;"
>
{{item.ClassStyleName}}
</span><span
class=
"iconfont icon-xiangxia"
style=
"color: #2961FE;font-size: 10px"
></span>
<div><span
class=
"d2-n"
>
上课时间
</span><span
style=
"text-decoration:underline;color:#111111;
cursor: pointer
"
>
{{item.ClassStyleName}}
</span><span
class=
"iconfont icon-xiangxia"
style=
"color: #2961FE;font-size: 10px"
></span>
<q-popup-proxy>
<q-banner>
<div
class=
"price-popup"
style=
"padding: 10px"
>
...
...
@@ -123,7 +123,7 @@
<div
style=
"margin: 0"
>
价格信息
</div>
<div><span
class=
"d2-n"
>
原价
</span><span>
{{item.OriginalPrice.toFixed(2)}}
</span></div>
<div><span
class=
"d2-n"
>
售价
</span><span
style=
"color:#f5576c;font-weight: bold"
>
{{item.SellPrice.toFixed(2)}}
</span></div>
<div
v-if=
"item.IsStepPrice==1 && item.ClassStepPriceList.length>0"
>
<div
v-if=
"item.IsStepPrice==1 && item.ClassStepPriceList.length>0"
style=
"cursor: pointer"
>
更多优惠价格
<span
class=
"iconfont icon-xiangxia"
style=
"color: #2961FE;font-size: 10px"
></span>
<q-popup-proxy>
<q-banner>
...
...
@@ -530,11 +530,6 @@
font-size
:
12px
;
color
:
#2D2D2D
;
}
.japaneseTrain
.el-calendar
{
width
:
454px
;
}
.japaneseTrain
.el-calendar-table
.el-calendar-day
{
height
:
60px
!important
;
}
</
style
>
src/router/routes.js
View file @
c75a26db
...
...
@@ -356,6 +356,11 @@ const routes = [{
component
:
()
=>
import
(
"pages/sale/studentList.vue"
)
},
{
path
:
"/course/classHourReward"
,
//教学奖励 课时奖励
component
:
()
=>
import
(
"pages/course/classHourReward.vue"
)
},
{
path
:
"/test"
,
//API测试
component
:
()
=>
...
...
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