diff --git a/App.vue b/App.vue index 01ec7ed..7e31c1b 100644 --- a/App.vue +++ b/App.vue @@ -13,7 +13,7 @@ export default { themeColor: "#00b666", themeBackgroundColor: "#00b66621", }, - onLaunch() { + onLaunch() { let that = this; uni.removeStorageSync("selectedCity"); // 可能只在小程序生效的监听方法 diff --git a/components/customTabbar.vue b/components/customTabbar.vue index aee6bde..e7317fa 100644 --- a/components/customTabbar.vue +++ b/components/customTabbar.vue @@ -1,8 +1,6 @@ @@ -49,45 +47,163 @@ export default { onShow() { console.log(123123123123); }, + created() { + if (this.userInfo.agencyId) { + this.tabbarInfo = [ + { + iconPath: "icon-home g_c_9", + selectedIconPath: "icon-home g_c_main", + pagePath: "/pages/home/index", + text: "首页", + iconSize: 48, + }, + { + iconPath: "icon-fadanhao-31 g_c_9", + selectedIconPath: "icon-fadanhao-31 g_c_main", + pagePath: "/pages/home/order", + text: "发单号", + iconSize: 48, + }, + { + iconPath: "icon-message g_c_9", + selectedIconPath: "icon-message g_c_main", + pagePath: "/pages/message/index", + text: "消息", + iconSize: 78, + iconType: "custom", + }, + { + iconPath: "icon-order_active g_c_9", + selectedIconPath: "icon-order_active g_c_main", + pagePath: "/pages/workBench/index", + text: "工单", + iconSize: 48, + count: 0, + }, + { + iconPath: "icon-user g_c_9", + selectedIconPath: "icon-user g_c_main", + pagePath: "/pages/person/index", + text: "我的", + iconSize: 48, + }, + ]; + } else { + this.tabbarInfo = [ + { + iconPath: "icon-home g_c_9", + selectedIconPath: "icon-home g_c_main", + pagePath: "/pages/home/index", + text: "首页", + iconSize: 48, + }, + { + iconPath: "icon-message g_c_9", + selectedIconPath: "icon-message g_c_main", + pagePath: "/pages/message/index", + text: "消息", + iconSize: 78, + iconType: "custom", + }, + { + iconPath: "icon-order_active g_c_9", + selectedIconPath: "icon-order_active g_c_main", + pagePath: "/pages/workBench/index", + text: "工单", + iconSize: 48, + count: 0, + }, + { + iconPath: "icon-user g_c_9", + selectedIconPath: "icon-user g_c_main", + pagePath: "/pages/person/index", + text: "我的", + iconSize: 48, + }, + ]; + } + }, data() { return { isShow: false, isLogin: false, corpUserFlag: uni.getStorageSync("apply-userinfo").corpUserFlag, + userInfo: uni.getStorageSync("apply-userinfo"), + globalData: getApp().globalData, + + // tabbarInfo: [ + // { + // iconPath: "/static/image/home.png", + // selectedIconPath: "/static/image/home-active.png", + // pagePath: "/pages/home/index", + // text: "首页", + // iconSize: 48, + // }, + // { + // iconPath: "/static/image/apply.png", + // selectedIconPath: "/static/image/apply-active.png", + // pagePath: "/pages/workBench/index", + // text: "工单", + // iconSize: 48, + // }, + // { + // iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/add.svg", + // selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/add.svg", + // pagePath: "/pages/addJob/index", + // text: "", + // iconSize: 78, + // iconType: "custom", + // }, + // { + // iconPath: "/static/image/message.png", + // selectedIconPath: "/static/image/message_active.png", + // pagePath: "/pages/message/index", + // text: "消息", + // iconSize: 48, + // count: 0, + // }, + // { + // iconPath: "/static/image/person.png", + // selectedIconPath: "/static/image/person-active.png", + // pagePath: "/pages/person/index", + // text: "我的", + // iconSize: 48, + // }, + // ], tabbarInfo: [ { - iconPath: "/static/image/home.png", - selectedIconPath: "/static/image/home-active.png", + iconPath: "icon-home g_c_9", + selectedIconPath: "icon-home g_c_main", pagePath: "/pages/home/index", text: "首页", iconSize: 48, }, { - iconPath: "/static/image/apply.png", - selectedIconPath: "/static/image/apply-active.png", - pagePath: "/pages/workBench/index", - text: "工单", + iconPath: "icon-fadanhao-31 g_c_9", + selectedIconPath: "icon-fadanhao-31 g_c_main", + pagePath: "/pages/home/order", + text: "发单号", iconSize: 48, }, { - iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/add.svg", - selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/add.svg", - pagePath: "/pages/addJob/index", - text: "", + iconPath: "icon-message g_c_9", + selectedIconPath: "icon-message g_c_main", + pagePath: "/pages/message/index", + text: "消息", iconSize: 78, iconType: "custom", }, { - iconPath: "/static/image/message.png", - selectedIconPath: "/static/image/message_active.png", - pagePath: "/pages/message/index", - text: "消息", + iconPath: "icon-order_active g_c_9", + selectedIconPath: "icon-order_active g_c_main", + pagePath: "/pages/workBench/index", + text: "工单", iconSize: 48, count: 0, }, { - iconPath: "/static/image/person.png", - selectedIconPath: "/static/image/person-active.png", + iconPath: "icon-user g_c_9", + selectedIconPath: "icon-user g_c_main", pagePath: "/pages/person/index", text: "我的", iconSize: 48, @@ -108,84 +224,83 @@ export default { uploadPage() { uni.vibrateShort(); }, - // setBadge(data) { - // let that = this; - // // console.log("datadatadatadatadatadata", data); - // for (var k in that.tabbarInfo) { - // if (that.tabbarInfo[k].pagePath == "/pages/message/indexcopy") { - // if (data) { - // // console.log(that.messageCount + "+++++++++++++++++" + that.noticeCount); - // if (data.type == "message") { - // that.messageCount = data.count || 0; - // } else if (data.type == "notice") { - // that.noticeCount = data.count || 0; - // } - // // console.log(that.messageCount + "-------------------------" + that.noticeCount); - // } else { - // that.messageCount = uni.getStorageSync("chat_info").count || 0; - // that.noticeCount = uni.getStorageSync("notice_info").count || 0; - // } + // setBadge(data) { + // let that = this; + // // console.log("datadatadatadatadatadata", data); + // for (var k in that.tabbarInfo) { + // if (that.tabbarInfo[k].pagePath == "/pages/message/indexcopy") { + // if (data) { + // // console.log(that.messageCount + "+++++++++++++++++" + that.noticeCount); + // if (data.type == "message") { + // that.messageCount = data.count || 0; + // } else if (data.type == "notice") { + // that.noticeCount = data.count || 0; + // } + // // console.log(that.messageCount + "-------------------------" + that.noticeCount); + // } else { + // that.messageCount = uni.getStorageSync("chat_info").count || 0; + // that.noticeCount = uni.getStorageSync("notice_info").count || 0; + // } - // that.tabbarInfo[k].count = that.messageCount + that.noticeCount; - // // console.log("that.tabbarInfo[k].count", that.tabbarInfo[k].count); - // // that.tabbarInfo[k].type = data.type; - // } else if (that.tabbarInfo[k].pagePath == "/pages/workBench/index") { - // if (data) { - // // console.log(that.messageCount + "+++++++++++++++++" + that.noticeCount); - // if (data.type == "follow") { - // that.followCount = data.count || 0; - // } + // that.tabbarInfo[k].count = that.messageCount + that.noticeCount; + // // console.log("that.tabbarInfo[k].count", that.tabbarInfo[k].count); + // // that.tabbarInfo[k].type = data.type; + // } else if (that.tabbarInfo[k].pagePath == "/pages/workBench/index") { + // if (data) { + // // console.log(that.messageCount + "+++++++++++++++++" + that.noticeCount); + // if (data.type == "follow") { + // that.followCount = data.count || 0; + // } - // // console.log(that.messageCount + "-------------------------" + that.noticeCount); - // } else { - // that.followCount = uni.getStorageSync("follow_info").count || 0; - // } - // that.tabbarInfo[k].count = that.followCount; - // } - // } - // }, - // checkUserAuth() { - // this.tabbarInfo = [ - // { - // iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/home.png", - // selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/home_active.png", - // pagePath: "/pages/home/index", - // text: "首页", - // iconSize: 48, - // }, - // { - // iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/unit.png", - // selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/unit_active.png", - // pagePath: "/pages/workBench/index", - // text: "工单", - // iconSize: 48, - // }, - // { - // iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/add.svg", - // selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/add.svg", - // pagePath: "/pages/addJob/index", - // text: "", - // iconSize: 78, - // iconType: "custom", - // }, - // { - // iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/message.png", - // selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/message_active.png", - // pagePath: "/pages/message/index", - // text: "消息", - // iconSize: 48, - // count: 0, - // }, - // { - // iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/user.png", - // selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/user_active.png", - // pagePath: "/pages/person/index", - // text: "我的", - // iconSize: 48, - // }, - // ] - // }, - + // // console.log(that.messageCount + "-------------------------" + that.noticeCount); + // } else { + // that.followCount = uni.getStorageSync("follow_info").count || 0; + // } + // that.tabbarInfo[k].count = that.followCount; + // } + // } + // }, + // checkUserAuth() { + // this.tabbarInfo = [ + // { + // iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/home.png", + // selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/home_active.png", + // pagePath: "/pages/home/index", + // text: "首页", + // iconSize: 48, + // }, + // { + // iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/unit.png", + // selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/unit_active.png", + // pagePath: "/pages/workBench/index", + // text: "工单", + // iconSize: 48, + // }, + // { + // iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/add.svg", + // selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/add.svg", + // pagePath: "/pages/addJob/index", + // text: "", + // iconSize: 78, + // iconType: "custom", + // }, + // { + // iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/message.png", + // selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/message_active.png", + // pagePath: "/pages/message/index", + // text: "消息", + // iconSize: 48, + // count: 0, + // }, + // { + // iconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/user.png", + // selectedIconPath: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/v3/user_active.png", + // pagePath: "/pages/person/index", + // text: "我的", + // iconSize: 48, + // }, + // ] + // }, }, }; diff --git a/components/list/apply.vue b/components/list/apply.vue index 678d6f9..973c86f 100644 --- a/components/list/apply.vue +++ b/components/list/apply.vue @@ -17,7 +17,7 @@ - + @@ -114,13 +114,17 @@ export default { data() { return { cdnBaseImg: this.G.store().cdnBaseImg, + tabbarHeight: 0, }; }, // 计算属性 computed: {}, // 侦听器 watch: {}, - created() {}, + created() { + this.tabbarHeight = uni.getStorageSync("TABBAR_HEIGHT"); + console.log('this.tabbarHeight',this.tabbarHeight); + }, mounted() {}, // 组件方法 methods: { diff --git a/pages.json b/pages.json index bef12a6..14c5bdc 100644 --- a/pages.json +++ b/pages.json @@ -8,6 +8,15 @@ "backgroundColorTop": "#fff" } }, + { + "path": "pages/home/order", + "style": { + "navigationBarTitleText": "关注的发单号", + "backgroundColor": "#ededed", + "backgroundColorTop": "#ededed", + "backgroundColorBottom": "#ededed" + } + }, { "path": "pages/message/index", "style": { @@ -32,32 +41,32 @@ "navigationBarTitleText": "我的" } }, - { - "path": "pages/addJob/index", - "style": { - "navigationBarTitleText": "大鹏Beta", - "backgroundColor": "#ffffff", - "backgroundColorTop": "#ffffff", - "backgroundColorBottom": "#ffffff", - "navigationBarTextStyle": "black" - } - } + { + "path": "pages/addJob/index", + "style": { + "navigationBarTitleText": "大鹏Beta", + "backgroundColor": "#ffffff", + "backgroundColorTop": "#ffffff", + "backgroundColorBottom": "#ffffff", + "navigationBarTextStyle": "black" + } + } ], "subPackages": [ - { - "root": "root/chat", - "pages": [ - { - "path": "index", - "style": { - "backgroundColor": "#ededed", - "backgroundColorTop": "#ededed", - "backgroundColorBottom": "#ededed", - "navigationBarTitleText": "大鹏Beta" - } - } - ] - }, + { + "root": "root/chat", + "pages": [ + { + "path": "index", + "style": { + "backgroundColor": "#ededed", + "backgroundColorTop": "#ededed", + "backgroundColorBottom": "#ededed", + "navigationBarTitleText": "大鹏Beta" + } + } + ] + }, { // 首页 "root": "root/home", "pages": [ @@ -121,15 +130,15 @@ { // 个人中心二级页面 "root": "root/person", "pages": [ - { - "path": "marge", - "style": { - "navigationBarTitleText": "合并团队", - "backgroundColor": "#ededed", - "backgroundColorTop": "#ededed", - "backgroundColorBottom": "#ededed" - } - }, + { + "path": "marge", + "style": { + "navigationBarTitleText": "合并团队", + "backgroundColor": "#ededed", + "backgroundColorTop": "#ededed", + "backgroundColorBottom": "#ededed" + } + }, { "path": "todayData", "style": { @@ -656,23 +665,29 @@ "text": "首页" }, { - "pagePath": "pages/workBench/index", + "pagePath": "pages/home/order", "iconPath": "static/image/apply.png", "selectedIconPath": "static/image/apply-active.png", - "text": "工单" + "text": "发单号" }, - { - "iconPath": "static/image/home.png", - "selectedIconPath": "static/image/home.png", - "pagePath": "pages/addJob/index", - "text": "" - }, { "iconPath": "static/image/message.png", "selectedIconPath": "static/image/message_active.png", "pagePath": "pages/message/index", "text": "消息" }, + { + "pagePath": "pages/workBench/index", + "iconPath": "static/image/apply.png", + "selectedIconPath": "static/image/apply-active.png", + "text": "工单" + }, + // { ai + // "iconPath": "static/image/home.png", + // "selectedIconPath": "static/image/home.png", + // "pagePath": "pages/addJob/index", + // "text": "" + // }, { "pagePath": "pages/person/index", "iconPath": "static/image/person.png", diff --git a/pages/home/index.vue b/pages/home/index.vue index 3d3a5bc..e60c8d1 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -29,7 +29,7 @@
职位
-
+
@@ -132,8 +132,7 @@
- - +
diff --git a/pages/home/order.vue b/pages/home/order.vue new file mode 100644 index 0000000..1409116 --- /dev/null +++ b/pages/home/order.vue @@ -0,0 +1,511 @@ + + + + + diff --git a/pages/message/index.vue b/pages/message/index.vue index 8eac06e..cc64966 100644 --- a/pages/message/index.vue +++ b/pages/message/index.vue @@ -4,12 +4,7 @@ - + @@ -20,14 +15,12 @@ - - - + - - - - + + + + { +onLoad(() => { isLogin.value = uni.getStorageSync("apply-token") ? true : false; console.log("count.value", count.value); corpUserFlag.value = uni.getStorageSync("apply-userinfo").corpUserFlag; @@ -150,6 +142,7 @@ onShow(() => { current.value = 0; } }); +onShow(() => {}); const goLogin = () => { uni.reLaunch({ url: "/root/person/loginIndex", @@ -210,7 +203,6 @@ const updateType = (e) => { \ No newline at end of file + diff --git a/pages/person/index.vue b/pages/person/index.vue index ae6250a..60492aa 100644 --- a/pages/person/index.vue +++ b/pages/person/index.vue @@ -4,15 +4,15 @@ - - + + - + {{ userInfo.name ? userInfo.name : "-" }} @@ -54,7 +54,7 @@ - + - + diff --git a/root/NEUIKit/base.scss b/root/NEUIKit/base.scss index d40c379..131cbac 100644 --- a/root/NEUIKit/base.scss +++ b/root/NEUIKit/base.scss @@ -1,5 +1,6 @@ $filter_bg_color: #e3ecfd; $main_bg_color: #1890ff; +$page_bg_color: #ededed; $main_color: #1890ff; image { vertical-align: top; @@ -359,7 +360,7 @@ scroll-view::-webkit-scrollbar { &_09f { color: #0091ff; } - &_027 { + &_027 { color: #027aff; } &_sub { @@ -429,6 +430,10 @@ scroll-view::-webkit-scrollbar { &_trans_main { background-color: $filter_bg_color; } + &_page { + background-color: $page_bg_color; + min-height: 100vh; + } } &text { // 字体位置 diff --git a/root/NEUIKit/pages/user-card/friend/index.vue b/root/NEUIKit/pages/user-card/friend/index.vue index 59d0c1c..6597da2 100644 --- a/root/NEUIKit/pages/user-card/friend/index.vue +++ b/root/NEUIKit/pages/user-card/friend/index.vue @@ -1,291 +1,265 @@ diff --git a/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue b/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue index 07fd8e6..50acd96 100644 --- a/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue +++ b/uni_modules/vk-uview-ui/components/u-icon/u-icon.vue @@ -1,22 +1,13 @@