Commit 904139af by 张卓

魔方导航兼容

parent 033b5557
...@@ -235,18 +235,6 @@ export default { ...@@ -235,18 +235,6 @@ export default {
}) })
//获取分销信息 //获取分销信息
this.getSpokesmanInit(options) this.getSpokesmanInit(options)
}else {
let footerVal = {...app.globalData.footerVal};
console.log('"分销员中心"',footerVal)
if (footerVal.componentData) {
footerVal.componentData.list.forEach(res=>{
if(res.link.name=="分销员中心"||res.link.name=="分销商中心") {
res.show = false
}
})
app.globalData.footerVal = footerVal;
this.$mp.page.selectComponent(".custom-tab-bar").init();
}
} }
// 来源 // 来源
if (options.from == "logout") { if (options.from == "logout") {
...@@ -347,6 +335,18 @@ export default { ...@@ -347,6 +335,18 @@ export default {
this.$mp.page.selectComponent(".custom-tab-bar").init(); this.$mp.page.selectComponent(".custom-tab-bar").init();
// that.applySucessEntry = res; // that.applySucessEntry = res;
}) })
}else {
let footerVal = {...app.globalData.footerVal};
console.log('"分销员中心"',footerVal)
if (footerVal.componentData) {
footerVal.componentData.list.forEach(res=>{
if(res.link.name=="分销员中心"||res.link.name=="分销商中心") {
res.show = false
}
})
app.globalData.footerVal = footerVal;
this.$mp.page.selectComponent(".custom-tab-bar").init();
}
} }
}, },
getSpokesmanInit(extConfig) { getSpokesmanInit(extConfig) {
......
...@@ -13,7 +13,7 @@ class fenxiaoModel{ ...@@ -13,7 +13,7 @@ class fenxiaoModel{
apply_for_withdraw: null,//关闭分销弹框 apply_for_withdraw: null,//关闭分销弹框
} }
spokesmanInfo = null;//分销信息 spokesmanInfo = null;//分销信息
applySucessEntry = null;//分销弹框信息 applySucessEntry = {};//分销弹框信息
spokesmanidByShareInfo = null;//获取分享信息 spokesmanidByShareInfo = null;//获取分享信息
distributorHomepageInfo = null;//小店详情 distributorHomepageInfo = null;//小店详情
constructor({ constructor({
...@@ -138,6 +138,7 @@ class fenxiaoModel{ ...@@ -138,6 +138,7 @@ class fenxiaoModel{
res.data.data != "null" && res.data.data != "null" &&
res.data.data != "false" res.data.data != "false"
) { ) {
_this.applySucessEntry = res.data.data;
resolve(res.data.data) resolve(res.data.data)
}else{ }else{
reject(res) reject(res)
...@@ -146,10 +147,10 @@ class fenxiaoModel{ ...@@ -146,10 +147,10 @@ class fenxiaoModel{
}) })
} }
//查询分销商货架 //查询分销商货架
getDistributorHomepageGoodsList() { getDistributorHomepageGoodsList(data) {
let _this = this let _this = this
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
_this.fenxiaoApi.getDistributorHomepageGoodsList().then(res=>{ _this.fenxiaoApi.getDistributorHomepageGoodsList(data).then(res=>{
if(res.data.code == '200') { if(res.data.code == '200') {
resolve(res.data.data) resolve(res.data.data)
}else { }else {
......
...@@ -23,7 +23,8 @@ Component({ ...@@ -23,7 +23,8 @@ Component({
changeShow: false, changeShow: false,
positionName: '定位中', positionName: '定位中',
wxReady: false, wxReady: false,
designateAreaObj : null designateAreaObj : null,
showSpokesManHome: false,
}, },
ready(){ ready(){
console.log('++++++++++++++++++++定位组件加载好了++++++++++++++++++++') console.log('++++++++++++++++++++定位组件加载好了++++++++++++++++++++')
...@@ -36,7 +37,20 @@ Component({ ...@@ -36,7 +37,20 @@ Component({
this.setData({ this.setData({
designateAreaObj: this.data.datas.componentData.designateAreaObj designateAreaObj: this.data.datas.componentData.designateAreaObj
}) })
//分销商货架存在
if(
app.fenxiaoModel.spokesmanInfo&&
app.fenxiaoModel.spokesmanInfo.parentSpokesmanDistributionModel == '1'&&
app.fenxiaoModel.spokesmanInfo.distributorHomepage.id
) {
this.setData({
showSpokesManHome: true
})
}else {
this.setData({
showSpokesManHome: false
})
}
console.log(this.data.datas.componentData.designateAreaObj,'2222') console.log(this.data.datas.componentData.designateAreaObj,'2222')
if (!wx.getStorageSync('location')) { if (!wx.getStorageSync('location')) {
......
<!--static/nativeComponents/AreaNavigation/index.wxml--> <!--static/nativeComponents/AreaNavigation/index.wxml-->
<van-sticky offset-top="44px" wx:if="{{datas.componentData.scrollPosition}}"> <van-sticky offset-top="44px" wx:if="{{datas.componentData.scrollPosition}}">
<view class="area-navigation clearfix" style="background-color:{{datas.componentData.backgroundColor}}"> <view class="area-navigation clearfix {{showSpokesManHome?'area-navigation-margintop':''}}" style="background-color:{{datas.componentData.backgroundColor}}">
<view style="width:100%;display:flex;"> <view style="width:100%;display:flex;">
<view class="area-l" style="font-size:{{datas.componentData.fontSize / 16 + 'em'}};color:{{datas.componentData.fontColor}};font-weight:{{datas.componentData.fontWeight}}" bindtap="changeOtherCity"> <view class="area-l" style="font-size:{{datas.componentData.fontSize / 16 + 'em'}};color:{{datas.componentData.fontColor}};font-weight:{{datas.componentData.fontWeight}}" bindtap="changeOtherCity">
<view class="antt ant-gongsidizhi"></view> <view class="antt ant-gongsidizhi"></view>
......
...@@ -8,6 +8,9 @@ ...@@ -8,6 +8,9 @@
font-size: 32rpx; font-size: 32rpx;
top: 0; top: 0;
} }
.area-navigation-margintop {
padding-top: 100rpx;
}
.area-l{ .area-l{
line-height: 60rpx; line-height: 60rpx;
} }
......
...@@ -97,6 +97,7 @@ const componentOptions = { ...@@ -97,6 +97,7 @@ const componentOptions = {
...this.data.query, ...this.data.query,
distributorHomepageId: this.spokesmanInfo.distributorHomepage.id, distributorHomepageId: this.spokesmanInfo.distributorHomepage.id,
} }
console.log(query,555555777777)
app.fenxiaoModel.getDistributorHomepageGoodsList(query).then(res=>{ app.fenxiaoModel.getDistributorHomepageGoodsList(query).then(res=>{
if(res) { if(res) {
let lists = []; let lists = [];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment