1

pages/agent/index.js

@@ -6,7 +6,6 @@ Page({
     searchParams: {
       pageNo: 1,
       pageSize: 10,
-      realname:'',
     },
     list:[],
   },

pages/divide/index.js

@@ -157,12 +157,14 @@ Page({
     let data = val.detail;
     let startTime = utils.formatDate(data.startTime,'yyyy-MM-dd')
     let endTime = utils.formatDate(data.endTime,'yyyy-MM-dd')
+    var et = endTime.split(" ");
+    var entt = et[0]+" 23:59:59"
     this.setData({
       ["searchParams.startTime"]: data.startTime,
-      ["searchParams.endTime"]: data.endTime,
+      ["searchParams.endTime"]: entt,
       dataStr: startTime +" ~ "+ endTime,
       ["searchParams.createTime_begin"]: data.startTime,
-      ["searchParams.createTime_end"]: data.endTime,
+      ["searchParams.createTime_end"]: entt,
       ["searchParams.storeName"]: this.data.searchParams.storeName,
       list:[]
     });

pages/order/index.js

@@ -130,13 +130,15 @@ Page({
         let data = val.detail;
         let startTime = utils.formatDate(data.startTime)
         let endTime = utils.formatDate(data.endTime)
+        var et = endTime.split(" ");
+        var entt = et[0]+" 23:59:59"
         this.setData({
             ["searchParams.startTime"]: data.startTime,
-            ["searchParams.endTime"]: data.endTime,
-            dataStr: startTime + " ~ " + endTime
+            ["searchParams.endTime"]: data.entt,
+            dataStr: startTime + " ~ " + entt
         });
         this.data.searchParams.startTime = data.startTime;
-        this.data.searchParams.endTime = data.endTime;
+        this.data.searchParams.entt = data.entt;
     },
     bindStorePickerChange: function (e) {
         var item = this.data.storeList[e.detail.value]

pages/pssRecord/index.js

@@ -97,6 +97,7 @@ Page({
             // that.data.params.storeId = that.data.searchParams.storeId;
             that.data.params.pageNo = that.data.searchParams.pageNo;
             that.data.params.pageSize = that.data.searchParams.pageSize;
+            that.data.params.productName = that.data.searchParams.productName;
             that.data.params.orderSn = that.data.searchParams.orderSn ? that.data.searchParams.orderSn : "";
 
 
@@ -132,12 +133,20 @@ Page({
                             })
                         }
                     } else {
-                        that.setData({
-                            loadding: false,
-                            pullUpOn: false,
-                            ["searchParams.pageNo"]: that.data.searchParams.pageNo - 1,
-                            orderList: []
-                        })
+                        if(this.data.searchParams.pageNo<=1){
+                            that.setData({
+                                loadding: false,
+                                pullUpOn: false,
+                                ["searchParams.pageNo"]: that.data.searchParams.pageNo - 1,
+                                orderList: []
+                            })
+                        }else{ 
+                            that.setData({
+                                loadding: false,
+                                pullUpOn: false,
+                            })
+                        }
+                        
                     }
                 }
             }).catch((res) => {})

pages/pssRecord/index.wxml

@@ -18,6 +18,13 @@
           value="{{searchParams.orderSn}}" />
       </view>
     </tui-list-cell>
+    <tui-list-cell hover="{{false}}">
+      <view class="tui-line-cell">
+        <view class="tui-title">商品</view>
+        <input placeholder-class="phcolor" catchinput="serchOrderNo"  class="tui-input" data-name="searchParams.productName" placeholder="请选择商品" type="text" 
+          value="{{searchParams.productName}}" />
+      </view>
+    </tui-list-cell>
   <view class="flex">
     <view class="flex-sub bg-grey padding-sm text-center text-bold">商品名称</view>
     <view class="flex-sub bg-grey padding-sm text-center text-bold">订单编号</view>

pages/scheme/form.js

@@ -117,12 +117,15 @@ Page({
           util.toast('门店分成必须是0-100的分成')
           return;
         }  
-        if(schemeBillEntryList[i].storeDivide+schemeBillEntryList[i].areaDivide<100){
+
+        if(schemeBillEntryList[i].storeDivide+schemeBillEntryList[i].areaDivide<100||
+            schemeBillEntryList[i].storeDivide+schemeBillEntryList[i].areaDivide>100){
           util.toast('分成之和应为100%')
           return;
         }  
       }
     }
+    return
     if(productCount==0){
       util.toast('请选择至少一个商品！')
       return;