更新 船东管理;我;金融管理;上传方法

miniprogram/apis/apiConfig.js

@@ -1,5 +1,5 @@
 let v = wx.getAccountInfoSync()
-let apiUrl = `${v.miniProgram.envVersion == 'release'?'https://interface.huihenduo.com.cn/hhd-pat-cargo-app/':'https://interface.huihenduo.com.cn/hhd-pat-cargo-app-dev/'}`
+let apiUrl = `${v.miniProgram.envVersion == 'release'?'https://interface.huihenduo.com.cn/hhd-pat-proxy-app/':'https://interface.huihenduo.com.cn/hhd-pat-proxy-app-dev/'}`
 
 function api(url, data, method) {
   return new Promise((resolve, reject) => {

miniprogram/app.wxss

@@ -162,31 +162,31 @@ cover-view {
   padding-bottom: 20rpx;
 }
 
-.fz20 {
+.fs20 {
   font-size: 20rpx;
 }
 
-.fz22 {
+.fs22 {
   font-size: 22rpx;
 }
 
-.fz24 {
+.fs24 {
   font-size: 24rpx;
 }
 
-.fz28 {
+.fs28 {
   font-size: 28rpx;
 }
 
-.fz32 {
+.fs32 {
   font-size: 32rpx;
 }
 
-.fz36 {
+.fs36 {
   font-size: 36rpx;
 }
 
-.fz40 {
+.fs40 {
   font-size: 40rpx;
 }
 

miniprogram/pages/financialManage/financialManage.js

@@ -5,7 +5,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-
+    logo: '../../images/ship-background.png',
   },
 
   /**

miniprogram/pages/financialManage/financialManage.wxml

@@ -1,2 +1,5 @@
-<!--pages/financialManage/financialManage.wxml-->
-<text>pages/financialManage/financialManage.wxml</text>
+<view class="tac" style="position: relative;">
+  <image style="width: 100vw;" mode="aspectFill" src="{{logo}}"></image>
+  <view style="position: absolute;bottom: 5vh;width:100vw;font-size: 48rpx;color: #fff;">欢迎使用汇很多智能航运</view>
+</view>
+<view style="margin-top: 20vh;font-size: 60rpx;color: grey;width: 100vw;text-align: center;">近期上线</view>

miniprogram/pages/me/me.js

@@ -6,10 +6,12 @@ import {
 import cloudApi from "../../apis/cloudApi"
 Page({
   data: {
-    cargoOwnerCompany: '',
+    proxyCompanyName: '',
     loginName: '',
     loginPhone: '',
-    logoSrc: '',
+    logo: '../../images/ship-background.png',
+    voyageNum: '-',
+    shipOwnerNum: '-',
   },
   async getCargoOwnerInfo() {
 
@@ -23,8 +25,19 @@ Page({
         Object.keys(data).forEach(function (key) {
           wx.setStorageSync(key, data[key])
         })
-        wx.switchTab({
-          url: '/pages/index/index',
+        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({
@@ -32,8 +45,6 @@ Page({
           title: '暂无权限'
         })
       }
-
-
     } else {
       wx.showToast({
         icon: "none",
@@ -41,18 +52,23 @@ Page({
       })
     }
   },
-  onShow() {
-    let cargoOwnerCompany = wx.getStorageSync('cargoOwnerCompany')
+  onLoad() {
+    let proxyCompanyName = wx.getStorageSync('proxyCompanyName')
     let loginName = wx.getStorageSync('loginName')
     let loginPhone = wx.getStorageSync('loginPhone')
-    let logo = wx.getStorageSync('logo')
-    let cargoOwnerId = wx.getStorageSync('cargoOwnerId')
+    let proxyCompanyId = wx.getStorageSync('proxyCompanyId')
+    let voyageNum = wx.getStorageSync('voyageNum')
+    let shipOwnerNum = wx.getStorageSync('shipOwnerNum')
     this.setData({
-      cargoOwnerCompany,
+      proxyCompanyName,
       loginName,
       loginPhone,
-      logo,
-      cargoOwnerId
+      proxyCompanyId,
+      voyageNum,
+      shipOwnerNum
     })
+  },
+  onShow() {
+
   }
 })

miniprogram/pages/me/me.wxml

@@ -1,24 +1,30 @@
-<block wx:if="{{cargoOwnerId}}">
-  <view class=" mtv10 mbv10 tac">
-    <image style="width: 20vw;height: 20vh;" mode="aspectFit" src="{{logo}}"></image>
+<block wx:if="{{proxyCompanyId}}">
+  <view class="tac" style="position: relative;">
+    <image style="width: 100vw;" mode="aspectFill" src="{{logo}}"></image>
+    <view style="position: absolute;bottom: 5vh;width:100vw;font-size: 48rpx;color: #fff;">欢迎使用汇很多智能航运</view>
   </view>
-  <view class=" mtv10  tac">
-    {{cargoOwnerCompany}}
+  <view class="mtv5  tac">
+    {{proxyCompanyName}}
   </view>
-  <view class=" mtv10  tac">
+  <view class="mtv5  tac">
     {{loginName}}
   </view>
-
-  <view class=" mtv10 tac">
+  <view class="mtv5 tac">
     {{loginPhone}}
   </view>
-
-  <view class=" mtv10  tac">
-    欢迎使用 汇很多科技 小程序
+  <view class="mtv5 tac df jcc nums">
+    <view>
+      <view>历史航次</view>
+      <view class="fs28">共 <text style="color: red;">{{voyageNum}}</text> 单</view>
+    </view>
+    <view>
+      <view>我的船东</view>
+      <view class="fs28">共 <text style="color: red;">{{shipOwnerNum}}</text> 人</view>
+    </view>
   </view>
 </block>
 <block wx:else>
-  <image style="margin:0 auto;display:block;width: 400rpx;margin-top: 10vh;height: 140rpx;" mode="aspectFit" src="https://6875-huihenduo-2gx127w7f837b584-1255802371.tcb.qcloud.la/miniapp-static/%E6%B1%87%E5%BE%88%E5%A4%9Alogo-%E5%B7%A6%E5%8F%B3.png?sign=fcd18f89de727b0193395cd2d44a730a&t=1647417257"></image>
+  <image style=" margin:0 auto;display:block;width: 400rpx;margin-top: 10vh;height: 140rpx;" mode="aspectFit" src="https://6875-huihenduo-2gx127w7f837b584-1255802371.tcb.qcloud.la/miniapp-static/%E6%B1%87%E5%BE%88%E5%A4%9Alogo-%E5%B7%A6%E5%8F%B3.png?sign=fcd18f89de727b0193395cd2d44a730a&t=1647417257"></image>
   <view style="margin-top: 100rpx;font-size: 50rpx;color: #333;text-align: center;">汇很多运输管家先行版
   </view>
   <view class="df jcc" style="position:absolute;bottom: 15vh;width: 100%;">

miniprogram/pages/me/me.wxss

@@ -7,6 +7,31 @@ page {
   margin-top: 10vh;
 }
 
+.mtv5 {
+  margin-top: 5vh;
+}
+
 .mbv10 {
   margin-bottom: 10vh;
+}
+
+.mbv5 {
+  margin-bottom: 5vh;
+}
+
+.nums {
+  width: 80vw;
+  margin: 5vh auto;
+  border: 2rpx solid grey;
+  border-radius: 10rpx;
+}
+
+.nums>view {
+  width: 40vw;
+  height: 25vw;
+  padding-top: 5vw;
+}
+
+.nums>view>view {
+  margin-bottom: 3vw;
 }

miniprogram/pages/sharePage/sharePage.wxml

@@ -10,7 +10,7 @@
     <view class="card">
       <view style="padding: 10rpx 0;border-bottom: 4rpx solid #ddd;">{{shipName}}</view>
       <view>
-        <view class="df aic mt20 fz24 c3">
+        <view class="df aic mt20 fs24 c3">
           <view class="df item">
             <view>装货港</view> <text class="mr20">:</text> {{loadPort}}
           </view>
@@ -18,7 +18,7 @@
             <view>卸货港</view> <text class="mr20">:</text> {{detailInfos[0].portName}}
           </view>
         </view>
-        <view class="df aic mt10 fz24 c3">
+        <view class="df aic mt10 fs24 c3">
           <view class="df item">
             <view>货种</view> <text class="mr20">:</text> {{cargo}}
           </view>
@@ -105,13 +105,13 @@
         <view bindtap="changeInfoType" data-type="truck" style="color:{{infoType=='truck'?'#0d8fcc':''}};border-bottom:{{infoType=='truck'?'2rpx solid #0d8fcc':''}}">汽车装货记录</view>
       </view>
       <view class="ship-discharge-list" wx:if="{{infoType=='ship'}}">
-        <view class="df aic jcsb mb20 mt10 fz22">
+        <view class="df aic jcsb mb20 mt10 fs22">
           <view>卸货时间</view>
           <view>卸货吨位</view>
           <view>卸货件数</view>
           <view>磅单</view>
         </view>
-        <view wx:for="{{shipDischargeList}}" wx:key="index" class="df aic jcsb mb20 fz22">
+        <view wx:for="{{shipDischargeList}}" wx:key="index" class="df aic jcsb mb20 fs22">
           <view>{{item.dischargeTime}}</view>
           <view>{{item.dischargeTons||''}}</view>
           <view>{{item.dischargePieces||''}}</view>
@@ -121,7 +121,7 @@
         <view bindtap="scrollShip" class="bottom-text">{{shipDischargeTotal==0?'暂无数据':(shipDischargeTotal>pageSize*shipDischargeCurrentPage?'点击或滑动加载更多...':'已加载完毕')}}</view>
       </view>
       <view class="truck-load-list" wx:if="{{infoType=='truck'}}">
-        <view class="df aic jcsb mb20 mt10 fz22">
+        <view class="df aic jcsb mb20 mt10 fs22">
           <view>车号</view>
           <view>毛重</view>
           <view>皮重</view>
@@ -129,7 +129,7 @@
           <view>称重时间</view>
           <view>单据</view>
         </view>
-        <view wx:for="{{truckLoadList}}" wx:key="index" class="df aic jcsb mb20 fz22">
+        <view wx:for="{{truckLoadList}}" wx:key="index" class="df aic jcsb mb20 fs22">
           <view>{{item.carNum}}</view>
           <view>{{item.grossWeight}}</view>
           <view>{{item.tare}}</view>

miniprogram/pages/shipOwnerManage/addShipOnwer/addShipOnwer.js

@@ -1,66 +1,15 @@
-// pages/shipOwnerManage/addShipOnwer/addShipOnwer.js
+// pages/shipOwnerManage/shipOwnerList/shipOwnerList.js
+import {
+  postApi
+} from "../../../apis/api"
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
-
+    phone: ''
   },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
+  async checkShipOwner() {
+    let res = await postApi('/ship/search/shipOwner', {
+      phone: this.data.phone
+    })
+    console.log(res)
   }
 })

miniprogram/pages/shipOwnerManage/addShipOnwer/addShipOnwer.json

@@ -1,3 +1,4 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "新建船东"
 }

miniprogram/pages/shipOwnerManage/addShipOnwer/addShipOnwer.wxml

@@ -1,2 +1,5 @@
-<!--pages/shipOwnerManage/addShipOnwer/addShipOnwer.wxml-->
-<text>pages/shipOwnerManage/addShipOnwer/addShipOnwer.wxml</text>
+<view style="width: 80vw;height: 50vw;border: 2rpx solid grey;border-radius: 10rpx;text-align: center;margin:10vh auto">
+  <view style="margin: 5vw;">请输入船东手机号</view>
+  <input model:value="{{phone}}" style="width: 400rpx;height: 60rpx;border: 1rpx solid grey;margin:0 auto;border-radius: 6rpx;padding-left: 20rpx;" type="number" placeholder-style="text-align:left" placeholder="必填" />
+  <view bindtap="checkShipOwner" style="width: 300rpx;height: 80rpx;line-height:80rpx;color: #fff;background:#0094FE;border-radius: 10rpx;margin: 8vw auto;">新建</view>
+</view>

miniprogram/pages/shipOwnerManage/shipOwnerList/shipOwnerList.js

@@ -1,66 +1,12 @@
 // pages/shipOwnerManage/shipOwnerList/shipOwnerList.js
+import {
+  uploadFile
+} from "../../../utils/upload"
+import {
+  postApi
+} from "../../../apis/api"
 Page({
-
-  /**
-   * 页面的初始数据
-   */
   data: {
 
   },
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad(options) {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide() {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload() {
-
-  },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
-  }
 })

miniprogram/pages/shipOwnerManage/shipOwnerList/shipOwnerList.json

@@ -1,3 +1,4 @@
 {
-  "usingComponents": {}
+  "usingComponents": {},
+  "navigationBarTitleText": "我的船东"
 }

miniprogram/pages/voyages/detail/detail.wxml

@@ -138,13 +138,13 @@
       <view bindtap="changeInfoType" data-type="truck" style="color:{{infoType=='truck'?'#0d8fcc':''}};border-bottom:{{infoType=='truck'?'2rpx solid #0d8fcc':''}}">汽车装货记录</view>
     </view>
     <view class="ship-discharge-list" wx:if="{{infoType=='ship'}}">
-      <view class="df aic jcsb mb20 mt10 fz22">
+      <view class="df aic jcsb mb20 mt10 fs22">
         <view>卸货时间</view>
         <view>卸货吨位</view>
         <view>卸货件数</view>
         <view>磅单</view>
       </view>
-      <view wx:for="{{shipDischargeList}}" wx:key="index" class="df aic jcsb mb20 fz22">
+      <view wx:for="{{shipDischargeList}}" wx:key="index" class="df aic jcsb mb20 fs22">
         <view>{{item.dischargeTime}}</view>
         <view>{{item.dischargeTons||''}}</view>
         <view>{{item.dischargePieces||''}}</view>
@@ -154,7 +154,7 @@
       <view bindtap="scrollShip" class="bottom-text">{{shipDischargeTotal==0?'暂无数据':(shipDischargeTotal>pageSize*shipDischargeCurrentPage?'点击或滑动加载更多...':'已加载完毕')}}</view>
     </view>
     <view class="truck-load-list" wx:if="{{infoType=='truck'}}">
-      <view class="df aic jcsb mb20 mt10 fz22">
+      <view class="df aic jcsb mb20 mt10 fs22">
         <view>车号</view>
         <view>毛重</view>
         <view>皮重</view>
@@ -162,7 +162,7 @@
         <view>称重时间</view>
         <view>单据</view>
       </view>
-      <view wx:for="{{truckLoadList}}" wx:key="index" class="df aic jcsb mb20 fz22">
+      <view wx:for="{{truckLoadList}}" wx:key="index" class="df aic jcsb mb20 fs22">
         <view>{{item.carNum}}</view>
         <view>{{item.grossWeight}}</view>
         <view>{{item.tare}}</view>

miniprogram/utils/uploadImage.js

@@ -0,0 +1,73 @@
+import {
+  apiUrl
+} from "../apis/apiConfig"
+
+function uploadFile(filePath, formData) {
+  return new Promise((resolve, reject) => {
+    wx.uploadFile({
+      url: `${apiUrl}/cos/upload`,
+      filePath,
+      name: 'file',
+      formData,
+      success: e => {
+        resolve(JSON.parse(e.data))
+      },
+      fail: reject
+    })
+  })
+}
+
+
+
+function uploadImage(type) {
+  return new Promise((resolve, reject) => {
+    wx.chooseMedia({
+      mediaType: ["image"],
+      sourceType: ["camera"],
+      success: e => {
+        console.log("获取媒体成功!", e)
+        let src = e.tempFiles[0].tempFilePath
+        wx.compressImage({
+          src,
+          quality: 80, // 压缩质量
+          success: async e => {
+            console.log("图片压缩成功!", e)
+            wx.hideLoading({
+              success: (res) => {},
+            })
+            wx.showLoading({
+              title: '正在上传...',
+            })
+            let res = await uploadFile(e.tempFilePath, {
+              type
+            })
+            console.log("上传结束", res)
+            if (res.status == 0) {
+              wx.showToast({
+                title: res.msg
+              })
+              resolve(res)
+            } else {
+              wx.showToast({
+                title: res.msg
+              })
+            }
+
+          },
+          fail: e => {
+            console.log("失败2", e)
+          }
+        })
+
+      },
+      fail: e => {
+        console.log("失败1", e)
+      }
+    })
+  })
+}
+
+
+module.exports = {
+  uploadImage
+}

project.config.json

@@ -38,7 +38,7 @@
     "minifyWXML": true,
     "showES6CompileOption": false,
     "useCompilerPlugins": false,
-    "ignoreUploadUnusedFiles": true
+    "ignoreUploadUnusedFiles": false
   },
   "appid": "wxd2dff8f427e787d7",
   "projectname": "汇很多代理",

project.private.config.json

@@ -36,12 +36,33 @@
           "query": "id=159",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/me/me",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/shipOwnerManage/shipOwnerList/shipOwnerList",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "",
+          "pathName": "pages/shipOwnerManage/addShipOnwer/addShipOnwer",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }
   },
   "setting": {
-    "urlCheck": true,
+    "urlCheck": false,
     "coverView": true,
     "compileHotReLoad": false,
     "lazyloadPlaceholderEnable": false,