diff --git a/assets/image/icon_complete.png b/assets/image/icon_complete.png
new file mode 100644
index 0000000..885de9c
Binary files /dev/null and b/assets/image/icon_complete.png differ
diff --git a/assets/image/icon_outcheck.png b/assets/image/icon_outcheck.png
new file mode 100644
index 0000000..dfbf3a6
Binary files /dev/null and b/assets/image/icon_outcheck.png differ
diff --git a/assets/image/icon_payback.png b/assets/image/icon_payback.png
new file mode 100644
index 0000000..3452e6d
Binary files /dev/null and b/assets/image/icon_payback.png differ
diff --git a/assets/image/icon_pound.png b/assets/image/icon_pound.png
new file mode 100644
index 0000000..858ef0e
Binary files /dev/null and b/assets/image/icon_pound.png differ
diff --git a/components/icon/index.wxss b/components/icon/index.wxss
index 26fc99e..cf0b49a 100644
--- a/components/icon/index.wxss
+++ b/components/icon/index.wxss
@@ -939,7 +939,6 @@
:host {
display: -webkit-inline-flex;
display: inline-flex;
- padding-top: 4rpx;
-webkit-align-items: center;
align-items: center;
-webkit-justify-content: center;
diff --git a/pages/login/index.js b/pages/login/index.js
index e34f4b1..93965cc 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -158,12 +158,24 @@ Page({
readAgreement: function () {
wx.navigateTo({ url: '/pages/htmls/agreement/index' })
},
- onGotUserInfo: function (e) {
+ onGetUserProfile: function(){
+ if(this.data.loging){
+ return
+ }
+ wx.getUserProfile({
+ desc: '业务需要',
+ success: res => {
+ console.log(res)
+ this.onGotUserInfo({detail: res })
+ }
+ })
+ },
+ onGotUserInfo: function ({detail}) {
if(this.data.loging){
return
}
this.setData({ loging: true })
- loginWechat({ encryptedData: e.detail.encryptedData, iv: e.detail.iv }).then(result => {
+ loginWechat({ encryptedData: detail.encryptedData, iv: detail.iv }).then(result => {
this.data.form.tmpAuthToken = result.data.tmpAuthToken
this.fetchUserInfo(result.data.token)
}).catch(error => {
diff --git a/pages/login/index.wxml b/pages/login/index.wxml
index 9d3f8cd..2bfb633 100644
--- a/pages/login/index.wxml
+++ b/pages/login/index.wxml
@@ -60,6 +60,8 @@
bind:click="registAccount" wx:elif="{{ regist }}">登录
同意
+
diff --git a/pages/process/index/index.js b/pages/process/index/index.js
index 1a41726..9ad66bb 100644
--- a/pages/process/index/index.js
+++ b/pages/process/index/index.js
@@ -23,10 +23,10 @@ Component({
{ status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
],
tabList2: [
- { status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_checking.png' },
- { status: 2, badge: '', name: '出货审核', icon: '/assets/image/icon_checking.png' },
- { status: 3, badge: '', name: '待收款', icon: '/assets/image/icon_payment.png' },
- { status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
+ { status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_pound.png' },
+ { status: 2, badge: '', name: '出货审核', icon: '/assets/image/icon_outcheck.png' },
+ { status: 3, badge: '', name: '待收款', icon: '/assets/image/icon_payback.png' },
+ { status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_complete.png' }
],
show: false,
totalInfo: {
@@ -55,17 +55,17 @@ Component({
var height = app.globalData.safeFragmentHeight - 100
if(app.userInfo.type.indexOf('ADMIN') >= 0){
var tabList2 = [
- { status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_checking.png' },
- { status: 2, badge: '', name: '出货审核', icon: '/assets/image/icon_checking.png' },
- { status: 3, badge: '', name: '待收款', icon: '/assets/image/icon_payment.png' },
- { status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
+ { status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_pound.png' },
+ { status: 2, badge: '', name: '出货审核', icon: '/assets/image/icon_outcheck.png' },
+ { status: 3, badge: '', name: '待收款', icon: '/assets/image/icon_payback.png' },
+ { status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_complete.png' }
]
this.setData({userInfo: app.userInfo, height, minDate, maxDate, vdate, vdateString, tabList2 })
} else {
var tabList2 = [
- { status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_checking.png' },
- { status: 3, badge: '', name: '待收款', icon: '/assets/image/icon_payment.png' },
- { status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
+ { status: 1, badge: '', name: '磅单信息', icon: '/assets/image/icon_pound.png' },
+ { status: 3, badge: '', name: '待收款', icon: '/assets/image/icon_payback.png' },
+ { status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_complete.png' }
]
this.setData({userInfo: app.userInfo, height, minDate, maxDate, vdate, vdateString, tabList2 })
}