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
da0249b7
Commit
da0249b7
authored
Feb 26, 2021
by
程默
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix tab
parent
dd2a6785
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
27 additions
and
13 deletions
+27
-13
config/dev.env.js
+1
-1
custom-tab-bar/index.wxss
+0
-0
project.config.json
+11
-7
src/app.json
+4
-0
src/pages/home/index.vue
+1
-0
src/utils/mayi.js
+10
-5
No files found.
config/dev.env.js
View file @
da0249b7
...
@@ -17,7 +17,7 @@ module.exports = merge(prodEnv, {//zjgyl
...
@@ -17,7 +17,7 @@ module.exports = merge(prodEnv, {//zjgyl
// BASE_URL:"'http://192.168.1.146:3005'",
// BASE_URL:"'http://192.168.1.146:3005'",
// BASE_URL:"'http://192.168.1.127:3000'",
// BASE_URL:"'http://192.168.1.127:3000'",
BASE_URL
:
"'https://test-m-shop.mayi888.cn'"
,
BASE_URL
:
"'https://test-m-shop.mayi888.cn'"
,
// BASE_URL:"'http://1
72.16.1.48
:3004'",
// BASE_URL:"'http://1
92.168.137.1
:3004'",
OLSHOP_URL
:
'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"'
,
OLSHOP_URL
:
'"https://test-m-shop.mayi888.cn/innerApi/shopApiService"'
,
// OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
// OLSHOP_URL:'"https://shop.mayi888.com/innerApi/shopApiService"',
...
...
custom-tab-bar/index.wxss
View file @
da0249b7
This diff is collapsed.
Click to expand it.
project.config.json
View file @
da0249b7
...
@@ -41,17 +41,10 @@
...
@@ -41,17 +41,10 @@
"simulatorPluginLibVersion"
:
{},
"simulatorPluginLibVersion"
:
{},
"libVersion"
:
"2.15.0"
,
"libVersion"
:
"2.15.0"
,
"condition"
:
{
"condition"
:
{
"search"
:
{
"list"
:
[]
},
"conversation"
:
{
"list"
:
[]
},
"plugin"
:
{
"plugin"
:
{
"list"
:
[]
"list"
:
[]
},
},
"game"
:
{
"game"
:
{
"currentL"
:
-1
,
"list"
:
[]
"list"
:
[]
},
},
"gamePlugin"
:
{
"gamePlugin"
:
{
...
@@ -79,6 +72,17 @@
...
@@ -79,6 +72,17 @@
"pathName"
:
"pages/index/main"
,
"pathName"
:
"pages/index/main"
,
"query"
:
"scene=pid_6141"
,
"query"
:
"scene=pid_6141"
,
"scene"
:
1047
"scene"
:
1047
},
{
"name"
:
"pages/tabBar1/main"
,
"pathName"
:
"pages/tabBar1/main"
,
"query"
:
""
,
"scene"
:
null
},
{
"name"
:
"pages/tabBar4/main"
,
"pathName"
:
"pages/tabBar4/main"
,
"scene"
:
null
}
}
]
]
}
}
...
...
src/app.json
View file @
da0249b7
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
"pages/tabBar1/main"
,
"pages/tabBar1/main"
,
"pages/tabBar2/main"
,
"pages/tabBar2/main"
,
"pages/tabBar3/main"
,
"pages/tabBar3/main"
,
"pages/tabBar4/main"
,
"pages/changeAdr/main"
"pages/changeAdr/main"
],
],
"tabBar"
:
{
"tabBar"
:
{
...
@@ -31,6 +32,9 @@
...
@@ -31,6 +32,9 @@
},
},
{
{
"pagePath"
:
"pages/tabBar3/main"
"pagePath"
:
"pages/tabBar3/main"
},
{
"pagePath"
:
"pages/tabBar4/main"
}
}
]
]
},
},
...
...
src/pages/home/index.vue
View file @
da0249b7
...
@@ -217,6 +217,7 @@ export default {
...
@@ -217,6 +217,7 @@ export default {
}
else
{
}
else
{
this
.
mpApp
.
themeColorCallBack
=
(
res
)
=>
{
this
.
mpApp
.
themeColorCallBack
=
(
res
)
=>
{
this
.
themeColor
=
res
this
.
themeColor
=
res
}
}
}
}
...
...
src/utils/mayi.js
View file @
da0249b7
...
@@ -3,7 +3,12 @@ import cart from "@/api/cart"
...
@@ -3,7 +3,12 @@ import cart from "@/api/cart"
// 登录白名单 name
// 登录白名单 name
export
const
noLoginList
=
[
"index"
,
"media-video"
,
"goods-goodsInfo"
,
"goods-commodityMenu"
,
"goodsSearch-goodsSearch"
,
"chooseStores"
,
"activty-receivingGift"
,
"activty"
,
"login-register"
,
"login-phoneLogin"
,
"login-authInformation"
,
"login-forgetPassWord"
,
"login-accountLogin"
,
"login-wxRegister"
,
"pay-payList"
,
"comment-evaluateList"
,
"goods-commonProblemList"
,
"article-articlePage"
,
"article-articleList"
,
"goods-posters"
,
"liveBroadcast"
,
"liveBroadcast-list"
,
"personalCenter-coupon-getCoupon"
,
"buyerShow-showDetail"
,
"goods-addGoodsList"
,
"personalCenter-CDkey-exchange"
,
"giftCards-linkReceive"
,
"giftCoupon-preview"
,
"smartForm"
,
"shopCart-shareShopCart"
,
"groupBuying-beInvite"
,
"brandTopics"
,
'personalCenter-spokesmanCenter'
,
'personalCenter-spokesmanCenter-mine-spokesmanHomePage'
,
'liveBroadcast-lived'
,
'personalCenter-spokesmanCenter-mine-getBusinessCard'
,
'changeAdr'
];
export
const
noLoginList
=
[
"index"
,
"media-video"
,
"goods-goodsInfo"
,
"goods-commodityMenu"
,
"goodsSearch-goodsSearch"
,
"chooseStores"
,
"activty-receivingGift"
,
"activty"
,
"login-register"
,
"login-phoneLogin"
,
"login-authInformation"
,
"login-forgetPassWord"
,
"login-accountLogin"
,
"login-wxRegister"
,
"pay-payList"
,
"comment-evaluateList"
,
"goods-commonProblemList"
,
"article-articlePage"
,
"article-articleList"
,
"goods-posters"
,
"liveBroadcast"
,
"liveBroadcast-list"
,
"personalCenter-coupon-getCoupon"
,
"buyerShow-showDetail"
,
"goods-addGoodsList"
,
"personalCenter-CDkey-exchange"
,
"giftCards-linkReceive"
,
"giftCoupon-preview"
,
"smartForm"
,
"shopCart-shareShopCart"
,
"groupBuying-beInvite"
,
"brandTopics"
,
'personalCenter-spokesmanCenter'
,
'personalCenter-spokesmanCenter-mine-spokesmanHomePage'
,
'liveBroadcast-lived'
,
'personalCenter-spokesmanCenter-mine-getBusinessCard'
,
'changeAdr'
];
// path
// path
export
const
noLoginListPath
=
noLoginList
.
map
(
item
=>
item
.
replace
(
/-/g
,
'/'
))
export
const
noLoginListPath
=
noLoginList
.
map
(
item
=>
{
item
=
item
.
replace
(
/-/g
,
'/'
)
item
=
'/'
+
item
item
==
"/index"
&&
(
item
=
"/"
)
return
item
})
// 主题色
// 主题色
export
let
themeColor
=
{
export
let
themeColor
=
{
...
@@ -25,21 +30,21 @@ export function $themeToLink(data, option) {
...
@@ -25,21 +30,21 @@ export function $themeToLink(data, option) {
// 点击底部栏
// 点击底部栏
if
(
option
)
{
if
(
option
)
{
let
parseLink
=
getUrlofLink
(
data
);
let
parseLink
=
getUrlofLink
(
data
);
let
aa
=
noLoginListPath
.
includes
(
parseLink
.
substr
(
1
))
let
aa
=
noLoginListPath
.
includes
(
parseLink
)
||
parseLink
.
substr
(
0
,
7
)
==
"/goods/"
console
.
log
(
parseLink
,
aa
,
'parseLinkparseLinkparseLink'
,
parseLink
.
substr
(
1
)
,
noLoginListPath
)
console
.
log
(
parseLink
,
aa
,
'parseLinkparseLinkparseLink'
,
parseLink
,
noLoginListPath
)
if
(
!
aa
&&
!
wx
.
getStorageSync
(
"sessionid"
))
{
if
(
!
aa
&&
!
wx
.
getStorageSync
(
"sessionid"
))
{
let
url
=
`/pages/login/main?back=
${
parseLink
}
`
;
let
url
=
`/pages/login/main?back=
${
parseLink
}
`
;
wx
.
navigateTo
({
url
});
wx
.
navigateTo
({
url
});
return
return
}
}
let
isTabbarIndex
=
checkTabbarPage
(
parseLink
);
// 替换首页位置
// 替换首页位置
let
isTabbarIndex
=
checkTabbarPage
(
parseLink
);
isTabbarIndex
=
isTabbarIndex
==
0
?
checkTabbarPage
(
'/'
)
:
isTabbarIndex
isTabbarIndex
=
isTabbarIndex
==
0
?
checkTabbarPage
(
'/'
)
:
isTabbarIndex
wx
.
switchTab
({
wx
.
switchTab
({
url
:
parseLink
==
'/'
?
'/pages/home/main'
:
`/pages/tabBar
${
isTabbarIndex
}
/main`
,
url
:
parseLink
==
'/'
?
'/pages/home/main'
:
`/pages/tabBar
${
isTabbarIndex
}
/main`
,
})
})
console
.
log
(
option
,
data
)
console
.
log
(
option
,
data
,
'---'
,
parseLink
==
'/'
?
'/pages/home/main'
:
`/pages/tabBar
${
isTabbarIndex
}
/main`
)
return
return
}
}
...
...
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