diff --git a/app.js b/app.js index 529be32..49c857b 100644 --- a/app.js +++ b/app.js @@ -10,7 +10,6 @@ App({ userInfo: null, openId: null, token: null, - isIPhoneX: false, isIos: false, kg: 0 }, diff --git a/components/vehicle-keyboard/index.js b/components/vehicle-keyboard/index.js index dee965b..243d459 100644 --- a/components/vehicle-keyboard/index.js +++ b/components/vehicle-keyboard/index.js @@ -29,12 +29,14 @@ Component({ }, 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: 1, activeIndex: 0, visible: true}) + this.setData({ plateNumber: this.data.plateNumber, mode: 1, activeIndex: index, visible: true}) }, hide: function () { this.setData({visible: false, plateNumber: ["", "", "", "", "", "", ""]}) diff --git a/components/vehicle-keyboard/index.wxml b/components/vehicle-keyboard/index.wxml index c78dbd8..2a03bf6 100644 --- a/components/vehicle-keyboard/index.wxml +++ b/components/vehicle-keyboard/index.wxml @@ -16,11 +16,11 @@ {{item}} diff --git a/pages/agent/edit/index.js b/pages/agent/edit/index.js index 9eead5c..a550087 100644 --- a/pages/agent/edit/index.js +++ b/pages/agent/edit/index.js @@ -98,9 +98,8 @@ Page({ }) } getRelation().then(result => { - //成功回调 if(util.isEmpty(result.data) || util.isEmpty(result.data.bizUserId)){ - this.showDialog() + // this.showDialog() } }).catch(err => { //异常回调 diff --git a/pages/home/info/index.js b/pages/home/info/index.js index b8ed2a0..1329295 100644 --- a/pages/home/info/index.js +++ b/pages/home/info/index.js @@ -18,7 +18,7 @@ Page({ { id: 6, name: '包装厂' }, { id: 7, name: '纸箱纸板厂' }, { id: 8, name: '后加工' }, - { id: 5, name: '其他' } + { id: 5, name: '其他' } ], cardList: [ { value: '1', text: '个体回收户' }, diff --git a/pages/index/index.js b/pages/index/index.js index e828eab..ef2c013 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -44,7 +44,6 @@ Page({ wx.showLoading({ title: '获取中', mask: true }) wx.getSystemInfo({ success: e => { - app.globalData.isIPhoneX = this.checkIPhoneX(e) app.globalData.isIos = this.checkIos(e) app.globalData.dev = e.platform == 'devtools' @@ -91,10 +90,6 @@ Page({ } return false }, - checkIPhoneX: function (e) { - var t = e.model - return (/iPhone 11/.test(t) || /iPhone X/.test(t) || /iPhone 12/.test(t)) && this.checkIos(e) - }, fetchUserInfo:function(){ config.header = { 'Authorization': 'QNT ' + app.globalData.token } getUserInfo().then(result => {