Merge branch 'skk/feat/writeOff'

pages/welfareMall/writeOff/writeOff.js

@@ -19,7 +19,8 @@ Page({
     storeList: [],
     index: 0,
     storeNo: '',
-    date: '',
+    startDate: '',
+    endDate: '',
   },
 
   /**
@@ -44,6 +45,9 @@ Page({
       isLogin: getMobileCache() != ''
      })
       if(this.data.isLogin){
+        this.setData({
+          hexiaoList: [],
+        })
         this.getHexiaoList();
         this.getStoreListByStaff();
       } else {
@@ -101,7 +105,8 @@ Page({
       pageSize: this.data.pageSize,
       mobile: getMobileCache(),
       storeNo: this.data.storeNo,
-      date: this.data.date,
+      startDate: this.data.startDate,
+      endDate: this.data.endDate,
     }).then(res => {
         if (res.code == 200) {
             this.userHexiaoListView(res.data)
@@ -208,10 +213,33 @@ userstoreListView: function(data) {
     }
     this.getHexiaoList();
   },
-  //选择日期
-  bindDateChange: function (e) { 
+  //选择日期起期
+  bindStartDateChange: function (e) { 
     this.setData({
-        date: e.detail.value,
+        startDate: e.detail.value,
+        hexiaoList: [],
+        page: 1,
+        pageSize: 10,
+        lock: false,
+        noResult: false,
+        noMore: false,
+        mobileTop: 'TONY WU',
+    })
+    this.getHexiaoList();
+  },
+  //选择日期止期
+  bindEndDateChange: function (e) { 
+    let that = this;
+    if(that.data.startDate == null || that.data.startDate == ''){
+      wx.showToast({
+        title: '请选择分账时间起期',
+        icon: 'none',
+        duration: 1500
+      })
+      return;
+    }
+    this.setData({
+        endDate: e.detail.value,
         hexiaoList: [],
         page: 1,
         pageSize: 10,
@@ -227,7 +255,8 @@ userstoreListView: function(data) {
   toCloseDet: function (e) { 
     this.setData({
         hexiaoList: [],
-        date: '',
+        startDate: '',
+        endDate: '',
         page: 1,
         pageSize: 10,
         lock: false,
@@ -237,4 +266,14 @@ userstoreListView: function(data) {
     })
     this.getHexiaoList();
   },
+  
+  toCopy: function(e){
+    let orderSn = e.currentTarget.dataset.ordersn
+    wx.setClipboardData({
+      data: orderSn,
+      success: function (res) {
+       console.log(orderSn)
+      }
+      })
+  }
 })

pages/welfareMall/writeOff/writeOff.wxml

@@ -12,22 +12,32 @@
   <view class="writeOff-search flex-column">
     <view class="search-bar flex-row">
       <image class="search-img" src="../../../images/welfareMall/search.png" />
-      <view class="search-text">
-        <picker mode="date" value="{{date}}" bindchange="bindDateChange">
+      <view class="search-text flex-row">
+        <picker mode="date" value="{{startDate}}" bindchange="bindStartDateChange" start="2022-01-01">
           <view class="search-date flex-row">
-            <view class="picker" wx:if="{{date == null || date == ''}}">搜索分账时间</view>
-            <view class="picker" wx:else>{{date}}</view>
-            <view class="search-text-close" catchtap="toCloseDet" wx:if="{{date != null && date != ''}}">⊗</view>
+            <view class="picker" wx:if="{{startDate == null || startDate == ''}}">分账时间起期</view>
+            <view class="picker" wx:else>{{startDate}}</view>
+          </view>
+        </picker>
+        ~
+        <picker mode="date" value="{{endDate}}" bindchange="bindEndDateChange" start="2022-01-01">
+          <view class="search-date flex-row">
+            <view class="picker" wx:if="{{endDate == null || endDate == ''}}">分账时间止期</view>
+            <view class="picker" wx:else>{{endDate}}</view>
           </view>
         </picker>
       </view>
+      <view class="search-text-close" catchtap="toCloseDet" wx:if="{{(startDate != null && startDate != '') || (endDate != null && endDate != '')}}">⊗</view>
     </view>
   </view>
 </view>
 <view class="writeOff-content" wx:for="{{hexiaoList}}" wx:key="index" data-ordersn="{{item.orderSn}}">
   <view class="writeOff-list flex-column">
     <view class="content-head flex-row">
-      <view class="content-head-date over-ellipsis">订单号 {{item.orderSn}}</view>
+      <view class="flex-row">
+        <view class="content-head-date">订单号 {{item.orderSn}}</view>
+        <view class="content-head-copy" data-ordersn="{{item.orderSn}}" catchtap="toCopy">复制</view>
+      </view>
       <view class="content-head-state">{{item.statusText}}</view>
     </view>
     <view class="content-line line-top"></view>

pages/welfareMall/writeOff/writeOff.wxss

@@ -72,11 +72,12 @@ page{
 }
 
 .search-text{
-  width: 540rpx;
+  width: 480rpx;
   margin-left: 28rpx;
   font-size: 28rpx;
   font-weight: 500;
   color: #A0A0A0;
+  justify-content: flex-start;
 }
 
 .search-text-close{
@@ -111,6 +112,13 @@ page{
   color: #444444;
 }
 
+.content-head-copy{
+  font-size: 24rpx;
+  font-weight: 500;
+  color: #d84436;
+  margin-left: 32rpx;
+}
+
 .content-head-state{
   font-size: 28rpx;
   font-weight: 500;