更新 picker样式

miniprogram/components/localPicker/localPicker.wxml

@@ -1,5 +1,8 @@
 <picker bindchange="_selectItem" range-key='value' value="{{index}}" range="{{arr}}">
-  <view class="picker" style="color:{{arr[index].value?'#6C6C6C':'#777'}}">
-    {{arr[index].value||placeholder}}
+  <view class="df aic arrow-box">
+    <view class="picker" style="color:{{arr[index].value?'#6C6C6C':'#777'}}">
+      {{arr[index].value||placeholder}}
+    </view>
+    <image class="arrow" src="../../images/newUI/right-arrow.png"></image>
   </view>
 </picker>

miniprogram/components/localPicker/localPicker.wxss

@@ -1,4 +1,37 @@
 .picker {
   height: 80rpx;
   line-height: 84rpx;
+}
+
+
+.arrow {
+  width: 20rpx;
+  height: 20rpx;
+  display: block;
+
+}
+
+.tac {
+  text-align: center;
+}
+
+.arrow-box {
+  justify-content: space-between;
+  width: 380rpx;
+}
+
+.df {
+  display: flex;
+}
+
+.aic {
+  align-items: center;
+}
+
+.jcsb {
+  justify-content: space-between;
+}
+
+.jcsa {
+  justify-content: space-around;
 }

miniprogram/components/newPicker/newPicker.js

@@ -35,6 +35,10 @@ Component({
     placeholder: {
       type: String
     },
+    arrow: {
+      type: Boolean,
+      value: true
+    }
   },
   data: {
     arr: [],

miniprogram/components/newPicker/newPicker.wxml

@@ -13,4 +13,7 @@
     <view wx:if="{{!isInit&&!arr.length}}" class="items" style="color:#ddd;text-align:center">暂无数据</view>
   </view>
 </view>
-<view bindtap="showModal" style="{{inputStyle}}">{{value||placeholder}}</view>
+<view class="df aic jcsa {{arrow?'arrow-box':''}}" bindtap="showModal" style="{{inputStyle}}">
+  <view>{{value||placeholder}}</view>
+  <image wx:if="{{arrow}}" class="arrow" src="../../images/newUI/right-arrow.png"></image>
+</view>

miniprogram/components/newPicker/newPicker.wxss

@@ -27,6 +27,14 @@
   display: flex;
 }
 
+.aic {
+  align-items: center;
+}
+
+.jcsb {
+  justify-content: space-between;
+}
+
 .jcsa {
   justify-content: space-around;
 }
@@ -59,4 +67,19 @@
   to {
     right: -100vw;
   }
+}
+
+.arrow {
+  width: 20rpx;
+  height: 20rpx;
+  display: block;
+
+}
+
+.tac {
+  text-align: center;
+}
+
+.arrow-box {
+  justify-content: space-between;
 }

miniprogram/pages/voyageManage/createVoyage/createVoyage.wxml

@@ -1,11 +1,11 @@
 <view class="type2">
   <view class="line">
     <view class="line-full-item jcsb">
-      <view class="df">
+      <view class="df aic">
         <view class="line-full-title">选择船舶</view>
-        <NewPicker placeholder="请搜索船舶" bind:selectItem="selectShip" url="/ship/select" params="{{defaultParams}}" value="{{currentShipName}}"></NewPicker>
+        <NewPicker placeholder="请搜索船舶" bind:selectItem="selectShip" url="/ship/select" params="{{defaultParams}}" value="{{currentShipName}}" inputStyle="width:380rpx;padding: 32rpx 0;"></NewPicker>
       </view>
-      <image class="arrow" src="../../../images/newUI/right-arrow.png"></image>
+      <!-- <image class="arrow" src="../../../images/newUI/right-arrow.png"></image> -->
     </view>
   </view>
   <view class="line">
@@ -16,7 +16,6 @@
           <LocalPicker autoGet placeholder="请选择货主" bind:selectItem="selectCargoOwner" url="/user/cargoOwner/select" params="{{defaultParams}}"></LocalPicker>
         </view>
       </view>
-      <image class="arrow" src="../../../images/newUI/right-arrow.png"></image>
     </view>
   </view>
   <view class="line" wx:if="{{currentCargoOwnerId}}">
@@ -27,7 +26,6 @@
           <LocalPicker id="cargoCmp" placeholder="请选择货种" bind:selectItem="selectCargo" url="/cargo/select"></LocalPicker>
         </view>
       </view>
-      <image class="arrow" src="../../../images/newUI/right-arrow.png"></image>
     </view>
   </view>
   <view class="line">
@@ -35,10 +33,9 @@
       <view class="df aic">
         <view class="line-full-title">装货港</view>
         <view>
-          <NewPicker placeholder="选择装货港" value="{{loadPort}}" bind:selectItem="selectLoadPort" url="/port/getCol"></NewPicker>
+          <NewPicker placeholder="选择装货港" value="{{loadPort}}" bind:selectItem="selectLoadPort" url="/port/getCol" inputStyle="width:380rpx;padding: 32rpx 0;"></NewPicker>
         </view>
       </view>
-      <image class="arrow" src="../../../images/newUI/right-arrow.png"></image>
     </view>
   </view>
   <view class="line" wx:for="{{dischargePorts}}" wx:key="key">
@@ -46,7 +43,7 @@
       <view class="df aic">
         <view class="line-full-title">卸货港 #{{index+1}}</view>
         <view>
