diff --git a/app.json b/app.json index 3f52d25..d789c9c 100644 --- a/app.json +++ b/app.json @@ -3,6 +3,9 @@ "pages/login/index", "pages/index/index", "pages/home/mobile/index", + "pages/process/order-list/index", + "pages/process/order-check/index", + "pages/process/order-info/index", "pages/home/authory/index", "pages/htmls/agreement/index", "pages/message/index/index" diff --git a/assets/image/icon-finace.png b/assets/image/icon-finace.png deleted file mode 100644 index 45ee565..0000000 Binary files a/assets/image/icon-finace.png and /dev/null differ diff --git a/assets/image/icon-payment.png b/assets/image/icon-payment.png deleted file mode 100644 index a72c6b5..0000000 Binary files a/assets/image/icon-payment.png and /dev/null differ diff --git a/assets/image/icon_checking.png b/assets/image/icon_checking.png new file mode 100644 index 0000000..9e57952 Binary files /dev/null and b/assets/image/icon_checking.png differ diff --git a/assets/image/icon_close.png b/assets/image/icon_close.png new file mode 100644 index 0000000..05aa57b Binary files /dev/null and b/assets/image/icon_close.png differ diff --git a/assets/image/icon_finish.png b/assets/image/icon_finish.png new file mode 100644 index 0000000..48232f0 Binary files /dev/null and b/assets/image/icon_finish.png differ diff --git a/assets/image/icon_payment.png b/assets/image/icon_payment.png new file mode 100644 index 0000000..502e18e Binary files /dev/null and b/assets/image/icon_payment.png differ diff --git a/assets/image/icon_pricing.png b/assets/image/icon_pricing.png new file mode 100644 index 0000000..aff05bc Binary files /dev/null and b/assets/image/icon_pricing.png differ diff --git a/assets/image/icon_uncheck.png b/assets/image/icon_uncheck.png new file mode 100644 index 0000000..d03475d Binary files /dev/null and b/assets/image/icon_uncheck.png differ diff --git a/assets/image/tabbar/mall-blue.png b/assets/image/tabbar/mall-blue.png index b6a2072..357f413 100644 Binary files a/assets/image/tabbar/mall-blue.png and b/assets/image/tabbar/mall-blue.png differ diff --git a/assets/image/tabbar/mall-gray.png b/assets/image/tabbar/mall-gray.png index b45d0ed..c33a540 100644 Binary files a/assets/image/tabbar/mall-gray.png and b/assets/image/tabbar/mall-gray.png differ diff --git a/components/vehicle-keyboard/index.js b/components/vehicle-keyboard/index.js new file mode 100644 index 0000000..5d2f6bb --- /dev/null +++ b/components/vehicle-keyboard/index.js @@ -0,0 +1,90 @@ +Component({ + options: { + addGlobalClass: true, + }, + properties: { + plateNumber: { + type: Array, + value: ["", "", "", "", "", "", ""] + }, + safeBottom: { + type: Number, + value: 0 + } + }, + data: { + provinces: "京津沪冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤川青藏琼宁渝港澳台", + letters: "ABCDEFGHIJKLMNOPQRSTUVWXYZ", + numbers: "0123456789", + visible: false, + activeIndex: -1, + type: 0, + disabled: true, + mode: 0 // 键盘模式 0 关闭状态 1 显示省份输入 2 显示数字和字母输入 + }, + lifetimes: { + attached: function () { + + }, + }, + methods: { + show: function (number, type) { + var index = 0 + if(number && number.length){ + this.data.plateNumber = number.split('') + index = this.data.plateNumber.length - 1 + } + this.data.type = type + this.updateNumber() + this.setData({ plateNumber: this.data.plateNumber, mode: index == 0 ? 1 : 2, activeIndex: index, visible: true}) + }, + hide: function () { + this.setData({visible: false, plateNumber: ["", "", "", "", "", "", ""]}) + this.triggerEvent("change", null) + }, + updateNumber: function(){ + this.data.disabled = false + for (let index = 0; index < this.data.plateNumber.length; index++) { + const element = this.data.plateNumber[index] + if(element.length == 0){ + this.data.disabled = true + break + } + } + this.setData({disabled: this.data.disabled, plateNumber: this.data.plateNumber}) + }, + inputKeyboard: function(e){ + let index = typeof e === 'number' ? e : e.currentTarget.dataset.index + if(e.currentTarget && this.data.plateNumber[index].length == 0){ + return + } + this.setData({ mode: index == 0 ? 1 : 2, activeIndex: index }) + }, + tapDelete: function(e){ + let activeIndex = this.data.activeIndex + this.data.plateNumber[activeIndex] = '' + this.updateNumber() + if (activeIndex > 0) { + this.inputKeyboard(--activeIndex) + } + }, + tapFinish: function(){ + if(this.data.disabled){ + return + } + this.setData({visible: false, activeIndex: -1 }) + this.triggerEvent("change", {plateNumber: this.data.plateNumber.join(''), type: this.data.type}) + }, + tapKeyboard: function(e){ + let val = e.currentTarget.dataset.val + let activeIndex = this.data.activeIndex + this.data.plateNumber[activeIndex] = val + this.updateNumber() + if (activeIndex < 6) { + this.inputKeyboard(++activeIndex) + } else { + this.tapFinish() + } + }, + } +}) \ No newline at end of file diff --git a/components/vehicle-keyboard/index.json b/components/vehicle-keyboard/index.json new file mode 100644 index 0000000..3cd0e3e --- /dev/null +++ b/components/vehicle-keyboard/index.json @@ -0,0 +1,6 @@ +{ + "component": true, + "usingComponents": { + "van-popup": "../popup/index" + } +} \ No newline at end of file diff --git a/components/vehicle-keyboard/index.wxml b/components/vehicle-keyboard/index.wxml new file mode 100644 index 0000000..6868a94 --- /dev/null +++ b/components/vehicle-keyboard/index.wxml @@ -0,0 +1,33 @@ + + + {{plateNumber[0]}} + {{plateNumber[1]}} + + {{plateNumber[2]}} + {{plateNumber[3]}} + {{plateNumber[4]}} + {{plateNumber[5]}} + {{plateNumber[6]}} + + + + + + + + + + + 确定 + + + + \ No newline at end of file diff --git a/components/vehicle-keyboard/index.wxss b/components/vehicle-keyboard/index.wxss new file mode 100644 index 0000000..bd5c8ac --- /dev/null +++ b/components/vehicle-keyboard/index.wxss @@ -0,0 +1,113 @@ + +.license-number .item { + width: 64rpx; + height: 72rpx; + line-height: 72rpx; + text-align: center; + border: 1rpx solid #999590; + border-radius: 8rpx; + display: flex; + font-size: 28rpx; + align-items: center; + justify-content: center; +} +.license-number .item.item-new-energy { + line-height: 1em; + display: flex; + align-items: center; + border: 1rpx dashed #999590; +} +.license-number .item.item-new-energy .ico { + line-height: 1em; + font-size: 36rpx; + margin-bottom: -5rpx; + color: #777; +} +.license-number .item.item-new-energy .tit { + font-size: 12px; + transform: scale(0.7); + color: #777; +} + +.license-number .item.active { + border: 1rpx solid #008AFF; + color:#008AFF; +} + +.license-number .item.item-dot { + border: none; + width: auto; + padding: 0 6rpx; +} +.license-number .item.item-dot .dot { + width: 12rpx; + height: 12rpx; + background: #a09c96; + border-radius: 10rpx; +} + +.kb-keyboard { + padding: 6rpx; + position: relative; +} +.flex-brick { + display: flex; + flex-flow: row wrap; +} +.kb-keyboard-action { + display: flex; + justify-content: space-between; + position: absolute; + bottom: 6rpx; + right: 6rpx; +} +.kb-keyboard_td { + color: #1e1e1e; + box-shadow: 1rpx 1rpx 1rpx #919191; + background: #fff; + display: flex; + align-items: center; + justify-content: center; + width: calc((100vw - 12rpx) / 10 - 12rpx); + font-size: 18px; + height: 48px; + margin: 6rpx; + border-radius:5px; +} + +.kb-keyboard_td.disabled { + opacity: 0.5; + pointer-events: none; +} + +.kb-keyboard_td:active { + background: #f2f2f2; +} +.kb-keyboard__del { + align-self: flex-end; + width: calc(((100vw - 12rpx) / 10 - 12rpx) * 1.8); + height: 48px; + display: flex; + justify-content: center; + align-items: center; + padding-right: 1rpx; +} +.kb-keyboard__del .ico-del { + width: 44rpx; + height: 30rpx; + background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAeCAMAAABg6AyVAAAAclBMVEUAAAAwMDAxMTEMDAwpKSkpKSkwMDAqKioxMTExMTEpKSkqKiokJCQpKSkpKSkqKioqKioqKioqKioqKiopKSkoKCgoKCgnJycqKioqKioqKioqKioqKioqKioqKiorKysrKysoKCgqKioAAAAlJSUqKipvWYGQAAAAJXRSTlMA/lcC+OyZhmk+lioH8OXd1MlOPzQZDCDcvr2ysaWjajsTEgEiwq/YugAAAM9JREFUOMud1McWgyAQBdABKxp7S+/v/38xDUPAY/DwNs7iLoQZhoycCswkiFY69RL8SaTbA/yaZnJGQD9Z7ZA1NBuAVPoNgpaW4UuFPKVluCuxHmgZHgqUnTxmHAqSEWHsTXCao7rKOmaM8U/Jn2Vs4jbAtieZkL30aFlo4CbDXrVHsLeWlgkd1z6O3teOiMsPaZj7SG5EE62swqkvm25qZRWOkNAkfLTu2P4bzge0X51rU+ztdh0kmbtlRC3D7/Cs3B+s6yqwLxnX9WVfjA8P3SLCPZZ7QgAAAABJRU5ErkJggg==); + background-size: 100% 100%; +} +.kb-keyboard__finished { + width: calc(((100vw - 12rpx) / 10 - 12rpx) * 1.8); +} + + +@keyframes breath { + from { + border-color:rgba(11, 245, 183, 0.3); + } + 40% { border-color: #0bf5b7c2; } + 60% { border-color: #0bf5b7c2; } + to { border-color: rgba(11, 245, 183, 0.3); } +} \ No newline at end of file diff --git a/pages/api/request.js b/pages/api/request.js index a38ef92..be3c47c 100644 --- a/pages/api/request.js +++ b/pages/api/request.js @@ -4,6 +4,7 @@ import axios from "./axios" const event = require('../../utils/event') +const storage = require('../../utils/storage') const app = getApp() /** * axios defaults 配置 @@ -91,8 +92,8 @@ function handleResult(result) { } if (result.code === 401) { app.globalData.token = null - app.globalData.userToken = null - wx.removeStorageSync('Authorization') + app.userInfo = null + storage.remove('Authorization') event.emit('EventMessage', { what: 666, desc: 'Logout' }) let pages = getCurrentPages() //当前页面栈 let prevPage = pages[pages.length - 1] //当前页面 diff --git a/pages/api/saas.js b/pages/api/saas.js index dd402da..6a26520 100644 --- a/pages/api/saas.js +++ b/pages/api/saas.js @@ -10,9 +10,11 @@ const sconfig = { // *****************************************账户业务********************************************** const loginToken = (params) => mPost(`/recycle-user-center/authorize/get/product-line-token/by/login-token`, params, sconfig) const getBaseInfo = () => mGet(`/ztb-factory/get/self-enterprise-profile-detail`, null, sconfig) +const getOrderList = (params) => mGet(`/ztb-factory/get/self-enterprise-profile-detail`, params, sconfig) export { sconfig, loginToken, - getBaseInfo + getBaseInfo, + getOrderList } \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index f505277..985ed14 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -9,11 +9,11 @@ Page({ safeBottom: app.globalData.safeBottom, fragment: app.globalData.safeFragmentHeight, tabList: [ - { index: 0, value: 'mall', badge: 0, name: '商城', blue: '/assets/image/tabbar/mall-blue.png', gray: '/assets/image/tabbar/mall-gray.png' }, + { index: 0, value: 'mall', badge: 0, name: '消息', blue: '/assets/image/tabbar/mall-blue.png', gray: '/assets/image/tabbar/mall-gray.png' }, { index: 1, value: 'work', badge: 0, name: '工作台', blue: '/assets/image/tabbar/process-blue.png', gray: '/assets/image/tabbar/process-gray.png' }, { index: 2, value: 'home', badge: 0, name: '我的', blue: '/assets/image/tabbar/home-blue.png', gray: '/assets/image/tabbar/home-gray.png' } ], - tabIndex: 0 + tabIndex: 1 }, /************************************** 初始化流程 ********************************************/ onLoad: function (options) { @@ -27,9 +27,6 @@ Page({ }, /************************************** 生命周期函数--监听页面初次渲染完成 ********************************************/ onShow: function () { - this.onResume() - }, - onResume: function(){ var pageView = this.selectComponent('#' + this.data.tabList[this.data.tabIndex].value) if (pageView && this.data.inited) { pageView.onRestart() @@ -37,7 +34,7 @@ Page({ }, onChange: function ({detail}) { this.setData({ tabIndex: detail }) - this.onResume() + this.onShow() }, stopTouchMove: function(e){ return false diff --git a/pages/login/index.js b/pages/login/index.js index 64c7554..9812ca6 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -64,10 +64,13 @@ Page({ app.globalData.safeFragmentHeight = windowHeight - statusBarHeight - app.globalData.safeBottom app.globalData.windowWidth = e.windowWidth + var authorization = app.globalData.token || storage.get('Authorization') if(this.data.code){ this.fetchQrCode(this.data.code) - } else { - this.fetchUserInfo() + } else if(!util.isEmpty(authorization)){ + wx.showLoading({ title: '登录中', mask: true }) + this.setData({ loging: true}) + this.fetchUserInfo(authorization) } } }) @@ -82,29 +85,26 @@ Page({ return false }, /************************************** 获取用户信息，进行登录 ********************************************/ - fetchUserInfo: function(){ - var authorization = app.globalData.token || storage.get('Authorization') - if (util.isEmpty(authorization)) { - return - } + fetchUserInfo: function(authorization){ app.globalData.token = authorization + storage.put('Authorization', authorization) config.header = { 'Authorization': 'QNT ' + authorization } - this.setData({ loging: true}) loginToken({loginToken: app.globalData.token}).then(result => { - sconfig.header = { 'Authorization': 'QNT ' + result.data.token } - getBaseInfo().then(result => { - this.setData({ loging: false}) - app.userInfo = result.data - wx.hideLoading() - wx.redirectTo({ url: '/pages/index/index' }) - }).catch(err => { - wx.hideLoading() - util.showToast(err) - app.globalData.token = null - storage.remove('Authorization') - config.header = null - this.setData({ loging: false}) - }) + sconfig.header = { 'Authorization': 'QNT ' + result.data } + wx.redirectTo({ url: '/pages/index/index' }) + // getBaseInfo().then(result => { + // this.setData({ loging: false}) + // app.userInfo = result.data + // wx.hideLoading() + // wx.redirectTo({ url: '/pages/index/index' }) + // }).catch(err => { + // wx.hideLoading() + // util.showToast(err) + // app.globalData.token = null + // storage.remove('Authorization') + // config.header = null + // this.setData({ loging: false}) + // }) }).catch(err => { wx.hideLoading() util.showToast(err) @@ -162,9 +162,10 @@ Page({ this.countDown = this.countDown || this.selectComponent('.count-down') this.countDown.reset() this.countDown.start() - }).catch(error => { + }).catch(err => { wx.hideLoading() - util.showToast(error) + console.log(err) + util.showToast(err) }) }, registAccount: function(){ @@ -184,22 +185,19 @@ Page({ this.setData({ loging: true }) if (this.data.type == 1) { loginCaptcha(this.data.form).then(result => { - storage.put('Authorization', result.data.token) - app.globalData.token = result.data.token - this.fetchUserInfo() + this.fetchUserInfo(result.data.token) }).catch(error => { wx.hideLoading() - console.log(error) util.showToast(error) + this.setData({ loging: false }) }) } else { loginPwd(this.data.form).then(result => { - storage.put('Authorization', result.data.token) - app.globalData.token = result.data.token - this.fetchUserInfo() + this.fetchUserInfo(result.data.token) }).catch(error => { wx.hideLoading() util.showToast(error) + this.setData({ loging: false }) }) } }, @@ -212,23 +210,25 @@ Page({ }, /************************************** 二维码流程 ********************************************/ fetchQrCode: function(code){ + wx.showLoading({ title: '处理中', mask: true }) + this.setData({ loging: true}) verifyCode(code).then(result => { this.data.code = null if(result.data.redirectUrl == '/login'){ // 根据userId来获取用户信息；并且直接登录 - app.globalData.token = result.data.metaData.token - storage.put('Authorization', app.globalData.token) - this.fetchUserInfo() + this.fetchUserInfo(result.data.metaData.token) } else { wx.hideLoading() + this.setData({ loging: false}) if(!result.data.message){ result.data.message = '二维码解析失败，请重新扫码' } util.showToast(result.data.message) } }).catch(err => { - //异常回调 wx.hideLoading() + util.showToast(err) + this.setData({ loging: false}) }) } }) \ No newline at end of file diff --git a/pages/login/index.wxml b/pages/login/index.wxml index 90ed99a..f5380db 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -31,7 +31,7 @@ - + 登录 diff --git a/pages/process/index/index.js b/pages/process/index/index.js index 6dedb6c..4e1035d 100644 --- a/pages/process/index/index.js +++ b/pages/process/index/index.js @@ -12,15 +12,13 @@ Component({ * 页面的初始数据 */ data: { - userInfo: app.accountInfo, - height: app.globalData.fragmentHeight - 100, - tabIndex: 0, tabList: [ - {id: 0, name: '供货单', badge: 0, value: 'supply' }, - {id: 1, name: '采购单', badge: 0, value: 'purchase'}, - {id: 2, name: '生产单', badge: 0, value: 'production' } - ], - loading: true + { status: 0, badge: 2, name: '定价', icon: '/assets/image/icon_pricing.png' }, + { status: 1, badge: 4, name: '过磅审核', icon: '/assets/image/icon_checking.png' }, + { status: 2, badge: '', name: '代付款', icon: '/assets/image/icon_payment.png' }, + { status: 3, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }, + { status: 4, badge: '', name: '已关闭', icon: '/assets/image/icon_close.png' } + ] }, lifetimes: { // 生命周期函数，可以为函数，或一个在methods段中定义的方法名 @@ -33,67 +31,14 @@ Component({ }, methods: { onRestart: function () { - if(this.data.loading){ - this.initAccountInfo() - } - var fragment = this.selectComponent('#' + this.data.tabList[this.data.tabIndex].value) - if (fragment) { - fragment.onRestart() - } + }, onEvent: function (message) { if (message.what == 888) { - this.initAccountInfo() - } - }, - initAccountInfo: function(){ - if(app.accountInfo && app.accountInfo.position == 'ORDINARY'){ - this.setData({ - loading: false, - userInfo: app.accountInfo, height: app.globalData.safeFragmentHeight - 100, - tabList: [ - {id: 0, name: '生产中', badge: 0, value: 'supply', status: 0 }, - {id: 1, name: '待生产', badge: 0, value: 'purchase', status: 1 }, - {id: 2, name: '已完成', badge: 0, value: 'production', status: 3 }, - {id: 3, name: '已终止', badge: 0, value: 'termination', status: 6 } - ] - }) - } else { - this.setData({ loading: false, userInfo: app.accountInfo, height: app.globalData.safeFragmentHeight - 100 }) - } - // 您的申请正在处理，请等待，轮询去查询userInfo - if(app.accountInfo && app.accountInfo.applicationStatus == 0){ - this.fetchUserInfo() } }, - onTabChange: function (event) { - if (this.data.tabIndex == Number(event.detail.index)) { - return - } - this.setData({ tabIndex: event.detail.index}) - var fragment = this.selectComponent('#' + this.data.tabList[this.data.tabIndex].value) - if (fragment) { - fragment.onRestart() - } - }, - fetchUserInfo: function(){ - getUserInfo().then(result => { - app.accountInfo = result.data - if(result.data.enterpriseId && result.data.applicationStatus == 1){ - this.initAccountInfo() - } else { - var that = this - setTimeout(function () { that.fetchUserInfo() }, 3000) - } - }).catch(err => { - console.log(err) - }) - }, - loginFrom: function(){ - wx.navigateTo({ url: '/pages/index/index' }) - }, - applyFrom: function(){ - wx.navigateTo({ url: '/pages/htmls/saas/index' }) + toOrderList: function (e) { + wx.navigateTo({ url: '/pages/process/order-list/index?status=' + e.currentTarget.dataset.status }) } } }) \ No newline at end of file diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml index 6733d98..2018075 100644 --- a/pages/process/index/index.wxml +++ b/pages/process/index/index.wxml @@ -3,16 +3,20 @@ 工作台 - - - - 收货管理 - - - - - - - - - \ No newline at end of file + + + + 钟落潭打包厂 + + + + + + 收货订单 + + + + + + + \ No newline at end of file diff --git a/pages/process/order-check/index.js b/pages/process/order-check/index.js new file mode 100644 index 0000000..7ad5f4d --- /dev/null +++ b/pages/process/order-check/index.js @@ -0,0 +1,59 @@ +// pages/process/order-check/index.js +import Dialog from '../../../components/dialog/dialog' +const app = getApp() + +Page({ + /** + * 页面的初始数据 + */ + data: { + safeBottom: app.globalData.safeBottom, + form: { + plateNumber: null + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + safeBottom: app.globalData.safeBottom + }) + }, + showPlate: function (e) { + this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard') + this.keyboard.show(this.data.form.plateNumber, 0) + }, + onPlatenumber: function({detail}){ + if(detail && detail.plateNumber){ + this.setData({ ['form.plateNumber']: detail.plateNumber }) + } + }, + showCategory: function(){ + + }, + bindInput: function (e) { + this.data.form[e.target.id] = e.detail.value + }, + onChange: function({ detail }) { + // 需要手动对 checked 状态进行更新 + this.setData({ ['form.isDefault']: detail ? 1 : 0 }) + }, + paddingOrder: function(){ + this.setData({ ['form.checking']: !this.data.form.checking }) + }, + cancelOrder: function(e){ + Dialog.confirm({ title: '温馨提示', message: '确定取消该订单？' }).then(() => { + }) + }, + viewImage: function (e) { + var imgList = [] + for (let index = 0; index < this.data.imgList.length; index++) { + if (this.data.imgList[index].indexOf('.mp4') >= 0) { + continue + } + imgList.push(this.data.imgList[index]) + } + wx.previewImage({ urls: imgList, current: e.currentTarget.dataset.url }) + } +}) \ No newline at end of file diff --git a/pages/process/order-check/index.json b/pages/process/order-check/index.json new file mode 100644 index 0000000..883bfbf --- /dev/null +++ b/pages/process/order-check/index.json @@ -0,0 +1,12 @@ +{ + "usingComponents": { + "van-index-anchor": "/components/index-anchor/index", + "van-cell": "/components/cell/index", + "van-button": "/components/button/index", + "van-checkbox": "/components/checkbox/index", + "van-loading": "/components/loading/index", + "van-image": "/components/image/index", + "van-dialog": "/components/dialog/index", + "vehicle-keyboard": "/components/vehicle-keyboard/index" + } +} \ No newline at end of file diff --git a/pages/process/order-check/index.wxml b/pages/process/order-check/index.wxml new file mode 100644 index 0000000..7805737 --- /dev/null +++ b/pages/process/order-check/index.wxml @@ -0,0 +1,94 @@ + + + 定价详情 + + + + + + 客户姓名 + 客户姓名 + + + + + 车牌号码 + {{form.plateNumber || '请输入车牌号码'}} + + + + + + 废纸品类 + * + + 请选择废纸品类 + + + + + + + 单价(元/KG) + * + + + + + + + + 扣重(KG) + * + + + + + + + + 扣点(%) + * + + + + + + + 是否无皮过磅 + + + + + + + 毛重(KG) + 2000.00 + + + + + + 过毛重照片 + + + + + + + + + + + + + + 取消 + 提交 + + + + \ No newline at end of file diff --git a/pages/process/order-check/index.wxss b/pages/process/order-check/index.wxss new file mode 100644 index 0000000..c7d8322 --- /dev/null +++ b/pages/process/order-check/index.wxss @@ -0,0 +1,4 @@ +/* pages/process/order-check/index.wxss */ +.page-icon { + margin-right: 24rpx; +} \ No newline at end of file diff --git a/pages/process/order-info/index.js b/pages/process/order-info/index.js new file mode 100644 index 0000000..7ad5f4d --- /dev/null +++ b/pages/process/order-info/index.js @@ -0,0 +1,59 @@ +// pages/process/order-check/index.js +import Dialog from '../../../components/dialog/dialog' +const app = getApp() + +Page({ + /** + * 页面的初始数据 + */ + data: { + safeBottom: app.globalData.safeBottom, + form: { + plateNumber: null + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + safeBottom: app.globalData.safeBottom + }) + }, + showPlate: function (e) { + this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard') + this.keyboard.show(this.data.form.plateNumber, 0) + }, + onPlatenumber: function({detail}){ + if(detail && detail.plateNumber){ + this.setData({ ['form.plateNumber']: detail.plateNumber }) + } + }, + showCategory: function(){ + + }, + bindInput: function (e) { + this.data.form[e.target.id] = e.detail.value + }, + onChange: function({ detail }) { + // 需要手动对 checked 状态进行更新 + this.setData({ ['form.isDefault']: detail ? 1 : 0 }) + }, + paddingOrder: function(){ + this.setData({ ['form.checking']: !this.data.form.checking }) + }, + cancelOrder: function(e){ + Dialog.confirm({ title: '温馨提示', message: '确定取消该订单？' }).then(() => { + }) + }, + viewImage: function (e) { + var imgList = [] + for (let index = 0; index < this.data.imgList.length; index++) { + if (this.data.imgList[index].indexOf('.mp4') >= 0) { + continue + } + imgList.push(this.data.imgList[index]) + } + wx.previewImage({ urls: imgList, current: e.currentTarget.dataset.url }) + } +}) \ No newline at end of file diff --git a/pages/process/order-info/index.json b/pages/process/order-info/index.json new file mode 100644 index 0000000..e55b6ea --- /dev/null +++ b/pages/process/order-info/index.json @@ -0,0 +1,10 @@ +{ + "usingComponents": { + "van-index-anchor": "/components/index-anchor/index", + "van-cell": "/components/cell/index", + "van-button": "/components/button/index", + "van-loading": "/components/loading/index", + "van-image": "/components/image/index", + "van-dialog": "/components/dialog/index" + } +} \ No newline at end of file diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml new file mode 100644 index 0000000..b907993 --- /dev/null +++ b/pages/process/order-info/index.wxml @@ -0,0 +1,118 @@ + + + 过磅详情 + + + + 待过磅审核 + + + + 客户姓名 + 刘财顺 + + + + + 车牌号码 + {{form.plateNumber || '请输入车牌号码'}} + + + + + 废纸品类 + 黄纸板 + + + + + 毛重(KG) + 黄纸板 + + + + + 皮重(KG) + 黄纸板 + + + + + 净重(KG) + 黄纸板 + + + + + 定价员 + 黄纸板 + + + + + 定价时间 + 2021年1月20日 21:46:27 + + + + + + 过毛重照片 + + + + + + + + + + + + + + 过皮重照片 + + + + + + + + + + + + + + + 单价(元/KG) + 1.80 + + + + + 金额(元) + 47001.80 + + + + + 订单时间 + 2021年1月20日 21:46:27 + + + + + 订单编号 + XXP123456709978957 + + + + + + 重新过皮重 + 通过审核 + + + \ No newline at end of file diff --git a/pages/process/order-info/index.wxss b/pages/process/order-info/index.wxss new file mode 100644 index 0000000..eb6f9a2 --- /dev/null +++ b/pages/process/order-info/index.wxss @@ -0,0 +1,10 @@ +/* pages/process/order-check/index.wxss */ +.page-icon { + margin-right: 24rpx; +} + +.info_status{ + background-image: linear-gradient(90deg, #FF4D2E 6%, #FF952F 100%); + height:90rpx; + padding: 0rpx 32rpx; +} \ No newline at end of file diff --git a/pages/process/order-list/index.js b/pages/process/order-list/index.js new file mode 100644 index 0000000..3df5463 --- /dev/null +++ b/pages/process/order-list/index.js @@ -0,0 +1,94 @@ +// pages/process/order-list/index.js +import Dialog from '../../../components/dialog/dialog' +import { getOrderList, cancelOrder, receiptOrder} from "../../api/saas" +const event = require('../../../utils/event') +const util = require('../../../utils/util') +const app = getApp() + +Page({ + + /** + * 页面的初始数据 + */ + data: { + height: app.globalData.fragmentHeight, + loading: true, + requesting: false, + finished: false, + top: 0, + orderList: [], + form: { + status: 0, + pageNum: 1 + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + if(options.status){ + this.data.form.status = Number(options.status) + } + this.setData({ height: app.globalData.fragmentHeight }) + this.fetchOrderList() + }, + onRefreshList: function () { + this.setData({ + orderList: [], + ['form.pageNum']: 1, + loading: true, + finished: false + }) + this.fetchOrderList() + }, + fetchOrderList: function () { + if (this.data.requesting || this.data.finished) { + return + } + if (this.data.loading) { + this.data.requesting = true + } else { + this.setData({ requesting: true }) + } + getOrderList(this.data.form).then(result => { + if (result.data.records.length) { + var respList = result.data.records + let nowList = `orderList[${this.data.orderList.length}]` + var num = this.data.form.pageNum + var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total + if(this.data.form.pageNum == 1){ + this.setData({ + [nowList]: respList, + ['form.pageNum']: (num + 1), + top: 0, + finished, + requesting: false, + loading: false + }) + } else { + this.setData({ + [nowList]: respList, + ['form.pageNum']: (num + 1), + finished, + requesting: false, + loading: false + }) + } + } else { + this.setData({ finished: true, requesting: false, loading: false }) + } + }).catch(err => { + //异常回调 + this.setData({ requesting: false, loading: false }) + util.showToast(err) + }) + }, + cancelOrder: function(e){ + Dialog.confirm({ title: '温馨提示', message: '确定取消该订单？' }).then(() => { + }) + }, + priceOrder: function(e){ + wx.navigateTo({ url: '/pages/process/order-info/index?id=' }) + } + +}) \ No newline at end of file diff --git a/pages/process/order-list/index.json b/pages/process/order-list/index.json new file mode 100644 index 0000000..83b51ac --- /dev/null +++ b/pages/process/order-list/index.json @@ -0,0 +1,12 @@ +{ + "usingComponents": { + "refresh-view": "/components/refresher/index", + "van-button": "/components/button/index", + "van-index-bar": "/components/index-bar/index", + "van-index-anchor": "/components/index-anchor/index", + "van-cell": "/components/cell/index", + "van-divider": "/components/divider/index", + "van-loading": "/components/loading/index", + "van-dialog": "/components/dialog/index" + } +} \ No newline at end of file diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml new file mode 100644 index 0000000..473bc41 --- /dev/null +++ b/pages/process/order-list/index.wxml @@ -0,0 +1,40 @@ + + + 定价列表 + + + + + + + + + {{loading? '正在加载' : '暂无数据'}} + + + + + + + + 客户名称：刘财顺 + 毛重：2000.00KG + + + 取消 + + 定价 + + + + + + + + + {{finished?'到底啦～':'加载中...'}} + + + + \ No newline at end of file diff --git a/pages/process/order-list/index.wxss b/pages/process/order-list/index.wxss new file mode 100644 index 0000000..649b69a --- /dev/null +++ b/pages/process/order-list/index.wxss @@ -0,0 +1 @@ +/* pages/process/order-list/index.wxss */ \ No newline at end of file