forked from angelo/web-retail-h5
feat(tabbar): 底部tabbar更改 移除会员专区
This commit is contained in:
parent
9b7ddb30e1
commit
25898024ac
|
@ -1,23 +1,19 @@
|
||||||
<!--
|
<!--
|
||||||
* @Descripttion:
|
* @Descripttion:
|
||||||
* @version:
|
* @version:
|
||||||
* @Author: kBank
|
* @Author: kBank
|
||||||
* @Date: 2022-11-21 16:46:09
|
* @Date: 2022-11-21 16:46:09
|
||||||
-->
|
-->
|
||||||
<template>
|
<template>
|
||||||
<view class="navBar"
|
<view class="navBar" @tap="toBack">
|
||||||
@tap="toBack">
|
<u-icon name="arrow-left" size="14" color="#333"></u-icon>
|
||||||
<u-icon name="arrow-left"
|
|
||||||
size="14"
|
|
||||||
color="#333"></u-icon>
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
export default {
|
export default {
|
||||||
name: 'navBar',
|
name: 'navBar',
|
||||||
props:['diff'],
|
props: ['diff'],
|
||||||
data() {
|
data() {
|
||||||
return {}
|
return {}
|
||||||
},
|
},
|
||||||
|
@ -35,15 +31,15 @@ export default {
|
||||||
uni.switchTab({ url: '/pages/specialArea/index' })
|
uni.switchTab({ url: '/pages/specialArea/index' })
|
||||||
} else if (this.diff == 1) {
|
} else if (this.diff == 1) {
|
||||||
uni.switchTab({ url: '/pages/index/index' })
|
uni.switchTab({ url: '/pages/index/index' })
|
||||||
}else if (this.diff == 2) {
|
} else if (this.diff == 2) {
|
||||||
uni.navigateBack()
|
uni.navigateBack()
|
||||||
} else {
|
} else {
|
||||||
if(pages[pages.length - 2]&&pages[pages.length - 2].route){
|
if (pages[pages.length - 2] && pages[pages.length - 2].route) {
|
||||||
uni.navigateBack()
|
uni.navigateBack()
|
||||||
}else{
|
} else {
|
||||||
uni.switchTab({ url: '/pages/index/index' })
|
uni.switchTab({ url: '/pages/index/index' })
|
||||||
}
|
}
|
||||||
// uni.navigateBack()
|
// uni.navigateBack()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -64,4 +60,4 @@ export default {
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
src="@/static/images/one2.png"
|
src="@/static/images/one2.png"
|
||||||
></image>
|
></image>
|
||||||
</u-tabbar-item>
|
</u-tabbar-item>
|
||||||
<u-tabbar-item :text="'会员专区'">
|
<!-- <u-tabbar-item :text="'会员专区'">
|
||||||
<image
|
<image
|
||||||
class="u-page__item__slot-icon"
|
class="u-page__item__slot-icon"
|
||||||
slot="active-icon"
|
slot="active-icon"
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
slot="inactive-icon"
|
slot="inactive-icon"
|
||||||
src="@/static/images/five2.jpg"
|
src="@/static/images/five2.jpg"
|
||||||
></image>
|
></image>
|
||||||
</u-tabbar-item>
|
</u-tabbar-item> -->
|
||||||
<u-tabbar-item :text="'个人推广'">
|
<u-tabbar-item :text="'个人推广'">
|
||||||
<image
|
<image
|
||||||
class="u-page__item__slot-icon"
|
class="u-page__item__slot-icon"
|
||||||
|
@ -67,7 +67,6 @@
|
||||||
src="@/static/images/three2.png"
|
src="@/static/images/three2.png"
|
||||||
></image>
|
></image>
|
||||||
</u-tabbar-item>
|
</u-tabbar-item>
|
||||||
|
|
||||||
<u-tabbar-item :text="'我的'">
|
<u-tabbar-item :text="'我的'">
|
||||||
<image
|
<image
|
||||||
class="u-page__item__slot-icon"
|
class="u-page__item__slot-icon"
|
||||||
|
@ -105,7 +104,7 @@
|
||||||
src="@/static/images/one11.jpg"
|
src="@/static/images/one11.jpg"
|
||||||
></image>
|
></image>
|
||||||
</u-tabbar-item>
|
</u-tabbar-item>
|
||||||
<u-tabbar-item :text="'会员专区'">
|
<!-- <u-tabbar-item :text="'会员专区'">
|
||||||
<image
|
<image
|
||||||
class="u-page__item__slot-icon2"
|
class="u-page__item__slot-icon2"
|
||||||
slot="active-icon"
|
slot="active-icon"
|
||||||
|
@ -116,7 +115,7 @@
|
||||||
slot="inactive-icon"
|
slot="inactive-icon"
|
||||||
src="@/static/images/five11.jpg"
|
src="@/static/images/five11.jpg"
|
||||||
></image>
|
></image>
|
||||||
</u-tabbar-item>
|
</u-tabbar-item> -->
|
||||||
<u-tabbar-item :text="'个人推广'">
|
<u-tabbar-item :text="'个人推广'">
|
||||||
<image
|
<image
|
||||||
class="u-page__item__slot-icon1"
|
class="u-page__item__slot-icon1"
|
||||||
|
@ -172,10 +171,10 @@ export default {
|
||||||
text: '首页',
|
text: '首页',
|
||||||
path: 'pages/index/index',
|
path: 'pages/index/index',
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
text: '会员专区',
|
// text: '会员专区',
|
||||||
path: 'pages/specialArea/index',
|
// path: 'pages/specialArea/index',
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
text: '个人推广',
|
text: '个人推广',
|
||||||
path: 'pages/mine/share/index',
|
path: 'pages/mine/share/index',
|
||||||
|
|
|
@ -916,9 +916,6 @@
|
||||||
{
|
{
|
||||||
"pagePath": "pages/index/index"
|
"pagePath": "pages/index/index"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"pagePath": "pages/specialArea/index"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"pagePath": "pages/shoppingCar/index"
|
"pagePath": "pages/shoppingCar/index"
|
||||||
},
|
},
|
||||||
|
|
|
@ -232,7 +232,7 @@
|
||||||
:text="'退出登录'"
|
:text="'退出登录'"
|
||||||
></u-button>
|
></u-button>
|
||||||
</view>
|
</view>
|
||||||
<cl-tabbar :current="4"></cl-tabbar>
|
<cl-tabbar :current="3"></cl-tabbar>
|
||||||
<u-popup
|
<u-popup
|
||||||
:show="pswShow"
|
:show="pswShow"
|
||||||
class="pspopup"
|
class="pspopup"
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
<img class="fullscreen-image" :src="generatedImageUrl" @click.stop="" />
|
<img class="fullscreen-image" :src="generatedImageUrl" @click.stop="" />
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<cl-tabbar class="tabbar" :current="2" />
|
<cl-tabbar class="tabbar" :current="1" />
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
@ -139,7 +139,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<cl-tabbar :current="3"></cl-tabbar>
|
<cl-tabbar :current="2"></cl-tabbar>
|
||||||
<view class="pp">
|
<view class="pp">
|
||||||
<u-popup
|
<u-popup
|
||||||
:show="dialogVisible2"
|
:show="dialogVisible2"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<view class="content">
|
<view class="content">
|
||||||
<special-area-wrapper v-if="specialAreaVisble" :userInfo="userInfo" />
|
<special-area-wrapper v-if="specialAreaVisble" :userInfo="userInfo" />
|
||||||
|
|
||||||
<cl-tabbar :current="1"></cl-tabbar>
|
<!-- <cl-tabbar :current="1"></cl-tabbar> -->
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
|
@ -214,7 +214,7 @@ export default {
|
||||||
goodList: [],
|
goodList: [],
|
||||||
titLabel: '',
|
titLabel: '',
|
||||||
itemChildren: [],
|
itemChildren: [],
|
||||||
diff: 0,
|
diff: null,
|
||||||
shopCarLength: false,
|
shopCarLength: false,
|
||||||
userInfo: {},
|
userInfo: {},
|
||||||
pkCountry: 1,
|
pkCountry: 1,
|
||||||
|
|
Loading…
Reference in New Issue