diff --git a/api/user.js b/api/user.js index a155b6f..e55eac0 100644 --- a/api/user.js +++ b/api/user.js @@ -23,6 +23,7 @@ const getAuthSession = () => mGet('/uec/create/identity-auth-session', null, con const certificateImage = (params) => mPost('/uec/recognize/certificate-img', params, config) const certificateIdentity = (params) => mPost('/uec/identify/identity', params, config) 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 getCheckList = (params) => mGet(`/uec/get/employee-joining-department-application-list`, params, config) @@ -200,6 +201,7 @@ export { modifyMobile, verifyCode, generateCode, + createQrcode, applyEmplyee, getCheckList, auditEmploye, diff --git a/app.js b/app.js index 50ac6e8..5bc6641 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,6 @@ //app.js App({ - evn: 2, // 0: 开发版本;1:测试版本;2:生产版本 + evn: 0, // 0: 开发版本;1:测试版本;2:生产版本 tmplIds: [''], version: 152, xAppId: '503258978847953926', diff --git a/pages/home/employee/index.js b/pages/home/employee/index.js index f6de77c..d39da64 100644 --- a/pages/home/employee/index.js +++ b/pages/home/employee/index.js @@ -1,6 +1,6 @@ // pages/home/employee/index.js import Scene from '../../index/scene' -import { getCheckList, auditEmploye, generateCode } from "../../../api/user" +import { getCheckList, auditEmploye, createQrcode } from "../../../api/user" import { getEmployeList } from "../../../api/saas" const util = require('../../../utils/util') const app = getApp() @@ -20,7 +20,8 @@ Scene({ actions: [ { id: 1, name: '删除该员工' } ], - nowIndex: -1 + nowIndex: -1, + qrcode: null }, /** * 生命周期函数--监听页面加载 @@ -28,6 +29,13 @@ Scene({ onLoad: function (options) { this.setData({ height: app.globalData.fragmentHeight }) this.fetchMemberList() + const form = { id: 5 } + form.metaData = { factoryId: app.userInfo.factoryId, factoryName: app.userInfo.factoryName } + createQrcode(form).then(result => { + this.setData({ qrcode: result.data.id }) + }).catch(err => { + util.showToast(err) + }) }, fetchMemberList: function(){ wx.showLoading({ title: '加载中', mask: true }) @@ -132,5 +140,12 @@ Scene({ that.setData({ showEmbedded: false }) } }) + }, + onShareAppMessage: function () { + return { + title: '邀请您加入' + app.userInfo.factoryName, + imageUrl: '/assets/image/icon_logo.png', + path: `pages/login/index?qrcode=${this.data.qrcode}` + } } }) \ No newline at end of file diff --git a/pages/home/employee/index.wxml b/pages/home/employee/index.wxml index 24c5bdd..0995b86 100644 --- a/pages/home/employee/index.wxml +++ b/pages/home/employee/index.wxml @@ -55,10 +55,10 @@ - - + + diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml index f57d146..f735020 100644 --- a/pages/process/index/index.wxml +++ b/pages/process/index/index.wxml @@ -101,7 +101,7 @@ - + 千鸟代付额度 @@ -110,7 +110,7 @@ - + diff --git a/pages/process/order-price/index.js b/pages/process/order-price/index.js index 80c0275..e8c3102 100644 --- a/pages/process/order-price/index.js +++ b/pages/process/order-price/index.js @@ -15,6 +15,7 @@ Scene({ safeBottom: app.globalData.safeBottom, paperList: null, form: null, + step: 1, columns: [], focus: 0, visible: false, @@ -48,6 +49,9 @@ Scene({ }) } }, + nextStep: function (e) { + this.setData({ step: 2 }) + }, showPlate: function (e) { this.keyboard = this.keyboard || this.selectComponent('#wux-keyboard') this.keyboard.show(this.data.form.plateNumber, 0) diff --git a/pages/process/order-price/index.wxml b/pages/process/order-price/index.wxml index eeb840c..4255111 100644 --- a/pages/process/order-price/index.wxml +++ b/pages/process/order-price/index.wxml @@ -1,9 +1,36 @@ - 定价详情 + 过磅定价 - + + + + 客户姓名 + {{form.factoryCustomerName}} + + + + + 过磅时间 + {{form.createTime}} + + + + + + + + + + + 取消订单 + + 进行定价 + + + @@ -91,9 +118,9 @@ - + + wx:if="{{form && step == 2}}"> 取消 提交 diff --git a/pages/process/order-price/index.wxss b/pages/process/order-price/index.wxss index c7d8322..5a0d819 100644 --- a/pages/process/order-price/index.wxss +++ b/pages/process/order-price/index.wxss @@ -1,4 +1,8 @@ /* pages/process/order-check/index.wxss */ .page-icon { margin-right: 24rpx; +} + +.big-icon{ + margin-top: 24rpx; } \ No newline at end of file