Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mayi-mp-shop
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
程默
mayi-mp-shop
Commits
2e09128f
Commit
2e09128f
authored
Mar 26, 2021
by
程默
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
移除tabbar
parent
45aa6078
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
8 additions
and
27 deletions
+8
-27
src/app.json
+0
-24
src/pages/home/index.vue
+3
-1
src/pages/home/main.json
+1
-0
src/pages/login/index.vue
+1
-1
src/utils/mayi.js
+2
-1
static/nativeComponents/custom-tab-bar/index.js
+0
-0
static/nativeComponents/custom-tab-bar/index.json
+0
-0
static/nativeComponents/custom-tab-bar/index.wxml
+0
-0
static/nativeComponents/custom-tab-bar/index.wxss
+1
-0
No files found.
src/app.json
View file @
2e09128f
...
@@ -14,30 +14,6 @@
...
@@ -14,30 +14,6 @@
"pages/tabBar4/main"
,
"pages/tabBar4/main"
,
"pages/changeAdr/main"
"pages/changeAdr/main"
],
],
"tabBar"
:
{
"custom"
:
true
,
"color"
:
"#7A7E83"
,
"selectedColor"
:
"#3cc51f"
,
"borderStyle"
:
"black"
,
"backgroundColor"
:
"#ffffff"
,
"list"
:
[
{
"pagePath"
:
"pages/home/main"
},
{
"pagePath"
:
"pages/tabBar1/main"
},
{
"pagePath"
:
"pages/tabBar2/main"
},
{
"pagePath"
:
"pages/tabBar3/main"
},
{
"pagePath"
:
"pages/tabBar4/main"
}
]
},
"usingComponents"
:
{},
"usingComponents"
:
{},
"window"
:
{
"window"
:
{
"backgroundTextStyle"
:
"light"
,
"backgroundTextStyle"
:
"light"
,
...
...
src/pages/home/index.vue
View file @
2e09128f
...
@@ -104,6 +104,8 @@
...
@@ -104,6 +104,8 @@
<div
v-if=
"applySucessEntry"
>
<div
v-if=
"applySucessEntry"
>
<apply-sucess-entry></apply-sucess-entry>
<apply-sucess-entry></apply-sucess-entry>
</div>
</div>
<custom-tab-bar></custom-tab-bar>
</div>
</div>
</
template
>
</
template
>
...
@@ -342,7 +344,7 @@ export default {
...
@@ -342,7 +344,7 @@ export default {
})
})
},
},
scrolls
(
el
){
scrolls
(
el
){
this
.
setFooterShow
(
el
);
//
this.setFooterShow(el);
if
(
this
.
pageData
)
{
if
(
this
.
pageData
)
{
for
(
let
i
=
0
;
i
<
this
.
pageData
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
this
.
pageData
.
length
;
i
++
)
{
const
element
=
this
.
pageData
[
i
]
const
element
=
this
.
pageData
[
i
]
...
...
src/pages/home/main.json
View file @
2e09128f
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
"van-tab"
:
"/static/vant/tab/index"
,
"van-tab"
:
"/static/vant/tab/index"
,
"banner"
:
"/static/nativeComponents/Banner/index"
,
"banner"
:
"/static/nativeComponents/Banner/index"
,
"goods-list"
:
"/static/nativeComponents/GoodsList/index"
,
"goods-list"
:
"/static/nativeComponents/GoodsList/index"
,
"custom-tab-bar"
:
"/static/nativeComponents/custom-tab-bar/index"
,
"time-limited-discount"
:
"/static/nativeComponents/TimeLimitedDiscount/index"
,
"time-limited-discount"
:
"/static/nativeComponents/TimeLimitedDiscount/index"
,
"waterfall-flow"
:
"/static/nativeComponents/module/WaterfallFlow/index"
,
"waterfall-flow"
:
"/static/nativeComponents/module/WaterfallFlow/index"
,
"van-button"
:
"/static/vant/button/index"
,
"van-button"
:
"/static/vant/button/index"
,
...
...
src/pages/login/index.vue
View file @
2e09128f
...
@@ -322,7 +322,7 @@ export default {
...
@@ -322,7 +322,7 @@ export default {
// wx.navigateBack()
// wx.navigateBack()
// return
// return
if
(
isTabbarIndex
>-
1
){
if
(
isTabbarIndex
>-
1
){
wx
.
reLaun
g
({
wx
.
reLaun
ch
({
url
:
parseLink
==
'/'
?
'/pages/home/main'
:
`/pages/tabBar
${
isTabbarIndex
}
/main`
,
url
:
parseLink
==
'/'
?
'/pages/home/main'
:
`/pages/tabBar
${
isTabbarIndex
}
/main`
,
})
})
}
else
{
}
else
{
...
...
src/utils/mayi.js
View file @
2e09128f
...
@@ -49,7 +49,8 @@ export function $themeToLink(data, option) {
...
@@ -49,7 +49,8 @@ export function $themeToLink(data, option) {
return
return
}
}
isTabbarIndex
=
isTabbarIndex
==
0
?
checkTabbarPage
(
'/'
)
:
isTabbarIndex
isTabbarIndex
=
isTabbarIndex
==
0
?
checkTabbarPage
(
'/'
)
:
isTabbarIndex
wx
.
switchTab
({
wx
.
reLaunch
({
url
:
parseLink
==
'/'
?
'/pages/home/main'
:
`/pages/tabBar
${
isTabbarIndex
}
/main`
,
url
:
parseLink
==
'/'
?
'/pages/home/main'
:
`/pages/tabBar
${
isTabbarIndex
}
/main`
,
})
})
return
return
...
...
custom-tab-bar/index.js
→
static/nativeComponents/
custom-tab-bar/index.js
View file @
2e09128f
File moved
custom-tab-bar/index.json
→
static/nativeComponents/
custom-tab-bar/index.json
View file @
2e09128f
File moved
custom-tab-bar/index.wxml
→
static/nativeComponents/
custom-tab-bar/index.wxml
View file @
2e09128f
File moved
custom-tab-bar/index.wxss
→
static/nativeComponents/
custom-tab-bar/index.wxss
View file @
2e09128f
...
@@ -1175,6 +1175,7 @@
...
@@ -1175,6 +1175,7 @@
bottom: 0;
bottom: 0;
left: 0;
left: 0;
background: #f5f5f4;
background: #f5f5f4;
z-index:888;
/* border-top: 1px solid #e2e2e2; */
/* border-top: 1px solid #e2e2e2; */
}
}
...
...
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