Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
X
XiTianSenMall
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
leiqingsong
XiTianSenMall
Commits
c80af5e0
Commit
c80af5e0
authored
Mar 02, 2021
by
leiqingsong
Browse files
Options
Browse Files
Download
Plain Diff
处理合并冲突
parents
f9490d28
2b5f4907
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
471 additions
and
82 deletions
+471
-82
package-lock.json
H5/package-lock.json
+81
-81
rankbox.png
H5/src/assets/images/rankbox.png
+0
-0
森林状态.png
H5/src/assets/images/森林状态.png
+0
-0
vant-ui.js
H5/src/plugins/vant-ui.js
+3
-1
index.js
H5/src/router/index.js
+12
-0
grade.vue
H5/src/views/grade.vue
+227
-0
leagueNums.vue
H5/src/views/leagueNums.vue
+148
-0
No files found.
H5/package-lock.json
View file @
c80af5e0
...
...
@@ -1747,6 +1747,16 @@
"integrity"
:
"sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="
,
"dev"
:
true
},
"ansi-styles"
:
{
"version"
:
"4.3.0"
,
"resolved"
:
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
,
"integrity"
:
"sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-convert"
:
"^2.0.1"
}
},
"autoprefixer"
:
{
"version"
:
"9.8.6"
,
"resolved"
:
"https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.6.tgz"
,
...
...
@@ -1788,6 +1798,41 @@
"unique-filename"
:
"^1.1.1"
}
},
"chalk"
:
{
"version"
:
"4.1.0"
,
"resolved"
:
"https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"
,
"integrity"
:
"sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"ansi-styles"
:
"^4.1.0"
,
"supports-color"
:
"^7.1.0"
}
},
"color-convert"
:
{
"version"
:
"2.0.1"
,
"resolved"
:
"https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
,
"integrity"
:
"sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-name"
:
"~1.1.4"
}
},
"color-name"
:
{
"version"
:
"1.1.4"
,
"resolved"
:
"https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
,
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
,
"dev"
:
true
,
"optional"
:
true
},
"has-flag"
:
{
"version"
:
"4.0.0"
,
"resolved"
:
"https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
,
"integrity"
:
"sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
,
"dev"
:
true
,
"optional"
:
true
},
"postcss-loader"
:
{
"version"
:
"3.0.0"
,
"resolved"
:
"https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz"
,
...
...
@@ -1829,6 +1874,16 @@
"minipass"
:
"^3.1.1"
}
},
"supports-color"
:
{
"version"
:
"7.2.0"
,
"resolved"
:
"https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
,
"integrity"
:
"sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"has-flag"
:
"^4.0.0"
}
},
"terser-webpack-plugin"
:
{
"version"
:
"2.3.8"
,
"resolved"
:
"https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz"
,
...
...
@@ -1845,6 +1900,32 @@
"terser"
:
"^4.6.12"
,
"webpack-sources"
:
"^1.4.3"
}
},
"vue-loader-v16"
:
{
"version"
:
"npm:vue-loader@16.1.2"
,
"resolved"
:
"https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz"
,
"integrity"
:
"sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"chalk"
:
"^4.1.0"
,
"hash-sum"
:
"^2.0.0"
,
"loader-utils"
:
"^2.0.0"
},
"dependencies"
:
{
"loader-utils"
:
{
"version"
:
"2.0.0"
,
"resolved"
:
"https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"
,
"integrity"
:
"sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"big.js"
:
"^5.2.2"
,
"emojis-list"
:
"^3.0.0"
,
"json5"
:
"^2.1.2"
}
}
}
}
}
},
...
...
@@ -11302,87 +11383,6 @@
}
}
},
"vue-loader-v16"
:
{
"version"
:
"npm:vue-loader@16.1.2"
,
"resolved"
:
"https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz"
,
"integrity"
:
"sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"chalk"
:
"^4.1.0"
,
"hash-sum"
:
"^2.0.0"
,
"loader-utils"
:
"^2.0.0"
},
"dependencies"
:
{
"ansi-styles"
:
{
"version"
:
"4.3.0"
,
"resolved"
:
"https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
,
"integrity"
:
"sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-convert"
:
"^2.0.1"
}
},
"chalk"
:
{
"version"
:
"4.1.0"
,
"resolved"
:
"https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz"
,
"integrity"
:
"sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"ansi-styles"
:
"^4.1.0"
,
"supports-color"
:
"^7.1.0"
}
},
"color-convert"
:
{
"version"
:
"2.0.1"
,
"resolved"
:
"https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
,
"integrity"
:
"sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"color-name"
:
"~1.1.4"
}
},
"color-name"
:
{
"version"
:
"1.1.4"
,
"resolved"
:
"https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
,
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
,
"dev"
:
true
,
"optional"
:
true
},
"has-flag"
:
{
"version"
:
"4.0.0"
,
"resolved"
:
"https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
,
"integrity"
:
"sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
,
"dev"
:
true
,
"optional"
:
true
},
"loader-utils"
:
{
"version"
:
"2.0.0"
,
"resolved"
:
"https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz"
,
"integrity"
:
"sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"big.js"
:
"^5.2.2"
,
"emojis-list"
:
"^3.0.0"
,
"json5"
:
"^2.1.2"
}
},
"supports-color"
:
{
"version"
:
"7.2.0"
,
"resolved"
:
"https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
,
"integrity"
:
"sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="
,
"dev"
:
true
,
"optional"
:
true
,
"requires"
:
{
"has-flag"
:
"^4.0.0"
}
}
}
},
"vue-router"
:
{
"version"
:
"3.5.1"
,
"resolved"
:
"https://registry.npmjs.org/vue-router/-/vue-router-3.5.1.tgz"
,
...
...
H5/src/assets/images/rankbox.png
0 → 100755
View file @
c80af5e0
2.33 KB
H5/src/assets/images/森林状态.png
0 → 100755
View file @
c80af5e0
12.6 KB
H5/src/plugins/vant-ui.js
View file @
c80af5e0
...
...
@@ -19,7 +19,8 @@ import {
Tab
,
Tabs
,
Toast
,
Uploader
Uploader
,
Progress
}
from
"vant"
;
Vue
.
use
(
Button
)
...
...
@@ -41,4 +42,5 @@ Vue.use(Button)
.
use
(
Tab
)
.
use
(
Tabs
)
.
use
(
Uploader
)
.
use
(
Progress
)
.
use
(
Toast
);
H5/src/router/index.js
View file @
c80af5e0
...
...
@@ -87,6 +87,18 @@ const routes = [
name
:
"ModefyAvatar"
,
component
:
()
=>
import
(
"@/views/modefyAvatar"
),
meta
:
{
title
:
"更换头像"
}
},
{
path
:
"/grade"
,
name
:
"Grade"
,
component
:
()
=>
import
(
"@/views/grade"
),
meta
:
{
title
:
"森林状态"
,
noNav
:
true
}
},
{
path
:
"/leagueNums"
,
name
:
"LeagueNums"
,
component
:
()
=>
import
(
"@/views/leagueNums"
),
meta
:
{
title
:
"团员总人数"
,
noNav
:
true
}
}
];
...
...
H5/src/views/grade.vue
0 → 100644
View file @
c80af5e0
<
template
>
<div
class=
"grade-status"
>
<div
class=
"nav"
>
<van-icon
name=
"arrow-left"
size=
"20"
class=
"nav-left"
@
click=
"$router.go(-1)"
/>
<span
class=
"nav-title"
>
森林状态
</span>
</div>
<div
class=
"forest-content"
>
<div
class=
"forest-level"
>
{{
level
}}
</div>
<div
class=
"nums"
>
距离下一级直推用户还需增加
{{
directpush
}}
</div>
<div
class=
"nums"
>
距离下一级团队用户还需增加
{{
team
}}
</div>
<div
class=
"level-progress"
>
<div
class=
"level-num"
>
{{
currentLevel
}}
</div>
<van-progress
:percentage=
"50"
/>
<div
class=
"level-num"
>
{{
nextLevel
}}
</div>
</div>
<div
class=
"relegation"
>
保级还需增加¥
{{
relegationNum
}}
业绩
</div>
</div>
<div
class=
"forest-list"
>
<div
class=
"forest-item"
v-for=
"(item,index) in list"
:key=
"index"
>
<span
class=
"forest-item-num"
>
{{
item
.
num
}}
</span>
<div
class=
"forest-item-label"
>
<span
>
{{
item
.
label
}}
</span>
<van-icon
v-if=
"item.hasArrow"
name=
"arrow"
size=
"16"
class=
"nav-left"
@
click=
"handleUrl(item.urlName)"
/>
</div>
</div>
</div>
</div>
</
template
>
<
script
>
export
default
{
name
:
"grade"
,
data
()
{
return
{
level
:
'Lv.3白银树'
,
directpush
:
'XXX'
,
team
:
"XXX"
,
relegationNum
:
"21,141"
,
currentLevel
:
'Lv.3'
,
nextLevel
:
'Lv.4'
,
list
:[
{
num
:
14
,
label
:
"团队总人数"
,
hasArrow
:
true
,
urlName
:
'LeagueNums'
},
{
num
:
12
,
label
:
"我的直推"
,
hasArrow
:
true
},
{
num
:
61859
,
label
:
"团队累计总业绩"
,
hasArrow
:
false
},
{
num
:
11256
,
label
:
"团队当月新增业绩"
,
hasArrow
:
false
},
]
};
},
methods
:
{
handleUrl
(
urlName
){
this
.
$router
.
push
({
name
:
urlName
})
}
}
};
</
script
>
<
style
lang=
"scss"
scoped
>
$white
:
#ffffff
;
.grade-status
{
width
:
100%
;
height
:
298px
;
background-image
:
url("../assets/images/森林状态.png")
;
background-size
:
cover
;
.nav
{
position
:
relative
;
display
:
flex
;
align-items
:
center
;
width
:
100%
;
height
:
46px
;
color
:
#fff
;
.nav-left
{
position
:
absolute
;
top
:
0
;
bottom
:
0
;
width
:
52px
;
height
:
100%
;
line-height
:
46px
;
text-align
:
center
;
}
.nav-title
{
max-width
:
60%
;
margin
:
0
auto
;
font-weight
:
bold
;
font-size
:
16px
;
}
}
.forest-content
{
text-align
:
center
;
padding-top
:
25px
;
.nums
{
font-size
:
14px
;
color
:
$white
;
line-height
:
25px
;
margin-bottom
:
12px
;
}
.relegation
{
font-size
:
16px
;
color
:
$white
;
margin-top
:
20px
;
}
}
.forest-level
{
height
:
45px
;
font-family
:
PingFang-SC-Bold
;
font-size
:
24px
;
font-weight
:
normal
;
font-stretch
:
normal
;
letter-spacing
:
0px
;
color
:
#ffffff
;
}
.level-progress
{
width
:
100%
;
padding
:
0
30px
;
display
:
flex
;
align-items
:
center
;
.level-num
{
width
:
36px
;
height
:
16px
;
line-height
:
16px
;
background-image
:
url("../assets/images/rankbox.png")
;
background-size
:
cover
;
font-family
:
PingFang-SC-Bold
;
font-size
:
11px
;
color
:
#fc5202
;
}
}
.forest-list
{
padding
:
0
15px
;
display
:
flex
;
flex-direction
:
row
;
flex-wrap
:
wrap
;
justify-content
:
space-between
;
margin-top
:
20px
;
.forest-item
{
height
:
98px
;
background-color
:
#ffffff
;
box-shadow
:
0px
1px
6px
0px
rgba
(
6
,
0
,
1
,
0
.04
);
border-radius
:
4px
;
width
:
calc
(
50%
-
8px
);
margin-bottom
:
10px
;
text-align
:
center
;
padding-top
:
15px
;
box-sizing
:
border-box
;
}
.forest-item-num
{
height
:
19px
;
font-family
:
DINCondensed-Bold
;
font-size
:
26px
;
font-weight
:
normal
;
font-stretch
:
normal
;
line-height
:
25px
;
letter-spacing
:
0px
;
color
:
#333333
;
}
.forest-item-label
{
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
span
{
font-family
:
PingFang-SC-Medium
;
font-size
:
14px
;
font-weight
:
normal
;
font-stretch
:
normal
;
letter-spacing
:
0px
;
color
:
#666666
;
}
.nav-left
{
color
:
#666
;
}
}
}
}
</
style
>
<
style
lang=
scss
>
.van-progress
{
width
:
250px
;
height
:
4px
;
background-color
:
rgba
(
0
,
0
,
0
,.
2
);
.van-progress__portion
{
background
:
#f9f9f9
;
}
.van-progress__pivot
{
display
:
none
;
}
}
</
style
>
H5/src/views/leagueNums.vue
0 → 100644
View file @
c80af5e0
<
template
>
<div
class=
"league-nums"
>
<div
class=
"nav"
>
<van-icon
name=
"arrow-left"
size=
"20"
class=
"nav-left"
@
click=
"$router.go(-1)"
/>
<span
class=
"nav-title"
>
森林状态
</span>
</div>
<div
class=
"panel-list"
>
<div
class=
"panel-item"
v-for=
"(item,index) in list"
:key=
"index"
>
<span
class=
"panel-item-num"
>
{{
item
.
num
}}
</span>
<div
class=
"panel-item-label"
>
<span
>
{{
item
.
label
}}
</span>
</div>
</div>
</div>
</div>
</
template
>
<
script
>
export
default
{
name
:
"leagueNums"
,
data
()
{
return
{
list
:[
{
num
:
54
,
label
:
"普通用户"
,
},
{
num
:
34
,
label
:
"幼苗"
,
},
{
num
:
22
,
label
:
"青铜树"
,
},
{
num
:
12
,
label
:
"白银树"
,
},
{
num
:
5
,
label
:
"黄金树"
,
},
{
num
:
1
,
label
:
"农场主"
,
},
{
num
:
0
,
label
:
"森林之星"
,
},
{
num
:
0
,
label
:
"西田森合伙人"
,
}
]
};
},
methods
:
{
}
};
</
script
>
<
style
lang=
"scss"
scoped
>
$white
:
#ffffff
;
.league-nums
{
width
:
100%
;
height
:
298px
;
background-image
:
url("../assets/images/森林状态.png")
;
background-size
:
cover
;
.nav
{
position
:
relative
;
display
:
flex
;
align-items
:
center
;
width
:
100%
;
height
:
46px
;
color
:
#fff
;
.nav-left
{
position
:
absolute
;
top
:
0
;
bottom
:
0
;
width
:
52px
;
height
:
100%
;
line-height
:
46px
;
text-align
:
center
;
}
.nav-title
{
max-width
:
60%
;
margin
:
0
auto
;
font-weight
:
bold
;
font-size
:
16px
;
}
}
}
.panel-list
{
padding
:
0
15px
;
display
:
flex
;
flex-direction
:
row
;
flex-wrap
:
wrap
;
justify-content
:
space-between
;
margin-top
:
20px
;
.panel-item
{
height
:
113px
;
background-color
:
#ffffff
;
box-shadow
:
0px
2px
12px
0px
rgba
(
6
,
0
,
1
,
0
.04
);
border-radius
:
4px
;
width
:
calc
(
50%
-
8px
);
margin-bottom
:
10px
;
text-align
:
center
;
padding-top
:
15px
;
box-sizing
:
border-box
;
}
.panel-item-num
{
height
:
19px
;
font-family
:
DINCondensed-Bold
;
font-size
:
26px
;
font-weight
:
normal
;
font-stretch
:
normal
;
line-height
:
25px
;
letter-spacing
:
0px
;
color
:
#333333
;
}
.panel-item-label
{
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
span
{
font-family
:
PingFang-SC-Medium
;
font-size
:
14px
;
font-weight
:
normal
;
font-stretch
:
normal
;
letter-spacing
:
0px
;
color
:
#666666
;
}
.nav-left
{
color
:
#666
;
}
}
}
</
style
>
\ No newline at end of file
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