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
eb30ff78
You need to sign in or sign up before continuing.
Commit
eb30ff78
authored
Oct 22, 2020
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
106cdeb9
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
15 deletions
+29
-15
cart.vue
pages/cart/cart.vue
+7
-1
course-submit.vue
pages/school/course-submit.vue
+2
-2
courseContent.vue
pages/school/courseContent.vue
+11
-7
courseInfo.vue
pages/school/courseInfo.vue
+7
-3
orderList.vue
pages/school/personal/orderList.vue
+1
-1
search.vue
pages/search/search.vue
+1
-1
No files found.
pages/cart/cart.vue
View file @
eb30ff78
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
v-if=
'IsEducation==1'
v-if=
'IsEducation==1'
mode=
"aspectFill"
mode=
"aspectFill"
style=
"width: 116px;height: 64px;margin-left: 30rpx;border-radius: 5px;box-shadow:0 4px 10px 1px #D2D2D2;"
style=
"width: 116px;height: 64px;margin-left: 30rpx;border-radius: 5px;box-shadow:0 4px 10px 1px #D2D2D2;"
@
click=
"clickHandler(item.GoodsId)"
@
click=
"clickHandler
2
(item.GoodsId)"
/>
/>
<view
class=
"item-r"
:style=
"
{'width':IsEducation!=1?'440rpx':item_r,'height':IsEducation!=1?'150rpx':'65px', }">
<view
class=
"item-r"
:style=
"
{'width':IsEducation!=1?'440rpx':item_r,'height':IsEducation!=1?'150rpx':'65px', }">
...
@@ -224,6 +224,9 @@ export default {
...
@@ -224,6 +224,9 @@ export default {
this
.
showAuth
=
true
;
this
.
showAuth
=
true
;
}
else
{
}
else
{
this
.
init
();
this
.
init
();
this
.
TotalPrice
=
0
;
this
.
checkCount
=
0
;
}
}
},
},
mounted
()
{
mounted
()
{
...
@@ -593,6 +596,9 @@ export default {
...
@@ -593,6 +596,9 @@ export default {
url
:
'/pages/goods/goods?id='
+
id
url
:
'/pages/goods/goods?id='
+
id
});
});
},
},
clickHandler2
(
id
){
//购物车跳到课程详情
uni
.
navigateTo
({
url
:
"/pages/school/courseInfo?GoodsId="
+
id
});
},
goUrl
(
url
)
{
goUrl
(
url
)
{
console
.
log
(
url
)
console
.
log
(
url
)
uni
.
navigateTo
({
uni
.
navigateTo
({
...
...
pages/school/course-submit.vue
View file @
eb30ff78
...
@@ -614,12 +614,12 @@
...
@@ -614,12 +614,12 @@
.
coursesubmit
.
store
-
list
{
.
coursesubmit
.
store
-
list
{
width
:
100
%
;
width
:
100
%
;
background
:
#
FFF
;
background
:
#
FFF
;
padding
:
0
15
px
;
padding
:
0
15
px
;
margin
-
top
:
15
px
;
margin
-
top
:
15
px
;
}
}
.
coursesubmit
.
good
{
.
coursesubmit
.
good
{
background
:
#
fff
;
background
:
#
fff
;
padding
:
1
0
px
0
px
;
padding
:
1
5
px
0
;
display
:
flex
;
display
:
flex
;
flex
-
direction
:
row
;
flex
-
direction
:
row
;
font
-
family
:
aa
;
font
-
family
:
aa
;
...
...
pages/school/courseContent.vue
View file @
eb30ff78
...
@@ -19,10 +19,10 @@
...
@@ -19,10 +19,10 @@
<text>
{{
studytext
}}
</text>
<text>
{{
studytext
}}
</text>
</view>
</view>
</view>
</view>
<view
v-if=
"selectcourse.Type!=1"
class=
"studyimg"
>
<view
v-if=
"selectcourse
&& selectcourse
.Type!=1"
class=
"studyimg"
>
<image
@
click=
"previewImage(
index
)"
<image
@
click=
"previewImage()"
v-if=
"selectcourse && selectcourse.ImageList.length>0 && selectcourse.ImageList[0].Path"
v-if=
"selectcourse && selectcourse.ImageList.length>0 && selectcourse.ImageList[0].Path"
style=
"width:100%;height:100%;"
:src=
"selectcourse.ImageList[0].Path"
mode=
""
></image>
style=
"width:100%;height:100%;"
:src=
"selectcourse.ImageList[0].Path"
mode=
"
aspectFill
"
></image>
<image
style=
"width:100%;height:100%;"
v-else
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/xuexibanner%20.png"
mode=
""
></image>
<image
style=
"width:100%;height:100%;"
v-else
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/xuexibanner%20.png"
mode=
""
></image>
</view>
</view>
...
@@ -70,11 +70,15 @@
...
@@ -70,11 +70,15 @@
<view
class=
"cb-l-bt"
:style=
"
{border:index==ci?'0.5px solid #00D6A6':(cl.IsRead==1
&&
cl.IsPay==1?'0.5px solid #999999':'0.5px solid #121212')}">
{{
cl
.
TypeName
}}
</view>
<view
class=
"cb-l-bt"
:style=
"
{border:index==ci?'0.5px solid #00D6A6':(cl.IsRead==1
&&
cl.IsPay==1?'0.5px solid #999999':'0.5px solid #121212')}">
{{
cl
.
TypeName
}}
</view>
</view>
</view>
{{
cl
.
SortName
}}
:
{{
cl
.
Name
}}
{{
cl
.
SortName
}}
:
{{
cl
.
Name
}}
</view>
</view>
<!-- IsPay 0不可看 1已付款 2已下单 -->
<!-- IsPay 0不可看 1已付款 2已下单 -->
<view
:style=
"
{color:mc}" class="catalog-box-r" v-if="cl.IsPay!=1">
{{
cl
.
IsTrySee
==
1
?
'可试看'
:
'购买'
}}
<view
:style=
"
{color:mc}" class="catalog-box-r" v-if="cl.IsPay!=1
&&
cl.IsTrySee==1">
可试看
</view>
<view
class=
"catalog-box-r"
v-if=
"cl.IsPay!=1 && cl.IsTrySee==2"
>
<image
style=
"width:15px;height:15px;"
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/suo.png"
mode=
""
></image>
</view>
</view>
</view>
</view>
<u-loadmore
:status=
"status"
:load-text=
"loadText"
:font-size=
"24"
:margin-top=
"20"
<u-loadmore
:status=
"status"
:load-text=
"loadText"
:font-size=
"24"
:margin-top=
"20"
...
@@ -200,7 +204,7 @@
...
@@ -200,7 +204,7 @@
},
},
//图片预览和文档的打开
//图片预览和文档的打开
previewImage
(
index
=
0
)
{
previewImage
(
index
=
0
)
{
console
.
log
(
this
.
selectcourse
)
if
(
this
.
selectcourse
.
IsPay
!=
1
){
if
(
this
.
selectcourse
.
IsPay
!=
1
){
if
(
this
.
img
.
length
>
0
){
if
(
this
.
img
.
length
>
0
){
uni
.
previewImage
({
uni
.
previewImage
({
...
...
pages/school/courseInfo.vue
View file @
eb30ff78
...
@@ -153,11 +153,15 @@
...
@@ -153,11 +153,15 @@
<view
class=
"cb-l-bt"
>
{{
cl
.
TypeName
}}
</view>
<view
class=
"cb-l-bt"
>
{{
cl
.
TypeName
}}
</view>
</view>
</view>
{{
cl
.
SortName
}}
:
{{
cl
.
Name
}}
{{
cl
.
SortName
}}
:
{{
cl
.
Name
}}
</view>
</view>
<!-- IsPay 0不可看 1已付款 2已下单 -->
<!-- IsPay 0不可看 1已付款 2已下单 -->
<view
:style=
"
{color:mc}" class="catalog-box-r" v-if="cl.IsPay!=1">
<view
:style=
"
{color:mc}" class="catalog-box-r" v-if="cl.IsPay!=1
&&
cl.IsTrySee==1">
{{
cl
.
IsTrySee
==
1
?
'可试看'
:
'购买'
}}
可试看
</view>
<view
class=
"catalog-box-r"
v-if=
"cl.IsPay!=1 && cl.IsTrySee==2"
>
<image
style=
"width:15px;height:15px;"
src=
"https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/suo.png"
mode=
""
></image>
</view>
</view>
</view>
</view>
<view
class=
"ckcatalog"
v-if=
"courseShow ==true"
@
click=
"gocourse(
{IsTrySee:1},0)">
<view
class=
"ckcatalog"
v-if=
"courseShow ==true"
@
click=
"gocourse(
{IsTrySee:1},0)">
...
...
pages/school/personal/orderList.vue
View file @
eb30ff78
...
@@ -118,7 +118,7 @@
...
@@ -118,7 +118,7 @@
{{
x
.
TripSTime
}}
{{
x
.
TripSTime
}}
</view>
</view>
<view
style=
"text-align: right;margin-top:15px;"
>
<view
style=
"text-align: right;margin-top:15px;"
>
<
text
style=
"color:#9A9A9A;font-size:12px;"
>
实付:
</text
>
<
!--
<text
style=
"color:#9A9A9A;font-size:12px;"
>
实付:
</text>
--
>
<text
style=
"font-size:15px;color:#121212"
>
¥
{{
x
.
Unit_Price
}}
</text>
<text
style=
"font-size:15px;color:#121212"
>
¥
{{
x
.
Unit_Price
}}
</text>
</view>
</view>
</view>
</view>
...
...
pages/search/search.vue
View file @
eb30ff78
...
@@ -149,7 +149,7 @@ export default {
...
@@ -149,7 +149,7 @@ export default {
loadText
:
{
loadText
:
{
loadmore
:
"轻轻上拉,加载更多"
,
loadmore
:
"轻轻上拉,加载更多"
,
loading
:
"努力加载中"
,
loading
:
"努力加载中"
,
nomore
:
"没有更多
商品
了"
,
nomore
:
"没有更多了"
,
},
},
showLoading
:
false
,
showLoading
:
false
,
g
:
[],
g
:
[],
...
...
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