Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CFFP-HB
Overview
Overview
Details
Activity
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chao Sun
CFFP-HB
Commits
331205cf
Commit
331205cf
authored
Nov 09, 2022
by
sunchao
Browse files
Options
Browse Files
Download
Plain Diff
pages冲突解决
parents
5ae9c717
c0ba71f4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
72 additions
and
33 deletions
+72
-33
components/courselist/courselist.vue
+1
-1
pages.json
+42
-25
pages/orderConfirm/orderConfirm.vue
+22
-0
pages/personalCenter/personalCenter.vue
+7
-7
No files found.
components/courselist/courselist.vue
View file @
331205cf
...
...
@@ -4,7 +4,7 @@
<ul
v-if=
"cffpCourseInfos.length>0"
>
<li
v-for=
"item in cffpCourseInfos"
:key=
"item.fileId"
@
click=
"goDetail(item)"
>
<view
class=
"thumbnailBox"
>
<img
src=
"
"
alt=
""
>
<img
:src=
"item.displayImage
"
alt=
""
>
</view>
<view
class=
"courseDetailBox"
>
<h4>
{{
item
.
fileTitle
}}
</h4>
...
...
pages.json
View file @
331205cf
...
...
@@ -6,34 +6,30 @@
"topWindow"
:
false
,
"navigationBarTitleText"
:
"CFFP"
}
},
{
},{
"path"
:
"components/login/login"
,
"style"
:
{
"topWindow"
:
false
,
"navigationBarTitleText"
:
"CFFP"
}
},
{
"path"
:
"components/courselist/courselist"
,
"style"
:
{
"topWindow"
:
false
,
"navigationBarTitleText"
:
"CFFP"
}
},{
"path"
:
"components/courselist/courselist"
,
"style"
:
{
"topWindow"
:
false
,
"navigationBarTitleText"
:
"CFFP"
}
,{
"path"
:
"pages/courseDetail/courseDetail"
,
"style"
:
{
"navigationBarTitleText"
:
""
,
"enablePullDownRefresh"
:
false
}
}
,{
},{
"path"
:
"pages/courseDetail/courseDetail"
,
"style"
:
{
"navigationBarTitleText"
:
"课程详情"
,
"enablePullDownRefresh"
:
false
}
},{
"path"
:
"pages/shareFriend/shareFriend"
,
"style"
:
{
"navigationBarTitleText"
:
""
,
"navigationBarTitleText"
:
"
分享好友
"
,
"enablePullDownRefresh"
:
false
}
...
...
@@ -41,7 +37,7 @@
"path"
:
"pages/personalCenter/personalCenter"
,
"style"
:
{
"navigationBarTitleText"
:
""
,
"navigationBarTitleText"
:
"
我的
"
,
"enablePullDownRefresh"
:
false
}
},{
...
...
@@ -79,16 +75,37 @@
"navigationBarTitleText"
:
"基本资料"
,
"enablePullDownRefresh"
:
false
}
},
{
},{
"path"
:
"pages/application-process/work-experience"
,
"style"
:
{
"navigationBarTitleText"
:
"从业经历"
,
"navigationBarTitleText"
:
"从业经历"
,
"enablePullDownRefresh"
:
false
}
},{
"path"
:
"pages/myCertify/myCertify"
,
"style"
:
{
"navigationBarTitleText"
:
"我的认证"
,
"enablePullDownRefresh"
:
false
}
}
],
},{
"path"
:
"pages/inviteJoin/inviteJoin"
,
"style"
:
{
"navigationBarTitleText"
:
"邀请加盟"
,
"enablePullDownRefresh"
:
false
}
},{
"path"
:
"pages/orderConfirm/orderConfirm"
,
"style"
:
{
"navigationBarTitleText"
:
"订单确认"
,
"enablePullDownRefresh"
:
false
}
}
],
"tabBar"
:
{
"color"
:
"#7A7E83"
,
//
tab
上的文字默认颜色
"selectedColor"
:
"#7A7E83"
,
//
tab
上的文字选中时的颜色
...
...
pages/orderConfirm/orderConfirm.vue
0 → 100644
View file @
331205cf
<
template
>
<view>
</view>
</
template
>
<
script
>
export
default
{
data
()
{
return
{
}
},
methods
:
{
}
}
</
script
>
<
style
>
</
style
>
pages/personalCenter/personalCenter.vue
View file @
331205cf
...
...
@@ -36,7 +36,7 @@
<!-- 个人信息 -->
<view
class=
"personalInfo"
>
<ul>
<li
v-for=
"item in minorMenuLists.filter(v=>v.isShow)"
:key=
"item.title"
>
<li
v-for=
"item in minorMenuLists.filter(v=>v.isShow)"
:key=
"item.title"
@
click=
"goDetail(item)"
>
<view
class=
"infoBox"
>
<img
:src=
"'/static/moduleIcon/'+item.icon+'.png'"
alt=
""
srcset=
""
>
<text>
{{
item
.
title
}}
</text>
...
...
@@ -60,40 +60,40 @@
{
id
:
'00'
,
categoryName
:
'销售管理'
,
children
:[
{
title
:
'销售课程'
,
icon
:
'salesCourse'
,
link
:
'/components/courselist/courselist'
,
isOpen
:
true
,
isShow
:
true
},
{
title
:
'销售保单'
,
icon
:
'salesOrder'
,
link
:
''
,
isOpen
:
true
,
isShow
:
tru
e
},
{
title
:
'销售保单'
,
icon
:
'salesOrder'
,
link
:
''
,
isOpen
:
true
,
isShow
:
fals
e
},
{
title
:
'我的售后'
,
icon
:
'afterSales'
,
link
:
''
,
isOpen
:
false
,
isShow
:
true
}
],
},
{
id
:
'01'
,
categoryName
:
'积分管理'
,
children
:[
{
title
:
'我的积分'
,
icon
:
'integral'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
},
{
title
:
'积分
商城
'
,
icon
:
'integralShopping'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
}
{
title
:
'积分
兑换
'
,
icon
:
'integralShopping'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
}
],
},
{
id
:
'02'
,
categoryName
:
'活动管理'
,
children
:[
{
title
:
'我的学习'
,
icon
:
'myLearning'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
},
{
title
:
'学习认证'
,
icon
:
'learningCertify'
,
link
:
'
/pages/myCertify/myCertify
'
,
isOpen
:
true
,
isShow
:
true
},
{
title
:
'学习认证'
,
icon
:
'learningCertify'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
},
{
title
:
'我的分享'
,
icon
:
'share'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
}
],
},
{
id
:
'03'
,
categoryName
:
'人员管理'
,
children
:[
{
title
:
'成交客户'
,
icon
:
'dealCustomer'
,
link
:
''
,
isOpen
:
true
,
isShow
:
tru
e
},
{
title
:
'成交客户'
,
icon
:
'dealCustomer'
,
link
:
''
,
isOpen
:
true
,
isShow
:
fals
e
},
{
title
:
'申请加盟'
,
icon
:
'applyJoin'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
}
],
},
{
id
:
'04'
,
categoryName
:
'团队管理'
,
children
:[
{
title
:
'我的团队'
,
icon
:
'team'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
},
{
title
:
'邀请加盟'
,
icon
:
'shareJoin'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
}
{
title
:
'邀请加盟'
,
icon
:
'shareJoin'
,
link
:
'
/pages/inviteJoin/inviteJoin
'
,
isOpen
:
true
,
isShow
:
true
}
],
}
],
minorMenuLists
:[
{
title
:
'我的邀请码'
,
icon
:
'shareEcode'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
},
{
title
:
'我的卡包'
,
icon
:
'card'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
},
{
title
:
'我的认证'
,
icon
:
'myCertify'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
},
{
title
:
'我的认证'
,
icon
:
'myCertify'
,
link
:
'
/pages/myCertify/myCertify
'
,
isOpen
:
true
,
isShow
:
true
},
{
title
:
'我的消息'
,
icon
:
'message'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
},
{
title
:
'系统设置'
,
icon
:
'setting'
,
link
:
''
,
isOpen
:
true
,
isShow
:
true
}
]
...
...
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