no message

pages/home/factory-list/index.js

@@ -39,9 +39,9 @@ Scene({
    */
   onLoad: function (options) {
     if(options.type){
-      this.setData({ height: app.globalData.fragmentHeight, type: Number(options.type )})
+      this.setData({ userInfo: app.userInfo, height: app.globalData.fragmentHeight, type: Number(options.type )})
     } else {
-      this.setData({ height: app.globalData.fragmentHeight })
+      this.setData({ userInfo: app.userInfo, height: app.globalData.fragmentHeight })
     }
     this.fetchList()
     // this.fetchFactoryList()

pages/home/factory-list/index.wxml

@@ -53,7 +53,7 @@
   </van-divider>
 </refresh-view>
 
-<view style="border-radius: 50rpx;position: fixed;bottom:160rpx;right:50rpx" wx:if="{{tabIndex == 0}}">
+<view style="border-radius: 50rpx;position: fixed;bottom:160rpx;right:50rpx" wx:if="{{tabIndex == 0 && userInfo.factoryId}}">
   <van-button round type="info" icon="plus" bind:click="showDialog" custom-style="width: 100rpx;height: 100rpx;"></van-button>
 </view>
 

pages/home/user-info/index.wxml

@@ -20,7 +20,7 @@
     </view>
   </view>
 </van-cell>
-<van-cell is-link clickable url="/pages/agent/focus-list/index">
+<van-cell is-link clickable url="/pages/agent/focus-list/index" wx:if="{{userInfo.factoryId}}">
   <view class="flex" slot="title" style="align-items: center">
     <text class="text-sg">关注纸厂</text>
   </view>

pages/login/index.js

@@ -123,6 +123,7 @@ Page({
             this.setData({ loging: false, metaData: this.data.metaData })
           }
         } else if(app.userInfo.factoryId){
+          this.setData({ loging: false})
           if(!result.data.isSaasPerssion){
             Dialog.alert({ title: '温馨提示', message: '您的打包站还在授权中，请耐心等待，或者联系相关客服人员' }).then(() => {
             })
@@ -131,8 +132,10 @@ Page({
           headerFactoryId(app.userInfo.factoryId)
           wx.redirectTo({ url: '/pages/index/index' })
         } else {
-          Dialog.alert({ title: '温馨提示', message: '还没有您所属的打包站，请耐心等待，或者联系相关客服人员' }).then(() => {
-          })
+          this.setData({ loging: false})
+          // Dialog.alert({ title: '温馨提示', message: '还没有您所属的打包站，请耐心等待，或者联系相关客服人员' }).then(() => {
+          // })
+          wx.redirectTo({ url: '/pages/index/index' })
         }
       }).catch(err => {
         wx.hideLoading()

pages/message/notification/index.js

@@ -26,7 +26,7 @@ Component({
   },
   methods: {
     notify: function(message){
-      if(this.data.notice){
+      if(!app.userInfo.factoryId || this.data.notice){
         return
       }
       this.setData({ notice: true, message })

pages/process/index/index.js

@@ -127,6 +127,7 @@ Component({
     },
     fetchStatisticsInfo: function(loading){
       getStatisticsInfo(this.data.form).then(result => {
+        
         if(Number(result.data.priceOrderNum) > 0){
           this.data.tabList[0].badge = Number(result.data.priceOrderNum)
         } else {
@@ -163,15 +164,14 @@ Component({
         } else {
           this.data.tabList1[3].badge = ''
         }
-
         if(util.isEmpty(result.data.availableCreditLine)){
           result.data.availableCreditLine = app.userInfo.availableCreditLine
         }
         if(util.isEmpty(result.data.usedCreditLine)){
           result.data.usedCreditLine = app.userInfo.usedCreditLine
         }
-        var vdateString = util.formatDate(new Date(vdate[0]), 'Y-M-D') + '至' + util.formatDate(new Date(vdate[1]), 'Y-M-D')
-        this.setData({ tabList: this.data.tabList, tabList1: this.data.tabList1, totalInfo: result.data, vdate, vdateString })
+        var vdateString = this.data.form.startTime.substring(0, 10) + '至' + this.data.form.endTime.substring(0, 10)
+        this.setData({ tabList: this.data.tabList, tabList1: this.data.tabList1, totalInfo: result.data, vdateString })
         if(loading){
           wx.hideLoading()
         }

pages/process/index/index.wxml

@@ -29,7 +29,7 @@
             <view style="height:24rpx;width:6rpx;background:#007AFF"></view>
             <view class="text-black text-sm" style="margin-left: 12rpx">收货重量</view>
           </view>
-          <view class="text-xxl text-bold" style="margin:12rpx 0rpx">{{formate.formateWeight(totalInfo.totalWeight)}}吨</view>
+          <view class="text-xxl text-bold" style="margin:12rpx 0rpx">{{formate.formateWeight(totalInfo.totalWeight || 0)}}吨</view>
           <view class="text-gray text-sm">查看收货详情</view>
         </view>
         <view style="flex:1;padding:0rpx 32rpx;margin-left:12rpx">