From 013061985424b8bc13df7ba4ef3cb62b514ef0d5 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Thu, 27 May 2021 16:40:52 +0800 Subject: [PATCH] no message --- components/sidebar-item/index.wxss | 2 +- components/tree-select/index.wxss | 2 +- pages/index/index.js | 9 +++++++-- pages/index/index.wxml | 2 +- utils/util.js | 10 +++++++++- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/components/sidebar-item/index.wxss b/components/sidebar-item/index.wxss index f9f6996..217c627 100644 --- a/components/sidebar-item/index.wxss +++ b/components/sidebar-item/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-sidebar-item{display:block;box-sizing:border-box;overflow:hidden;word-wrap:break-word;border-left:3px solid transparent;-webkit-user-select:none;user-select:none;padding:20px 12px 20px 8px;padding:var(--sidebar-padding,20px 12px 20px 8px);font-size:14px;font-size:var(--sidebar-font-size,14px);line-height:20px;line-height:var(--sidebar-line-height,20px);color:#323233;color:var(--sidebar-text-color,#323233);background-color:#f7f8fa;background-color:var(--sidebar-background-color,#f7f8fa)}.van-sidebar-item__text{position:relative;display:inline-block}.van-sidebar-item--hover:not(.van-sidebar-item--disabled){background-color:#f2f3f5;background-color:var(--sidebar-active-color,#f2f3f5)}.van-sidebar-item:after{border-bottom-width:1px}.van-sidebar-item--selected{color:#323233;color:var(--sidebar-selected-text-color,#323233);font-weight:500;font-weight:var(--sidebar-selected-font-weight,500);border-color:#008AFF;border-color:var(--sidebar-selected-border-color,#008AFF)}.van-sidebar-item--selected:after{border-right-width:1px}.van-sidebar-item--selected,.van-sidebar-item--selected.van-sidebar-item--hover{background-color:#fff;background-color:var(--sidebar-selected-background-color,#fff)}.van-sidebar-item--disabled{color:#c8c9cc;color:var(--sidebar-disabled-text-color,#c8c9cc)} \ No newline at end of file +@import '../common/index.wxss';.van-sidebar-item{display:block;box-sizing:border-box;overflow:hidden;word-wrap:break-word;border-left:3px solid transparent;-webkit-user-select:none;user-select:none;padding:20px 12px 20px 8px;padding:var(--sidebar-padding,20px 12px 20px 8px);font-size:14px;font-size:var(--sidebar-font-size,14px);line-height:24px;line-height:var(--sidebar-line-height,24px);color:#323233;color:var(--sidebar-text-color,#323233);background-color:#f7f8fa;background-color:var(--sidebar-background-color,#f7f8fa)}.van-sidebar-item__text{position:relative;display:inline-block}.van-sidebar-item--hover:not(.van-sidebar-item--disabled){background-color:#f2f3f5;background-color:var(--sidebar-active-color,#f2f3f5)}.van-sidebar-item:after{border-bottom-width:1px}.van-sidebar-item--selected{color:#323233;color:var(--sidebar-selected-text-color,#323233);font-weight:500;font-weight:var(--sidebar-selected-font-weight,500);border-color:#008AFF;border-color:var(--sidebar-selected-border-color,#008AFF)}.van-sidebar-item--selected:after{border-right-width:1px}.van-sidebar-item--selected,.van-sidebar-item--selected.van-sidebar-item--hover{background-color:#fff;background-color:var(--sidebar-selected-background-color,#fff)}.van-sidebar-item--disabled{color:#c8c9cc;color:var(--sidebar-disabled-text-color,#c8c9cc)} \ No newline at end of file diff --git a/components/tree-select/index.wxss b/components/tree-select/index.wxss index 5ccd629..be009ca 100644 --- a/components/tree-select/index.wxss +++ b/components/tree-select/index.wxss @@ -1 +1 @@ -@import '../common/index.wxss';.van-tree-select{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none;font-size:14px;font-size:var(--tree-select-font-size,14px)}.van-tree-select__nav{-webkit-flex:1.5;flex:1.5;background-color:#f7f8fa;background-color:var(--tree-select-nav-background-color,#f7f8fa);--sidebar-padding:12px 8px 12px 12px}.van-tree-select__nav__inner{width:100%!important;height:100%}.van-tree-select__content{-webkit-flex:2;flex:2;background-color:#fff;background-color:var(--tree-select-content-background-color,#fff)}.van-tree-select__item{position:relative;font-weight:700;padding:0 32px 0 16px;padding:0 32px 0 var(--padding-md,16px);line-height:44px;line-height:var(--tree-select-item-height,44px)}.van-tree-select__item--active{color:#008AFF;color:var(--tree-select-item-active-color,#008AFF)}.van-tree-select__item--disabled{color:#c8c9cc;color:var(--tree-select-item-disabled-color,#c8c9cc)}.van-tree-select__selected{position:absolute;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);right:16px;right:var(--padding-md,16px)} \ No newline at end of file +@import '../common/index.wxss';.van-tree-select{position:relative;display:-webkit-flex;display:flex;-webkit-user-select:none;user-select:none;font-size:14px;font-size:var(--tree-select-font-size,14px)}.van-tree-select__nav{-webkit-flex:1.5;flex:1.5;background-color:#f7f8fa;background-color:var(--tree-select-nav-background-color,#f7f8fa);--sidebar-padding:12px 8px 12px 12px}.van-tree-select__nav__inner{width:100%!important;height:100%}.van-tree-select__content{-webkit-flex:2;flex:2;background-color:#fff;background-color:var(--tree-select-content-background-color,#fff)}.van-tree-select__item{position:relative;font-weight:700;padding:0 32px 0 16px;padding:0 32px 0 var(--padding-md,16px);line-height:48px;line-height:var(--tree-select-item-height,48px)}.van-tree-select__item--active{color:#008AFF;color:var(--tree-select-item-active-color,#008AFF)}.van-tree-select__item--disabled{color:#c8c9cc;color:var(--tree-select-item-disabled-color,#c8c9cc)}.van-tree-select__selected{position:absolute;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%);right:16px;right:var(--padding-md,16px)} \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 115f4f6..b683ab0 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -2,6 +2,7 @@ import Scene from './scene' import { getMessageList } from "../../api/saas" import { headerFactoryId } from "../../api/user" +import util from '../../utils/util' const event = require('../../utils/event') const storage = require('../../utils/storage') const app = getApp() @@ -41,7 +42,7 @@ Scene({ this.data.items = [] for (let mIndex = 0; mIndex < app.userInfo.enterpriseInfos.length; mIndex++) { const element = app.userInfo.enterpriseInfos[mIndex] - var enterprise = { text: element.enterpriseName } + var enterprise = { text: util.substring(element.enterpriseName, 8) } var children = [] if(mIndex >= 1){ this.data.arrow = true @@ -61,7 +62,7 @@ Scene({ this.data.arrow = true } var factory = { id: item.factoryId } - if(item.applicationStatus == 0 && !element.isEnterprisePrimary){ + if(!item.type && !element.isEnterprisePrimary){ factory.text = item.factoryName + '(申请中)' factory.disabled = true } else { @@ -135,6 +136,10 @@ Scene({ this.setData({ mActiveIndex: detail.index || 0 }); }, changeFactory({ detail }) { + if(app.userInfo.factoryId == detail.id){ + this.setData({ visible: false }) + return + } wx.showLoading({ title: '正在切换', mask: true }) app.userInfo.factoryId = detail.id storage.put('X-FACTORY-ID' + app.userInfo.userId, detail.id) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 9beb040..688f4aa 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -39,7 +39,7 @@ --> - diff --git a/utils/util.js b/utils/util.js index f68ab3c..1d360a8 100644 --- a/utils/util.js +++ b/utils/util.js @@ -198,6 +198,13 @@ function navigateTarget(redirectInfo){ } } +function substring(string, length){ + if(string.length > length){ + return string.substring(0, length) + '...' + } + return string +} + module.exports = { isEmpty: isEmpty, extend: extend, @@ -213,5 +220,6 @@ module.exports = { checkId: checkId, combination: combination, navigateTo: navigateTo, - navigateTarget: navigateTarget + navigateTarget: navigateTarget, + substring: substring } \ No newline at end of file