-          <NewPicker placeholder="选择卸货港" id="{{'disc'+index}}" style="width: 200rpx;" bind:selectItem="selectDiscPort" value="{{dischargePorts[index].dischargePort}}" data-index="{{index}}" url="/port/getCol"></NewPicker>
+          <NewPicker placeholder="选择卸货港" id="{{'disc'+index}}" style="width: 200rpx;" bind:selectItem="selectDiscPort" value="{{dischargePorts[index].dischargePort}}" data-index="{{index}}" url="/port/getCol" inputStyle="width:380rpx;padding: 32rpx 0;"></NewPicker>
         </view>
       </view>
       <image wx:if="{{dischargePorts[0].id}}" bindtap="deleteDischargePort" data-index="{{index}}" src="../../../images/newUI/delete.png" class="delete"></image>
@@ -61,7 +58,7 @@
   </view> -->
   <view wx:if="{{dischargePorts[0].id}}" class="line-full-item line jcsb" style="padding-top: 10rpx;padding-right: 26rpx;">
     <view></view>
-    <NewPicker placeholder="添加卸货港" inputStyle="width: 140rpx;height: 40rpx;font-size: 28rpx;font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;color: #0089FD;line-height: 40rpx;text-align:center" bind:selectItem="selectDiscPort" url="/port/getCol"></NewPicker>
+    <NewPicker placeholder="添加卸货港" inputStyle="width: 180rpx;height: 40rpx;font-size: 28rpx;font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;color: #0089FD;line-height: 40rpx;text-align:center;padding:40rpx 0" bind:selectItem="selectDiscPort" url="/port/getCol"></NewPicker>
   </view>
   <view class="line">
     <view class="line-full-item aic jcsb" style="padding: 0;">

miniprogram/pages/voyageManage/createVoyage/createVoyage.wxss

@@ -53,7 +53,7 @@
 }
 
 .line-full-title {
-  width: 240rpx;
+  width: 280rpx;
   font-size: 30rpx;
   font-family: PingFangSC-Regular, PingFang SC;
   font-weight: 400;
@@ -137,7 +137,6 @@
 }
 
 .type2 .line-full-item {
-  padding: 32rpx 0;
   border-bottom: 1rpx solid #EBEBEB;
 }
 
@@ -150,7 +149,6 @@
 }
 
 .type2 .line-full-title {
-  width: 200rpx;
   color: #20252E;
 }
 

miniprogram/pages/voyageManage/voyageManage.js

@@ -53,6 +53,39 @@ Page({
         title: '尚未登录',
         icon: "error"
       })
+      this.setData({
+        list: [{
+          shipName: '体验航次 #1',
+          loadPort: '南京',
+          discPort: "小池",
+          cargo: '石油焦',
+          tons: '10000',
+        }, {
+          shipName: '体验航次 #2',
+          loadPort: '小池',
+          discPort: "武汉",
+          cargo: '豆粕',
+          tons: '15000',
+        }, {
+          shipName: '体验航次 #3',
+          loadPort: '北仑港',
+          discPort: "小池",
+          cargo: '煤炭',
+          tons: '25000',
+        }, {
+          shipName: '体验航次 #4',
+          loadPort: '张家港',
+          discPort: "汉口",
+          cargo: '玉米',
+          tons: '15000',
+        }, {
+          shipName: '体验航次 #5',
+          loadPort: '武汉',
+          discPort: "小池",
+          cargo: '大豆',
+          tons: '3000',
+        }],
+      })
       return
     }
     this.setData({
@@ -163,6 +196,7 @@ Page({
     }
   },
   goToDetail(e) {
+    if (!wx.getStorageSync('loginAccountId')) return
     let {
       id,
       trans
@@ -234,6 +268,7 @@ Page({
   },
 
   call(e) {
+    if (!wx.getStorageSync('loginAccountId')) return
     wx.makePhoneCall({
       phoneNumber: e.currentTarget.dataset.phone
     })

miniprogram/pages/voyages/detail/detail.wxml

@@ -44,7 +44,7 @@
       <view class="line-full-item">
         <view class="line-full-title">卸货港 #{{index+1}}:</view>
         <view class="line-text">{{item}}</view>
-        <NewPicker wx:if="{{dischargePorts.length-1==index&&voyageStatus!=2}}" value="{{currentDischargePort}}" placeholder="添加卸货港" inputStyle="width: 180rpx;height: 56rpx;background: #0089FD;border-radius: 12rpx;font-size: 26rpx;font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;color: #FFFFFF;line-height: 56rpx;text-align:center" spTop="top:406rpx" spHeight="360rpx" bind:selectItem="selectDischargePort" url="/port/getCol"></NewPicker>
+        <NewPicker wx:if="{{dischargePorts.length-1==index&&voyageStatus!=2}}" value="{{currentDischargePort}}" placeholder="添加卸货港" inputStyle="width: 180rpx;height: 56rpx;background: #0089FD;border-radius: 12rpx;font-size: 26rpx;font-family: PingFangSC-Medium, PingFang SC;font-weight: 500;color: #FFFFFF;line-height: 56rpx;text-align:center" spTop="top:406rpx" spHeight="360rpx" bind:selectItem="selectDischargePort" arrow="{{false}}" url="/port/getCol"></NewPicker>
       </view>
     </view>
     <view class="line">