feat(global): 底部导航栏移除会员专区
This commit is contained in:
parent
8767788959
commit
b097d35d48
|
|
@ -23,18 +23,7 @@
|
||||||
src="@/static/images/one2.png"
|
src="@/static/images/one2.png"
|
||||||
></image>
|
></image>
|
||||||
</u-tabbar-item>
|
</u-tabbar-item>
|
||||||
<u-tabbar-item :text="'会员专区'">
|
|
||||||
<image
|
|
||||||
class="u-page__item__slot-icon"
|
|
||||||
slot="active-icon"
|
|
||||||
src="@/static/images/five1.jpg"
|
|
||||||
></image>
|
|
||||||
<image
|
|
||||||
class="u-page__item__slot-icon"
|
|
||||||
slot="inactive-icon"
|
|
||||||
src="@/static/images/five2.jpg"
|
|
||||||
></image>
|
|
||||||
</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"
|
||||||
|
|
@ -74,81 +63,6 @@
|
||||||
></image>
|
></image>
|
||||||
</u-tabbar-item>
|
</u-tabbar-item>
|
||||||
</u-tabbar>
|
</u-tabbar>
|
||||||
<u-tabbar
|
|
||||||
:value="current ? current : 0"
|
|
||||||
class="greenEd"
|
|
||||||
v-if="systemSkin === 2"
|
|
||||||
@change="tabbarChange"
|
|
||||||
:fixed="true"
|
|
||||||
:placeholder="false"
|
|
||||||
:border="false"
|
|
||||||
:safeAreaInsetBottom="true"
|
|
||||||
inactiveColor="#666666"
|
|
||||||
activeColor="#333333"
|
|
||||||
>
|
|
||||||
<u-tabbar-item :text="'首页'">
|
|
||||||
<image
|
|
||||||
class="u-page__item__slot-icon1"
|
|
||||||
slot="active-icon"
|
|
||||||
src="@/static/images/one11.jpg"
|
|
||||||
></image>
|
|
||||||
<image
|
|
||||||
class="u-page__item__slot-icon1"
|
|
||||||
slot="inactive-icon"
|
|
||||||
src="@/static/images/one11.jpg"
|
|
||||||
></image>
|
|
||||||
</u-tabbar-item>
|
|
||||||
<u-tabbar-item :text="'会员专区'">
|
|
||||||
<image
|
|
||||||
class="u-page__item__slot-icon2"
|
|
||||||
slot="active-icon"
|
|
||||||
src="@/static/images/five11.jpg"
|
|
||||||
></image>
|
|
||||||
<image
|
|
||||||
class="u-page__item__slot-icon2"
|
|
||||||
slot="inactive-icon"
|
|
||||||
src="@/static/images/five11.jpg"
|
|
||||||
></image>
|
|
||||||
</u-tabbar-item>
|
|
||||||
<u-tabbar-item :text="'个人推广'">
|
|
||||||
<image
|
|
||||||
class="u-page__item__slot-icon1"
|
|
||||||
slot="active-icon"
|
|
||||||
src="@/static/images/share-act.svg"
|
|
||||||
></image>
|
|
||||||
<image
|
|
||||||
class="u-page__item__slot-icon1"
|
|
||||||
slot="inactive-icon"
|
|
||||||
src="@/static/images/share.svg"
|
|
||||||
></image>
|
|
||||||
</u-tabbar-item>
|
|
||||||
|
|
||||||
<u-tabbar-item :text="'购物车'" :badge="shopCarLength">
|
|
||||||
<image
|
|
||||||
class="u-page__item__slot-icon1"
|
|
||||||
slot="active-icon"
|
|
||||||
src="@/static/images/three11.jpg"
|
|
||||||
></image>
|
|
||||||
<image
|
|
||||||
class="u-page__item__slot-icon1"
|
|
||||||
slot="inactive-icon"
|
|
||||||
src="@/static/images/three11.jpg"
|
|
||||||
></image>
|
|
||||||
</u-tabbar-item>
|
|
||||||
|
|
||||||
<u-tabbar-item :text="'我的'">
|
|
||||||
<image
|
|
||||||
class="u-page__item__slot-icon1"
|
|
||||||
slot="active-icon"
|
|
||||||
src="@/static/images/fore11.jpg"
|
|
||||||
></image>
|
|
||||||
<image
|
|
||||||
class="u-page__item__slot-icon1"
|
|
||||||
slot="inactive-icon"
|
|
||||||
src="@/static/images/fore11.jpg"
|
|
||||||
></image>
|
|
||||||
</u-tabbar-item>
|
|
||||||
</u-tabbar>
|
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -165,10 +79,6 @@ export default {
|
||||||
text: '首页',
|
text: '首页',
|
||||||
path: 'pages/index/index',
|
path: 'pages/index/index',
|
||||||
},
|
},
|
||||||
{
|
|
||||||
text: '会员专区',
|
|
||||||
path: 'pages/specialArea/index',
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
text: '个人推广',
|
text: '个人推广',
|
||||||
path: 'pages/mine/share/index',
|
path: 'pages/mine/share/index',
|
||||||
|
|
|
||||||
|
|
@ -101,13 +101,12 @@ import areaProductList from '@/components/area-product-list/index.vue'
|
||||||
import { formatCurrency } from '@/util/index.js'
|
import { formatCurrency } from '@/util/index.js'
|
||||||
import { mapGetters } from 'vuex'
|
import { mapGetters } from 'vuex'
|
||||||
import RegionSelect from '@/components/region-select/index.vue'
|
import RegionSelect from '@/components/region-select/index.vue'
|
||||||
import RaisedTabbar from '@/components/raised-tabbar.vue'
|
|
||||||
import GoodsList from '@/components/goods-list.vue'
|
import GoodsList from '@/components/goods-list.vue'
|
||||||
import RankingPopup from '@/components/RankingPopup.vue'
|
import RankingPopup from '@/components/RankingPopup.vue'
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
noticePopup,
|
noticePopup,
|
||||||
'cl-tabbar': RaisedTabbar,
|
'cl-tabbar': clTabbar,
|
||||||
areaProductList,
|
areaProductList,
|
||||||
RegionSelect,
|
RegionSelect,
|
||||||
GoodsList,
|
GoodsList,
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="ju_grade" v-if="!ifSpecial && !newShareMember" >
|
<view class="ju_grade" v-if="!ifSpecial && !newShareMember">
|
||||||
<!-- <view v-if="awards.tarAwardsName" class="awards-progress-summary" style="text-align: center;">
|
<!-- <view v-if="awards.tarAwardsName" class="awards-progress-summary" style="text-align: center;">
|
||||||
<span class="descriptive-text">当前距离</span>
|
<span class="descriptive-text">当前距离</span>
|
||||||
<span class="highlight-name">
|
<span class="highlight-name">
|
||||||
|
|
@ -314,7 +314,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"
|
||||||
|
|
@ -358,7 +358,7 @@ import RegionSelect from '@/components/region-select/index.vue'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
'cl-tabbar': RaisedTabbar,
|
'cl-tabbar': clTabbar,
|
||||||
RegionSelect,
|
RegionSelect,
|
||||||
// talentList,
|
// talentList,
|
||||||
},
|
},
|
||||||
|
|
@ -666,8 +666,8 @@ export default {
|
||||||
return `${(Math.floor(valueInWan * 100) / 100).toFixed(2)}`
|
return `${(Math.floor(valueInWan * 100) / 100).toFixed(2)}`
|
||||||
},
|
},
|
||||||
getMemberBalance() {
|
getMemberBalance() {
|
||||||
if(this.newShareMember){
|
if (this.newShareMember) {
|
||||||
return;
|
return
|
||||||
}
|
}
|
||||||
getMemberBalance().then(res => {
|
getMemberBalance().then(res => {
|
||||||
console.log('🌈res', res)
|
console.log('🌈res', res)
|
||||||
|
|
@ -730,7 +730,7 @@ export default {
|
||||||
if (res) {
|
if (res) {
|
||||||
this.userInfo = res.data || {}
|
this.userInfo = res.data || {}
|
||||||
console.log(this.userInfo)
|
console.log(this.userInfo)
|
||||||
this.newShareMember = (this.userInfo?.loginType !== 0);
|
this.newShareMember = this.userInfo?.loginType !== 0
|
||||||
if (this.userInfo.memberCode == 'BD68880628' || this.newShareMember) {
|
if (this.userInfo.memberCode == 'BD68880628' || this.newShareMember) {
|
||||||
this.ifSpecial = true
|
this.ifSpecial = true
|
||||||
this.otherMenuList = [
|
this.otherMenuList = [
|
||||||
|
|
@ -835,7 +835,7 @@ export default {
|
||||||
|
|
||||||
// },
|
// },
|
||||||
]
|
]
|
||||||
if(this.newShareMember){
|
if (this.newShareMember) {
|
||||||
this.otherMenuList = [
|
this.otherMenuList = [
|
||||||
{
|
{
|
||||||
url: '/pages/pickupArea/pickupArea',
|
url: '/pages/pickupArea/pickupArea',
|
||||||
|
|
|
||||||
|
|
@ -39,7 +39,7 @@
|
||||||
/>
|
/>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<cl-tabbar class="tabbar" :current="2" />
|
<cl-tabbar class="tabbar" :current="1" />
|
||||||
</view>
|
</view>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -53,7 +53,7 @@ import RaisedTabbar from '@/components/raised-tabbar.vue'
|
||||||
export default {
|
export default {
|
||||||
name: 'ShareQRCode',
|
name: 'ShareQRCode',
|
||||||
components: {
|
components: {
|
||||||
'cl-tabbar': RaisedTabbar,
|
'cl-tabbar': clTabbar,
|
||||||
DefaultSharePage,
|
DefaultSharePage,
|
||||||
SpecialSharePage,
|
SpecialSharePage,
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,3 @@
|
||||||
<!--
|
|
||||||
* @Descripttion:
|
|
||||||
* @version:
|
|
||||||
* @Author: kBank
|
|
||||||
* @Date: 2022-11-21 15:11:22
|
|
||||||
-->
|
|
||||||
<template>
|
<template>
|
||||||
<view class="content">
|
<view class="content">
|
||||||
<view class="context">
|
<view class="context">
|
||||||
|
|
@ -139,7 +133,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"
|
||||||
|
|
@ -185,7 +179,7 @@ import RaisedTabbar from '@/components/raised-tabbar.vue'
|
||||||
import { canOrder } from '@/config/order'
|
import { canOrder } from '@/config/order'
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
'cl-tabbar': RaisedTabbar,
|
'cl-tabbar': clTabbar,
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue