From daeb8b9695953f6b3d2d9060b1cbbc35b132b110 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sun, 25 Jun 2023 18:03:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=BA=95=E9=83=A8?=
=?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=BC=98=E5=8C=96=20=20=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E5=85=A8=E9=83=A8=E4=BD=BF=E7=94=A8=E5=BD=93=E5=89=8D=E9=97=A8?=
=?UTF-8?q?=E5=BA=97=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=BB=98=E8=AE=A4=E5=BA=95?=
=?UTF-8?q?=E9=83=A8=E5=AF=BC=E8=88=AA=20=E4=BC=98=E5=8C=96=EF=BC=9A?=
=?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=BB=91=E5=AE=9A=20-=20=E5=8D=8F?=
=?UTF-8?q?=E8=AE=AE=E5=86=85=E5=AE=B9=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mycomponent/foot/foot.js | 63 +++++++++++++++++-----
packageA/member/editmobile/editmobile.wxml | 4 +-
2 files changed, 52 insertions(+), 15 deletions(-)
diff --git a/mycomponent/foot/foot.js b/mycomponent/foot/foot.js
index 32b47b4..3b9285e 100644
--- a/mycomponent/foot/foot.js
+++ b/mycomponent/foot/foot.js
@@ -247,17 +247,24 @@ Component({
// height: wx.getSystemInfoSync().windowHeight,
clientWidth: wx.getSystemInfoSync().windowWidth,
});
-
let pages = getCurrentPages(); //获取加载的页面
let currentPage = pages[pages.length - 1]; //获取当前页面的对象
// 页面路由 pageName：独立门店路由
let pathName = currentPage.__route__;
+ console.log('------- 当前页面 -----------',currentPage.route);
this.setData({
routeData: currentPage.route,
selectedMenuIndex: ''
});
-
let that = this;
+
+
+
+ console.log('--------------- 装修内容 ------------------------',this.data.datas);
+ // 获取门店默认菜单
+ this.getDefaultMenu();
+
+ return false;// TODO：这里强制使用每个门店设置的默认菜单
// console.log(this.data.datas,this.data.foot_type,"this.data.foot_type")
// console.log(pathName , pageName, "pageName")
if (this.data.isDiy && this.data.datas) {
@@ -267,7 +274,8 @@ Component({
this.setData({
routeDataShow: false,
});
- } else if (!this.data.foot_type || this.data.foot_type == 1) {
+ }
+ else if (!this.data.foot_type || this.data.foot_type == 1) {
if (this.data.datas.group_title) {
// 显示列表默认
@@ -321,7 +329,8 @@ Component({
}
- } else if (this.data.foot_type == 2) {
+ }
+ else if (this.data.foot_type == 2) {
// 显示自定义的底部导航
if (!this.data.datas.group_title) {
this.setData({
@@ -329,12 +338,10 @@ Component({
});
return;
}
-
this.setData({
menu_button: this.data.datas.button_item.menu_button,
tab_style: this.data.datas.tab_style.value
});
-
if (this.data.datas.button_item && this.data.datas.button_item.menu_button) {
let menus = this.data.datas.button_item.menu_button;
for (let i = 0; i < menus.length; i++) {
@@ -372,9 +379,7 @@ Component({
}
}
-
}
-
}
else if (app.globalData.store_alone_temp == 1 || pathName == pageName) {
// 门店独立模块
@@ -382,7 +387,6 @@ Component({
menu_button: that.data.storeData.button_item.menu_button,
tab_style: that.data.storeData.tab_style.value
});
-
// 显示storeData的底部导航
if (that.data.menu_button) {
let menus = that.data.menu_button;
@@ -397,7 +401,6 @@ Component({
}
}
}
-
}
else {
// 其他页面
@@ -821,10 +824,44 @@ Component({
});
},
-
-
-
+ // 获取门店设置的默认底部菜单
+ getDefaultMenu(){
+ let _this = this;
+ app._getNetWork({
+ url: app.getNetAddresss("plugin.store-cashier.frontend.store.get-store-info.getDefaultFooterMenu"),
+ success: (result) => {
+ let res = result.data;
+ if (parseInt(res.result) === 1) {
+ console.log('------- 默认底部菜单 ----------',res.data);
+ _this.setData({
+ menu_button: res.data.button_item.menu_button,
+ tab_style: res.data.tab_style.value
+ },function(){
+ _this.selectedButton();
+ });
+ }
+ },
+ fail: function (res) {
+ console.log("fail " + res);
+ }
+ });
+ },
+ // 选中底部导航按钮
+ selectedButton(){
+ let _this = this;
+ let routeData = this.data.routeData;
+ let menuButtons = _this.data.menu_button;
+ Object.values(menuButtons).forEach(function (item,index){
+ let url = item.link || '';
+ if(url.indexOf(routeData) > 0){
+ _this.setData({
+ routeDataShow: true,
+ selectedMenuIndex: index,
+ });
+ }
+ });
+ }
diff --git a/packageA/member/editmobile/editmobile.wxml b/packageA/member/editmobile/editmobile.wxml
index 964463a..337e4a5 100644
--- a/packageA/member/editmobile/editmobile.wxml
+++ b/packageA/member/editmobile/editmobile.wxml
@@ -128,7 +128,7 @@
-
+
确认授权开通并绑定会员