diff --git a/common/config.js b/common/config.js
index 676aebb..536d05e 100644
--- a/common/config.js
+++ b/common/config.js
@@ -17,7 +17,7 @@ export const whiteList = [
"pages/shouye/huanxiang", // 换箱页面
"pages/mall/index", // 商城首页
"pages/shouye/detail_wuxian", // 无限详情页
- "pages/sangdai/sangdai", // 盒柜页面
+ "pages/hegui/hegui", // 盒柜页面
"pages/infinite/index", // 福利首页
"pages/user/index", // 用户中心
"pages/infinite/daily_check_in", // 每日签到
diff --git a/common/platform/AppPlatform.js b/common/platform/AppPlatform.js
index 81bee73..2ce520c 100644
--- a/common/platform/AppPlatform.js
+++ b/common/platform/AppPlatform.js
@@ -18,6 +18,32 @@ class AppPlatform extends BasePlatform {
}
AppLaunch(options) {
console.log("AppLaunch", options);
+ uni.hideTabBar({})
+ this.getConfig().then(res => {
+ console.log("AppLaunch", res);
+
+ if (res.isCheck) {
+ console.log("开启审核模式开启审核模式开启审核模式开启审核模式开启审核模式开启审核模式开启审核模式");
+ uni.setTabBarItem({
+ index: 0,
+ visible: false,
+ });
+ uni.setTabBarItem({
+ index: 2,
+ text: "购物车"
+ // visible:false,
+ });
+ uni.setTabBarItem({
+ index: 3,
+ visible: false,
+ });
+ uni.showTabBar({})
+ uni.switchTab({
+ url: '/pages/mall/index'
+ });
+ // uni.tos
+ }
+ })
}
@@ -171,7 +197,18 @@ class AppPlatform extends BasePlatform {
getUserMenuList() {
// 获取基础菜单列表
const baseMenuList = super.getUserMenuList();
+ let menuList = [];
+ for (let i = 0; i < baseMenuList.length; i++) {
+ let menu = baseMenuList[i];
+ if (menu.id == 3) {
+ if (!this.getIsCheck("user_menu_3")) {
+ menuList.push(menu);
+ }
+ } else {
+ menuList.push(menu);
+ }
+ }
// 添加App特有的菜单项
const appSpecificMenus = [{
id: 12,
@@ -183,7 +220,7 @@ class AppPlatform extends BasePlatform {
}];
// 返回合并后的菜单列表
- return [...baseMenuList];
+ return menuList;
}
/**
@@ -266,7 +303,7 @@ class AppPlatform extends BasePlatform {
uni.removeStorageSync('token');
uni.removeStorageSync('userinfo');
uni.switchTab({
- url: '/pages/shouye/index'
+ url: '/pages/shouye/index'
});
// window.location.href = window.location.href;
}
diff --git a/common/platform/BasePlatform.js b/common/platform/BasePlatform.js
index d970664..9b54fc2 100644
--- a/common/platform/BasePlatform.js
+++ b/common/platform/BasePlatform.js
@@ -18,6 +18,7 @@ class BasePlatform {
this.config = null;
}
async getConfig() {
+ // return new Promise((resolve, reject) => {
if (this.config) {
return this.config;
}
@@ -25,6 +26,13 @@ class BasePlatform {
this.config = res;
return this.config;
}
+ /**
+ * 获取是否需要审核
+ * @returns {boolean} 是否需要审核
+ */
+ getIsCheck(tag) {
+ return this.config?.isCheck ?? false;
+ }
getPayData(url, data) {
throw new Error('子类必须实现 getPayData 方法');
}
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index e9b4d2a..2483be5 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -78,7 +78,7 @@
icon: '/static/tabbar/hegui.png',
actIcon: '/static/tabbar/hegui_sel.png',
title: '盒柜',
- path: '/pages/sangdai/sangdai'
+ path: '/pages/hegui/hegui'
},
{
id: 5,
@@ -109,7 +109,7 @@
icon: '/static/tabbar/hegui.png',
actIcon: '/static/tabbar/hegui_sel.png',
title: '盒柜',
- path: '/pages/sangdai/sangdai'
+ path: '/pages/hegui/hegui'
},
{
id: 4,
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 2bc2887..94e5fb7 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -19,7 +19,7 @@ Component({
},
{
"index": 3,
- "pagePath": "/pages/sangdai/sangdai",
+ "pagePath": "/pages/hegui/hegui",
"iconPath": "/static/tabbar/m3.png",
"selectedIconPath": "/static/tabbar/s3.png",
"text": "盒柜"
diff --git a/package/index/leitai.vue b/package/index/leitai.vue
index a2af6a2..65ce1e6 100644
--- a/package/index/leitai.vue
+++ b/package/index/leitai.vue
@@ -716,7 +716,7 @@ export default {
this.$c.to({
type: 3,
- url: "/pages/sangdai/sangdai",
+ url: "/pages/hegui/hegui",
});
},
diff --git a/package/index/lian-ji.vue b/package/index/lian-ji.vue
index 18d4a31..0dccfa4 100644
--- a/package/index/lian-ji.vue
+++ b/package/index/lian-ji.vue
@@ -695,7 +695,7 @@
this.$c.to({
type: 3,
- url: '/pages/sangdai/sangdai'
+ url: '/pages/hegui/hegui'
})
},
diff --git a/pages.json b/pages.json
index b2d9dd0..9fc8c71 100644
--- a/pages.json
+++ b/pages.json
@@ -180,23 +180,6 @@
"navigationStyle": "custom"
}
},
-
- {
- "path": "pages/sangdai/sangdai",
- "style": {
- "navigationBarBackgroundColor": "#222222",
- "navigationStyle": "custom",
- "disableSwipeBack": true
- }
- },
- {
- "path": "pages/sangdai/caceDetail",
- "style": {
- "navigationBarBackgroundColor": "#222222",
- "navigationStyle": "custom",
- "disableSwipeBack": true
- }
- },
{
"path": "pages/user/tui-guang",
"style": {
@@ -410,6 +393,13 @@
{
"navigationStyle": "custom"
}
+ },
+ {
+ "path" : "pages/hegui/hegui",
+ "style" :
+ {
+ "navigationStyle": "custom"
+ }
}
],
"subPackages": [{
@@ -512,7 +502,7 @@
"text": "商城"
},
{
- "pagePath": "pages/sangdai/sangdai",
+ "pagePath": "pages/hegui/hegui",
"iconPath": "static/tabbar/m3.png",
"selectedIconPath": "static/tabbar/s3.png",
"text": "盒柜"
diff --git a/pages/sangdai/sangdai.vue b/pages/hegui/hegui.vue
similarity index 98%
rename from pages/sangdai/sangdai.vue
rename to pages/hegui/hegui.vue
index ef732e6..603a9ce 100644
--- a/pages/sangdai/sangdai.vue
+++ b/pages/hegui/hegui.vue
@@ -453,12 +453,15 @@ export default {
if (this.tabList[this.tabCur].id != 1) return
const arr = []
-
- this.listData.forEach(item => {
- item.orderlist.forEach(a => {
- arr.push(a)
+ if (this.listData != null && this.listData.length > 0) {
+ this.listData.forEach(item => {
+ if (item != null && item.orderlist != null && item.orderlist.length > 0) {
+ item.orderlist.forEach(a => {
+ arr.push(a)
+ })
+ }
})
- })
+ }
return arr
.filter(item => item.prize_num > 0)
@@ -468,9 +471,11 @@ export default {
if (this.listData != null && this.listData.length > 0) {
let t = []
this.listData.forEach(it => {
- it.orderlist.forEach(a => {
- t.push(a)
- })
+ if (it != null && it.orderlist != null && it.orderlist.length > 0) {
+ it.orderlist.forEach(a => {
+ t.push(a)
+ })
+ }
})
return t
} else {
@@ -540,7 +545,7 @@ export default {
chooseAdd() {
this.canReload = false;
console.log('aaaaaaaaaaaaaaaaaaaa');
-
+
this.$platform.chooseAddress().then(res => {
console.log(res);
@@ -800,7 +805,6 @@ export default {
a.chooseNum = 0
})
})
-
this.freightData = res.data.yufei
}
if (res.data.show_dadajuan != null) {
@@ -1313,12 +1317,12 @@ export default {
// #endif
// #ifdef MP
bottom: calc(var(--window-bottom) + 160rpx);
-
+
// #endif
// #ifdef APP
bottom: 10px;
// #endif
-
+
width: 750rpx;
box-sizing: border-box;
padding: 0 30rpx 100rpx;
diff --git a/pages/sangdai/caceDetail.vue b/pages/sangdai/caceDetail.vue
deleted file mode 100644
index f4755ae..0000000
--- a/pages/sangdai/caceDetail.vue
+++ /dev/null
@@ -1,741 +0,0 @@
-
-
-
-
-
-
-
-
-
- 搜索
-
-
-
- {{v}}
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/shouye/detail.vue b/pages/shouye/detail.vue
index 7e1ec10..eac8c3d 100644
--- a/pages/shouye/detail.vue
+++ b/pages/shouye/detail.vue
@@ -606,7 +606,7 @@ export default {
this.$c.to({
type: 3,
- url: "/pages/sangdai/sangdai",
+ url: "/pages/hegui/hegui",
});
},
diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue
index d60406b..4d93033 100644
--- a/pages/shouye/detail_wuxian.vue
+++ b/pages/shouye/detail_wuxian.vue
@@ -521,7 +521,7 @@
this.$refs.resPop.close();
this.$c.to({
type: 3,
- url: '/pages/sangdai/sangdai'
+ url: '/pages/hegui/hegui'
})
},
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 66aaa05..91ce382 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -22,7 +22,7 @@
-
LV.{{ userinfo.quan_yi_level.level }}
@@ -49,7 +49,7 @@
-
+
{{ $config.getAppSetting('balance_name') }}
@@ -74,7 +74,7 @@
-
+
主要任务
@@ -109,7 +109,7 @@
- 其他服务
+ 其他服务