kk.shi преди 3 години
родител
ревизия
034b2916e1
променени са 3 файла, в които са добавени 29 реда и са изтрити 12 реда
  1. 14 6
      pages/welfareMall/writeOff/writeOff.js
  2. 14 6
      pages/welfareMall/writeOff/writeOff.wxml
  3. 1 0
      pages/welfareMall/writeOff/writeOff.wxss

+ 14 - 6
pages/welfareMall/writeOff/writeOff.js

@@ -17,6 +17,8 @@ Page({
     hexiaoList: [],
     storeList: [],
     index: 0,
+    storeNo: '',
+    date: '',
   },
 
   /**
@@ -76,12 +78,14 @@ Page({
 
   },
 
-  // 订单数据
+  // 获取核销记录
   getHexiaoList: function() {
     WelfareMall.getHexiaoList({
       page: this.data.page,
       pageSize: this.data.pageSize,
       mobile: getMobileCache(),
+      storeNo: this.data.storeNo,
+      date: this.data.date,
     }).then(res => {
         if (res.code == 200) {
             this.userHexiaoListView(res.data)
@@ -148,20 +152,24 @@ userstoreListView: function(data) {
       }
       return
   }
-  const storeNameList = []
-  data.forEach(v => {
-        storeNameList.push(v.storeName)
-    })
+  this.data.storeList = data
   this.setData({
       mobileTop:getMobileCache(),
-      storeList: storeNameList
+      storeList: this.data.storeList
   })
   },  
 
+  //选择门店
   bindPickerChange: function (e) {
     console.log(e)
     this.setData({
         index: e.detail.value
     })
   },
+  //选择日期
+  bindDateChange: function (e) { 
+    this.setData({
+        date: e.detail.value
+    })
+  },
 })

+ 14 - 6
pages/welfareMall/writeOff/writeOff.wxml

@@ -1,13 +1,21 @@
 <!--pages/welfareMall/writeOff/writeOff.wxml-->
-<picker class="store-bar flex-row" bindchange="bindPickerChange" value="{{index}}" range="{{storeList}}" range-key="{{'storeName'}}">
-  <view class="store-text">{{storeList[index].storeName}}</view>
-  <view class="store-text" style="display: none;">{{storeList[index].storeNo}}</view>
-  <!-- <image class="store-img" src="../../../images/welfareMall/open.png" /> -->
-</picker>
+<view class="store-bar flex-row">
+  <picker bindchange="bindPickerChange" value="{{index}}" range="{{storeList}}" range-key="{{'storeName'}}">
+    <view class="store-text">{{storeList[index].storeName}}</view>
+    <view class="store-text" style="display: none;">{{storeList[index].storeNo}}</view>
+  </picker>
+  <image class="store-img" src="../../../images/welfareMall/open.png" />
+</view>
 <view class="writeOff-search flex-column">
   <view class="search-bar flex-row">
     <image class="search-img" src="../../../images/welfareMall/search.png" />
-    <input class="search-text" placeholder="搜索分账时间"></input>
+    <!-- <input class="search-text" placeholder="搜索分账时间"></input> -->
+    <view class="search-text">
+      <picker mode="date" value="{{date}}"  bindchange="bindDateChange">
+        <view class="picker" wx:if="{{date == null || date == ''}}">搜索分账时间</view>
+        <view class="picker" wx:else>{{date}}</view>
+      </picker>
+    </view>
   </view>
 </view>
 <view class="writeOff-content">

+ 1 - 0
pages/welfareMall/writeOff/writeOff.wxss

@@ -65,6 +65,7 @@ page{
 }
 
 .search-text{
+  width: 500rpx;
   margin-left: 30rpx;
   font-size: 28rpx;
   font-weight: 500;