修改发票显示问题和暂存工作台修改

components/Segmented/index.js

@@ -0,0 +1,24 @@
+// components/Segmented/index.js
+Component({
+
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    list: Array
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  }
+})

components/Segmented/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

components/Segmented/index.wxml

@@ -0,0 +1,4 @@
+<!--components/Segmented/index.wxml-->
+<view>
+    <view wx:for="{{list}}" wx:key="index"></view>
+</view>

components/Segmented/index.wxss

@@ -0,0 +1 @@
+/* components/Segmented/index.wxss */

components/navigator/index.js

@@ -7,6 +7,7 @@ Component({
   properties: {
     title: String,
     canBack: Boolean,
+    beforeBack: Function,
   },
 
   /**
@@ -34,7 +35,11 @@ Component({
    * 组件的方法列表
    */
   methods: {
-    back() {
+    async back() {
+      const { beforeBack } = this;
+      if (beforeBack) {
+        await beforeBack();
+      }
       wx.navigateBack();
     }
   }

components/searchSelect/index.js

@@ -1,8 +1,8 @@
-import { getLoginParkList } from "../../service/park"
+import { getLoginParkList, getParkBuildingList } from "../../service/park"
 import { getParkSimpleMeterList } from "../../service/meter"
 import { alertInfo } from "../../utils/index";
 import request from "../../utils/request"
-import { payWays } from "../../utils/data";
+import { payWays, feeType } from "../../utils/data";
 import { getTenementList } from "../../service/tenement";
 const { OK } = request;
 
@@ -86,9 +86,13 @@ Component({
           return;
         case "meter":
           this.onSearchMeter();
+          return
         case "tenement":
           this.onSearchTenement();
           return;
+        case "building":
+          this.onSearchBuilding();
+          return;
       }
     },
     async onSearchPark() {
@@ -127,6 +131,18 @@ Component({
         list: data,
       })
     },
+    async onSearchBuilding() {
+      const { park } = this.data;
+      const { code, message, data = [] } = await getParkBuildingList(park);
+      if (code !== OK) {
+        alertInfo(message)
+        return
+      }
+      this.setData({
+        columns: data?.length ? data?.map(item => item?.name) : [],
+        list: data,
+      })
+    },
   }
 })
 

components/searchSelect/index.wxml

@@ -3,6 +3,7 @@
     show="{{ show }}" 
     bind:click="onClickHide"
     position="bottom"
+    z-index="100000"
 >
     <view wx:if="{{type !== 'pay'}}">
         <van-search
@@ -26,7 +27,7 @@
             bind:confirm="onConfirm"
         /> 
     </view>
-    <view wx:else>
+    <view wx:elif="{{type === 'pay'}}">
         <van-picker 
             custom-style="width: 100%;" 
             columns="{{ payWays }}" 
@@ -36,4 +37,24 @@
             bind:confirm="onPayConfirm"
         /> 
     </view>
+    <view wx:elif="{{type === 'feeType'}}">
+        <van-picker 
+            custom-style="width: 100%;" 
+            columns="{{ feeType }}" 
+            title="{{title}}"
+            show-toolbar="{{true}}"
+            bind:cancel="onCancel"
+            bind:confirm="onPayConfirm"
+        /> 
+    </view>
+    <view wx:else>
+        <van-picker 
+            custom-style="width: 100%;" 
+            columns="{{ columns }}" 
+            title="{{title}}"
+            show-toolbar="{{true}}"
+            bind:cancel="onCancel"
+            bind:confirm="onConfirm"
+        /> 
+    </view>
 </van-popup>

components/searchSelect/index.wxss

@@ -1,3 +1 @@
 /* components/searchSelect/index.wxss */
-.van-ellipsis van-picker-column__item {
-}