Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mallapp
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
viitto
mallapp
Commits
ec0df54e
Commit
ec0df54e
authored
Oct 21, 2020
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
b53b63d3
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
379 additions
and
19 deletions
+379
-19
Rstudy.vue
components/study/Rstudy.vue
+1
-1
style6.vue
components/studyArticle/style6.vue
+1
-1
pages.json
pages.json
+2
-0
index.vue
pages/index/index.vue
+9
-0
articleDetails.vue
pages/school/articleDetails.vue
+5
-5
course-submit.vue
pages/school/course-submit.vue
+1
-1
orderDetail.vue
pages/school/personal/orderDetail.vue
+6
-6
orderList.vue
pages/school/personal/orderList.vue
+5
-5
payment-order.vue
pages/school/personal/payment-order.vue
+349
-0
No files found.
components/study/Rstudy.vue
View file @
ec0df54e
...
...
@@ -53,7 +53,7 @@
this
.
isshow
=
true
;
this
.
Name
=
this
.
laststudy
.
name
;
this
.
Cover
=
this
.
laststudy
.
cover_pic
;
this
.
progress
=
parseInt
(
this
.
laststudy
.
learned
/
this
.
laststudy
.
count
)
*
100
;
this
.
progress
=
parseInt
(
(
this
.
laststudy
.
learned
/
this
.
laststudy
.
count
)
*
100
)
;
}
},
methods
:{
...
...
components/studyArticle/style6.vue
View file @
ec0df54e
...
...
@@ -47,7 +47,7 @@
},
mounted
(){
console
.
log
(
this
.
goodsInfo
,
'gdinfo'
);
},
methods
:
{
openGood
(
item
)
{
...
...
pages.json
View file @
ec0df54e
...
...
@@ -405,6 +405,8 @@
"path"
:
"personal/order-commit"
//课程待评价
},{
"path"
:
"personal/order-commit-details"
//发表评论
},{
"path"
:
"personal/payment-order"
//课程代付
}]
},
...
...
pages/index/index.vue
View file @
ec0df54e
...
...
@@ -325,6 +325,9 @@ export default {
}
else
if
(
that
.
JumpType
==
5
)
{
//课程详情
uni
.
navigateTo
({
url
:
"/pages/school/courseInfo?GoodsId="
+
that
.
GoodsId
});
}
else
if
(
that
.
JumpType
==
6
)
{
//课程代付页面
uni
.
navigateTo
({
url
:
"/pages/school/personal/payment-order?OrderId="
+
that
.
OrderId
});
}
},
500
);
}
else
{
...
...
@@ -534,6 +537,9 @@ export default {
}
else
if
(
that
.
JumpType
==
5
)
{
//课程详情
uni
.
navigateTo
({
url
:
"/pages/school/courseInfo?GoodsId="
+
that
.
GoodsId
});
}
else
if
(
that
.
JumpType
==
6
)
{
//课程代付页面
uni
.
navigateTo
({
url
:
"/pages/school/personal/payment-order?OrderId="
+
that
.
OrderId
});
}
},
500
);
...
...
@@ -875,6 +881,9 @@ export default {
}
else
if
(
this
.
JumpType
==
5
)
{
//课程详情
uni
.
navigateTo
({
url
:
"/pages/school/courseInfo?GoodsId="
+
this
.
GoodsId
});
}
else
if
(
this
.
JumpType
==
6
)
{
//课程代付页面
uni
.
navigateTo
({
url
:
"/pages/school/personal/payment-order?OrderId="
+
this
.
OrderId
});
}
},
500
);
...
...
pages/school/articleDetails.vue
View file @
ec0df54e
<
template
>
<view
class=
"articleDetails"
>
<view
class=
"ad-box"
>
<view
style=
"font-size: 21px;color: #1C1E1F;"
>
{{
article
.
Name
}}
</view>
<view
style=
"font-size: 21px;color: #1C1E1F;
font-weight: bold;
"
>
{{
article
.
Name
}}
</view>
<view
class=
"ad-box-tx"
>
<u-avatar
:src=
"article.TeacherLogo"
size=
"60"
v-if=
"article.TeacherLogo!=null && article.TeacherLogo!=''"
></u-avatar>
<u-avatar
:src=
"mall.setting.share_pic"
size=
"60"
v-if=
"article.TeacherLogo==null || article.TeacherLogo==''"
></u-avatar>
<view
class=
"ad-box-txr"
>
<text
v-if=
"article.TeacherName!=null && article.TeacherName!=''"
>
{{
article
.
TeacherName
}}
</text>
<text
v-if=
"article.TeacherName==null || article.TeacherName==''"
>
{{
mall
.
setting
.
share_title
}}
</text>
<text
style=
"font-weight: bold;"
v-if=
"article.TeacherName!=null && article.TeacherName!=''"
>
{{
article
.
TeacherName
}}
</text>
<text
style=
"font-weight: bold;"
v-if=
"article.TeacherName==null || article.TeacherName==''"
>
{{
mall
.
setting
.
share_title
}}
</text>
<text
style=
"font-size: 11px;color: #9A9A9A;"
>
{{
article
.
CreateDate
}}
</text>
</view>
</view>
...
...
@@ -20,7 +20,7 @@
<view
class=
"tiaoti"
>
<view
style=
"display: flex;flex-direction: row;align-items: center;"
>
<view
class=
"tiaoti-l"
></view>
<text
style=
"font-size: 12px;color: #1C1E1F;margin-left: 5px;"
>
{{
count
}}
条留言
</text>
<text
style=
"font-size: 12px;color: #1C1E1F;margin-left: 5px;
font-weight: bold;
"
>
{{
count
}}
条留言
</text>
</view>
<view
style=
"display: flex;flex-direction: row;align-items: center;"
v-if=
"count>5"
@
click=
"gocomList"
>
...
...
@@ -216,7 +216,7 @@ export default {
.articleDetails
.ad-box-txr
{
margin-left
:
10px
;
width
:
calc
(
100vw
-
70px
);
height
:
2
5px
;
height
:
3
5px
;
font-size
:
13px
;
color
:
#121212
;
display
:
flex
;
...
...
pages/school/course-submit.vue
View file @
ec0df54e
...
...
@@ -357,7 +357,7 @@
SmallShopId
=
u
.
UserSmallShopId
?
u
.
UserSmallShopId
:
0
;
}
//TODO 需要看跳转哪里
that
.
path
=
'/pages/index/index?OrderId='
+
res
.
data
.
OrderId
+
"&user_id="
+
uid
+
"&Up="
+
Up
+
"&SmallShopId="
+
SmallShopId
+
'&JumpType=
5
'
;
that
.
path
=
'/pages/index/index?OrderId='
+
res
.
data
.
OrderId
+
"&user_id="
+
uid
+
"&Up="
+
Up
+
"&SmallShopId="
+
SmallShopId
+
'&JumpType=
6
'
;
}
else
{
if
(
that
.
ds
.
total_price
>
0
){
that
.
payBtn
=
true
;
...
...
pages/school/personal/orderDetail.vue
View file @
ec0df54e
...
...
@@ -176,18 +176,18 @@
<view
class=
"eduorderDetail"
>
<template>
<view
class=
"orderItem"
>
<view
class=
"orderCar"
>
<view
class=
"orderCar"
v-for=
"(item,index) in dataList.DetailList"
:key=
"index"
>
<view
class=
"order_carImg"
>
<image
mode=
"aspectFit"
:src=
"
dataList.DetailList[0]
.CoverImagePath"
style=
"width: 100%; height: 100%;border-radius: 4px;"
>
<image
mode=
"aspectFit"
:src=
"
item
.CoverImagePath"
style=
"width: 100%; height: 100%;border-radius: 4px;"
>
</image>
</view>
<view
class=
"collect_right"
:style=
"
{'width': (windowWidth -166)+'px'}">
<view
class=
"collect_Name"
>
{{
dataList
.
DetailList
[
0
]
.
GoodsName
}}
</view>
<view
class=
"collect_Name"
>
{{
item
.
GoodsName
}}
</view>
<view
class=
"collect_price"
>
<template
v-if=
"
dataList.Incom
e>0"
>
<text
style=
"font-size:13px;"
>
¥
</text>
{{
dataList
.
Incom
e
}}
<template
v-if=
"
item.Final_Pric
e>0"
>
<text
style=
"font-size:13px;"
>
¥
</text>
{{
item
.
Final_Pric
e
}}
</
template
>
<
template
v-if=
"
dataList.Incom
e==0"
>
<
template
v-if=
"
item.Final_Pric
e==0"
>
<text
style=
"font-size:13px;color: #999999;"
>
免费
</text>
</
template
>
</view>
...
...
pages/school/personal/orderList.vue
View file @
ec0df54e
...
...
@@ -107,19 +107,19 @@
<view
class=
"order_Status"
v-if=
"item.OrderStatus==5"
style=
"color:#121212"
>
{{
item
.
OrderStatusName
}}
</view>
<view
class=
"order_Status"
v-if=
"item.OrderStatus==7"
style=
"color:#9A9A9A"
>
{{
item
.
OrderStatusName
}}
</view>
</view>
<view
class=
"order_Car"
>
<view
class=
"order_Car"
v-for=
"(x,j) in item.DetailList"
:key=
"x"
>
<view
class=
"order_carImg"
>
<image
mode=
"aspectFit"
style=
"width: 100%; height: 100%;border-radius: 4px;"
:src=
"
item.DetailList[0]
.CoverImagePath"
/>
<image
mode=
"aspectFit"
style=
"width: 100%; height: 100%;border-radius: 4px;"
:src=
"
x
.CoverImagePath"
/>
</image>
</view>
<view
class=
"order_middle"
>
<view
class=
"order_eduName"
>
{{
item
.
DetailList
[
0
]
.
GoodsName
}}
</view>
<view
class=
"order_eduName"
>
{{
x
.
GoodsName
}}
</view>
<view
style=
"margin-bottom:5px;"
>
{{
item
.
DetailList
[
0
]
.
TripSTime
}}
{{
x
.
TripSTime
}}
</view>
<view
style=
"text-align: right;margin-top:15px;"
>
<text
style=
"color:#9A9A9A;font-size:12px;"
>
实付:
</text>
<text
style=
"font-size:15px;color:#121212"
>
¥
{{
item
.
DetailList
[
0
]
.
Unit_Price
}}
</text>
<text
style=
"font-size:15px;color:#121212"
>
¥
{{
x
.
Unit_Price
}}
</text>
</view>
</view>
</view>
...
...
pages/school/personal/payment-order.vue
0 → 100644
View file @
ec0df54e
<
style
>
.eduorderDetail
{
background
:
#f0f4f7
;
font-family
:
'oswald'
;
padding
:
0
5px
;
padding-bottom
:
60px
;
height
:
100vh
;
}
.eduorderDetail
.orderItem
{
background-color
:
#fff
;
margin-bottom
:
10px
;
padding
:
0
15px
;
border-radius
:
10px
;
}
.eduorderDetail
.order_big
{
font-size
:
14px
;
color
:
#08090E
;
font-weight
:
bold
;
}
.eduorderDetail
.order_mini
{
font-size
:
11px
;
color
:
#919191
;
margin-top
:
10px
;
}
.eduorderDetail
.orderCar
{
background
:
#fff
;
padding
:
10px
0
;
display
:
-webkit-box
;
display
:
-webkit-flex
;
display
:
flex
;
-webkit-box-orient
:
horizontal
;
-webkit-box-direction
:
normal
;
-webkit-flex-direction
:
row
;
flex-direction
:
row
;
font-family
:
aa
;
}
.eduorderDetail
.order_carImg
{
width
:
125px
;
height
:
70px
;
border-radius
:
4px
;
box-shadow
:
0
4px
10px
1px
#D2D2D2
;
}
.eduorderDetail
.order_small
{
font-size
:
14px
;
color
:
#1C1E1F
;
}
.eduorderDetail
.order_GName
{
width
:
100%
;
height
:
50px
;
border-top
:
1px
solid
rgba
(
0
,
0
,
0
,
0.03
);
display
:
flex
;
align-items
:
center
;
justify-content
:
space-between
;
}
.eduorderDetail
.order_dList
{
border-bottom
:
1px
solid
rgba
(
0
,
0
,
0
,
0.03
);
padding
:
20px
0
;
}
.order_dList
:last-child
{
border-bottom
:
0
;
}
.eduorderDetail
.order_comLeft
{
margin-left
:
70px
;
}
.eduorderDetail
.order_Tprice
{
display
:
flex
;
justify-content
:
space-between
;
}
.order_redPrice
{
color
:
#F20707
;
font-size
:
14px
;
}
.order_Apply
,
.order_Sure
{
width
:
50%
;
text-align
:
center
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
height
:
60px
;
}
.eduorderDetail
.order_ImgS
{
width
:
17px
;
height
:
17px
;
margin-right
:
5px
;
}
.eduorderDetail
.order_Line
{
width
:
1px
;
height
:
40px
;
background-color
:
#e2e2e2
;
}
.eduorderDetail
.order_nonBtm
{
border-bottom
:
0
!important
;
}
.eduorderDetail
.btn-box
{
display
:
flex
;
flex-direction
:
row-reverse
;
height
:
60px
;
padding
:
10px
20px
;
position
:
fixed
;
bottom
:
0
;
left
:
0
;
right
:
0
;
z-index
:
2
;
border-top
:
1px
solid
#f5f5f5
;
background
:
#fff
;
display
:
flex
;
align-items
:
center
;
}
.order_Btn_Com
{
padding
:
5px
10px
;
border
:
1px
solid
#999999
;
border-radius
:
6px
;
color
:
#999999
;
font-size
:
12px
;
float
:
right
;
margin-right
:
15px
;
}
.eduorderDetail
.collect_right
{
margin-left
:
15px
;
display
:
-webkit-box
;
display
:
-webkit-flex
;
display
:
flex
;
-webkit-box-orient
:
vertical
;
-webkit-box-direction
:
normal
;
-webkit-flex-direction
:
column
;
flex-direction
:
column
;
-webkit-box-pack
:
justify
;
-webkit-justify-content
:
space-between
;
justify-content
:
space-between
;
padding
:
3px
;
}
.eduorderDetail
.collect_Name
{
overflow
:
hidden
;
text-overflow
:
ellipsis
;
display
:
-webkit-box
;
-webkit-line-clamp
:
2
;
-webkit-box-orient
:
vertical
;
margin-bottom
:
3px
;
font-size
:
14px
;
color
:
#1B1D1E
;
}
.eduorderDetail
.collect_price
{
height
:
20px
;
text-align
:
right
;
font-size
:
16px
;
color
:
#ff4544
;
}
.edu_orderList
{
border-bottom
:
1px
solid
rgba
(
0
,
0
,
0
,
0.03
);
padding
:
15px
0
;
}
</
style
>
<
template
>
<view
class=
"eduorderDetail"
>
<template>
<view
class=
"orderItem"
>
<view
class=
"orderCar"
v-for=
"(item,index) in dataList.DetailList"
:key=
"index"
>
<view
class=
"order_carImg"
>
<image
mode=
"aspectFit"
:src=
"item.CoverImagePath"
style=
"width: 100%; height: 100%;border-radius: 4px;"
>
</image>
</view>
<view
class=
"collect_right"
:style=
"
{'width': (windowWidth -166)+'px'}">
<view
class=
"collect_Name"
>
{{
item
.
GoodsName
}}
</view>
<view
class=
"collect_price"
>
<template
v-if=
"item.Final_Price>0"
>
<text
style=
"font-size:13px;"
>
¥
</text>
{{
item
.
Final_Price
}}
</
template
>
<
template
v-if=
"item.Final_Price==0"
>
<text
style=
"font-size:13px;color: #999999;"
>
免费
</text>
</
template
>
</view>
</view>
</view>
</view>
<view
class=
"orderItem"
>
<view
class=
"order_dList order_Tprice"
>
<text
class=
"order_small"
>
订单编号
</text>
<text
class=
"order_big"
style=
"margin-left:20px;"
>
{{dataList.OrderNo}}
</text>
</view>
<view
class=
"order_dList order_Tprice"
>
<text
class=
"order_small"
>
下单时间
</text>
<text
class=
"order_big"
style=
"margin-left:20px;"
>
{{dataList.CreateDate}}
</text>
</view>
<view
class=
"order_dList order_Tprice"
>
<text
class=
"order_small"
>
支付方式
</text>
<text
class=
"order_big"
style=
"margin-left:20px;"
>
{{dataList.PaymentWayName}}
</text>
</view>
</view>
<view
class=
"orderItem"
>
<view
class=
"order_dList order_Tprice"
>
<text
class=
"order_small"
>
商品总额
</text>
<text
class=
"order_big"
>
¥ {{dataList.Income}}
</text>
</view>
<view
class=
"order_dList order_Tprice"
>
<text
class=
"order_small"
>
优惠
</text>
<text
class=
"order_big"
>
¥ {{dataList.CouponMoney}}
</text>
</view>
<!-- <view class="order_dList order_Tprice">
<text class="order_small">积分使用/抵扣</text>
<text class="order_big">{{dataList.DetailList[0].IntegralNumber!=null?dataList.DetailList[0].IntegralNumber:'0'}}积分/-¥{{dataList.DetailList[0].IntegralMoney!=null?dataList.DetailList[0].IntegralMoney:'0'}} </text>
</view> -->
<view
class=
"order_dList"
style=
"text-align: right"
:class=
"{'order_nonBtm':dataList.OrderStatus!=3}"
>
<text
class=
"order_big"
>
实付款:
</text>
<text
class=
"order_redPrice"
>
¥ {{dataList.Income}}
</text>
</view>
<view
class=
"btn-box"
v-if=
"dataList.OrderStatus == 1"
>
<view
class=
"item"
>
<view
class=
"order_Btn_Com"
v-on:click
.
stop=
"payment(dataList)"
style=
"color:#00D6A6;border-color:#00D6A6;"
>
立即支付
</view>
</view>
</view>
</view>
</template>
<after-sale
:list=
"dataList.DetailList"
v-if=
"showAfter"
@
close=
"closeAfterHandler"
></after-sale>
<payCom
v-if=
"payBtn"
:payInfo=
"payInfo"
@
closePay=
"closePay"
></payCom>
<u-popup
v-model=
"payExit"
mode=
"center"
:mask-close-able=
"false"
>
<view
style=
"background:#fff;width:500rpx"
>
<view
style=
"padding:10px 0 0 10px"
>
提交失败
</view>
<view
style=
"text-align:center;padding-bottom:40rpx"
>
<view
style=
"margin:80rpx 0"
>
支付取消
</view>
<span
@
click=
"exitPay"
style=
"padding:10rpx 50rpx;color:#fff;background:#19be6b;border-radius: 12px;"
>
确定
</span>
</view>
</view>
</u-popup>
</view>
</template>
<
script
>
import
payCom
from
'@/components/pay/pay'
;
import
afterSale
from
"@/components/userorder/after-sale"
;
export
default
{
components
:
{
afterSale
,
payCom
},
data
()
{
return
{
pageTitle
:
'订单详情'
,
mainColor
:
''
,
msg
:
{
OrderId
:
0
,
},
dataList
:
{},
showAfter
:
false
,
themCustomStyle
:
{
marginLeft
:
"20px"
,
padding
:
"0 2rpx"
,
color
:
"#FFF"
,
},
showModal
:
false
,
Cancelmsg
:
{
OrderId
:
0
,
Type
:
1
,
Remark
:
''
,
},
payInfo
:
{
OpenId
:
''
,
OrderId
:
''
,
OrderPayType
:
1
,
GoodsName
:
''
},
payBtn
:
false
,
payExit
:
false
,
windowWidth
:
0
,
}
},
created
()
{
this
.
mainColor
=
this
.
$uiConfig
.
mainColor
;
},
mounted
()
{
let
currentPages
=
getCurrentPages
();
let
u
=
"/"
+
currentPages
[
currentPages
.
length
-
1
].
route
;
let
pages
=
wx
.
getStorageSync
(
"basedata"
)
?
wx
.
getStorageSync
(
"basedata"
).
bar_title
:
[];
pages
.
forEach
((
x
)
=>
{
if
(
x
.
value
==
u
)
{
this
.
pageTitle
=
x
.
new_name
?
x
.
new_name
:
x
.
name
;
}
});
uni
.
setNavigationBarTitle
({
title
:
this
.
pageTitle
,
});
this
.
windowWidth
=
this
.
$utils
.
SystemInfo
().
windowWidth
;
},
onLoad
(
option
)
{
this
.
u
=
uni
.
getStorageSync
(
"mall_UserInfo"
);
this
.
msg
.
OrderId
=
option
.
OrderId
;
this
.
payInfo
.
OpenId
=
uni
.
getStorageSync
(
'mall_UserInfo'
).
OpenId
;
this
.
getData
();
},
methods
:
{
//获取数据
getData
()
{
this
.
request2
({
url
:
"/api/AppletEducation/GetAppletGuidecarOrderOrderInfo"
,
data
:
this
.
msg
,
},
(
res
)
=>
{
if
(
res
.
resultCode
==
1
)
{
console
.
log
(
res
,
'数据'
);
this
.
dataList
=
res
.
data
;
}
}
);
},
closeAfterHandler
()
{
this
.
showAfter
=
false
;
},
//支付
payment
(
e
)
{
this
.
payInfo
.
OrderId
=
e
.
OrderId
;
this
.
payInfo
.
GoodsName
=
e
.
DetailList
[
0
].
GoodsName
.
slice
(
0
,
10
);
this
.
payInfo
.
PaymentWay
=
e
.
PaymentWay
;
this
.
payInfo
.
total_price
=
e
.
Income
;
this
.
payBtn
=
true
},
closePay
()
{
this
.
payBtn
=
false
;
this
.
payExit
=
true
;
},
exitPay
()
{
this
.
payExit
=
false
;
},
}
}
</
script
>
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