diff --git a/app.js b/app.js index caa4cff..bb1e811 100644 --- a/app.js +++ b/app.js @@ -16,7 +16,7 @@ App({ globalData: { // 本地环境 - baseUrl:'http://192.168.51.22:8201/mall-portal', + baseUrl:'http://192.168.51.200:8201/mall-portal', // 线上环境 // baseUrl:'https://portal-api.macrozheng.com', token: '', diff --git a/app.json b/app.json index 2cd0e7b..f6f76f2 100644 --- a/app.json +++ b/app.json @@ -18,7 +18,7 @@ "navigationBarBackgroundColor": "#27adb0", "navigationBarTitleText": "物流端", "navigationBarTextStyle": "white", - "backgroundColor": "#27adb0" + "backgroundColor": "#F8F8F8" }, "tabBar": { "color": "#000", diff --git a/app.wxss b/app.wxss index dcf8047..42bc5bd 100644 --- a/app.wxss +++ b/app.wxss @@ -5,14 +5,13 @@ page{ .box{ background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1); - min-height: 1300rpx; + min-height: 1400rpx; padding: 20rpx; font-size: 28rpx; } .back{ padding: 20rpx; - border-radius: 15rpx; + border-radius: 5rpx; background-color: #fff; - border: 1rpx #eceaea solid; } diff --git a/images/qrcode.jpg b/images/qrcode.jpg new file mode 100644 index 0000000..3725d3c Binary files /dev/null and b/images/qrcode.jpg differ diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..8fdfbd5 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "yyt_logistics", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "weapp-qrcode-canvas-2d": "^1.1.2" + } + }, + "node_modules/weapp-qrcode-canvas-2d": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/weapp-qrcode-canvas-2d/-/weapp-qrcode-canvas-2d-1.1.2.tgz", + "integrity": "sha512-HQef+xpZiiWDcq8aLZdXnVdNljoYsEWiEKiBYnAnfgqXTeYfC8ApzoB9pMI5mnPFbhtu5xCi8oId1g/86uUl8Q==" + } + }, + "dependencies": { + "weapp-qrcode-canvas-2d": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/weapp-qrcode-canvas-2d/-/weapp-qrcode-canvas-2d-1.1.2.tgz", + "integrity": "sha512-HQef+xpZiiWDcq8aLZdXnVdNljoYsEWiEKiBYnAnfgqXTeYfC8ApzoB9pMI5mnPFbhtu5xCi8oId1g/86uUl8Q==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..bac6482 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "weapp-qrcode-canvas-2d": "^1.1.2" + } +} diff --git a/pages/details/details.js b/pages/details/details.js index 812d14c..8adfba1 100644 --- a/pages/details/details.js +++ b/pages/details/details.js @@ -31,6 +31,7 @@ Page({ status:item.status, logisticsNo:item.logisticsNo, unitType:item.unitType, + entryDate:item.entryDate, cost:item.cost, expectedEndTime:item.expectedEndTime, boxNum:item.boxNum, diff --git a/pages/handover/handover.js b/pages/handover/handover.js index a0104b8..685c89b 100644 --- a/pages/handover/handover.js +++ b/pages/handover/handover.js @@ -1,25 +1,116 @@ // pages/handover/handover.js +const request = require('../../utils/http') +import drawQrcode from '../../utils/weapp.qrcode.esm.js' +// var app = getApp(); Page({ - /** * 页面的初始数据 */ data: { date: '', - start:'2020-01-01', - end:'', + start: '', + end: '', + logisticsCodeList: [], //物流单列表 + sampleList: [], //样本列表 + showDialog: false }, - sx(){ + //刷新按钮 + refresh() { this.onLoad() console.log("123"); }, - bindDateChange(e){ - // console.log(e.detail.value) + bindDateChange(e) { this.setData({ - date:e.detail.value + date: e.detail.value + }) + }, + + //查询物流单列表 + selTranLogistics() { + var reqData = { + startTime: this.data.date, + pageNum: 1, + pageSize: 100 + } + request.post(`/batch/selectTranLogistics`, reqData).then(res => { + console.log(JSON.stringify(res)); + // this.data.logisticsCodeList = res.data.data + this.setData({ + logisticsCodeList: res.data.data + }) + }) + }, + + //查询物流单下的样本列表 + selSampleList(e) { + var _this = this; + // console.log('selSampleList run' + JSON.stringify(e.target.dataset.id)); + var reqData = { + 'logisticsNo': e.target.dataset.id + } + + request.post(`/logistics/selectTranLogistics`, reqData).then(res => { + console.log(res.data.data); + this.setData({ + sampleList: res.data.data, + // sampleCount: res.data.data.length + }) }) + + //生成二维码 + this.drawQrImg(e.target.dataset.id) + }, + + drawQrImg(text) { + var _this = this; + const query = wx.createSelectorQuery() + query.select('#myQrcode') + .fields({ + node: true, + size: true + }) + .exec((res) => { + var canvas = res[0].node + + // 调用方法drawQrcode生成二维码 + drawQrcode({ + canvas: canvas, + canvasId: 'myQrcode', + width: 100, + padding: 0, + background: '#ffffff', + foreground: '#000000', + text: text, + }) + + // 获取临时路径 + wx.canvasToTempFilePath({ + canvasId: 'myQrcode', + canvas: canvas, + x: 0, + y: 0, + width: 100, + height: 100, + destWidth: 100, + destHeight: 100, + success(res) { + console.log('二维码临时路径:', res.tempFilePath) + _this.toggleDialog() + }, + fail(res) { + console.error(res) + } + }) + }) + }, + + //控制二维码弹窗 + toggleDialog() { + this.setData({ + showDialog: !this.data.showDialog + }); }, /** @@ -32,6 +123,8 @@ Page({ this.setData({ end: '' + year + '-' + (Array(2).join(0) + month).slice(-2) + '-' + (Array(2).join(0) + now.getDate()).slice(-2), }) //当前的时间 + + this.selTranLogistics() }, /** diff --git a/pages/handover/handover.wxml b/pages/handover/handover.wxml index 01d3981..f16e31a 100644 --- a/pages/handover/handover.wxml +++ b/pages/handover/handover.wxml @@ -6,23 +6,22 @@ 日 期: - + - + - + 物流单号 - 物流单号:M2023051500231 - 物流单号:M2023051500232 - 物流单号:M2023051500233 - 物流单号:M2023051500234 - 物流单号:M2023051500235 + + + {{item.logisticsNo}} + - - + + 序号 样本号 送检机构 @@ -31,24 +30,30 @@ 交接人 状态 - - 1 - Y100008645 - XX卫生院 - 2023-6-26 - X254687 - 李四 - 已核收 - - - 2 - Y100008645 - XX卫生院 - 2023-6-26 - X254687 - 张三 - 已核收 - + + + {{idx+1}} + {{item.barCode}} + {{item.institutionName}} + {{item.entryDate}} + {{item.boxNum}} + {{item.logisticsMen}} + 未采样 + 已采样 + 已发货 + 已接收 + 重新采样 + 其它 + + - + + + + + + + + + \ No newline at end of file diff --git a/pages/handover/handover.wxss b/pages/handover/handover.wxss index d93d963..0c85af9 100644 --- a/pages/handover/handover.wxss +++ b/pages/handover/handover.wxss @@ -1,29 +1,40 @@ /* pages/handover/handover.wxss */ -.back{ +.back { margin-top: 15rpx; } -.top{ + +.top { background-color: #fff; padding: 10rpx 10rpx; font-size: 22rpx; - border-radius: 15rpx; + border-radius: 5rpx; } -.from-con{ +.from-con { display: flex; align-items: center; position: relative; } -.from-con input{ + +.from-con input { width: 250rpx; + border-radius: 5rpx; border: 1rpx #666 solid; padding: 3rpx 10rpx; - text-align: right; + text-align: center; +} + +.canvas { + width: 100px; + height: 100px; + background-color: #6bc9ca; } -.place{ - color:#c4bfbf; + +.place { + color: #c4bfbf; } -.f5{ + +.f5 { width: 200rpx !important; font-size: 28rpx; background-color: #eee; @@ -37,48 +48,96 @@ } -.allordernum{ +.allordernum { margin-top: 20rpx; /* border: 1rpx #999 solid; */ background-color: #f1f1f1; border: 1rpx #eee solid; - border-radius: 15rpx; + border-radius: 5rpx; width: 100%; height: 350rpx; - padding: 20rpx 0 ; + padding: 20rpx 0; } -.allordernum view{ + +.allordernum view view { padding: 20rpx; background-color: #eee; width: 88%; margin: 0 auto; margin-bottom: 15rpx; - border-radius: 15rpx; + border-radius: 5rpx; } -.tr{ +.tr { display: flex; width: 100%; } -.tr .td{ + +.tr .td { /* border-right:#ddd solid 1rpx ; border-top: #ddd solid 1rpx; */ border: 1rpx #ddd solid; - padding: 15rpx 0; + padding: 10rpx 0; font-size: 22rpx; display: flex; justify-content: center; align-items: center; flex-wrap: nowrap; white-space: nowrap; - min-width: 150rpx; + min-width: 200rpx; } -.top1 view{ + +.top1 view { background-color: #6bc9ca; color: #fff; } -.td1{ + +.td1 { min-width: 100rpx !important; } + + +.zan-dialog__mask { + position: fixed; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 10; + background: rgba(0, 0, 0, 0); + /* 设置阴影半透明背景如: background: rgba(0, 0, 0, 0.4); */ + display: none; +} + +.zan-dialog__container { + position: fixed; + bottom: 200rpx; + width: 350rpx; + /* 弹窗布局宽 */ + height: 300rpx; + /* 弹窗布局高,与下面弹出距离transform有关 */ + margin-left: 180rpx; + background: #f8f8f8; + transform: translateY(300%); + /* 弹框弹出距离,与弹框布局高度有关,如300%表示弹起距离为3倍弹窗高度 */ + transition: all 0.4s ease; + z-index: 12; + border-radius: 10rpx; + box-shadow: 0px 3px 3px 2px gainsboro; + /* 弹框的悬浮阴影效果,如不需要可注释该行 */ +} + +.zan-dialog--show .zan-dialog__container { + transform: translateY(0); +} + +.zan-dialog--show .zan-dialog__mask { + display: block; +} + +/*隐藏*/ +.pop_hidden { + display: none; +} \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 3e0c21b..6723860 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -63,7 +63,6 @@ Page({ //跳转对应界面 goLogisticsType(e){ - console.log(JSON.stringify(e)); var tag = e.currentTarget.dataset.id var url //自建物流 @@ -90,28 +89,6 @@ Page({ }) }, - //自建物流 - goMelogistics(){ - wx.navigateTo({ - url: '../meLogistics/meLogistics', - }) - }, - - //第三方物流 - goThreelogistics(){ - wx.navigateTo({ - url: '../threeLogistics/threeLogistics', - }) - }, - - //物流交接 - goHandover(){ - wx.navigateTo({ - url: '../freiLogistics/freiLogistics', - // url: '../handover/handover', - }) - }, - /** * 生命周期函数--监听页面加载 */ diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 566e0de..1c6dddf 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -1,5 +1,5 @@ -