diff --git a/jnpf-app/pages.json b/jnpf-app/pages.json index 1befbdd1..1f1a1456 100644 --- a/jnpf-app/pages.json +++ b/jnpf-app/pages.json @@ -1171,7 +1171,7 @@ }, { "pagePath": "pages/index/home", - "text": "协同", + "text": "消息", "iconPath": "static/image/tabbar/workFlow.png", "selectedIconPath": "static/image/tabbar/workFlowHL.png" }, @@ -1190,7 +1190,7 @@ },*/ { "pagePath": "pages/index/index", - "text": "消息", + "text": "通讯录", "iconPath": "static/image/tabbar/message.png", "selectedIconPath": "static/image/tabbar/messageHL.png" }, diff --git a/jnpf-app/pages/index/portal.vue b/jnpf-app/pages/index/portal.vue index a7218262..848c0d3f 100644 --- a/jnpf-app/pages/index/portal.vue +++ b/jnpf-app/pages/index/portal.vue @@ -11,19 +11,33 @@ - + {{homeInfo.avgPurchasePrice}} 磅单采购数 - + + + + + + + {{homeInfo.todayPurchasePrice}} 今日采购量 - + + + + + + + + + {{homeInfo.salesVolumeToday}} 今日销售量 @@ -31,6 +45,9 @@ + + + @@ -122,6 +139,34 @@ + + + @@ -196,23 +241,23 @@ onShow() { console.log('11112') this.getHomeInfo() - this.$forceUpdate() - this.token = uni.getStorageSync('token') - if (!this.$store.state.chat.socket) chat.initSocket() - this.mpPortalUrl = this.define.baseURL + '/pages/mpPortal/index?token=' + this.token + // this.$forceUpdate() + // this.token = uni.getStorageSync('token') + // if (!this.$store.state.chat.socket) chat.initSocket() + // this.mpPortalUrl = this.define.baseURL + '/pages/mpPortal/index?token=' + this.token this.userInfo = uni.getStorageSync('userInfo') || {} - if (!this.userInfo.appPortalId) return - // #ifndef MP - this.getPortalList() - this.$nextTick(() => { - // this.mescroll.resetUpScroll(); - this.portalList = [] + // if (!this.userInfo.appPortalId) return + // // #ifndef MP + // this.getPortalList() + // this.$nextTick(() => { + // // this.mescroll.resetUpScroll(); + // this.portalList = [] - }) - // #endif - // #ifdef APP-PLUS - this.rightIcon = 'scan' - // #endif + // }) + // // #endif + // // #ifdef APP-PLUS + // this.rightIcon = 'scan' + // // #endif }, onReady() { // #ifdef APP-PLUS @@ -544,10 +589,12 @@ .sty-statistics-top { // background-color: #2DA9FA; background-color: #66B3FF; - padding: 0px; - //padding: 5px 0px 15px 0px; + // padding: 0px; + // padding: 5px 0px 15px 0px; color: #ffffff; - + padding: 5px 0px; + border-radius: 10px; + margin-top: 8px; .sty-statistics-top-item { padding: 5px 0px; } @@ -556,6 +603,9 @@ border-right: solid 1px #ffffff; } } + + + .sty-statistics-top-b { background-color: #97CBFF; padding: 0px; diff --git a/jnpf-app/pages/login/index.vue b/jnpf-app/pages/login/index.vue index f606f0f4..f6e6d65f 100644 --- a/jnpf-app/pages/login/index.vue +++ b/jnpf-app/pages/login/index.vue @@ -207,7 +207,7 @@ this.$store.dispatch('user/getCurrentUser').then((res) => { uni.hideLoading() uni.reLaunch({ - url: '/pages/index/home' + url: '/pages/index/portal' }); }).catch(() => { uni.hideLoading() @@ -226,7 +226,7 @@ this.$store.dispatch('user/getCurrentUser').then((res) => { uni.hideLoading() uni.reLaunch({ - url: '/pages/index/home' + url: '/pages/index/portal' }); }).catch(() => { uni.hideLoading() @@ -353,7 +353,7 @@ this.$store.dispatch('user/getCurrentUser').then((res) => { uni.hideLoading() uni.switchTab({ - url: '/pages/index/home' + url: '/pages/index/portal' }); this.show = false }).catch(() => { @@ -447,7 +447,7 @@ this.$store.dispatch('user/getCurrentUser').then((res) => { this.loading = false uni.switchTab({ - url: '/pages/index/home' + url: '/pages/index/portal' }); }).catch(() => { this.loading = false diff --git a/jnpf-app/pages/login/otherLogin.vue b/jnpf-app/pages/login/otherLogin.vue index 8bd49950..f4145c49 100644 --- a/jnpf-app/pages/login/otherLogin.vue +++ b/jnpf-app/pages/login/otherLogin.vue @@ -46,7 +46,7 @@ this.$store.dispatch('user/getCurrentUser').then((res) => { uni.hideLoading() uni.reLaunch({ - url: '/pages/index/home' + url: '/pages/index/portal' }); }).catch(() => { uni.hideLoading() @@ -71,7 +71,7 @@ this.$store.dispatch('user/getCurrentUser').then((res) => { uni.hideLoading() uni.reLaunch({ - url: '/pages/index/home' + url: '/pages/index/portal' }); }).catch(() => { uni.hideLoading() diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java index 10f50d72..286423cd 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java @@ -782,7 +782,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl