no message

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;

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 => {

pages/login/index.wxml

@@ -60,6 +60,8 @@
 		bind:click="registAccount" wx:elif="{{ regist }}">登录</van-button>
 	<van-button block type="info" loading="{{loging}}" loading-text="登录中..." open-type="getUserInfo"
 		bind:getuserinfo="onGotUserInfo" wx:else>同意</van-button>
+	<!-- <van-button block type="info" loading="{{loging}}" loading-text="登录中..."
+		bind:click="onGetUserProfile" wx:else>同意</van-button> -->
 </view>
 
 <view class="flex flex-center" style="margin-top:10rpx;font-size:24rpx;color:#008AFF;text-align: center">

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 })
       }