船主注册及完善信息

app.json

@@ -21,8 +21,10 @@
     "pages/car/info",
     "pages/login/index",
     "pages/register/index",
+    "pages/register/indexShip",
     "pages/updatePass/index",
     "pages/updateInfo/index",
+    "pages/updateInfo/indexShip",
     "pages/sign/index",
     "pages/deliveryConfirm/index",
     "pages/deliveryConfirm/info",

custom-tab-bar/index.js

@@ -91,6 +91,22 @@ Component({
         "selectedIconPath": "wode-active",
         "text": "我的"
       }],
+      list6: [{ //shipowner
+        "pagePath": "/pages/index/index",
+        "iconPath": "gonghuiyuyue-wodeyuyuelan",
+        "selectedIconPath": "yuyue1",
+        "text": "扫码预约"
+      },{
+        "pagePath": "/pages/salesOrderMan/index",
+        "iconPath": "yundans",
+        "selectedIconPath": "yundans-fill",
+        "text": "物流订单"
+      },{
+        "pagePath": "/pages/mine/index",
+        "iconPath": "wode2",
+        "selectedIconPath": "wode-active",
+        "text": "我的"
+      }],
     }],
     list: []
   },

pages/login/index.js

@@ -116,12 +116,13 @@ Page({
           successFun:true
         })
       }).then(res=>{
-        let { id, account, name, nickname, phone, roleCodeList, buttonCodeList } = res.data.data
+        let { id, account, name, nickname, phone, unloadImg, roleCodeList, buttonCodeList } = res.data.data
         wx.setStorageSync('id', id); //用户id
         wx.setStorageSync('account', account); //用户姓名
         wx.setStorageSync('name', name); //用户姓名
         wx.setStorageSync('nickname', nickname); //企业名称
         wx.setStorageSync('phone', phone); //职位
+        wx.setStorageSync('unloadImg', unloadImg); //证书图片
         wx.setStorageSync('roleCodeList', roleCodeList.join(',')); //用户类型
         wx.setStorageSync('buttonCodeList', buttonCodeList); //用户类型
         wx.switchTab({

pages/login/index.wxml

@@ -23,8 +23,9 @@
 
     <view class="submitBtn width520">
       <van-button block round color="#2C6CEC" plain type="info" form-type="submit">确定</van-button>
-      <view style="font-size: 24rpx;color: #FFFFFF;text-align: center;margin-top: 50rpx;">
-        <text data-url="../register/index" bind:tap="toLink" class="register">手动注册</text>
+      <view style="font-size: 25rpx;color: #FFFFFF;text-align: center;margin-top: 50rpx;">
+        <text data-url="../register/index" bind:tap="toLink" class="register">司机注册</text>
+        <text data-url="../register/indexShip" bind:tap="toLink" class="register">船主注册</text>
         <!-- <button type="default" size="mini" class="registerBtn" open-type="getPhoneNumber" bindgetphonenumber='getPhoneNumber' style="width:auto !important;padding:0 10rpx;display: inline-block;background-color: transparent;border: none;color: #fff;vertical-align: middle;">快速注册</button> -->
       </view>
     </view>

pages/mine/index.wxml

@@ -31,15 +31,25 @@
   <view class="height20"></view><view class="height20"></view>
   <!-- 第二部分菜单 -->
   <view class="nav">
-    <van-cell title="完善信息" is-link data-url="../updateInfo/index" bind:click="toLink">
+    <van-cell title="完善信息" is-link data-url="../updateInfo/index" bind:click="toLink"
+          wx:if="{{ roleCodeList == 'driver'||roleCodeList == 'customer'||roleCodeList == 'bizAdmin'||roleCodeList == 'sale'||roleCodeList == 'send'}}">
       <van-icon name="/images/edit.png" size="18px" slot="icon" custom-class="leftIcon" />
     </van-cell>
+
+    <van-cell title="完善信息" is-link data-url="../updateInfo/indexShip" bind:click="toLink"
+          wx:if="{{ roleCodeList == 'ship'}}">
+      <van-icon name="/images/edit.png" size="18px" slot="icon" custom-class="leftIcon" />
+    </van-cell>
+
     <van-cell title="绑定微信" is-link data-url="" bind:click="bindingWX">
       <van-icon name="/images/mineIcon9.png" size="18px" slot="icon" custom-class="leftIcon" />
     </van-cell>
-    <van-cell title="车辆管理" is-link data-url="../car/index" bind:click="toLink" wx:if="{{ roleCodeList == 'driver'||roleCodeList == 'customer'||roleCodeList == 'bizAdmin'}}">
+
+    <van-cell title="车辆管理" is-link data-url="../car/index" bind:click="toLink" 
+          wx:if="{{ roleCodeList == 'driver'||roleCodeList == 'customer'||roleCodeList == 'bizAdmin'}}">
       <van-icon name="/images/car2.png" size="18px" slot="icon" custom-class="leftIcon" />
     </van-cell>
+
     <van-cell title="修改密码" is-link data-url="../updatePass/index" bind:click="toLink">
       <van-icon name="/images/lock.png" size="18px" slot="icon" custom-class="leftIcon" />
     </van-cell>

pages/register/index.js

@@ -58,6 +58,7 @@ Page({
       inputPlates: inputPlates,
       isNewEnergy: getCarNumArr.length > 7 ? true : false,
       licensePlate: wx.getStorageSync('nickname'),
+      roleName: "1",
     })
   },
   formSubmit: function (e) {
@@ -91,7 +92,7 @@ Page({
         url: app.API.register,
         params: formData,
         page: this,
-        isLoadingTxt: '注册中...',
+        isLoadingTxt: '司机注册中...',
         isToken:false,
         isSubmitting: true,
         successFun: true
@@ -105,7 +106,7 @@ Page({
           complete: function () {
             setTimeout( ()=> {
               wx.setStorageSync('name', formData.name); //用户姓名
-              wx.setStorageSync('nickname', formData.nickname); //车牌号
+              wx.setStorageSync('nickname', formData.nickname); //车牌号or船舶号
               wx.navigateBack()
             }, 1500) //延迟时间  
           }

pages/register/index.json

@@ -1,5 +1,5 @@
 {
-  "navigationBarTitleText": "注册",
+  "navigationBarTitleText": "司机注册",
   "navigationBarBackgroundColor": "#2C6CEC",
   "navigationBarTextStyle":"white",
   "usingComponents": {

pages/register/index.wxml

@@ -14,6 +14,7 @@
       <view class="part">
         <view class="topItem topItem1">
           <view class="labelTitle">账号</view>
+          <input name="roleName" value='{{roleName}}' hidden='true' />
           <van-field label="" name="account" placeholder="请输入账号" border="{{false}}" />
         </view>
 
@@ -38,7 +39,7 @@
 
       <view class="fixedBtn submitBtn">
         
-        <van-button loading="{{isSubmitting}}" round block disabled="{{isSubmitting}}" loading-text="{{isSubmitting?'提交中...':''}}"  type="info" form-type="submit">确定
+        <van-button loading="{{isSubmitting}}" round block disabled="{{isSubmitting}}" loading-text="{{isSubmitting?'提交中...':''}}"  type="info" form-type="submit">注册成为司机
         </van-button>
       </view>
 

pages/signReview/info.wxml

@@ -88,7 +88,7 @@
             <van-uploader name="" deletable="{{false}}" file-list="{{ unloadImgArray }}" max-count="{{unloadImgArray.length}}" preview-size="80" />
           </view>
         </van-field>
-      </van-cell-group>
+      </van-cell-group> 
 
       <van-field center clearable label="签收审核" placeholder="签字图片" border="{{ false }}" use-button-slot class="radioHeight fieldAutoHeight">
         <view slot="input" class="radioHeightBx">

pages/workstand/index.js

@@ -8,8 +8,8 @@ Page({
     loginStatus: wx.getStorageSync('loginStatus') ? wx.getStorageSync('loginStatus') : false,
     roleCodeList: wx.getStorageSync('roleCodeList') ? wx.getStorageSync('roleCodeList') : '',
     menuData:[
-      {url:'/pages/index/index',flowName:'扫码预约',flowIcon:'',iconfont:'yuyue',color:"#00a8ff",role:["driver","customer"]},
-      {url:'/pages/weighingRecord/index',flowName:'过磅记录',flowIcon:'',iconfont:'xuexijilu-',color:"#26CA83",role:["bizAdmin","driver"]},
+      {url:'/pages/index/index',flowName:'扫码预约',flowIcon:'',iconfont:'yuyue',color:"#00a8ff",role:["driver","customer", "ship"]},
+      {url:'/pages/weighingRecord/index',flowName:'过磅记录',flowIcon:'',iconfont:'xuexijilu-',color:"#26CA83",role:["bizAdmin","driver", "ship"]},
 
       {url:'/pages/queueCar/index',flowName:'排队车辆',flowIcon:'',iconfont:'item5',color:"#6c5ce7",role:["bizAdmin"]},
       {url:'/pages/salesOrderMan/index',flowName:'物流订单',flowIcon:'',iconfont:'xiaoshouguanli3',color:"#20A0E3",role:["bizAdmin","sale","customer","dispatcher"]},
@@ -33,8 +33,6 @@ Page({
     //   {url:'',flowName:'工序任务',flowIcon:'',iconfont:'gongxu',color:"#20A0E3",role:["工序操作员"]},
 
     //   {url:'',flowName:'保洁任务',flowIcon:'',iconfont:'baojie-chulizhong',color:"#20A0E3",role:["保洁员"]},
-
-    //   {url:'/otherPages/parkConfig/index',flowName:'停车费',flowIcon:'',iconfont:'baojie-chulizhong',color:"#20A0E3",role:["巡检员"]},
     ]
   },