diff --git a/pages/agent/appointment/index.json b/pages/agent/appointment/index.json index f21dc9f..bf52850 100644 --- a/pages/agent/appointment/index.json +++ b/pages/agent/appointment/index.json @@ -1,6 +1,7 @@ { "usingComponents": { "van-cell": "/components/cell/index", + "van-field": "/components/field/index", "van-button": "/components/button/index", "van-dialog": "/components/dialog/index", "van-loading": "/components/loading/index", diff --git a/pages/agent/appointment/index.wxml b/pages/agent/appointment/index.wxml index df86831..d15b7a4 100644 --- a/pages/agent/appointment/index.wxml +++ b/pages/agent/appointment/index.wxml @@ -18,8 +18,20 @@ 纸品信息 + + + 纸厂名称 + {{factoryDetail.name}} + + + + + 纸品品类 + {{cateName || '请选择品类'}} + + - + 预估单价(元/吨): diff --git a/pages/index/index.js b/pages/index/index.js index a3adade..115f4f6 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -39,17 +39,18 @@ Scene({ updateManager.applyUpdate() }) this.data.items = [] - for (let mIndex = 0; m < app.userInfo.enterpriseInfos.length; mIndex++) { + for (let mIndex = 0; mIndex < app.userInfo.enterpriseInfos.length; mIndex++) { const element = app.userInfo.enterpriseInfos[mIndex] var enterprise = { text: element.enterpriseName } var children = [] if(mIndex >= 1){ this.data.arrow = true } - for (let nIndex = 0; n < element.factoryInfos.length; nIndex++) { + for (let nIndex = 0; nIndex < element.factoryInfos.length; nIndex++) { const item = element.factoryInfos[nIndex] if(item.factoryId == app.userInfo.factoryId){ this.data.mActiveIndex = mIndex + app.userInfo.factoryName = item.factoryName if(element.isEnterprisePrimary){ app.userInfo.type = 'ADMIN' } else { diff --git a/pages/login/index.js b/pages/login/index.js index 763cb3e..3817468 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -26,8 +26,8 @@ Page({ loging: false, regist: false, metaData: null, - code: null - // code: '?mark=ztb_saas&QrCodeRecordId=589851945913683968' + // code: null + code: '?mark=ztb_saas&QrCodeRecordId=595295714456768512' }, /************************************** 初始化登录流程 ********************************************/ onLoad: function (options) { @@ -102,6 +102,7 @@ Page({ if(enterpriseInfo.factoryInfos && enterpriseInfo.factoryInfos.length){ factoryId = enterpriseInfo.factoryInfos[enterpriseInfo.factoryInfos.length - 1].factoryId } + app.userInfo.factoryId = factoryId } if(factoryId){ headerFactoryId(app.userInfo.factoryId) @@ -152,7 +153,7 @@ Page({ for (let n = 0; n < element.factoryInfos.length; n++) { const item = element.factoryInfos[n] if(applicationStatus == -1){ - applicationStatus = item.applicationStatus + applicationStatus = item.type ? 1 : 0 } } } @@ -385,15 +386,14 @@ Page({ }) }, submitForm: function(){ + if(!this.data.metaData){ + util.showToast('您的申请已经提交,不要重复提交') + return + } this.setData({loging: true}) if(this.data.metaData.qrPage == '/page/index/yaoqing'){ bindingAdmin(this.data.metaData).then(result => { - storage.put('Authorization', app.globalData.token) - app.userInfo.factoryId = this.data.metaData.factoryId - app.userInfo.factoryName = this.data.metaData.factoryName - this.data.metaData = null - this.setData({loging: false}) - wx.redirectTo({ url: '/pages/index/index' }) + this.fetchUserInfo(app.globalData.token) }).catch(error => { this.setData({loging: false}) util.showToast(error) diff --git a/pages/login/index.wxml b/pages/login/index.wxml index 9595e82..774c805 100644 --- a/pages/login/index.wxml +++ b/pages/login/index.wxml @@ -4,7 +4,7 @@ - + 欢迎您使用纸通宝工厂版! 现邀请您成为{{metaData.factoryName}}的管理员 @@ -19,7 +19,7 @@ maxlength="20" placeholder="请输入您的姓名,以便于识别" bindinput="bindInput" disabled="{{loging}}" bindfocus="inputFocus" wx:if="{{ metaData.qrPage == '/page/index/yaoqing' || metaData.qrPage == '/page/index/shenqing' }}"/> - + 手机号码