diff --git a/api/user.js b/api/user.js index 94e461f..91e500f 100644 --- a/api/user.js +++ b/api/user.js @@ -27,9 +27,9 @@ const certificateIdentity = (params) => mPost('/uec/identify/identity', params, const generateCode = (params) => mPost('/uec/generate/qrcode', params, config) const createQrcode = (params) => mPost('/uec/create/qrcode-record', params, config) const verifyCode = (code, params) => mGet(`/uec/verify/qrcode${code}`, params, config) -const applyEmplyee = (params) => mPost(`/uec/apply/to/be/employee/of/enterprise-department`, params, config) +const applyEmplyee = (params) => mPost(`/uec/save/join/of/enterprise-department`, params, config) const getCheckList = (params) => mGet(`/uec/get/employee-joining-department-application-list`, params, config) -const auditEmploye = (params) => mPost(`/uec/audit/employee-joining-department-application`, params, config) +const auditEmploye = (params) => mPost(`/uec/modify/join/of/enterprise-department`, params, config) const deleteEmploye = (params) => mPost(`/uec/remove/employees`, params, config) const editEmploye = (params) => mPost(`/uec/save/self-department-member`, params, config) // **************************************************************************************************************************************** diff --git a/pages/login/index.js b/pages/login/index.js index 5256f4b..5eb510d 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -180,7 +180,7 @@ Page({ if(applicationStatus == -1){ this.setData({ loging: false}) Dialog.alert({ title: '温馨提示', message: '还没有您所属的打包站信息,请联系相关客服人员' }).then(() => { - wx.redirectTo({ url: '/pages/process/order-check/index' }) + // wx.redirectTo({ url: '/pages/process/order-check/index' }) }) return } diff --git a/pages/process/order-check/index.js b/pages/process/order-check/index.js index 5573cbb..b9a64de 100644 --- a/pages/process/order-check/index.js +++ b/pages/process/order-check/index.js @@ -13,7 +13,7 @@ Scene({ data: { safeBottom: app.globalData.safeBottom, paperList: null, - form: {}, + form: null, columns: [], focus: 0, visible: false, diff --git a/pages/process/order-check/index.wxss b/pages/process/order-check/index.wxss index 086471d..983acce 100644 --- a/pages/process/order-check/index.wxss +++ b/pages/process/order-check/index.wxss @@ -2,6 +2,7 @@ .page-icon { margin-right: 24rpx; } + .margin-top{ margin-top: 16rpx; } diff --git a/pages/process/order-price/index.json b/pages/process/order-price/index.json index aefd927..6b21fc1 100644 --- a/pages/process/order-price/index.json +++ b/pages/process/order-price/index.json @@ -1,6 +1,5 @@ { "usingComponents": { - "van-index-anchor": "/components/index-anchor/index", "van-cell": "/components/cell/index", "van-button": "/components/button/index", "van-checkbox": "/components/checkbox/index", diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml index c7c066d..ad2869e 100644 --- a/pages/process/order-price/index.wxml +++ b/pages/process/order-price/index.wxml @@ -31,7 +31,10 @@ - + + + 订单信息 + 客户姓名 @@ -53,7 +56,10 @@ {{form.productName || '请选择废纸品类'}} - + + + 定价信息 + @@ -97,7 +103,10 @@ - + + + 过磅信息 + 毛重(公斤) diff --git a/pages/process/order-price/index.wxss b/pages/process/order-price/index.wxss index 5a0d819..086471d 100644 --- a/pages/process/order-price/index.wxss +++ b/pages/process/order-price/index.wxss @@ -2,6 +2,9 @@ .page-icon { margin-right: 24rpx; } +.margin-top{ + margin-top: 16rpx; +} .big-icon{ margin-top: 24rpx;