更新 首页文案显示；货主信息更新；添加传动step

miniprogram/pages/index/index.wxml

@@ -3,17 +3,17 @@
     <view class="block-line df aic">
       <view style="width: 100%;">
         <view>执行中航次数量</view>
-        <view>{{indexInfo.activeVoyageNum}}</view>
+        <view>{{indexInfo.activeVoyageNum||"*"}}</view>
       </view>
     </view>
     <view class="block-line df aic">
       <view>
         <view>装载吨位</view>
-        <view>{{indexInfo.loadTons}}</view>
+        <view>{{indexInfo.loadTons||"*"}}</view>
       </view>
       <view>
         <view>卸载吨位</view>
-        <view>{{indexInfo.discTons}}</view>
+        <view>{{indexInfo.discTons||"*"}}</view>
       </view>
     </view>
   </view>
@@ -22,19 +22,19 @@
       <view bindtap="goTo" data-maintab="{{2}}" class="go-to" data-url="/pages/voyageManage/voyageManage">
         <image src="../../images/camera.png"></image>
         <view>日报</view>
-        <view class="badge">{{indexInfo.dayReportNum}}</view>
+        <view class="badge">{{indexInfo.dayReportNum||0}}</view>
       </view>
       <view bindtap="goTo" data-maintab="{{1}}" class="go-to" data-url="/pages/voyageManage/voyageManage">
         <image src="../../images/ship.png"></image>
         <view>卸货</view>
-        <view class="badge">{{indexInfo.discVoyageNum}}</view>
+        <view class="badge">{{indexInfo.discVoyageNum||0}}</view>
       </view>
     </view>
     <view class="df">
       <view bindtap="goTo" data-maintab="{{3}}" class="go-to" data-url="/pages/voyageManage/voyageManage">
         <image src="../../images/bills.png"></image>
         <view>单据</view>
-        <view class="badge">{{indexInfo.billNum}}</view>
+        <view class="badge">{{indexInfo.billNum||0}}</view>
       </view>
       <view bindtap="goTo" class="go-to" data-url="/pages/voyageManage/createVoyage/createVoyage">
         <image src="../../images/rudder.png"></image>

miniprogram/pages/me/me.js

@@ -14,41 +14,61 @@ Page({
     shipOwnerNum: '-',
   },
   async getCargoOwnerInfo() {
-
+    let res = await postApi("/user/wx/login", {
+      openId: wx.getStorageSync('openId'),
+      phone: wx.getStorageSync('loginPhone')
+    })
+    if (res.data.status == 0) {
+      let data = res.data.result
+      Object.keys(data).forEach(function (key) {
+        wx.setStorageSync(key, data[key])
+      })
+      let proxyCompanyName = wx.getStorageSync('proxyCompanyName')
+      let loginName = wx.getStorageSync('loginName')
+      let loginPhone = wx.getStorageSync('loginPhone')
+      let proxyCompanyId = wx.getStorageSync('proxyCompanyId')
+      let voyageNum = wx.getStorageSync('voyageNum')
+      let shipOwnerNum = wx.getStorageSync('shipOwnerNum')
+      this.setData({
+        proxyCompanyName,
+        loginName,
+        loginPhone,
+        proxyCompanyId,
+        voyageNum,
+        shipOwnerNum
+      })
+    } else {
+      wx.showToast({
+        icon: "none",
+        title: '暂无权限'
+      })
+    }
   },
   loginEvent(e) {
     let res = e.detail
-    console.log(res)
     if (res.data.status == 0) {
       let data = res.data.result
-      if (!data.isClient) {
-        Object.keys(data).forEach(function (key) {
-          wx.setStorageSync(key, data[key])
-        })
-        let proxyCompanyName = wx.getStorageSync('proxyCompanyName')
-        let loginName = wx.getStorageSync('loginName')
-        let loginPhone = wx.getStorageSync('loginPhone')
-        let proxyCompanyId = wx.getStorageSync('proxyCompanyId')
-        let voyageNum = wx.getStorageSync('voyageNum')
-        let shipOwnerNum = wx.getStorageSync('shipOwnerNum')
-        this.setData({
-          proxyCompanyName,
-          loginName,
-          loginPhone,
-          proxyCompanyId,
-          voyageNum,
-          shipOwnerNum
-        })
-      } else {
-        wx.showToast({
-          icon: "none",
-          title: '暂无权限'
-        })
-      }
+      Object.keys(data).forEach(function (key) {
+        wx.setStorageSync(key, data[key])
+      })
+      let proxyCompanyName = wx.getStorageSync('proxyCompanyName')
+      let loginName = wx.getStorageSync('loginName')
+      let loginPhone = wx.getStorageSync('loginPhone')
+      let proxyCompanyId = wx.getStorageSync('proxyCompanyId')
+      let voyageNum = wx.getStorageSync('voyageNum')
+      let shipOwnerNum = wx.getStorageSync('shipOwnerNum')
+      this.setData({
+        proxyCompanyName,
+        loginName,
+        loginPhone,
+        proxyCompanyId,
+        voyageNum,
+        shipOwnerNum
+      })
     } else {
       wx.showToast({
         icon: "none",
-        title: res.data.msg
+        title: '暂无权限'
       })
     }
   },
@@ -69,6 +89,8 @@ Page({
     })
   },
   onShow() {
-
+    if (wx.getStorageSync('loginAccountId')) {
+      this.getCargoOwnerInfo()
+    }
   }
 })

miniprogram/pages/shipOwnerManage/addShipOnwer/addShipOnwer.js

@@ -9,7 +9,7 @@ import {
 
 Page({
   data: {
-    step: 2,
+    step: 1,
     userId: 0,
     userName: "",
     userPhone: "",

miniprogram/pages/shipOwnerManage/shipOwnerList/shipOwnerList.js

@@ -25,6 +25,13 @@ Page({
     })
     if (type) wx.stopPullDownRefresh()
     if (res.data.status == 0) {
+      if(res.data.result.length==0) {
+        wx.showToast({
+          title: '暂无数据',
+          icon:"error"
+        })
+        return
+      }
       let shipOwnerList = res.data.result
       shipOwnerList[0].letter = "#"
       shipOwnerList.push(shipOwnerList.shift())

project.private.config.json

@@ -50,7 +50,7 @@
   "setting": {
     "urlCheck": true,
     "coverView": true,
-    "compileHotReLoad": false,
+    "compileHotReLoad": true,
     "lazyloadPlaceholderEnable": false,
     "preloadBackgroundData": false,
     "autoAudits": false,
@@ -59,5 +59,6 @@
     "showES6CompileOption": false,
     "checkInvalidKey": true
   },
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "Agency_WxApp"
 }