diff --git a/app.wxss b/app.wxss deleted file mode 100644 index 223cc35..0000000 --- a/app.wxss +++ /dev/null @@ -1,17 +0,0 @@ -/**app.wxss**/ -page{ - background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1) -} - -.box{ - background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1); - min-height: 1400rpx; - padding: 5rpx; - font-size: 28rpx; -} - -.back{ - padding: 10rpx; - border-radius: 5rpx; - background-color: #fff; -} diff --git a/pages/details/details.wxml b/pages/details/details.wxml deleted file mode 100644 index 421a0e9..0000000 --- a/pages/details/details.wxml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - {{barCode}} - - - - {{receiveTime}} - - - - 已接收 - - - - {{logisticsNo}} - - - - {{unitType}} - - - - {{entryDate}} - - - - {{cost}} - - - - {{expectedEndTime}} - - - - {{boxNum}} - - - - {{numberplate}} - - - - {{logisticsMen}} - - - - {{notes}} - - - diff --git a/pages/details/details.wxss b/pages/details/details.wxss deleted file mode 100644 index 377434c..0000000 --- a/pages/details/details.wxss +++ /dev/null @@ -1,18 +0,0 @@ -/* pages/details/details.wxss */ -.cen{ - /* border-bottom: 1rpx #ececec solid; */ - padding: 10rpx 20rpx; - display: flex; -} -.cen label{ - width: 150rpx; - text-align: right; - margin-right: 20rpx; -} -.cen view{ - background-color: #eee; - padding: 10rpx 30rpx; - width: 300rpx; - flex: 1; - border-radius: 15rpx; -} \ No newline at end of file diff --git a/pages/freiLogistics/freiLogistics.json b/pages/freiLogistics/freiLogistics.json deleted file mode 100644 index 59d9f03..0000000 --- a/pages/freiLogistics/freiLogistics.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "usingComponents": {}, - "navigationBarTitleText": "物流签收" -} \ No newline at end of file diff --git a/pages/freiLogistics/freiLogistics.wxml b/pages/freiLogistics/freiLogistics.wxml deleted file mode 100644 index fcc433c..0000000 --- a/pages/freiLogistics/freiLogistics.wxml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - 扫 码 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 物流车拍照 - - - - - - - - - - - 转运箱拍照 - - - - - - - - - - - 总计：{{sampleCount}}/管数 - - - - - - - 序号 - 样本条码号 - 接收时间 - 样本状态 - 物流员 - 物流单号 - - - {{item.id}} - {{item.number}} - {{item.time}} - {{item.status}} - {{item.name}} - {{item.num}} - - - - \ No newline at end of file diff --git a/pages/handover/handover.wxml b/pages/handover/handover.wxml deleted file mode 100644 index 6b7fc86..0000000 --- a/pages/handover/handover.wxml +++ /dev/null @@ -1,63 +0,0 @@ - - - 物流单号M2023020200012已签收。签收时间:2023年6月14日 14:36 - - - - 日 期： - - - - - - 物流单号 - - - - - {{item.logisticsNo}} - [未核收] - - {{item.logisticsNo}} - [已核收] - - - - - - - - - 序号 - 样本号 - 送检机构 - 日期 - 转运箱号 - 交接人 - 状态 - - - - {{index+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 deleted file mode 100644 index 32e5de6..0000000 --- a/pages/handover/handover.wxss +++ /dev/null @@ -1,143 +0,0 @@ -/* pages/handover/handover.wxss */ -.back { - margin-top: 15rpx; -} - -.top { - background-color: #fff; - padding: 10rpx 10rpx; - font-size: 22rpx; - border-radius: 5rpx; -} - -.from-con { - display: flex; - align-items: center; - position: relative; -} - -.from-con input { - width: 250rpx; - border-radius: 5rpx; - border: 1rpx #666 solid; - padding: 3rpx 10rpx; - text-align: center; -} - -.canvas { - width: 100px; - height: 100px; - background-color: #6bc9ca; -} - -.place { - color: #c4bfbf; -} - -.f5 { - width: 200rpx !important; - font-size: 28rpx; - background-color: #eee; - border: 1rpx #ddd solid; - height: 60rpx; - display: flex; - align-items: center; - justify-content: center; - position: relative; - left: 40rpx; -} - - -.allordernum { - margin-top: 20rpx; - /* border: 1rpx #999 solid; */ - background-color: #f1f1f1; - border: 1rpx #eee solid; - border-radius: 5rpx; - width: 100%; - height: 350rpx; - padding: 20rpx 0; -} - -.allordernum view view { - padding: 20rpx; - background-color: #eee; - width: 88%; - margin: 0 auto; - margin-bottom: 15rpx; - border-radius: 5rpx; -} - - -.tr { - display: flex; - width: 100%; - -} - -.tr .td { - /* border-right:#ddd solid 1rpx ; - border-top: #ddd solid 1rpx; */ - border: 1rpx #ddd solid; - padding: 10rpx 0; - font-size: 22rpx; - display: flex; - justify-content: center; - align-items: center; - flex-wrap: nowrap; - white-space: nowrap; - min-width: 200rpx; -} - -.top1 view { - background-color: #6bc9ca; - color: #fff; -} - -.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.05); - /* 设置阴影半透明背景如： background: rgba(0, 0, 0, 0.4); */ - display: none; -} - -.zan-dialog__container { - position: fixed; - bottom: 200rpx; - width: 280rpx; - /* 弹窗布局宽 */ - height: 280rpx; - /* 弹窗布局高，与下面弹出距离transform有关 */ - margin-left: 220rpx; - 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/login/login.js b/pages/login/login.js deleted file mode 100644 index c396e27..0000000 --- a/pages/login/login.js +++ /dev/null @@ -1,98 +0,0 @@ -// pages/login/login.js -const request = require('../../utils/http') -var app = getApp(); - -Page({ - - /** - * 页面的初始数据 - */ - data: { - username: "yuexiangqian", //账号 - userpwd: "123456", //密码 - }, - getUsername(e) { - this.setData({ - username: e.detail.value - }) - }, - getUserpwd(e) { - this.setData({ - userpwd: e.detail.value - }) - }, - //登录请求 - login() { - request.post(`/sso/login?username=${this.data.username}&password=${this.data.userpwd}`).then(res => { - console.log(res); - if (res.data.code == 200) { - app.globalData.token = res.data.data.tokenHead + res.data.data.token; - request.get('/sso/info').then(res2 => { - app.globalData.userInfo = res2.data.data - wx.showToast({ - title: '登陆成功' - }) - wx.reLaunch({ - url: '../about/about' - }); - }) - } - }) - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/pages/login/login.json b/pages/login/login.json deleted file mode 100644 index a38ebaa..0000000 --- a/pages/login/login.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "usingComponents": {}, - "navigationBarTitleText": "登录" -} \ No newline at end of file diff --git a/pages/login/login.wxss b/pages/login/login.wxss deleted file mode 100644 index a87f097..0000000 --- a/pages/login/login.wxss +++ /dev/null @@ -1,62 +0,0 @@ -/* pages/login/login.wxss */ -/* pages/login/login.wxss */ -page { - background: -webkit-linear-gradient(top, #27adb0, #b6f0f0, #f8f8f8); - padding-top: 250rpx; -} - -.title { - padding: 40rpx 50rpx; - font-size: 55rpx; - color: #fff; - font-weight: 600; - font-family: 'Courier New', Courier, monospace; -} - - -.box { - background-color: #fff; - width: 650rpx; - border-radius: 10rpx; - margin: 0 auto; - padding: 30rpx 0; -} - -.text { - display: flex; - /* background-color: #f1f1f1; */ - border-radius: 20rpx; - width: 600rpx; - margin: 0 auto; - padding: 20rpx; - align-items: center; -} - -.text label { - font-weight: 900; - font-size: 30rpx; - color: #333; -} - -.text input { - font-size: 28rpx; - background-color: #f5f5f5; - width: 70%; - height: 60rpx; - padding: 0 20rpx; - border-radius: 10rpx; -} - -.btn { - border-radius: 10rpx; - height: 80rpx; - display: flex; - align-items: center; - justify-content: center; - font-size: 30rpx; - font-weight: 500; - background-color: #259c9e; - color: #fff; - margin-top: 50rpx; - width: 300rpx !important; -} \ No newline at end of file diff --git a/pages/meLogistics/meLogistics.json b/pages/meLogistics/meLogistics.json deleted file mode 100644 index 59d9f03..0000000 --- a/pages/meLogistics/meLogistics.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "usingComponents": {}, - "navigationBarTitleText": "物流签收" -} \ No newline at end of file diff --git a/pages/queryfrei/queryfrei.wxml b/pages/queryfrei/queryfrei.wxml deleted file mode 100644 index 0e4ae2c..0000000 --- a/pages/queryfrei/queryfrei.wxml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 序号 - 物流单号 - 送检机构 - 日期 - 样本管数 - 转运方式 - 转运箱号 - 出发时间 - 到达时间 - 车牌号 - 备注 - - - - - {{index + 1}} - {{item.logisticsNo}} - {{item.institutionName}} - {{item.entryDate}} - {{item.number}} - - 私家车 - 其他 - - {{item.boxNum}} - {{item.startTime}} - {{item.endTime}} - {{itme.numberplate}} - {{itme.notes}} - - - - - - - - \ No newline at end of file diff --git a/pages/queryfrei/queryfrei.wxss b/pages/queryfrei/queryfrei.wxss deleted file mode 100644 index 4e78062..0000000 --- a/pages/queryfrei/queryfrei.wxss +++ /dev/null @@ -1,79 +0,0 @@ - -page{ - background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1) -} - -.form{ - background-color: #fff; - border-radius: 15rpx; - padding: 20rpx 50rpx; - margin-bottom: 15rpx; -} -.form .from-con{ - font-size: 28rpx; - border-bottom: 2rpx #eee solid; - position: relative; - margin-top: 25rpx; -} -.from-con label{ - position: absolute; - top: 5rpx; - font-weight: 900; - font-size: 28rpx; - color: #333; -} -.from-con input{ - text-align: right; - padding: 10rpx; -} -.place{ - color:#c4bfbf; -} -.from-button{ - display: flex; - margin-top: 20rpx; -} - -.from-button button{ - display: flex; - align-items: center; - justify-content: center; - width: 250rpx !important; - font-size: 28rpx; -} - - -.tr{ - display: flex; - width: 100%; - -} -.tr .td{ - /* border-right:#ddd solid 1rpx ; - border-top: #ddd solid 1rpx; - border-bottom: #ddd solid 1rpx; */ - border: 1rpx #ddd solid; - padding: 15rpx 0; - font-size: 22rpx; - display: flex; - justify-content: center; - align-items: center; - flex-wrap: nowrap; - white-space: nowrap; - min-width: 150rpx; -} -.top view{ - background-color: #6bc9ca; - color: #fff; -} -.td1{ - min-width: 100rpx !important; -} -.td_date{ - min-width: 200rpx !important; -} -.td_time{ - min-width: 300rpx !important; -} - - diff --git a/pages/queryme/queryme.wxml b/pages/queryme/queryme.wxml deleted file mode 100644 index c501d9b..0000000 --- a/pages/queryme/queryme.wxml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 物流单号 - 送检机构 - 创建日期 - 样本管数 - 转运方式 - 转运箱号 - 预计出发时间 - 到达时间 - 车牌号 - 备注 - - - - - {{index + 1}} - {{item.logisticsNo}} - {{item.institutionName}} - {{item.createTime}} - {{item.number}} - - 自建物流 - 其他 - - {{item.boxNum}} - {{item.startTime}} - {{item.collTime == '' ? '未核收':item.collTime}} - {{itme.numberplate}} - {{itme.notes}} - - - - 共 {{sampleList.length}} 条 - - \ No newline at end of file diff --git a/pages/queryme/queryme.wxss b/pages/queryme/queryme.wxss deleted file mode 100644 index cb850b6..0000000 --- a/pages/queryme/queryme.wxss +++ /dev/null @@ -1,85 +0,0 @@ - -page{ - background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1) -} - -.form{ - background-color: #fff; - border-radius: 15rpx; - padding: 20rpx 50rpx; - margin-bottom: 15rpx; -} -.form .from-con{ - font-size: 28rpx; - border-bottom: 2rpx #eee solid; - position: relative; - margin-top: 25rpx; -} -.from-con label{ - position: absolute; - top: 5rpx; - font-weight: 900; - font-size: 28rpx; - color: #333; -} -.from-con input{ - text-align: right; - padding: 10rpx; -} -.place{ - color:#c4bfbf; -} -.from-button{ - display: flex; - margin-top: 20rpx; -} - -.from-button button{ - display: flex; - align-items: center; - justify-content: center; - width: 250rpx !important; - font-size: 28rpx; -} - - -.tr{ - display: flex; - width: 100%; - -} -.tr .td{ - /* border-right:#ddd solid 1rpx ; - border-top: #ddd solid 1rpx; - border-bottom: #ddd solid 1rpx; */ - border: 1rpx #ddd solid; - padding: 15rpx 0; - font-size: 22rpx; - display: flex; - justify-content: center; - align-items: center; - flex-wrap: nowrap; - white-space: nowrap; - min-width: 200rpx; -} - -.top view{ - background-color: #6bc9ca; - color: #fff; -} -.td1{ - min-width: 50rpx !important; -} - -.td2{ - min-width: 100rpx !important; -} - -.td_date{ - min-width: 250rpx !important; -} -.td_time{ - min-width: 300rpx !important; -} - - diff --git a/pages/querythree/querythree.wxml b/pages/querythree/querythree.wxml deleted file mode 100644 index df07cbe..0000000 --- a/pages/querythree/querythree.wxml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 序号 - 物流单号 - 送检机构 - 日期 - 物流费用 - 转运方式 - - - - {{index + 1}} - {{item.logisticsNo}} - {{item.institutionName}} - {{item.entryDate}} - {{item.cost}} - - 私家车 - 其他 - - - - - - - - - \ No newline at end of file diff --git a/pages/querythree/querythree.wxss b/pages/querythree/querythree.wxss deleted file mode 100644 index a22b31a..0000000 --- a/pages/querythree/querythree.wxss +++ /dev/null @@ -1,79 +0,0 @@ - -page{ - background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1) -} - -.form{ - background-color: #fff; - border-radius: 5rpx; - padding: 20rpx 50rpx; - margin-bottom: 15rpx; -} -.form .from-con{ - font-size: 28rpx; - border-bottom: 2rpx #eee solid; - position: relative; - margin-top: 25rpx; -} -.from-con label{ - position: absolute; - top: 5rpx; - font-weight: 900; - font-size: 28rpx; - color: #333; -} -.from-con input{ - text-align: right; - padding: 10rpx; -} -.place{ - color:#c4bfbf; -} -.from-button{ - display: flex; - margin-top: 20rpx; -} - -.from-button button{ - display: flex; - align-items: center; - justify-content: center; - width: 250rpx !important; - font-size: 28rpx; -} - - -.tr{ - display: flex; - width: 100%; - -} -.tr .td{ - /* border-right:#ddd solid 1rpx ; - border-top: #ddd solid 1rpx; - border-bottom: #ddd solid 1rpx; */ - border: 1rpx #ddd solid; - padding: 15rpx 0; - font-size: 22rpx; - display: flex; - justify-content: center; - align-items: center; - flex-wrap: nowrap; - white-space: nowrap; - min-width: 150rpx; -} -.top view{ - background-color: #6bc9ca; - color: #fff; -} -.td1{ - min-width: 50rpx !important; -} -.td_date{ - min-width: 200rpx !important; -} -.td_time{ - min-width: 300rpx !important; -} - - diff --git a/pages/threeLogistics/threeLogistics.json b/pages/threeLogistics/threeLogistics.json deleted file mode 100644 index 59d9f03..0000000 --- a/pages/threeLogistics/threeLogistics.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "usingComponents": {}, - "navigationBarTitleText": "物流签收" -} \ No newline at end of file diff --git a/pages/threeLogistics/threeLogistics.wxml b/pages/threeLogistics/threeLogistics.wxml deleted file mode 100644 index 0f949c2..0000000 --- a/pages/threeLogistics/threeLogistics.wxml +++ /dev/null @@ -1,111 +0,0 @@ - - - - - - 扫 码 - - - - - 总计：{{sampleCount}}/管数 - - - - - - - - 序号 - 样本条码号 - 接收时间 - 样本状态 - 物流员 - 物流单号 - - - {{item.id}} - {{item.number}} - {{item.time}} - {{item.status}} - {{item.name}} - {{item.num}} - - - - - - - - 物流车拍照 - - - - - - - - - - - - - 转运箱拍照 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.eslintrc.js b/yyt-mall-wl/.eslintrc.js similarity index 100% rename from .eslintrc.js rename to yyt-mall-wl/.eslintrc.js diff --git a/app.js b/yyt-mall-wl/app.js similarity index 94% rename from app.js rename to yyt-mall-wl/app.js index 46624a4..8c77500 100644 --- a/app.js +++ b/yyt-mall-wl/app.js @@ -15,7 +15,7 @@ App({ globalData: { // 本地环境 - baseUrl: 'http://192.168.51.4:8201/mall-portal', + baseUrl: 'http://192.168.51.6:8201/mall-portal', // 线上环境 // baseUrl:'https://portal-api.macrozheng.com', token: '', diff --git a/app.json b/yyt-mall-wl/app.json similarity index 100% rename from app.json rename to yyt-mall-wl/app.json diff --git a/yyt-mall-wl/app.wxss b/yyt-mall-wl/app.wxss new file mode 100644 index 0000000..a876eb7 --- /dev/null +++ b/yyt-mall-wl/app.wxss @@ -0,0 +1,17 @@ +/**app.wxss**/ +page{ + background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f4f4f4) +} + +.box{ + background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f4f4f4); + min-height: 1400rpx; + padding: 5rpx 15rpx; + font-size: 28rpx; +} + +.back{ + padding: 10rpx; + border-radius: 15rpx; + background-color: #fff; +} diff --git a/components/echarts/ec-canvas.js b/yyt-mall-wl/components/echarts/ec-canvas.js similarity index 100% rename from components/echarts/ec-canvas.js rename to yyt-mall-wl/components/echarts/ec-canvas.js diff --git a/components/echarts/ec-canvas.json b/yyt-mall-wl/components/echarts/ec-canvas.json similarity index 100% rename from components/echarts/ec-canvas.json rename to yyt-mall-wl/components/echarts/ec-canvas.json diff --git a/components/echarts/ec-canvas.wxml b/yyt-mall-wl/components/echarts/ec-canvas.wxml similarity index 100% rename from components/echarts/ec-canvas.wxml rename to yyt-mall-wl/components/echarts/ec-canvas.wxml diff --git a/components/echarts/ec-canvas.wxss b/yyt-mall-wl/components/echarts/ec-canvas.wxss similarity index 100% rename from components/echarts/ec-canvas.wxss rename to yyt-mall-wl/components/echarts/ec-canvas.wxss diff --git a/components/echarts/echarts.js b/yyt-mall-wl/components/echarts/echarts.js similarity index 100% rename from components/echarts/echarts.js rename to yyt-mall-wl/components/echarts/echarts.js diff --git a/components/echarts/wx-canvas.js b/yyt-mall-wl/components/echarts/wx-canvas.js similarity index 100% rename from components/echarts/wx-canvas.js rename to yyt-mall-wl/components/echarts/wx-canvas.js diff --git a/images/addPoto.png b/yyt-mall-wl/images/addPoto.png similarity index 100% rename from images/addPoto.png rename to yyt-mall-wl/images/addPoto.png diff --git a/images/banner.png b/yyt-mall-wl/images/banner.png similarity index 100% rename from images/banner.png rename to yyt-mall-wl/images/banner.png diff --git a/images/binding_wx.png b/yyt-mall-wl/images/binding_wx.png similarity index 100% rename from images/binding_wx.png rename to yyt-mall-wl/images/binding_wx.png diff --git a/images/bush.png b/yyt-mall-wl/images/bush.png similarity index 100% rename from images/bush.png rename to yyt-mall-wl/images/bush.png diff --git a/yyt-mall-wl/images/code.png b/yyt-mall-wl/images/code.png new file mode 100644 index 0000000..b9aa1f7 Binary files /dev/null and b/yyt-mall-wl/images/code.png differ diff --git a/images/home_not.png b/yyt-mall-wl/images/home_not.png similarity index 100% rename from images/home_not.png rename to yyt-mall-wl/images/home_not.png diff --git a/images/home_sel.png b/yyt-mall-wl/images/home_sel.png similarity index 100% rename from images/home_sel.png rename to yyt-mall-wl/images/home_sel.png diff --git a/images/my_not.png b/yyt-mall-wl/images/my_not.png similarity index 100% rename from images/my_not.png rename to yyt-mall-wl/images/my_not.png diff --git a/images/my_sel.png b/yyt-mall-wl/images/my_sel.png similarity index 100% rename from images/my_sel.png rename to yyt-mall-wl/images/my_sel.png diff --git a/yyt-mall-wl/images/saoma.png b/yyt-mall-wl/images/saoma.png new file mode 100644 index 0000000..6e4947c Binary files /dev/null and b/yyt-mall-wl/images/saoma.png differ diff --git a/yyt-mall-wl/images/shaixuan.png b/yyt-mall-wl/images/shaixuan.png new file mode 100644 index 0000000..a246d52 Binary files /dev/null and b/yyt-mall-wl/images/shaixuan.png differ diff --git a/images/意见反馈.png b/yyt-mall-wl/images/意见反馈.png similarity index 100% rename from images/意见反馈.png rename to yyt-mall-wl/images/意见反馈.png diff --git a/images/样本交接.png b/yyt-mall-wl/images/样本交接.png similarity index 100% rename from images/样本交接.png rename to yyt-mall-wl/images/样本交接.png diff --git a/images/物流码.png b/yyt-mall-wl/images/物流码.png similarity index 100% rename from images/物流码.png rename to yyt-mall-wl/images/物流码.png diff --git a/images/第三方物流.png b/yyt-mall-wl/images/第三方物流.png similarity index 100% rename from images/第三方物流.png rename to yyt-mall-wl/images/第三方物流.png diff --git a/images/第三方物流_查询.png b/yyt-mall-wl/images/第三方物流_查询.png similarity index 100% rename from images/第三方物流_查询.png rename to yyt-mall-wl/images/第三方物流_查询.png diff --git a/images/统计.png b/yyt-mall-wl/images/统计.png similarity index 100% rename from images/统计.png rename to yyt-mall-wl/images/统计.png diff --git a/images/自建物流.png b/yyt-mall-wl/images/自建物流.png similarity index 100% rename from images/自建物流.png rename to yyt-mall-wl/images/自建物流.png diff --git a/images/自建物流_查询.png b/yyt-mall-wl/images/自建物流_查询.png similarity index 100% rename from images/自建物流_查询.png rename to yyt-mall-wl/images/自建物流_查询.png diff --git a/images/货运物流.png b/yyt-mall-wl/images/货运物流.png similarity index 100% rename from images/货运物流.png rename to yyt-mall-wl/images/货运物流.png diff --git a/images/货运物流_查询.png b/yyt-mall-wl/images/货运物流_查询.png similarity index 100% rename from images/货运物流_查询.png rename to yyt-mall-wl/images/货运物流_查询.png diff --git a/package-lock.json b/yyt-mall-wl/package-lock.json similarity index 100% rename from package-lock.json rename to yyt-mall-wl/package-lock.json diff --git a/package.json b/yyt-mall-wl/package.json similarity index 100% rename from package.json rename to yyt-mall-wl/package.json diff --git a/pages/about/about.js b/yyt-mall-wl/pages/about/about.js similarity index 96% rename from pages/about/about.js rename to yyt-mall-wl/pages/about/about.js index 3237134..7cf9761 100644 --- a/pages/about/about.js +++ b/yyt-mall-wl/pages/about/about.js @@ -79,10 +79,13 @@ Page({ //登录 goLogin() { - wx.navigateTo({ - url: '../login/login', - }) + if(app.globalData.token == ''){ + wx.navigateTo({ + url: '../login/login' + }) + } }, + //退出登录 outLogin() { diff --git a/pages/about/about.json b/yyt-mall-wl/pages/about/about.json similarity index 100% rename from pages/about/about.json rename to yyt-mall-wl/pages/about/about.json diff --git a/pages/about/about.wxml b/yyt-mall-wl/pages/about/about.wxml similarity index 100% rename from pages/about/about.wxml rename to yyt-mall-wl/pages/about/about.wxml diff --git a/pages/about/about.wxss b/yyt-mall-wl/pages/about/about.wxss similarity index 85% rename from pages/about/about.wxss rename to yyt-mall-wl/pages/about/about.wxss index bd68245..3eb1901 100644 --- a/pages/about/about.wxss +++ b/yyt-mall-wl/pages/about/about.wxss @@ -55,8 +55,11 @@ color: #fff; font-size: 30rpx; width: 100%; - height: 100rpx; - background-color: #ff8c8c; + height: 80rpx; + font-weight: 700; + letter-spacing: 5rpx; + background-color: #4eb8b9; margin-top: 350rpx; - border-radius: 5rpx; + border-radius: 50rpx; + border: 1rpx #ddd solid; } \ No newline at end of file diff --git a/pages/details/details.js b/yyt-mall-wl/pages/details/details.js similarity index 95% rename from pages/details/details.js rename to yyt-mall-wl/pages/details/details.js index ac272ef..1cad8f8 100644 --- a/pages/details/details.js +++ b/yyt-mall-wl/pages/details/details.js @@ -19,6 +19,12 @@ Page({ notes:'',//备注 }, + goIndex(){ + wx.switchTab({ + url: '../index/index', + }) + }, + /** * 生命周期函数--监听页面加载 */ diff --git a/pages/details/details.json b/yyt-mall-wl/pages/details/details.json similarity index 100% rename from pages/details/details.json rename to yyt-mall-wl/pages/details/details.json diff --git a/yyt-mall-wl/pages/details/details.wxml b/yyt-mall-wl/pages/details/details.wxml new file mode 100644 index 0000000..1de758a --- /dev/null +++ b/yyt-mall-wl/pages/details/details.wxml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/yyt-mall-wl/pages/details/details.wxss b/yyt-mall-wl/pages/details/details.wxss new file mode 100644 index 0000000..c586384 --- /dev/null +++ b/yyt-mall-wl/pages/details/details.wxss @@ -0,0 +1,47 @@ +/* pages/details/details.wxss */ +.cen{ + display: flex; + margin-top: 5rpx; + padding: 0 30rpx; + align-items: center; +} +.cen label{ + width: 150rpx; + text-align: right; + + padding: 20rpx 20rpx; + font-size: 30rpx; + font-weight: 700; + color: #444; + /* background-color: blue; */ +} + +.cen input{ + background-color: #f1f1f1; + padding: 8rpx 30rpx; + /* width: 250rpx; */ + flex: 1; + border-radius: 60rpx; + font-size: 26rpx; + letter-spacing: 2rpx; +} + +.bottom{ + display: flex; + margin-top: 100rpx; + justify-content: space-around; + width: 100%; +} +.bottom button{ + border-radius: 60rpx; + width: 45% !important; + font-size: 30rpx; +} +.btn1{ + background-color: #ddd; +} +.btn2{ + background-color: #ddd; + color: #fff; + background-color: #27adb0; +} \ No newline at end of file diff --git a/pages/feedback/feedback.js b/yyt-mall-wl/pages/feedback/feedback.js similarity index 100% rename from pages/feedback/feedback.js rename to yyt-mall-wl/pages/feedback/feedback.js diff --git a/pages/feedback/feedback.json b/yyt-mall-wl/pages/feedback/feedback.json similarity index 100% rename from pages/feedback/feedback.json rename to yyt-mall-wl/pages/feedback/feedback.json diff --git a/pages/feedback/feedback.wxml b/yyt-mall-wl/pages/feedback/feedback.wxml similarity index 100% rename from pages/feedback/feedback.wxml rename to yyt-mall-wl/pages/feedback/feedback.wxml diff --git a/pages/feedback/feedback.wxss b/yyt-mall-wl/pages/feedback/feedback.wxss similarity index 100% rename from pages/feedback/feedback.wxss rename to yyt-mall-wl/pages/feedback/feedback.wxss diff --git a/pages/freiLogistics/freiLogistics.js b/yyt-mall-wl/pages/freiLogistics/freiLogistics.js similarity index 99% rename from pages/freiLogistics/freiLogistics.js rename to yyt-mall-wl/pages/freiLogistics/freiLogistics.js index 4e54dfc..ea193a4 100644 --- a/pages/freiLogistics/freiLogistics.js +++ b/yyt-mall-wl/pages/freiLogistics/freiLogistics.js @@ -200,6 +200,7 @@ Page({ if (e.target.dataset.id == 'car_2') potoIdx = 1 if (e.target.dataset.id == 'box_1') potoIdx = 2 if (e.target.dataset.id == 'box_2') potoIdx = 3 + //回显所拍摄照片 var _this = this; diff --git a/yyt-mall-wl/pages/freiLogistics/freiLogistics.json b/yyt-mall-wl/pages/freiLogistics/freiLogistics.json new file mode 100644 index 0000000..7067bc5 --- /dev/null +++ b/yyt-mall-wl/pages/freiLogistics/freiLogistics.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "三力货运物流" +} \ No newline at end of file diff --git a/yyt-mall-wl/pages/freiLogistics/freiLogistics.wxml b/yyt-mall-wl/pages/freiLogistics/freiLogistics.wxml new file mode 100644 index 0000000..0026f3c --- /dev/null +++ b/yyt-mall-wl/pages/freiLogistics/freiLogistics.wxml @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 物流车拍照 + + + + + + + + + + + 转运箱拍照 + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/threeLogistics/threeLogistics.wxss b/yyt-mall-wl/pages/freiLogistics/freiLogistics.wxss similarity index 60% rename from pages/threeLogistics/threeLogistics.wxss rename to yyt-mall-wl/pages/freiLogistics/freiLogistics.wxss index c1390d8..85b05be 100644 --- a/pages/threeLogistics/threeLogistics.wxss +++ b/yyt-mall-wl/pages/freiLogistics/freiLogistics.wxss @@ -1,21 +1,24 @@ /* pages/meLogistics/meLogistics.wxss */ -.top{ +.top { display: flex; - justify-content: center; + justify-content: left; font-size: 28rpx; } -.top input{ - border: 1rpx #333 solid; + +.top input { + background-color: #fff; + border-radius: 40rpx !important; height: 60rpx; width: 700rpx; border-radius: 5rpx; - padding: 5rpx 10rpx; + padding: 3rpx 30rpx; + font-size: 24rpx; } -.top view{ - width: 305rpx; + +.top view { + width: 120rpx; margin-left: 20rpx; - background-color: #eee; display: flex; justify-content: center; align-items: center; @@ -27,8 +30,10 @@ .form{ background-color: #fff; border-radius: 15rpx; - padding: 0rpx 30rpx; + padding:10rpx 40rpx; margin-bottom: 15rpx; + margin-top: 15rpx; + box-shadow: 0 0 10px #ddd; } .form .from-con{ font-size: 28rpx; @@ -41,11 +46,14 @@ top: 5rpx; font-weight: 900; font-size: 28rpx; - color: #333; + color: #555; } .from-con input{ text-align: right; padding: 10rpx; + position: relative; + left: 28%; + width: 70%; } .place{ color:#c4bfbf; @@ -55,6 +63,7 @@ display: flex; justify-content:space-between; align-items: center; + padding-left: 30rpx; } .bush button{ width: 200rpx !important; @@ -69,39 +78,48 @@ .bush-img{ display: flex; flex-wrap: wrap; - justify-content:space-around; - padding: 20rpx 10rpx; + justify-content: space-around; + padding:10rpx; + width: 100%; } .bush-img image{ - width: 100rpx; - height: 100rpx; + width: 120rpx; + height: 120rpx; margin-top: 5rpx; - border: 1rpx solid #999; - border-radius: 5rpx; + /* border: 10rpx solid #eee; + background-color: #eee; */ + border: 1rpx solid rgb(189, 188, 188,0.6); + /* background-color: #ddd; */ + border-radius: 10rpx; +} +.box{ + padding: 10rpx 20rpx; } .back{ - margin-top: 15rpx; + margin-top: 10rpx; } - -.con{ - display: flex; - align-items: center; +.back_img_box { + margin-top: 20rpx; + padding: 30rpx 0; + background-color: rgb(221, 221, 221,0.2); + /* background-color: #fff; */ + border-radius: 15rpx; + box-shadow: 0 0 10px #ddd; } -.con button{ - width: 170rpx !important; + +.con { display: flex; - justify-content: center; align-items: center; - font-size: 28rpx; - background-color: rgb(245, 90, 90); - height: 55rpx; - margin-left: 10rpx !important; + padding: 0 20rpx; + font-size: 26rpx; } .tabel{ margin-top: 20rpx; width: 100%; - border: 1rpx #ddd solid; + /* border: 1rpx #ddd solid; */ + height: 400rpx; + position: relative; } .tabel .tr{ @@ -125,7 +143,7 @@ background-color: #51bdbe; color:#fff; font-weight: 700; - font-size: 28rpx; + font-size: 26rpx !important; } .td1{ border-right:#ddd solid 1rpx ; @@ -139,3 +157,19 @@ white-space: nowrap; min-width: 100rpx; } + +.bottomButton { + width: 100% !important; + height: 90rpx; + margin-top: 50rpx; + margin-bottom: 80rpx; + padding: 0rpx 10rpx; + display: block; + display: inline-flex; + align-items: center; + justify-content: center; + text-align: center; + background-color:#4eb8b9; + color: #fff; + border-radius: 50rpx; +} diff --git a/pages/handover/handover.js b/yyt-mall-wl/pages/handover/handover.js similarity index 72% rename from pages/handover/handover.js rename to yyt-mall-wl/pages/handover/handover.js index 875b107..5e8650f 100644 --- a/pages/handover/handover.js +++ b/yyt-mall-wl/pages/handover/handover.js @@ -8,7 +8,33 @@ Page({ * 页面的初始数据 */ data: { - date: '', + screenisshow:false, + dateList:[ + { + id:1, + name:'近1个月', + isShow:false, + }, + { + id:2, + name:'近3个月', + isShow:false, + }, + { + id:3, + name:'近6个月', + isShow:false, + }, + { + id:4, + name:'今年', + isShow:false, + }, + ], + date: '', //开始时间 + endDate: '', + + // date: '', start: '', end: '', logisticsCodeList: [], //物流单列表 @@ -17,16 +43,76 @@ Page({ logisticsNo:'', //记录当前物流单号 }, + //筛选-------------------------- + screenisshow(){ + this.setData({ + screenisshow:true + }) + }, + + selectDate(e){ + console.log(e.currentTarget.dataset.id); + var id=e.currentTarget.dataset.id + var dateList=this.data.dateList + for(var i in dateList){ + if(dateList[i].id==id){ + dateList[i].isShow=true + }else{ + dateList[i].isShow=false + } + } + this.setData({ + dateList:dateList + }) + }, + + //筛选确定 + okDate(){ + this.setData({ + screenisshow:false + }) + }, + + //筛选重置 + resDate(){ + var dateList=this.data.dateList + for(var i in dateList){ + dateList[i].isShow=false + } + this.setData({ + dateList:dateList, + date: '', + endDate: '', + }) + }, + //------------------------------- + + //退出 + out(){ + wx.switchTab({ + url: '../index/index', + }) + }, + //刷新按钮 refresh() { this.selTranLogistics() }, + //开始时间 bindDateChange(e) { + // console.log(e.detail.value) this.setData({ date: e.detail.value }) }, + //结束时间 + bindDateChangeend(e) { + // console.log(e.detail.value) + this.setData({ + endDate: e.detail.value + }) + }, //查询物流单列表 selTranLogistics() { @@ -145,9 +231,9 @@ Page({ end: tempDate }) //当前的时间 - this.setData({ - date: tempDate - }) + // this.setData({ + // date: tempDate + // }) this.selTranLogistics() }, diff --git a/pages/handover/handover.json b/yyt-mall-wl/pages/handover/handover.json similarity index 100% rename from pages/handover/handover.json rename to yyt-mall-wl/pages/handover/handover.json diff --git a/yyt-mall-wl/pages/handover/handover.wxml b/yyt-mall-wl/pages/handover/handover.wxml new file mode 100644 index 0000000..cb7a3a1 --- /dev/null +++ b/yyt-mall-wl/pages/handover/handover.wxml @@ -0,0 +1,115 @@ + + + + 按时间查询 + + {{item.name}} + + + + + — + + + + + + + + + + + + + +物流单号M2023020200012已签收。签收时间:2023年6月14日 14:36 + + + + + + + 筛选 + + + + + + + + + + + + + + + + + + + + + + + + + 物流单号 + + + + + {{item.logisticsNo}} - [未核收] + + {{item.logisticsNo}} - [已核收] + + + + 总管数：20管 + + + + + + 序号 + 样本号 + 送检机构 + 日期 + 转运箱号 + 交接人 + 状态 + + + + {{index+1}} + {{item.barCode}} + {{item.institutionName}} + {{item.entryDate}} + {{item.boxNum}} + {{item.logisticsMen}} + 未采样 + 已采样 + 已发货 + 已接收 + 重新采样 + 其它 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yyt-mall-wl/pages/handover/handover.wxss b/yyt-mall-wl/pages/handover/handover.wxss new file mode 100644 index 0000000..2d873a3 --- /dev/null +++ b/yyt-mall-wl/pages/handover/handover.wxss @@ -0,0 +1,295 @@ +/* pages/handover/handover.wxss */ +.back { + margin-top: 15rpx; +} + +.top { + background-color: rgb(255, 255, 255,0.8); + padding: 10rpx 10rpx; + font-size: 22rpx; + border-radius: 5rpx; +} + +.form{ + background-color: #fff; + border-radius: 15rpx; + padding: 20rpx 50rpx; + margin-bottom: 15rpx; + margin-top: 15rpx; + /* border: 1rpx #ebeaea solid; */ + box-shadow: 0 0 10px #ddd; +} +.form .from-con{ + font-size: 28rpx; + border-bottom: 2rpx #eee solid; + position: relative; + margin-top: 25rpx; +} +.from-con label{ + position: absolute; + top: 5rpx; + font-weight: 900; + font-size: 28rpx; + color: #333; +} +.from-con input{ + text-align: right; + padding: 10rpx; + width: 60%; + position: relative; + left: 230rpx; +} +.place{ + color:#c4bfbf; +} +.from-button{ + display: flex; + margin-top: 20rpx; +} + +.from-button button{ + display: flex; + align-items: center; + justify-content: center; + width: 250rpx !important; + font-size: 28rpx; +} + + + +.canvas { + width: 100px; + height: 100px; + background-color: #6bc9ca; +} + +.allordernum { + margin-top: 20rpx; + /* border: 1rpx #999 solid; */ + background-color: #f1f1f1; + border: 1rpx #eee solid; + border-radius: 15rpx; + width: 100%; + height: 350rpx; + padding: 20rpx 0; +} + +.allordernum view view { + padding: 20rpx; + background-color: #eee; + width: 88%; + margin: 0 auto; + margin-bottom: 15rpx; + border-radius: 5rpx; +} + + +.tr { + display: flex; + width: 100%; + +} + +.tr .td { + /* border-right:#ddd solid 1rpx ; + border-top: #ddd solid 1rpx; */ + border-right: 1rpx #ddd solid; + padding: 10rpx 0; + font-size: 22rpx; + display: flex; + justify-content: center; + align-items: center; + flex-wrap: nowrap; + white-space: nowrap; + min-width: 200rpx; +} + +.top1 view { + background-color: #6bc9ca; + color: #fff; +} + +.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.05); + /* 设置阴影半透明背景如： background: rgba(0, 0, 0, 0.4); */ + display: none; +} + +.zan-dialog__container { + position: fixed; + bottom: 200rpx; + width: 280rpx; + /* 弹窗布局宽 */ + height: 280rpx; + /* 弹窗布局高，与下面弹出距离transform有关 */ + margin-left: 220rpx; + 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; +} + +.dateQuery{ + margin-top: 15rpx; + display: flex; + justify-content:center; +} +.dateQuery .datesel{ + background-color: #fff; + display: flex; + align-items: center; + padding: 0 30rpx; + width: 60%; + border-radius: 40rpx; +} +.f5 { + width: 28% !important; + font-size: 28rpx; + background-color: #c6eaeb; + color: #666; + height: 60rpx; + display: flex; + align-items: center; + justify-content: center; + margin-left: 20rpx; +} + + +.out{ + border-radius: 50rpx; + background-color: #38bec0; + width: 70% !important; + color: #fff; + margin-top: 60rpx; + margin-bottom: 60rpx; +} + +.screen{ + display: flex; + align-items: center; + margin-bottom: 5rpx; + font-size: 26rpx; + letter-spacing: 1rpx; + margin-top: 10rpx; + +} +.screen input{ + background-color: rgb(255, 255, 255); + flex: 1; + padding: 10rpx 35rpx; + border-radius: 50rpx; + box-shadow: 0 0 5rpx #ddd; +} +.screen image{ + width: 50rpx; + height:50rpx; + margin-left: 15rpx; +} +.screen .wz{ + margin-right: 10rpx; + font-size: 30rpx; + font-weight: 500; + color: #fff; +} + +.zhezhaoceng{ + position: fixed; + background-color: rgb(0, 0, 0,0.4); + width: 100%; + height: 100vh; + z-index: 1000; + transition: all 0.4s; + transform: translateY(-100vh); +} +.screenAlertActive{ + transform: translateY(0); +} +.screenAlert{ + z-index: 2000; + background:#f4f4f4; + border-radius: 0 0 20rpx 20rpx; + max-height: 500rpx; + padding: 20rpx; + font-size: 30rpx; +} + +.dateList{ + display: flex; + flex-wrap: wrap; + justify-content:space-around; +} +.dateList .date1{ + background-color: #fff; + margin-left: 20rpx; + text-align: center; + width: 200rpx; + padding: 15rpx 0; + margin-top: 20rpx; + border-radius: 50rpx; + font-size: 26rpx; + +} +.dataActive{ + border: 1rpx #38bec0 solid; + background-color: #deeff0 !important; +} + +.selectdate{ + margin-top: 20rpx; + display: flex; + justify-content: space-between; + align-items: center; + width: 62%; +} +.selectdate input{ + background-color: #fff; + border-radius: 30rpx; + font-size: 26rpx; + padding: 12rpx 0; + text-align: center; +} + +.chongzhi{ + background-color: #eee; + border-radius: 52rpx; + border: 1rpx #ddd solid; + width: 45% !important; + height: 70rpx; + font-size: 30rpx; +} +.queren{ + background-color: #38bec0; + color: #fff; + border-radius: 52rpx; + width: 45% !important; + height: 70rpx; + font-size: 30rpx; +} \ No newline at end of file diff --git a/pages/index/index.js b/yyt-mall-wl/pages/index/index.js similarity index 97% rename from pages/index/index.js rename to yyt-mall-wl/pages/index/index.js index 36416cb..4d523f0 100644 --- a/pages/index/index.js +++ b/yyt-mall-wl/pages/index/index.js @@ -138,10 +138,6 @@ Page({ url = '../queryfrei/queryfrei' } - //合作物流 - if(tag == 'goOtherLogistics'){ - url = '../otherLogistics/otherLogistics' - } wx.navigateTo({ url: url, diff --git a/pages/index/index.json b/yyt-mall-wl/pages/index/index.json similarity index 59% rename from pages/index/index.json rename to yyt-mall-wl/pages/index/index.json index 6aaec87..398b71a 100644 --- a/pages/index/index.json +++ b/yyt-mall-wl/pages/index/index.json @@ -2,5 +2,5 @@ "usingComponents": { "ec-canvas":"../../components/echarts/ec-canvas" }, - "navigationBarTitleText": "物流管理系统" + "navigationBarTitleText": "三力物流管理系统" } \ No newline at end of file diff --git a/pages/index/index.wxml b/yyt-mall-wl/pages/index/index.wxml similarity index 87% rename from pages/index/index.wxml rename to yyt-mall-wl/pages/index/index.wxml index 3e925d3..c4539e1 100644 --- a/pages/index/index.wxml +++ b/yyt-mall-wl/pages/index/index.wxml @@ -44,19 +44,13 @@ 货运查询 - - - - 合作物流 - - - + - + \ No newline at end of file diff --git a/pages/index/index.wxss b/yyt-mall-wl/pages/index/index.wxss similarity index 91% rename from pages/index/index.wxss rename to yyt-mall-wl/pages/index/index.wxss index 728c87d..3da3241 100644 --- a/pages/index/index.wxss +++ b/yyt-mall-wl/pages/index/index.wxss @@ -14,10 +14,9 @@ page { .msg{ border-radius: 2px; margin: 10rpx 10rpx 0rpx; - height: 40rpx; background-color: #fff; - font-size: 26rpx; - padding: 10rpx; + font-size: 24rpx; + padding: 15rpx; text-align: center; } @@ -48,7 +47,9 @@ page { background-color: #3ec6c9; color: #fff; margin-top: 10rpx; - padding: 30rpx 10rpx; + padding: 25rpx 10rpx; + font-size: 35rpx; + letter-spacing: 2rpx; width: 98% !important; } diff --git a/yyt-mall-wl/pages/login/login.js b/yyt-mall-wl/pages/login/login.js new file mode 100644 index 0000000..c68015a --- /dev/null +++ b/yyt-mall-wl/pages/login/login.js @@ -0,0 +1,144 @@ +// pages/login/login.js +const request = require('../../utils/http') +var app = getApp(); + +Page({ + + /** + * 页面的初始数据 + */ + data: { + username: "yuexiangqian", //账号 + userpwd: "123456", //密码 + code:'', + inputCode:'', + }, + getUsername(e) { + this.setData({ + username: e.detail.value + }) + }, + getUserpwd(e) { + this.setData({ + userpwd: e.detail.value + }) + }, + getinputCode(e){ + this.setData({ + inputCode:e.detail.value + }) + }, + //登录请求 + login() { + if(this.data.inputCode == ''){ + wx.showToast({ + title: '请输入验证码', + icon:'error' + }) + }else if(this.data.inputCode.toLowerCase()!==this.data.code.toLowerCase()){ + this.createCode() + this.setData({ + inputCode:'' + }) + wx.showToast({ + title: '验证码错误', + icon:'error' + }) + }else{ + request.post(`/sso/login?username=${this.data.username}&password=${this.data.userpwd}`).then(res => { + console.log(res); + if (res.data.code == 200) { + app.globalData.token = res.data.data.tokenHead + res.data.data.token; + request.get('/sso/info').then(res2 => { + app.globalData.userInfo = res2.data.data + wx.showToast({ + title: '登陆成功' + }) + wx.reLaunch({ + url: '../about/about' + }); + }) + } + }) + } + + }, + + getCode() { + //点击调用创建验证码方法 + this.createCode() + }, + + //创建随机验证码方法 + createCode() { + let code = ''; + let codeLength = 4; //验证码长度 + let txt = new Array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 'a', 'b', 'C', 'd', 'E', 'f', 'g', 'H', 'i', 'J', 'k', 'L', 'm', 'N', 'O', 'p', 'Q', 'r', 'S', 'T', 'u', 'V', 'w', 'X', 'Y', 'z'); + for(let i = 0; i < codeLength; i++) { + //随机数范围 + let index = Math.floor(Math.random() * 36); + code += txt[index]; + } + this.setData({ + code + }) + console.log(this.data.code); + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.createCode() + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/yyt-mall-wl/pages/login/login.json b/yyt-mall-wl/pages/login/login.json new file mode 100644 index 0000000..791915a --- /dev/null +++ b/yyt-mall-wl/pages/login/login.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "三力物流管理系统" +} \ No newline at end of file diff --git a/pages/login/login.wxml b/yyt-mall-wl/pages/login/login.wxml similarity index 59% rename from pages/login/login.wxml rename to yyt-mall-wl/pages/login/login.wxml index 55f7232..4f296ff 100644 --- a/pages/login/login.wxml +++ b/yyt-mall-wl/pages/login/login.wxml @@ -1,5 +1,6 @@ + 欢迎登录 @@ -14,6 +15,18 @@ + + + + + {{code}} + + + 看不清？换一张 + + + + \ No newline at end of file diff --git a/yyt-mall-wl/pages/login/login.wxss b/yyt-mall-wl/pages/login/login.wxss new file mode 100644 index 0000000..60104ea --- /dev/null +++ b/yyt-mall-wl/pages/login/login.wxss @@ -0,0 +1,124 @@ +/* pages/login/login.wxss */ +/* pages/login/login.wxss */ +page { + background: -webkit-linear-gradient(top, #27adb0, #b6f0f0, #f8f8f8); + padding-top: 250rpx; +} + +.title { + padding: 40rpx 50rpx; + font-size: 55rpx; + color: #fff; + font-weight: 600; + font-family: 'Courier New', Courier, monospace; +} + + +.box { + background-color: #fff; + width: 650rpx; + border-radius: 10rpx; + margin: 0 auto; + padding: 30rpx 0; +} + +.text { + display: flex; + justify-content: center; + /* background-color: #f1f1f1; */ + border-radius: 20rpx; + width: 600rpx; + margin: 0 auto; + padding: 20rpx; + align-items: center; +} + +.text label { + font-weight: 900; + font-size: 30rpx; + color: #333; +} + +.text input { + font-size: 28rpx; + background-color: #f1f1f1; + /* background-color: #f1f1f1; + border: 1rpx #ddd solid; */ + width: 55%; + height: 60rpx; + padding: 0 20rpx; + border-radius: 40rpx; +} + +.btn { + border-radius: 80rpx; + height: 70rpx; + display: flex; + align-items: center; + justify-content: center; + font-size: 30rpx; + font-weight: 900; + background-color: #63b8b9; + color: #fff; + margin-top: 80rpx; + width: 400rpx !important; +} + +.code{ + display: flex; + padding: 20rpx; + justify-content:center; + margin-left: 30rpx; +} +.code input{ + font-size: 28rpx; + background-color: #f1f1f1; + width: 40%; + height: 60rpx; + padding: 0 20rpx; + border-radius: 30rpx; + color: #000; + font-size: 28rpx; +} +.place{ + color: #cccccc; + font-size: 22rpx; +} +.codenum{ + width: 65%; + height: 70%; + padding: 10rpx; + text-align: center; + font-weight: 900; + letter-spacing: 10rpx; + font-style: oblique; + font-size: 40rpx; + position: relative; + overflow: hidden; + margin-left: 20rpx; +} +.codenum view{ + position: absolute; + color:#000; + z-index: 200; + text-align: center; +} +.codenum image{ + width: 400rpx; + height: 200rpx; + position: absolute; + top: 0; + left: 0; +} + +.huan{ + margin-left:25rpx; + font-size: 26rpx; + margin-top: 10rpx; + color: #555; + font-weight: 500; + letter-spacing: 2rpx; + text-decoration: underline; + font-style: oblique; +} + diff --git a/pages/meLogistics/meLogistics.js b/yyt-mall-wl/pages/meLogistics/meLogistics.js similarity index 100% rename from pages/meLogistics/meLogistics.js rename to yyt-mall-wl/pages/meLogistics/meLogistics.js diff --git a/yyt-mall-wl/pages/meLogistics/meLogistics.json b/yyt-mall-wl/pages/meLogistics/meLogistics.json new file mode 100644 index 0000000..b848ee4 --- /dev/null +++ b/yyt-mall-wl/pages/meLogistics/meLogistics.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "三力自建物流" +} \ No newline at end of file diff --git a/pages/meLogistics/meLogistics.wxml b/yyt-mall-wl/pages/meLogistics/meLogistics.wxml similarity index 90% rename from pages/meLogistics/meLogistics.wxml rename to yyt-mall-wl/pages/meLogistics/meLogistics.wxml index 4303646..9309266 100644 --- a/pages/meLogistics/meLogistics.wxml +++ b/yyt-mall-wl/pages/meLogistics/meLogistics.wxml @@ -1,24 +1,21 @@ - - - - - 扫 码 - + + + + + + - + 总计：{{sampleCount}}/管数 - - - - + 序号 样本条码号 接收时间 样本状态 @@ -75,7 +72,6 @@ - - 数 量： + 数 量： @@ -152,14 +148,14 @@ - 备 注： + 备 注： - + - + \ No newline at end of file diff --git a/pages/meLogistics/meLogistics.wxss b/yyt-mall-wl/pages/meLogistics/meLogistics.wxss similarity index 74% rename from pages/meLogistics/meLogistics.wxss rename to yyt-mall-wl/pages/meLogistics/meLogistics.wxss index 6b756f0..446ce32 100644 --- a/pages/meLogistics/meLogistics.wxss +++ b/yyt-mall-wl/pages/meLogistics/meLogistics.wxss @@ -7,17 +7,18 @@ } .top input { - border: 1rpx #333 solid; + background-color: #fff; + border-radius: 40rpx !important; height: 60rpx; width: 700rpx; border-radius: 5rpx; - padding: 5rpx 10rpx; + padding: 3rpx 30rpx; + font-size: 24rpx; } .top view { - width: 305rpx; + width: 120rpx; margin-left: 20rpx; - background-color: #eee; display: flex; justify-content: center; align-items: center; @@ -29,8 +30,9 @@ .form { background-color: #fff; border-radius: 15rpx; - padding: 0rpx 30rpx; + padding: 10rpx 30rpx; margin-bottom: 15rpx; + margin-top: 15rpx; } .form .from-con { @@ -54,12 +56,16 @@ top: 5rpx; font-weight: 900; font-size: 28rpx; - color: #333; + color: #555; } .from-con input { text-align: right; padding: 10rpx; + /* background-color: #23c559; */ + position: relative; + left: 28%; + width: 70%; } .place { @@ -70,7 +76,7 @@ display: flex; justify-content: space-between; align-items: center; - padding-left: 40rpx; + padding-left: 30rpx; } .bush button { @@ -85,36 +91,41 @@ } .bush-img { - display: flex; flex-wrap: wrap; justify-content: space-around; - padding: 20rpx 10rpx; + padding:10rpx; width: 100%; } .bush-img image { - width: 100rpx; - height: 100rpx; + width: 120rpx; + height: 120rpx; margin-top: 5rpx; - border: 1rpx solid #999; - border-radius: 5rpx; + /* border: 10rpx solid #eee; + background-color: #eee; */ + border: 1rpx solid rgb(189, 188, 188,0.6); + /* background-color: #ddd; */ + border-radius: 10rpx; } .back { - margin-top: 15rpx; + margin-top: 10rpx; } .back_img_box { - margin-top: 20rpx; - padding-top: 10rpx; - background-color: #e6e6e6; - border-radius: 5rpx; + margin-top: 15rpx; + padding: 30rpx 0; + /* background-color: #f6f6f6; */ + background-color: rgb(255, 255, 255,0.8); + border-radius: 15rpx; } .con { display: flex; align-items: center; + padding: 0 20rpx; + font-size: 26rpx; } .con button { @@ -129,6 +140,8 @@ } .bottomButton { + width: 100% !important; + height: 90rpx; margin-top: 30rpx; margin-bottom: 80rpx; padding: 0rpx 10rpx; @@ -137,13 +150,15 @@ align-items: center; justify-content: center; text-align: center; - background-color: #7f96d3; + background-color:#4eb8b9; + color: #fff; + border-radius: 50rpx; } .tabel { margin-top: 20rpx; width: 100%; - border: 1rpx #ddd solid; + /* border: 1rpx #eee solid; */ } @@ -170,7 +185,7 @@ background-color: #51bdbe; color: #fff; font-weight: 700; - font-size: 28rpx; + font-size: 26rpx !important; } .td1 { @@ -184,5 +199,5 @@ flex-wrap: nowrap; white-space: nowrap; padding: 0rpx 2rpx; - min-width: 30rpx; + min-width: 100rpx; } \ No newline at end of file diff --git a/pages/otherLogistics/otherLogistics.js b/yyt-mall-wl/pages/otherLogistics/otherLogistics.js similarity index 100% rename from pages/otherLogistics/otherLogistics.js rename to yyt-mall-wl/pages/otherLogistics/otherLogistics.js diff --git a/pages/otherLogistics/otherLogistics.json b/yyt-mall-wl/pages/otherLogistics/otherLogistics.json similarity index 100% rename from pages/otherLogistics/otherLogistics.json rename to yyt-mall-wl/pages/otherLogistics/otherLogistics.json diff --git a/pages/otherLogistics/otherLogistics.wxml b/yyt-mall-wl/pages/otherLogistics/otherLogistics.wxml similarity index 100% rename from pages/otherLogistics/otherLogistics.wxml rename to yyt-mall-wl/pages/otherLogistics/otherLogistics.wxml diff --git a/pages/otherLogistics/otherLogistics.wxss b/yyt-mall-wl/pages/otherLogistics/otherLogistics.wxss similarity index 98% rename from pages/otherLogistics/otherLogistics.wxss rename to yyt-mall-wl/pages/otherLogistics/otherLogistics.wxss index c6a8cc1..3f6a7bf 100644 --- a/pages/otherLogistics/otherLogistics.wxss +++ b/yyt-mall-wl/pages/otherLogistics/otherLogistics.wxss @@ -5,7 +5,7 @@ font-size: 28rpx; } .top input{ - border: 1rpx #333 solid; + border: 1rpx #f1f1f1 solid; height: 60rpx; width: 700rpx; border-radius: 5rpx; diff --git a/pages/queryfrei/queryfrei.js b/yyt-mall-wl/pages/queryfrei/queryfrei.js similarity index 73% rename from pages/queryfrei/queryfrei.js rename to yyt-mall-wl/pages/queryfrei/queryfrei.js index cfcd023..ee5b9f4 100644 --- a/pages/queryfrei/queryfrei.js +++ b/yyt-mall-wl/pages/queryfrei/queryfrei.js @@ -6,6 +6,30 @@ Page({ * 页面的初始数据 */ data: { + screenisshow:false, + dateList:[ + { + id:1, + name:'近1个月', + isShow:false, + }, + { + id:2, + name:'近3个月', + isShow:false, + }, + { + id:3, + name:'近6个月', + isShow:false, + }, + { + id:4, + name:'今年', + isShow:false, + }, + ], + date: '', //开始时间 endDate: '', start: '2023-01-01', @@ -20,6 +44,57 @@ Page({ sampleCount: '', //查询记录总数 }, + //筛选-------------------------- + screenisshow(){ + this.setData({ + screenisshow:true + }) + }, + + selectDate(e){ + console.log(e.currentTarget.dataset.id); + var id=e.currentTarget.dataset.id + var dateList=this.data.dateList + for(var i in dateList){ + if(dateList[i].id==id){ + dateList[i].isShow=true + }else{ + dateList[i].isShow=false + } + } + this.setData({ + dateList:dateList + }) + }, + + //筛选确定 + okDate(){ + this.setData({ + screenisshow:false + }) + }, + + //筛选重置 + resDate(){ + var dateList=this.data.dateList + for(var i in dateList){ + dateList[i].isShow=false + } + this.setData({ + dateList:dateList, + date: '', + endDate: '', + }) + }, + + //------------------------------- + //退出 + out(){ + wx.switchTab({ + url: '../index/index', + }) + }, + //开始时间 bindDateChange(e) { // console.log(e.detail.value) @@ -116,7 +191,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - this.currentTime() + // this.currentTime() //获取送检机构列表 diff --git a/pages/queryfrei/queryfrei.json b/yyt-mall-wl/pages/queryfrei/queryfrei.json similarity index 100% rename from pages/queryfrei/queryfrei.json rename to yyt-mall-wl/pages/queryfrei/queryfrei.json diff --git a/yyt-mall-wl/pages/queryfrei/queryfrei.wxml b/yyt-mall-wl/pages/queryfrei/queryfrei.wxml new file mode 100644 index 0000000..74cf0dc --- /dev/null +++ b/yyt-mall-wl/pages/queryfrei/queryfrei.wxml @@ -0,0 +1,130 @@ + + + + 按时间查询 + + {{item.name}} + + + + + — + + + + + + + + + + + + + + + + + + + + 筛选 + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + 转运方式 + 转运箱号 + 数 量 + 日 期 + 物流电话 + 物流费用 + 到达时间 + 车牌号 + 物流员 + 备注 + + + + + {{index + 1}} + {{item.logisticsNo}} + {{item.institutionName}} + {{item.entryDate}} + {{item.number}} + + 私家车 + 其他 + + {{item.boxNum}} + {{item.startTime}} + {{item.endTime}} + {{itme.numberplate}} + {{itme.notes}} + + + + + + + + + \ No newline at end of file diff --git a/yyt-mall-wl/pages/queryfrei/queryfrei.wxss b/yyt-mall-wl/pages/queryfrei/queryfrei.wxss new file mode 100644 index 0000000..c093330 --- /dev/null +++ b/yyt-mall-wl/pages/queryfrei/queryfrei.wxss @@ -0,0 +1,206 @@ + +page{ + background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1) +} + +.form{ + background-color: #fff; + border-radius: 15rpx; + padding: 20rpx 50rpx; + margin-bottom: 15rpx; + margin-top: 15rpx; + /* border: 1rpx #ebeaea solid; */ + box-shadow: 0 0 10px #ddd; +} +.form .from-con{ + font-size: 28rpx; + border-bottom: 2rpx #eee solid; + position: relative; + margin-top: 25rpx; +} +.from-con label{ + position: absolute; + top: 5rpx; + font-weight: 900; + font-size: 28rpx; + color: #333; +} +.from-con input{ + text-align: right; + padding: 10rpx; + width: 60%; + position: relative; + left: 230rpx; +} +.place{ + color:#c4bfbf; +} +.from-button{ + display: flex; + margin-top: 20rpx; +} + +.from-button button{ + display: flex; + align-items: center; + justify-content: center; + width: 250rpx !important; + font-size: 28rpx; +} + +.tabel{ + background-color: #fff; + border-radius: 15rpx;margin-top: 15rpx; + padding: 30rpx 10rpx 50rpx 10rpx; + padding: 20rpx; + /* border: 1rpx #ebeaea solid; */ + box-shadow: 0 0 10px #ddd; +} +.tr{ + display: flex; + width: 100%; + +} +.tr .td{ + /* border-right:#ddd solid 1rpx ; + border-top: #ddd solid 1rpx; + border-bottom: #ddd solid 1rpx; */ + border-right: 1rpx #ddd solid; + border-bottom: 1rpx #ddd solid; + padding: 15rpx 0; + font-size: 22rpx; + display: flex; + justify-content: center; + align-items: center; + flex-wrap: nowrap; + white-space: nowrap; + min-width: 150rpx; +} +.top view{ + background-color: #6bc9ca; + color: #fff; + font-size: 24rpx !important; + font-weight: 700 !important; +} +.td1{ + min-width: 100rpx !important; +} +.td_date{ + min-width: 200rpx !important; +} +.td_time{ + min-width: 300rpx !important; +} + + +.screen{ + display: flex; + align-items: center; + margin-bottom: 5rpx; + font-size: 26rpx; + letter-spacing: 1rpx; + +} +.screen input{ + background-color: rgb(255, 255, 255); + flex: 1; + padding: 10rpx 35rpx; + border-radius: 50rpx; + box-shadow: 0 0 5rpx #ddd; +} +.screen image{ + width: 50rpx; + height:50rpx; + margin-left: 15rpx; +} +.screen .wz{ + margin-right: 10rpx; + font-size: 30rpx; + font-weight: 500; + color: #fff; +} + +.zhezhaoceng{ + position: fixed; + background-color: rgb(0, 0, 0,0.4); + width: 100%; + height: 100vh; + z-index: 1000; + transition: all 0.4s; + transform: translateY(-100vh); +} +.screenAlertActive{ + transform: translateY(0); +} +.screenAlert{ + z-index: 2000; + background:#f4f4f4; + border-radius: 0 0 20rpx 20rpx; + max-height: 500rpx; + padding: 20rpx; + font-size: 30rpx; +} + +.dateList{ + display: flex; + flex-wrap: wrap; + justify-content:space-around; +} +.dateList .date1{ + background-color: #fff; + margin-left: 20rpx; + text-align: center; + width: 200rpx; + padding: 15rpx 0; + margin-top: 20rpx; + border-radius: 50rpx; + font-size: 26rpx; + +} +.dataActive{ + border: 1rpx #38bec0 solid; + background-color: #deeff0 !important; +} + +.selectdate{ + margin-top: 20rpx; + display: flex; + justify-content: space-between; + align-items: center; + width: 62%; +} +.selectdate input{ + background-color: #fff; + border-radius: 30rpx; + font-size: 26rpx; + padding: 12rpx 0; + text-align: center; +} + +.chongzhi{ + background-color: #eee; + border-radius: 52rpx; + border: 1rpx #ddd solid; + width: 45% !important; + height: 70rpx; + font-size: 30rpx; +} +.queren{ + background-color: #38bec0; + color: #fff; + border-radius: 52rpx; + width: 45% !important; + height: 70rpx; + font-size: 30rpx; +} + + +.out{ + border-radius: 50rpx; + background-color: #38bec0; + color: #fff; + margin-top: 200rpx; + width: 70% !important; +} + + diff --git a/pages/queryme/queryme.js b/yyt-mall-wl/pages/queryme/queryme.js similarity index 73% rename from pages/queryme/queryme.js rename to yyt-mall-wl/pages/queryme/queryme.js index e5fd2a7..18e6dfd 100644 --- a/pages/queryme/queryme.js +++ b/yyt-mall-wl/pages/queryme/queryme.js @@ -6,6 +6,29 @@ Page({ * 页面的初始数据 */ data: { + screenisshow:false, + dateList:[ + { + id:1, + name:'近1个月', + isShow:false, + }, + { + id:2, + name:'近3个月', + isShow:false, + }, + { + id:3, + name:'近6个月', + isShow:false, + }, + { + id:4, + name:'今年', + isShow:false, + }, + ], date: '', //开始时间 endDate: '', start: '2023-01-01', @@ -20,6 +43,57 @@ Page({ sampleCount: '', //查询记录总数 }, + //筛选-------------------------- + screenisshow(){ + this.setData({ + screenisshow:true + }) + }, + + selectDate(e){ + console.log(e.currentTarget.dataset.id); + var id=e.currentTarget.dataset.id + var dateList=this.data.dateList + for(var i in dateList){ + if(dateList[i].id==id){ + dateList[i].isShow=true + }else{ + dateList[i].isShow=false + } + } + this.setData({ + dateList:dateList + }) + }, + + //筛选确定 + okDate(){ + this.setData({ + screenisshow:false + }) + }, + + //筛选重置 + resDate(){ + var dateList=this.data.dateList + for(var i in dateList){ + dateList[i].isShow=false + } + this.setData({ + dateList:dateList, + date: '', + endDate: '', + }) + }, + + //------------------------------- + //退出 + out(){ + wx.switchTab({ + url: '../index/index', + }) + }, + //开始时间 bindDateChange(e) { // console.log(e.detail.value) @@ -116,7 +190,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - this.currentTime() + // this.currentTime() //获取送检机构列表 diff --git a/pages/queryme/queryme.json b/yyt-mall-wl/pages/queryme/queryme.json similarity index 100% rename from pages/queryme/queryme.json rename to yyt-mall-wl/pages/queryme/queryme.json diff --git a/yyt-mall-wl/pages/queryme/queryme.wxml b/yyt-mall-wl/pages/queryme/queryme.wxml new file mode 100644 index 0000000..599d1ad --- /dev/null +++ b/yyt-mall-wl/pages/queryme/queryme.wxml @@ -0,0 +1,140 @@ + + + 按时间查询 + + {{item.name}} + + + + + — + + + + + + + + + + + + + + + + + + + + + + 筛选 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序 号 + 送检机构 + 物流单号 + 数 量 + 运输方式 + 转运箱号 + 预计出发时间 + 到达时间 + 车牌号 + 驾驶员 + 物流员 + 备 注 + + + + + {{index + 1}} + {{item.logisticsNo}} + {{item.institutionName}} + {{item.createTime}} + {{item.number}} + + 自建物流 + 其他 + + {{item.boxNum}} + {{item.startTime}} + {{item.collTime == '' ? '未核收':item.collTime}} + {{itme.numberplate}} + {{itme.notes}} + + + + + + + + \ No newline at end of file diff --git a/yyt-mall-wl/pages/queryme/queryme.wxss b/yyt-mall-wl/pages/queryme/queryme.wxss new file mode 100644 index 0000000..9d50faf --- /dev/null +++ b/yyt-mall-wl/pages/queryme/queryme.wxss @@ -0,0 +1,212 @@ + +page{ + background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1) +} + +.form{ + background-color: #fff; + border-radius: 15rpx; + padding: 20rpx 50rpx; + margin-bottom: 15rpx; + margin-top: 15rpx; + /* border: 1rpx #ebeaea solid; */ + box-shadow: 0 0 10px #ddd; +} +.form .from-con{ + font-size: 28rpx; + border-bottom: 2rpx #eee solid; + position: relative; + margin-top: 25rpx; +} +.from-con label{ + position: absolute; + top: 5rpx; + font-weight: 900; + font-size: 28rpx; + color: #333; +} +.from-con input{ + text-align: right; + padding: 10rpx; + width: 60%; + position: relative; + left: 230rpx; +} +.place{ + color:#c4bfbf; +} +.from-button{ + display: flex; + margin-top: 20rpx; +} + +.from-button button{ + display: flex; + align-items: center; + justify-content: center; + width: 250rpx !important; + font-size: 28rpx; +} + +.tabel{ + background-color: #fff; + border-radius: 15rpx;margin-top: 15rpx; + padding: 30rpx 10rpx 50rpx 10rpx; + padding: 20rpx; + /* border: 1rpx #ebeaea solid; */ + box-shadow: 0 0 10px #ddd; +} +.tr{ + display: flex; + width: 100%; + +} +.tr .td{ + /* border-right:#ddd solid 1rpx ; + border-top: #ddd solid 1rpx; + border-bottom: #ddd solid 1rpx; */ + border-right: 1rpx #ddd solid; + border-bottom: 1rpx #ddd solid; + padding: 15rpx 0; + font-size: 22rpx; + display: flex; + justify-content: center; + align-items: center; + flex-wrap: nowrap; + white-space: nowrap; + min-width: 200rpx; + +} + +.top view{ + background-color: #6bc9ca; + color: #fff; + font-size: 24rpx !important; + font-weight: 700 !important; + letter-spacing: 1rpx; +} +.td1{ + min-width: 80rpx !important; +} + +.td2{ + min-width: 100rpx !important; +} + +.td_date{ + min-width: 250rpx !important; +} +.td_time{ + min-width: 300rpx !important; +} + +.screen{ + display: flex; + align-items: center; + margin-bottom: 5rpx; + font-size: 26rpx; + letter-spacing: 1rpx; + +} +.screen input{ + background-color: rgb(255, 255, 255); + flex: 1; + padding: 10rpx 35rpx; + border-radius: 50rpx; + box-shadow: 0 0 5rpx #ddd; +} +.screen image{ + width: 50rpx; + height:50rpx; + margin-left: 15rpx; +} +.screen .wz{ + margin-right: 10rpx; + font-size: 30rpx; + font-weight: 500; + color: #fff; +} + +.zhezhaoceng{ + position: fixed; + background-color: rgb(0, 0, 0,0.4); + width: 100%; + height: 100vh; + z-index: 1000; + transition: all 0.4s; + transform: translateY(-100vh); +} +.screenAlertActive{ + transform: translateY(0); +} +.screenAlert{ + z-index: 2000; + background:#f4f4f4; + border-radius: 0 0 20rpx 20rpx; + max-height: 500rpx; + padding: 20rpx; + font-size: 30rpx; +} + +.dateList{ + display: flex; + flex-wrap: wrap; + justify-content:space-around; +} +.dateList .date1{ + background-color: #fff; + margin-left: 20rpx; + text-align: center; + width: 200rpx; + padding: 15rpx 0; + margin-top: 20rpx; + border-radius: 50rpx; + font-size: 26rpx; + +} +.dataActive{ + border: 1rpx #38bec0 solid; + background-color: #deeff0 !important; +} + +.selectdate{ + margin-top: 20rpx; + display: flex; + justify-content: space-between; + align-items: center; + width: 62%; +} +.selectdate input{ + background-color: #fff; + border-radius: 30rpx; + font-size: 26rpx; + padding: 12rpx 0; + text-align: center; +} + +.chongzhi{ + background-color: #eee; + border-radius: 52rpx; + border: 1rpx #ddd solid; + width: 45% !important; + height: 70rpx; + font-size: 30rpx; +} +.queren{ + background-color: #38bec0; + color: #fff; + border-radius: 52rpx; + width: 45% !important; + height: 70rpx; + font-size: 30rpx; +} + + +.out{ + border-radius: 50rpx; + background-color: #38bec0; + color: #fff; + margin-top: 200rpx; + width: 70% !important; +} + diff --git a/pages/querythree/querythree.js b/yyt-mall-wl/pages/querythree/querythree.js similarity index 73% rename from pages/querythree/querythree.js rename to yyt-mall-wl/pages/querythree/querythree.js index e5fd2a7..0537a85 100644 --- a/pages/querythree/querythree.js +++ b/yyt-mall-wl/pages/querythree/querythree.js @@ -6,6 +6,30 @@ Page({ * 页面的初始数据 */ data: { + screenisshow:false, + dateList:[ + { + id:1, + name:'近1个月', + isShow:false, + }, + { + id:2, + name:'近3个月', + isShow:false, + }, + { + id:3, + name:'近6个月', + isShow:false, + }, + { + id:4, + name:'今年', + isShow:false, + }, + ], + date: '', //开始时间 endDate: '', start: '2023-01-01', @@ -20,6 +44,57 @@ Page({ sampleCount: '', //查询记录总数 }, + //筛选-------------------------- + screenisshow(){ + this.setData({ + screenisshow:true + }) + }, + + selectDate(e){ + console.log(e.currentTarget.dataset.id); + var id=e.currentTarget.dataset.id + var dateList=this.data.dateList + for(var i in dateList){ + if(dateList[i].id==id){ + dateList[i].isShow=true + }else{ + dateList[i].isShow=false + } + } + this.setData({ + dateList:dateList + }) + }, + + //筛选确定 + okDate(){ + this.setData({ + screenisshow:false + }) + }, + + //筛选重置 + resDate(){ + var dateList=this.data.dateList + for(var i in dateList){ + dateList[i].isShow=false + } + this.setData({ + dateList:dateList, + date: '', + endDate: '', + }) + }, + + //------------------------------- + //退出 + out(){ + wx.switchTab({ + url: '../index/index', + }) + }, + //开始时间 bindDateChange(e) { // console.log(e.detail.value) @@ -116,7 +191,7 @@ Page({ * 生命周期函数--监听页面加载 */ onLoad(options) { - this.currentTime() + // this.currentTime() //获取送检机构列表 diff --git a/pages/querythree/querythree.json b/yyt-mall-wl/pages/querythree/querythree.json similarity index 100% rename from pages/querythree/querythree.json rename to yyt-mall-wl/pages/querythree/querythree.json diff --git a/yyt-mall-wl/pages/querythree/querythree.wxml b/yyt-mall-wl/pages/querythree/querythree.wxml new file mode 100644 index 0000000..79ba26f --- /dev/null +++ b/yyt-mall-wl/pages/querythree/querythree.wxml @@ -0,0 +1,119 @@ + + + + 按时间查询 + + {{item.name}} + + + + + — + + + + + + + + + + + + + + + + + + + + + 筛选 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序 号 + 物流单号 + 物流单位 + 送检机构 + 物流电话 + 物流费用 + 转运箱号 + 到达时间 + 物流员 + 备注 + + + + {{index + 1}} + {{item.logisticsNo}} + {{item.institutionName}} + {{item.entryDate}} + {{item.cost}} + + 私家车 + 其他 + + + + + + + + + + \ No newline at end of file diff --git a/yyt-mall-wl/pages/querythree/querythree.wxss b/yyt-mall-wl/pages/querythree/querythree.wxss new file mode 100644 index 0000000..40d32a4 --- /dev/null +++ b/yyt-mall-wl/pages/querythree/querythree.wxss @@ -0,0 +1,210 @@ + +page{ + background: -webkit-linear-gradient(top,#27adb0,#ebf7f7,#f1f1f1) +} + +.form{ + /* background-color: #fff; + border-radius: 5rpx; + padding: 20rpx 50rpx; + margin-bottom: 15rpx; */ + background-color: #fff; + border-radius: 15rpx; + padding: 20rpx 50rpx; + margin-bottom: 15rpx; + margin-top: 15rpx; + /* border: 1rpx #ebeaea solid; */ + box-shadow: 0 0 10px #ddd; +} +.form .from-con{ + font-size: 28rpx; + border-bottom: 2rpx #eee solid; + position: relative; + margin-top: 25rpx; +} +.from-con label{ + position: absolute; + top: 5rpx; + font-weight: 900; + font-size: 28rpx; + color: #333; +} +.from-con input{ + text-align: right; + padding: 10rpx; + width: 60%; + position: relative; + left: 230rpx; +} +.place{ + color:#c4bfbf; +} +.from-button{ + display: flex; + margin-top: 20rpx; +} + +.from-button button{ + display: flex; + align-items: center; + justify-content: center; + width: 250rpx !important; + font-size: 28rpx; +} + +.tabel{ + background-color: #fff; + border-radius: 15rpx;margin-top: 15rpx; + padding: 30rpx 10rpx 50rpx 10rpx; + padding: 20rpx; + /* border: 1rpx #ebeaea solid; */ + box-shadow: 0 0 10px #ddd; +} +.tr{ + display: flex; + width: 100%; + +} +.tr .td{ + /* border-right:#ddd solid 1rpx ; + border-top: #ddd solid 1rpx; + border-bottom: #ddd solid 1rpx; */ + border-right: 1rpx #ddd solid; + border-bottom: 1rpx #ddd solid; + padding: 15rpx 0; + font-size: 22rpx; + display: flex; + justify-content: center; + align-items: center; + flex-wrap: nowrap; + white-space: nowrap; + min-width: 150rpx; +} +.top view{ + background-color: #6bc9ca; + color: #fff; + font-size: 24rpx !important; + font-weight: 700 !important; +} +.td1{ + min-width: 100rpx !important; + +} +.td_date{ + min-width: 200rpx !important; +} +.td_time{ + min-width: 300rpx !important; +} + +.screen{ + display: flex; + align-items: center; + margin-bottom: 5rpx; + font-size: 26rpx; + letter-spacing: 1rpx; + +} +.screen input{ + background-color: rgb(255, 255, 255); + flex: 1; + padding: 10rpx 35rpx; + border-radius: 50rpx; + box-shadow: 0 0 5rpx #ddd; +} +.screen image{ + width: 50rpx; + height:50rpx; + margin-left: 15rpx; +} +.screen .wz{ + margin-right: 10rpx; + font-size: 30rpx; + font-weight: 500; + color: #fff; +} + +.zhezhaoceng{ + position: fixed; + background-color: rgb(0, 0, 0,0.4); + width: 100%; + height: 100vh; + z-index: 1000; + transition: all 0.4s; + transform: translateY(-100vh); +} +.screenAlertActive{ + transform: translateY(0); +} +.screenAlert{ + z-index: 2000; + background:#f4f4f4; + border-radius: 0 0 20rpx 20rpx; + max-height: 500rpx; + padding: 20rpx; + font-size: 30rpx; +} + +.dateList{ + display: flex; + flex-wrap: wrap; + justify-content:space-around; +} +.dateList .date1{ + background-color: #fff; + margin-left: 20rpx; + text-align: center; + width: 200rpx; + padding: 15rpx 0; + margin-top: 20rpx; + border-radius: 50rpx; + font-size: 26rpx; + +} +.dataActive{ + border: 1rpx #38bec0 solid; + background-color: #deeff0 !important; +} + +.selectdate{ + margin-top: 20rpx; + display: flex; + justify-content: space-between; + align-items: center; + width: 62%; +} +.selectdate input{ + background-color: #fff; + border-radius: 30rpx; + font-size: 26rpx; + padding: 12rpx 0; + text-align: center; +} + +.chongzhi{ + background-color: #eee; + border-radius: 52rpx; + border: 1rpx #ddd solid; + width: 45% !important; + height: 70rpx; + font-size: 30rpx; +} +.queren{ + background-color: #38bec0; + color: #fff; + border-radius: 52rpx; + width: 45% !important; + height: 70rpx; + font-size: 30rpx; +} + + +.out{ + border-radius: 50rpx; + background-color: #38bec0; + color: #fff; + margin-top: 150rpx; + width: 70% !important; +} + + diff --git a/pages/threeLogistics/threeLogistics.js b/yyt-mall-wl/pages/threeLogistics/threeLogistics.js similarity index 98% rename from pages/threeLogistics/threeLogistics.js rename to yyt-mall-wl/pages/threeLogistics/threeLogistics.js index 49df07c..3d9f8e1 100644 --- a/pages/threeLogistics/threeLogistics.js +++ b/yyt-mall-wl/pages/threeLogistics/threeLogistics.js @@ -36,14 +36,7 @@ Page({ sampleCount: '0', //样本数量 //样本列表 - sampleList: [{ - 'id': 1, - 'number': '2023050002', - 'time': '2023-5-12 11:32', - 'status': '已签收', - 'name': '张三', - 'num': 'M2023055568' - }], + sampleList: [], }, //物流车、转运箱拍照 diff --git a/yyt-mall-wl/pages/threeLogistics/threeLogistics.json b/yyt-mall-wl/pages/threeLogistics/threeLogistics.json new file mode 100644 index 0000000..79b2825 --- /dev/null +++ b/yyt-mall-wl/pages/threeLogistics/threeLogistics.json @@ -0,0 +1,4 @@ +{ + "usingComponents": {}, + "navigationBarTitleText": "三力第三方物流" +} \ No newline at end of file diff --git a/yyt-mall-wl/pages/threeLogistics/threeLogistics.wxml b/yyt-mall-wl/pages/threeLogistics/threeLogistics.wxml new file mode 100644 index 0000000..7fc3993 --- /dev/null +++ b/yyt-mall-wl/pages/threeLogistics/threeLogistics.wxml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + 总计：{{sampleCount}}/管数 + + + + + + + 序号 + 样本条码号 + 接收时间 + 样本状态 + 物流员 + 物流单号 + + + {{item.id}} + {{item.number}}123 + {{item.time}} + {{item.status}} + {{item.name}} + {{item.num}} + + + + + + + + 物流车拍照 + + + + + + + + + + + 转运箱拍照 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/freiLogistics/freiLogistics.wxss b/yyt-mall-wl/pages/threeLogistics/threeLogistics.wxss similarity index 62% rename from pages/freiLogistics/freiLogistics.wxss rename to yyt-mall-wl/pages/threeLogistics/threeLogistics.wxss index 1fb312a..6b4ba46 100644 --- a/pages/freiLogistics/freiLogistics.wxss +++ b/yyt-mall-wl/pages/threeLogistics/threeLogistics.wxss @@ -1,21 +1,24 @@ /* pages/meLogistics/meLogistics.wxss */ -.top{ +.top { display: flex; justify-content: left; font-size: 28rpx; } -.top input{ - border: 1rpx #333 solid; + +.top input { + background-color: #fff; + border-radius: 40rpx !important; height: 60rpx; width: 700rpx; border-radius: 5rpx; - padding: 5rpx 10rpx; + padding: 3rpx 30rpx; + font-size: 24rpx; } -.top view{ - width: 305rpx; + +.top view { + width: 120rpx; margin-left: 20rpx; - background-color: #eee; display: flex; justify-content: center; align-items: center; @@ -27,8 +30,9 @@ .form{ background-color: #fff; border-radius: 15rpx; - padding: 0rpx 30rpx; + padding: 10rpx 35rpx; margin-bottom: 15rpx; + margin-top: 15rpx; } .form .from-con{ font-size: 28rpx; @@ -41,11 +45,14 @@ top: 5rpx; font-weight: 900; font-size: 28rpx; - color: #333; + color: #555; } .from-con input{ text-align: right; padding: 10rpx; + position: relative; + left: 28%; + width: 70%; } .place{ color:#c4bfbf; @@ -55,6 +62,7 @@ display: flex; justify-content:space-between; align-items: center; + padding-left: 30rpx; } .bush button{ width: 200rpx !important; @@ -66,42 +74,49 @@ color:#fff; height: 55rpx; } -.bush-img{ + +.bush-img { display: flex; flex-wrap: wrap; - justify-content:space-around; - padding: 20rpx 10rpx; + justify-content: space-around; + padding:10rpx; + width: 100%; } -.bush-img image{ - width: 270rpx; - height: 230rpx; - margin-top: 10rpx; - border: 1rpx solid #999; - border-radius: 15rpx; +.bush-img image { + width: 120rpx; + height: 120rpx; + margin-top: 5rpx; + /* border: 10rpx solid #eee; + background-color: #eee; */ + border: 1rpx solid rgb(189, 188, 188,0.6); + /* background-color: #ddd; */ + border-radius: 10rpx; } .back{ - margin-top: 15rpx; + margin-top: 10rpx; } -.con{ - display: flex; - align-items: center; +.back_img_box { + margin-top: 15rpx; + padding: 30rpx 0; + background-color: rgb(255, 255, 255,0.8); + /* background-color: #fff; */ + border-radius: 15rpx; } -.con button{ - width: 170rpx !important; + +.con { display: flex; - justify-content: center; align-items: center; - font-size: 28rpx; - background-color: rgb(245, 90, 90); - height: 55rpx; - margin-left: 10rpx !important; + padding: 0 20rpx; + font-size: 26rpx; } .tabel{ margin-top: 20rpx; width: 100%; - border: 1rpx #ddd solid; + /* border: 1rpx #ddd solid; */ + height: 400rpx; + position: relative; } .tabel .tr{ @@ -125,7 +140,7 @@ background-color: #51bdbe; color:#fff; font-weight: 700; - font-size: 28rpx; + font-size: 26rpx !important; } .td1{ border-right:#ddd solid 1rpx ; @@ -139,3 +154,19 @@ white-space: nowrap; min-width: 100rpx; } + +.bottomButton { + width: 100% !important; + height: 90rpx; + margin-top: 50rpx; + margin-bottom: 80rpx; + padding: 0rpx 10rpx; + display: block; + display: inline-flex; + align-items: center; + justify-content: center; + text-align: center; + background-color:#4eb8b9; + color: #fff; + border-radius: 50rpx; +} diff --git a/project.config.json b/yyt-mall-wl/project.config.json similarity index 100% rename from project.config.json rename to yyt-mall-wl/project.config.json diff --git a/project.private.config.json b/yyt-mall-wl/project.private.config.json similarity index 68% rename from project.private.config.json rename to yyt-mall-wl/project.private.config.json index 4d863e9..a9ac055 100644 --- a/project.private.config.json +++ b/yyt-mall-wl/project.private.config.json @@ -83,6 +83,48 @@ "query": "", "launchMode": "default", "scene": null + }, + { + "name": "", + "pathName": "pages/meLogistics/meLogistics", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "", + "pathName": "pages/threeLogistics/threeLogistics", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "", + "pathName": "pages/threeLogistics/threeLogistics", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "", + "pathName": "pages/details/details", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "", + "pathName": "pages/freiLogistics/freiLogistics", + "query": "", + "launchMode": "default", + "scene": null + }, + { + "name": "", + "pathName": "pages/querythree/querythree", + "query": "", + "launchMode": "default", + "scene": null } ] } diff --git a/sitemap.json b/yyt-mall-wl/sitemap.json similarity index 100% rename from sitemap.json rename to yyt-mall-wl/sitemap.json diff --git a/utils/dateSetting.js b/yyt-mall-wl/utils/dateSetting.js similarity index 100% rename from utils/dateSetting.js rename to yyt-mall-wl/utils/dateSetting.js diff --git a/utils/dateUtils.js b/yyt-mall-wl/utils/dateUtils.js similarity index 100% rename from utils/dateUtils.js rename to yyt-mall-wl/utils/dateUtils.js diff --git a/utils/http.js b/yyt-mall-wl/utils/http.js similarity index 100% rename from utils/http.js rename to yyt-mall-wl/utils/http.js diff --git a/utils/login.js b/yyt-mall-wl/utils/login.js similarity index 100% rename from utils/login.js rename to yyt-mall-wl/utils/login.js diff --git a/utils/weapp-qrcode.js b/yyt-mall-wl/utils/weapp-qrcode.js similarity index 100% rename from utils/weapp-qrcode.js rename to yyt-mall-wl/utils/weapp-qrcode.js diff --git a/utils/weapp.qrcode.esm.js b/yyt-mall-wl/utils/weapp.qrcode.esm.js similarity index 100% rename from utils/weapp.qrcode.esm.js rename to yyt-mall-wl/utils/weapp.qrcode.esm.js