Merge branch 'master' of http://git.huihenduo.com.cn:3000/wzh/Agency_WxApp into new

miniprogram/pages/voyageManage/voyageManage.js

@@ -20,6 +20,7 @@ Page({
     size: 20,
     list: [],
     total: 0,
+    term: "",
     isFreshing: false,
     apiArr: ['/voyage/list', '/dayReport/list', '/bill/list']
   },
@@ -59,7 +60,8 @@ Page({
     })
     let res = await postApi(this.data.apiArr[this.data.maintab - 1], {
       loginAccountId: wx.getStorageSync('loginAccountId'),
-      cargoOwnerId: this.data.cargoOwnerId,
+      // cargoOwnerId: this.data.cargoOwnerId,
+      term: this.data.term,
       status: this.data.status,
       currentPage: this.data.currentPage,
       size: this.data.size,
@@ -172,6 +174,13 @@ Page({
       phoneNumber: e.currentTarget.dataset.phone
     })
   },
+
+  inputSearch(e) {
+    this.setData({
+      currentPage: 1
+    })
+    this.getList()
+  },
   onLoad() {
 
   },

miniprogram/pages/voyageManage/voyageManage.wxml

@@ -1,7 +1,8 @@
 <view class="df aic jcsb line">
   <view>航次搜索</view>
   <view>
-    <RemotePicker bind:selectItem="selectCargoOwner" url="/user/cargoOwner/select" params="{{defaultParams}}" placeholder="请输入货主，船名或船东" inputStyle="height:60rpx"></RemotePicker>
+    <!-- <RemotePicker bind:selectItem="selectCargoOwner" url="/user/cargoOwner/select" params="{{defaultParams}}" placeholder="请输入货主，船名或船东" inputStyle="height:60rpx"></RemotePicker> -->
+    <input class="new-seach" 	confirm-type="search" bindconfirm="inputSearch"  model:value="{{term}}" type="text"/>
   </view>
 </view>
 <view class="date tac mb20 fs26">今日日期:{{todayDate}}</view>

miniprogram/pages/voyageManage/voyageManage.wxss

@@ -89,4 +89,11 @@
   padding-bottom: 50rpx;
   font-size: 26rpx;
   color: #777;
+}
+
+.new-seach {
+  padding-left: 20rpx;
+  border: 1px solid grey;
+  height: 80rpx;
+  width: 50vw;
 }