Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
project-online-fi
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
EzijingWeb
project-online-fi
Commits
622a5e43
提交
622a5e43
authored
1月 09, 2023
作者:
王鹏飞
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: 学习系统地址修改; paa -> prp;
上级
09b12cdd
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
15 行增加
和
31 行删除
+15
-31
base.ts
src/api/base.ts
+1
-1
Header.vue
src/components/layout/Header.vue
+1
-1
usePay.ts
src/modules/pay/composables/usePay.ts
+1
-1
Order.vue
src/modules/pay/views/Order.vue
+9
-25
CourseFooter.vue
src/modules/shop/components/CourseFooter.vue
+1
-1
CourseListItem.vue
src/modules/shop/components/CourseListItem.vue
+1
-1
DetailBanner.vue
src/modules/shop/components/DetailBanner.vue
+1
-1
没有找到文件。
src/api/base.ts
浏览文件 @
622a5e43
...
@@ -31,7 +31,7 @@ export function uploadFile(data: object) {
...
@@ -31,7 +31,7 @@ export function uploadFile(data: object) {
// 获取已经购买的课程
// 获取已经购买的课程
export
function
getBuyShop
()
{
export
function
getBuyShop
()
{
return
httpRequest
.
get
(
'https://learn-api.ezijing.com/api/lms-ep/v2/education/courses/my'
,
{
return
httpRequest
.
get
(
'https://learn-api.ezijing.com/api/lms-ep/v2/education/courses/my'
,
{
headers
:
{
tenant
:
'p
aa
'
}
headers
:
{
tenant
:
'p
rp
'
}
})
})
}
}
/**
/**
...
...
src/components/layout/Header.vue
浏览文件 @
622a5e43
...
@@ -36,7 +36,7 @@ const isScrolled = computed(() => {
...
@@ -36,7 +36,7 @@ const isScrolled = computed(() => {
})
})
const
handleStudy
=
()
=>
{
const
handleStudy
=
()
=>
{
// if (courseStore.courses.length > 0) {
// if (courseStore.courses.length > 0) {
window
.
open
(
'https://
paa
-learning.ezijing.com'
)
window
.
open
(
'https://
fi
-learning.ezijing.com'
)
// } else {
// } else {
// ElMessage.warning('请先购买课程,才能开始学习')
// ElMessage.warning('请先购买课程,才能开始学习')
// }
// }
...
...
src/modules/pay/composables/usePay.ts
浏览文件 @
622a5e43
...
@@ -31,7 +31,7 @@ export function usePay() {
...
@@ -31,7 +31,7 @@ export function usePay() {
sku_id: shopStore.shopItem?.sku_id,
sku_id: shopStore.shopItem?.sku_id,
buy_count: '1',
buy_count: '1',
redirect_url: redirectURL.value,
redirect_url: redirectURL.value,
notify_url: `
https
:
//ep-lms-api.ezijing.com/v2/student/push?tenant=p
aa
&sso_id=${userStore.user?.id}&class_id=${shopStore.shopItem?.class_id}&course_flag=1&course_id=${shopStore.shopItem?.course_id}`
notify_url: `
https
:
//ep-lms-api.ezijing.com/v2/student/push?tenant=p
rp
&sso_id=${userStore.user?.id}&class_id=${shopStore.shopItem?.class_id}&course_flag=1&course_id=${shopStore.shopItem?.course_id}`
}
)
}
)
const params = Object.assign(defaultParams, options)
const params = Object.assign(defaultParams, options)
...
...
src/modules/pay/views/Order.vue
浏览文件 @
622a5e43
...
@@ -21,7 +21,7 @@ const orderId = useStorage('order_detail_id', route.query.order_detail_id)
...
@@ -21,7 +21,7 @@ const orderId = useStorage('order_detail_id', route.query.order_detail_id)
const
order
=
ref
<
Order
>
()
const
order
=
ref
<
Order
>
()
async
function
getOrder
()
{
async
function
getOrder
()
{
getOrderList
({
order_detail_id
:
orderId
.
value
})
getOrderList
({
order_detail_id
:
orderId
.
value
})
.
then
(
(
res
)
=>
{
.
then
(
res
=>
{
order
.
value
=
res
.
data
[
0
]
order
.
value
=
res
.
data
[
0
]
if
(
order
.
value
?.
order_status
===
'4'
)
{
if
(
order
.
value
?.
order_status
===
'4'
)
{
// 支付成功
// 支付成功
...
@@ -44,7 +44,7 @@ const start_time = getDateTime(0)
...
@@ -44,7 +44,7 @@ const start_time = getDateTime(0)
const
end_time
=
getDateTime
(
90
)
const
end_time
=
getDateTime
(
90
)
const
handleStudy
=
()
=>
{
const
handleStudy
=
()
=>
{
window
.
open
(
'https://
paa
-learning.ezijing.com'
)
window
.
open
(
'https://
fi
-learning.ezijing.com'
)
}
}
const
handlePrev
=
()
=>
{
const
handlePrev
=
()
=>
{
router
.
replace
({
path
:
`/shop/detail/
${
shopItem
?.
id
}
` })
router
.
replace
({
path
:
`/shop/detail/
${
shopItem
?.
id
}
` })
...
@@ -56,9 +56,7 @@ const handlePrev = () => {
...
@@ -56,9 +56,7 @@ const handlePrev = () => {
<div
class=
"main_pay"
v-if=
"!mobile"
>
<div
class=
"main_pay"
v-if=
"!mobile"
>
<div
class=
"pay_con"
>
<div
class=
"pay_con"
>
<div
class=
"con_top"
>
<div
class=
"con_top"
>
<img
<img
src=
"https://webapp-pub.ezijing.com/project_online/fi/icon_sucess.png"
/>
src=
"https://webapp-pub.ezijing.com/project_online/fi/icon_sucess.png"
/>
<div
class=
"top_tit"
>
支付成功!
</div>
<div
class=
"top_tit"
>
支付成功!
</div>
</div>
</div>
<div
class=
"con_info"
>
<div
class=
"con_info"
>
...
@@ -70,9 +68,7 @@ const handlePrev = () => {
...
@@ -70,9 +68,7 @@ const handlePrev = () => {
<div
class=
"price_tit"
>
支付金额:
</div>
<div
class=
"price_tit"
>
支付金额:
</div>
<div
class=
"price_id"
>
¥
{{
order
.
payment_money
}}
</div>
<div
class=
"price_id"
>
¥
{{
order
.
payment_money
}}
</div>
</div>
</div>
<div
class=
"info_tips"
>
<div
class=
"info_tips"
>
若有疑问请与客服联系,我们将尽快为您提供服务
</div>
若有疑问请与客服联系,我们将尽快为您提供服务
</div>
<div
class=
"info_btn"
>
<div
class=
"info_btn"
>
<div
class=
"btn_prev"
@
click=
"handlePrev"
>
返回
</div>
<div
class=
"btn_prev"
@
click=
"handlePrev"
>
返回
</div>
<div
class=
"btn_study"
@
click=
"handleStudy"
>
开始学习
</div>
<div
class=
"btn_study"
@
click=
"handleStudy"
>
开始学习
</div>
...
@@ -82,29 +78,19 @@ const handlePrev = () => {
...
@@ -82,29 +78,19 @@ const handlePrev = () => {
</div>
</div>
<div
class=
"main_pay_mobile"
v-else
>
<div
class=
"main_pay_mobile"
v-else
>
<div
class=
"con_nav"
>
<div
class=
"con_nav"
>
<img
<img
class=
"img1"
src=
"https://webapp-pub.ezijing.com/project_online/fi/prev_mini.png"
@
click=
"handlePrev"
/>
class=
"img1"
src=
"https://webapp-pub.ezijing.com/project_online/fi/prev_mini.png"
@
click=
"handlePrev"
/>
<div
class=
"nav_title"
>
<div
class=
"nav_title"
>
<img
<img
class=
"img2"
src=
"https://webapp-pub.ezijing.com/project_online/fi/icon_sucess.png"
/>
class=
"img2"
src=
"https://webapp-pub.ezijing.com/project_online/fi/icon_sucess.png"
/>
支付成功
支付成功
</div>
</div>
</div>
</div>
<div
class=
"course_con"
>
<div
class=
"course_con"
>
<img
<img
src=
"https://img1.baidu.com/it/u=3009731526,373851691&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=500"
src=
"https://img1.baidu.com/it/u=3009731526,373851691&fm=253&fmt=auto&app=138&f=JPEG?w=800&h=500"
@
click=
"handlePrev"
@
click=
"handlePrev"
/>
/>
<div
class=
"course_dec"
>
<div
class=
"course_dec"
>
<div
class=
"info_title"
>
{{
shopItem
?.
title
}}
</div>
<div
class=
"info_title"
>
{{
shopItem
?.
title
}}
</div>
<div
class=
"info_date"
>
<div
class=
"info_date"
>
有效期:
{{
start_time
}}
至
{{
end_time
}}
</div>
有效期:
{{
start_time
}}
至
{{
end_time
}}
</div>
</div>
</div>
</div>
</div>
<div
class=
"order_main"
>
<div
class=
"order_main"
>
...
@@ -114,9 +100,7 @@ const handlePrev = () => {
...
@@ -114,9 +100,7 @@ const handlePrev = () => {
<div
class=
"order_price"
>
<div
class=
"order_price"
>
支付金额:
<span>
{{
order
.
payment_money
}}
</span>
支付金额:
<span>
{{
order
.
payment_money
}}
</span>
</div>
</div>
<div
class=
"order_after_sales"
>
<div
class=
"order_after_sales"
>
若有疑问请与客服联系,我们将尽快为您提供服务
</div>
若有疑问请与客服联系,我们将尽快为您提供服务
</div>
</div>
</div>
<div
class=
"start_study"
>
<div
class=
"start_study"
>
<div
class=
"study_con"
@
click=
"handleStudy"
>
开始学习
</div>
<div
class=
"study_con"
@
click=
"handleStudy"
>
开始学习
</div>
...
...
src/modules/shop/components/CourseFooter.vue
浏览文件 @
622a5e43
...
@@ -19,7 +19,7 @@ const handleBuyCourse = () => {
...
@@ -19,7 +19,7 @@ const handleBuyCourse = () => {
console
.
log
(
props
.
payStatus
,
props
.
shopItem
?.
isBuy
)
console
.
log
(
props
.
payStatus
,
props
.
shopItem
?.
isBuy
)
if
(
user
.
isLogin
)
{
if
(
user
.
isLogin
)
{
if
(
props
.
payStatus
===
'4'
||
props
.
shopItem
?.
isBuy
===
true
)
{
if
(
props
.
payStatus
===
'4'
||
props
.
shopItem
?.
isBuy
===
true
)
{
// window.open('https://
paa
-learning.ezijing.com')
// window.open('https://
fi
-learning.ezijing.com')
buyDialogVisible
.
value
=
true
buyDialogVisible
.
value
=
true
}
else
{
}
else
{
// if (props.shopItem?.type === '课程包') {
// if (props.shopItem?.type === '课程包') {
...
...
src/modules/shop/components/CourseListItem.vue
浏览文件 @
622a5e43
...
@@ -23,7 +23,7 @@ const handleBuy = (courseItem: any) => {
...
@@ -23,7 +23,7 @@ const handleBuy = (courseItem: any) => {
if
(
user
.
isLogin
)
{
if
(
user
.
isLogin
)
{
if
(
courseItem
?.
isBuy
===
true
)
{
if
(
courseItem
?.
isBuy
===
true
)
{
buyDialogVisible
.
value
=
true
buyDialogVisible
.
value
=
true
// window.open('https://
paa
-learning.ezijing.com')
// window.open('https://
fi
-learning.ezijing.com')
}
else
{
}
else
{
// if (courseItem.type === '课程包') {
// if (courseItem.type === '课程包') {
// buyDialogVisible.value = true
// buyDialogVisible.value = true
...
...
src/modules/shop/components/DetailBanner.vue
浏览文件 @
622a5e43
...
@@ -33,7 +33,7 @@ const shareTit = computed(() => {
...
@@ -33,7 +33,7 @@ const shareTit = computed(() => {
const
handleBuyCourse
=
()
=>
{
const
handleBuyCourse
=
()
=>
{
if
(
user
.
isLogin
)
{
if
(
user
.
isLogin
)
{
if
(
props
.
payStatus
===
'4'
||
props
.
shopItem
?.
isBuy
===
true
)
{
if
(
props
.
payStatus
===
'4'
||
props
.
shopItem
?.
isBuy
===
true
)
{
// window.open('https://
paa
-learning.ezijing.com')
// window.open('https://
fi
-learning.ezijing.com')
buyDialogVisible
.
value
=
true
buyDialogVisible
.
value
=
true
}
else
{
}
else
{
// if (props.shopItem?.type === '课程包') {
// if (props.shopItem?.type === '课程包') {
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论