工作台代码提交

components/searchSelect/index.js

@@ -2,7 +2,9 @@ import { getLoginParkList, getParkBuildingList } from "../../service/park"
 import { getParkSimpleMeterList, getParkBoxList, getCardList, getCollectionList, getInventoryMeter } from "../../service/meter"
 import { alertInfo } from "../../utils/index";
 import request from "../../utils/request"
-import { payWays, feeType, meterType } from "../../utils/data";
+import { payWays, feeType, meterType, noticeFlowType, noticeFlowStatus,
+  meterMode
+} from "../../utils/data";
 import { getTenementList, getWxTenementList } from "../../service/tenement";
 const { OK } = request;
 
@@ -23,6 +25,7 @@ Component({
   observers: {
     "show,type,filterBind": function(newShow, newType) {
       if (newShow && newType) { 
+        console.log("newShow",  newShow,"newType", newType)
         this.onSearch()
       }
     }
@@ -35,7 +38,10 @@ Component({
     searchText: "",
     payWays,
     feeType,
-    meterType
+    meterType,
+    noticeFlowType,
+    noticeFlowStatus,
+    meterMode,
   },
   lifetimes: {
     attached() {
@@ -76,6 +82,17 @@ Component({
       })
       this.triggerEvent("confirm", { data: item, type, index } );
     },
+    onMeterModeConfirm(event) {
+      const { index } = event.detail;
+      const { meterMode = [], type } = this.data;
+      const item = meterMode[index];
+      this.setData({
+        columns: [],
+        list: [],
+        searchText: ""
+      })
+      this.triggerEvent("confirm", { data: item, way: index, type } );
+    },
     onPayConfirm(event) {
       const { index } = event.detail;
       const { payWays = [], type } = this.data;
@@ -87,6 +104,29 @@ Component({
       })
       this.triggerEvent("confirm", { data: item, way: index, type } );
     },
+    onNoticeFlowTypeConfirm(event) {
+      const { index } = event.detail;
+      const { noticeFlowType = [], type } = this.data;
+      const item = noticeFlowType[index];
+      this.setData({
+        columns: [],
+        list: [],
+        searchText: ""
+      })
+      this.triggerEvent("confirm", { data: item, way: index + 1, type } );
+    },
+    onNoticeFlowStatusConfirm(event) {
+      const { index } = event.detail;
+      const { noticeFlowStatus = [], type } = this.data;
+      const item = noticeFlowStatus[index];
+      this.setData({
+        columns: [],
+        list: [],
+        searchText: ""
+      })
+      console.log("{ data: item, way: index + 1, type }", { data: item, way: index + 1, type })
+      this.triggerEvent("confirm", { data: item, way: index + 1, type } );
+    },
     onFeeTypeConfirm(event) {
       const { index } = event.detail;
       const { feeType = [], type } = this.data;

components/searchSelect/index.wxml

@@ -36,6 +36,36 @@
             bind:confirm="onMeterTypeConfirm"
         /> 
     </view>
+    <view wx:elif="{{type === 'noticeFlowType'}}">
+        <van-picker 
+            custom-style="width: 100%;" 
+            columns="{{ noticeFlowType }}" 
+            title="{{title}}"
+            show-toolbar="{{true}}"
+            bind:cancel="onCancel"
+            bind:confirm="onNoticeFlowTypeConfirm"
+        /> 
+    </view>
+    <view wx:elif="{{type === 'meterMode'}}">
+        <van-picker 
+            custom-style="width: 100%;" 
+            columns="{{ meterMode }}" 
+            title="{{title}}"
+            show-toolbar="{{true}}"
+            bind:cancel="onCancel"
+            bind:confirm="onMeterModeConfirm"
+        /> 
+    </view>
+    <view wx:elif="{{type === 'noticeFlowStatus'}}">
+        <van-picker 
+            custom-style="width: 100%;" 
+            columns="{{ noticeFlowStatus }}" 
+            title="{{title}}"
+            show-toolbar="{{true}}"
+            bind:cancel="onCancel"
+            bind:confirm="onNoticeFlowStatusConfirm"
+        /> 
+    </view>
     <view wx:elif="{{type !== 'pay'}}">
         <van-search
             value="{{ value }}"

components/searchSelectWrapper/index.wxml

@@ -4,6 +4,7 @@
     <view class="content" bind:tap="clickTime" bind:tap="onSearch">
         <view class="text" wx:if="{{!text}}" style="color: #ccc;"> {{placeholder}} </view>
         <view class="text" wx:else> {{text}} </view>
+        <!-- <van-icon name="close" custom-style="margin-right: 16rpx" /> -->
         <van-icon name="arrow-down" />
     </view>
 </view>

components/searchSelectWrapper/index.wxss

@@ -15,6 +15,7 @@
     border-radius: 12rpx;
     border: 1rpx solid #ccc;
     background-color: #fff;
+    position: relative;
 }
 
 .inputContent {
@@ -26,6 +27,7 @@
     border-radius: 12rpx;
     border: 1rpx solid #ccc;
     background-color: #fff;
+    position: relative;
 }
   
 .text {
@@ -39,4 +41,5 @@
 .required {
     color: rgb(209, 83, 25);
     font-size: 30rpx;
-}
+}
+