From f36b6c221f47f338f02a597fd0a97e87bb09de2a Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 4 Jan 2024 09:33:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A5=E6=BA=90?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=8F=AF=E4=BB=A5=E6=BB=91=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycomponents/scan/winScanPackAndLocation.vue | 2 +- pages/putaway/job/putawayDetail.vue | 12 ------------ .../uni-combox/components/uni-combox/uni-combox.vue | 1 + 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue index dd303565..4071f989 100644 --- a/mycomponents/scan/winScanPackAndLocation.vue +++ b/mycomponents/scan/winScanPackAndLocation.vue @@ -28,7 +28,7 @@ + @confirm="scanLocation" style='height: 30rpx;border:1px solid #fff ;'> diff --git a/pages/putaway/job/putawayDetail.vue b/pages/putaway/job/putawayDetail.vue index f2eede04..86b9e627 100644 --- a/pages/putaway/job/putawayDetail.vue +++ b/pages/putaway/job/putawayDetail.vue @@ -105,7 +105,6 @@ managementList: [], fromLocationCode: "", toLocationCode: "", - toLocationInfo: {}, tolocationTypeList: [], }; }, @@ -187,7 +186,6 @@ that.fromLocationCode = that.subList[0].fromLocationCode that.toLocationCode = that.subList[0].toLocationCode that.tolocationTypeList = getDirectoryItemArray(that.jobContent.toLocationTypes) - that.getLocationInfo(that.toLocationCode); } else { that.showMessage('列表数据为0'); @@ -199,16 +197,6 @@ }) }, - getLocationInfo(locationCode) { - if (locationCode != '') { - getBasicLocationByCode(locationCode).then(res => { - if (res.data.list.length > 0) { - this.toLocationInfo = res.data.list[0] - } - }) - } - }, - calcScanCount(closeScan) { let items = this.subList.filter(r => { if (r.scaned) { diff --git a/uni_modules/uni-combox/components/uni-combox/uni-combox.vue b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue index 251b434e..fe3b2d6c 100644 --- a/uni_modules/uni-combox/components/uni-combox/uni-combox.vue +++ b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue @@ -233,6 +233,7 @@ .uni-combox__selector-scroll { /* #ifndef APP-NVUE */ max-height: 200px; + height: 200rpx; box-sizing: border-box; /* #endif */ } From c6e4b3cdb7490caa5758ed7d61cb8ad2e00c2f44 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 4 Jan 2024 10:20:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B6=E5=93=81?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/deliver/coms/comScanDeliverPack.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pages/deliver/coms/comScanDeliverPack.vue b/pages/deliver/coms/comScanDeliverPack.vue index fb013ada..885ac385 100644 --- a/pages/deliver/coms/comScanDeliverPack.vue +++ b/pages/deliver/coms/comScanDeliverPack.vue @@ -152,6 +152,7 @@ defaultValueList: [], label:{}, fromInventoryStatuses :"", + packageInfo:{} } }, created() { @@ -191,7 +192,8 @@ } }, - showBalanceSelect(items) { + showBalanceSelect(items,packageInfo) { + this.packageInfo = packageInfo; this.$refs.balanceSelect.openPopup(items); }, @@ -260,7 +262,7 @@ this.afterGetBalance(result.label, balance,packageInfo); } else { this.label =result.label; - this.showBalanceSelect(balanceRes.data.list); + this.showBalanceSelect(balanceRes.data.list,packageInfo); } } else { this.showErrorMessage(balanceRes.message.message); @@ -275,7 +277,7 @@ }, selectBalanceItem(balance) { - this.afterGetBalance(this.label, balance); + this.afterGetBalance(this.label, balance,this.packageInfo); }, From 1313f08ea968f86f5320deacafb23e2df090f301 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 4 Jan 2024 15:45:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/request2.js | 54 +++++++ pages.json | 23 +++ pages/message/details.vue | 96 ++++++++++++ pages/message/index.vue | 320 +++++++++++++++++++++++++++++++++++++- static/images/message.svg | 4 + 5 files changed, 495 insertions(+), 2 deletions(-) create mode 100644 pages/message/details.vue create mode 100644 static/images/message.svg diff --git a/api/request2.js b/api/request2.js index 4b08c50b..f481334a 100644 --- a/api/request2.js +++ b/api/request2.js @@ -96,6 +96,60 @@ export function updateUserPwd(oldPassword, newPassword) { }) } +/** + * 获取消息列表 + * @param {*} + * + */ +export function getMessageList(pageNo,pageSize) { + return request({ + url: baseApi + "/system/notify-message/my-page?pageNo="+pageNo+"&pageSize="+pageSize, + method: "get", + data: {}, + }); +} + +/** + * 标记站内信为已读 + * @param {*} + * + */ +export function setMessageUpdateRead(ids) { + return request({ + url: baseApi + "/system/notify-message/update-read?ids="+ids, + method: "put", + data: {}, + }); +} + +/** + * 标记所有站内信为已读 + * @param {*} + * + */ +export function setAllMessageUpdateRead() { + return request({ + url: baseApi + "/system/notify-message/update-all-read", + method: "put", + data: {}, + }); +} + +/** + * 获取当前用户的未读站内信数量 + * @param {*} + * + */ +export function getMessageUnreadCount() { + return request({ + url: baseApi + "/system/notify-message/get-unread-count", + method: "get", + data: {}, + }); +} + + + /** * 获取配置字典 * @param {*} diff --git a/pages.json b/pages.json index eb8d553d..51c6e84b 100644 --- a/pages.json +++ b/pages.json @@ -24,6 +24,28 @@ } } }, + { + "path": "pages/message/details", + "style": { + "navigationBarTitleText": "消息详情", + "enablePullDownRefresh": false, + "titleNView": { + // "autoBackButton": "true", + "buttons": [ + // 右边按钮 + { + + "float": "right", + "fontSize": "58rpx", //按钮上文字的大小 + "text": "\ue696", + "fontSrc": "/static/ali_icon/iconfont.ttf" + + } + ] + } + } + }, + { "path": "pages/common/webview/index", @@ -1801,6 +1823,7 @@ "pagePath": "pages/message/index", "iconPath": "static/bar/xx.svg", "selectedIconPath": "static/bar/xxa.svg", + "enablePullDownRefresh": true, "text": "消息" }, { "pagePath": "pages/setter/index", diff --git a/pages/message/details.vue b/pages/message/details.vue new file mode 100644 index 00000000..915b210a --- /dev/null +++ b/pages/message/details.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/pages/message/index.vue b/pages/message/index.vue index 3e29db03..ab2c0299 100644 --- a/pages/message/index.vue +++ b/pages/message/index.vue @@ -1,9 +1,325 @@ \ No newline at end of file + .body-view { + height: 100%; + width: 100%; + display: flex; + flex: 1; + flex-direction: column; + overflow: hidden; + align-items: flex-start; + justify-content: center; + } + + .body-view .right-arrow { + position: absolute; + top: 22upx; + right: 0upx; + padding-left: 60upx; + padding-right: 20upx; + line-height: 42upx; + background: linear-gradient(to right, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 60%); + } + + .body-view .right-arrow .iconfont { + font-size: 24upx; + font-family: iconfont; + color: #909399; + } + + .top-menu-view { + display: flex; + white-space: nowrap; + width: 100%; + background-color: #FFFFFF; + height: 86upx; + /* border-top: 1px solid #d8dbe6; + border-bottom: 1px solid #d8dbe6; */ + } + + .top-menu-view .menu-topic-view { + display: inline-block; + white-space: nowrap; + height: 86upx; + position: relative; + } + + .top-menu-view .menu-topic-view .menu-topic { + margin-left: 30upx; + margin-right: 10upx; + position: relative; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + } + + .uni-list--border:after { + height: 0; + } + + .top-menu-view .menu-topic-view .menu-topic:first-child { + margin-left: 30upx; + } + + .top-menu-view .menu-topic-view:last-child .menu-topic { + margin-right: 80upx; + } + + .top-menu-view .menu-topic-view .menu-topic .menu-topic-txt { + font-size: 30upx; + color: #303133; + } + + .top-menu-view .menu-topic-view .menu-topic .menu-topic-bottom { + position: absolute; + bottom: 0; + width: 100%; + } + + .top-menu-view .menu-topic-view .menu-topic .menu-topic-bottom .menu-topic-bottom-color { + width: 40upx; + height: 4upx; + } + + .top-menu-view .menu-topic-view .menu-topic-act { + margin-left: 30upx; + margin-right: 10upx; + position: relative; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + } + + .top-menu-view .menu-topic-view:last-child .menu-topic-act { + margin-right: 80upx; + } + + .top-menu-view .menu-topic-view .menu-topic-act .menu-topic-txt { + font-size: 1rem; + color: #3d7eff; + font-weight: 600; + } + + .top-menu-view .menu-topic-view .menu-topic-act .menu-topic-bottom { + position: absolute; + bottom: 0; + width: 100%; + display: flex; + justify-content: center; + } + + .top-menu-view .menu-topic-view .menu-topic-act .menu-topic-bottom .menu-topic-bottom-color { + width: 40upx; + height: 6upx; + background: #3d7eff; + } + + .swiper-box-list { + flex: 1; + width: 100%; + height: auto; + height: 900upx; + background-color: #FFFFFF; + } + + .swiper-topic-list { + height: 100%; + width: 100%; + } + + .list { + width: 100%; + } + + .tipred { + position: absolute; + top: 0; + right: -40rpx; + background-color: red; + color: #FFFFFF; + font-size: .7rem; + display: inline-block; + width: 46rpx; + height: 46rpx; + margin-bottom: 10upx; + text-align: center; + line-height: 46rpx; + border-radius: 50%; + overflow: hidden; + margin-left: 10upx; + font-size: 20upx; + } + diff --git a/static/images/message.svg b/static/images/message.svg new file mode 100644 index 00000000..28380e52 --- /dev/null +++ b/static/images/message.svg @@ -0,0 +1,4 @@ + + + + From e1561059689e51f04e3ddb4548b3b439c81d3fa7 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Thu, 4 Jan 2024 16:06:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/message/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/message/index.vue b/pages/message/index.vue index ab2c0299..78221e4d 100644 --- a/pages/message/index.vue +++ b/pages/message/index.vue @@ -22,7 +22,7 @@ -