diff --git a/src/pages.json b/src/pages.json
index d007de2..73c4bde 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -10,6 +10,24 @@
}
},
{
+ "path": "pages/menu/second",
+ "style": {
+ "navigationBarTitleText": "推广营销",
+ "componentPlaceholder": {
+ "bottom-logo": "view"
+ }
+ }
+ },
+ {
+ "path": "pages/menu/third",
+ "style": {
+ "navigationBarTitleText": "商家服务",
+ "componentPlaceholder": {
+ "bottom-logo": "view"
+ }
+ }
+ },
+ {
"path": "pages/menu/forth",
"style": {
"navigationBarTitleText": "个人中心",
@@ -1003,6 +1021,18 @@
"selectedIconPath": "static/images/tab/ta_1.png"
},
{
+ "pagePath": "pages/menu/second",
+ "text": "推广营销",
+ "iconPath": "static/images/tab/tab_2.png",
+ "selectedIconPath": "static/images/tab/ta_2.png"
+ },
+ {
+ "pagePath": "pages/menu/third",
+ "text": "商家服务",
+ "iconPath": "static/images/tab/tab_3.png",
+ "selectedIconPath": "static/images/tab/ta_3.png"
+ },
+ {
"pagePath": "pages/menu/forth",
"text": "我的",
"iconPath": "static/images/tab/tab_4.png",
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 21e9c93..38e7e21 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -121,7 +121,7 @@
},
{
id: 6,
- name: '设备管理',
+ name: '智能设备',
path: '/subpackage/device/pages/index/index',
serverKey: 1010 // 后端对应权限编号
},
diff --git a/src/pages/menu/forth.vue b/src/pages/menu/forth.vue
index 9af5aa4..2fcc2b9 100644
--- a/src/pages/menu/forth.vue
+++ b/src/pages/menu/forth.vue
@@ -6,10 +6,11 @@
@click:login="loginBtn"
:nickname="userInfo.nickname"
:name="userInfo.actual_name"
- :account="userInfo.mobile"
+ :account="userInfo.mobile || userInfo.username || ''"
:photo="userInfo.avatar_url"
@click:update="updateUser"
>
+
账号管理
@@ -29,15 +30,14 @@
(复制网址)
-
- 总后台
-
- (复制网址)
-
+
+
+ 总后台({{ deadData.backstageLink }})复制
+
-
+
投诉建议
解绑退出
@@ -218,4 +218,19 @@ export default {
.fm-copy{
@include flcw(32upx, 44upx, $mColor);
}
+ .fm-admin{
+ @include ctf;
+ .fa-txt{
+ @include flcw(32upx, 44upx, #9A9A9D);
+ @include tHide;
+ .ft-txt{
+ font-size: 28upx;
+ }
+ }
+ .fa-copy{
+ padding: 0upx 10upx;
+ flex-shrink: 0;
+ @include flcw(28upx, 44upx, $mColor);
+ }
+ }
\ No newline at end of file
diff --git a/src/pages/menu/second.vue b/src/pages/menu/second.vue
new file mode 100644
index 0000000..0e40ef5
--- /dev/null
+++ b/src/pages/menu/second.vue
@@ -0,0 +1,32 @@
+
+
+
+
+ 板块更新中
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/menu/third.vue b/src/pages/menu/third.vue
new file mode 100644
index 0000000..92636e0
--- /dev/null
+++ b/src/pages/menu/third.vue
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+ 采购商城
+ 采购专业装备
+
+
+
+ 客服外包
+ 客服外包
+
+
+
+ 敬请期待
+ 敬请期待
+
+
+
+ 敬请期待
+ 敬请期待
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/static/images/third_pages/banner.png b/src/static/images/third_pages/banner.png
new file mode 100644
index 0000000..1732315
Binary files /dev/null and b/src/static/images/third_pages/banner.png differ
diff --git a/src/static/images/third_pages/bg.png b/src/static/images/third_pages/bg.png
new file mode 100644
index 0000000..e52e905
Binary files /dev/null and b/src/static/images/third_pages/bg.png differ
diff --git a/src/static/images/third_pages/tab_a.png b/src/static/images/third_pages/tab_a.png
new file mode 100644
index 0000000..afc8d31
Binary files /dev/null and b/src/static/images/third_pages/tab_a.png differ
diff --git a/src/static/images/third_pages/tab_b.png b/src/static/images/third_pages/tab_b.png
new file mode 100644
index 0000000..545b00b
Binary files /dev/null and b/src/static/images/third_pages/tab_b.png differ
diff --git a/src/store/index.js b/src/store/index.js
index ebb04ce..f4a60d0 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -38,7 +38,7 @@ export default new Vuex.Store({
'1007': '员工管理',
'1008': '核销查询',
'1009': '场地看板',
- '1010': '设备管理',
+ '1010': '智能设备',
'1011': '商品零售',
// '1013': '课程管理',
'1014': '储值卡管理',
diff --git a/src/subpackage/authorization/components/user_info/impower.vue b/src/subpackage/authorization/components/user_info/impower.vue
index 5fb815a..e3f4571 100644
--- a/src/subpackage/authorization/components/user_info/impower.vue
+++ b/src/subpackage/authorization/components/user_info/impower.vue
@@ -27,7 +27,7 @@ export default {
watch: {
showAuthorizationModal(nVal, oVal){
let { initData } = this;
- if(!nVal&&oVal)initData?.close();
+ if(!nVal&&oVal)initData?.close?.();
}
},
data() {
@@ -51,6 +51,7 @@ export default {
let _imgUrl = await this.uploadImg(info.avatar);
let _editObj = { nickname: info.nickname, avatar_url: _imgUrl };
await userEdit(_editObj);
+ this.hide();
initData?.success?.(_editObj);
}catch(err){
console.warn('authorize components user info impower updatedUserInfoEvent err --->', err)
diff --git a/src/subpackage/menu/components/bottom_logo.vue b/src/subpackage/menu/components/bottom_logo.vue
index 9806574..56a1a45 100644
--- a/src/subpackage/menu/components/bottom_logo.vue
+++ b/src/subpackage/menu/components/bottom_logo.vue
@@ -1,27 +1,40 @@
-
-
-
+
+