From e9d148275fd7654be38b31bad11a4abd77214cca Mon Sep 17 00:00:00 2001
From: xpz2018 <107107461@qq.com>
Date: Thu, 14 Oct 2021 14:25:20 +0800
Subject: [PATCH] no message

---
 pages/agent/order/index.js       | 53 +++++++-------------------------
 pages/agent/order/index.wxml     |  2 +-
 pages/moment/fragment/index.wxml |  8 ++---
 3 files changed, 16 insertions(+), 47 deletions(-)

diff --git a/pages/agent/order/index.js b/pages/agent/order/index.js
index e7f781c..f5a3f1e 100644
--- a/pages/agent/order/index.js
+++ b/pages/agent/order/index.js
@@ -13,7 +13,6 @@ Page({
     finished: false,
     tabList: ['全部', '待预约', '待送货', '结算中', '已完成', '已关闭'],
     tabIndex: 0,
-    top: 0,
     orderList: [],
     form: {
       status: '',
@@ -23,11 +22,8 @@ Page({
     isOnece:''
   },
   onLoad: function (options) {
-    this.setData({
-      height: app.globalData.fragmentHeight - 90,
-      ['form.status']: options.status ? options.status : '',
-      tabIndex: options.tabIndex ? parseInt(options.tabIndex) : 0
-    })
+    this.setData({ height: app.globalData.fragmentHeight - 90, tabIndex: options.tabIndex ? parseInt(options.tabIndex) : 0 })
+    this.data.form.status = options.status ? options.status : '',
     event.on('ProxyMessage', this, this.onEvent)
     this.fetchOrderList()
   },
@@ -64,42 +60,15 @@ Page({
         let nowList = `orderList[${this.data.orderList.length}]`
         var num = this.data.form.pageNum
         var finished = this.data.form.pageNum >= result.data.pages
-        if (this.data.form.pageNum == 1) {
-          respList.forEach(element => {
-            if (element.createTime.substring(0, 10) === this.data.isOnece) {
-              element.isShowDateQd = false
-            } else {
-              element.isShowDateQd = true
-              this.data.isOnece = element.createTime.substring(0, 10)
-            }
-          });
-          this.setData({
-            [nowList]: respList,
-            total: result.data.total,
-            ['form.pageNum']: (num + 1),
-            top: 0,
-            finished,
-            requesting: false,
-            loading: false
-          })
-        } else {
-          respList.forEach(element => {
-            if (element.createTime.substring(0, 10) ===  this.data.isOnece && this.data.isOnece!=='') {
-              element.isShowDateQd = false
-            } else {
-              element.isShowDateQd = true
-              this.data.isOnece = element.createTime.substring(0, 10)
-            }
-          });
-          this.setData({
-            [nowList]: respList,
-            total: result.data.total,
-            ['form.pageNum']: (num + 1),
-            finished,
-            requesting: false,
-            loading: false
-          })
-        }
+        respList.forEach(element => {
+          if (element.createTime.substring(0, 10) ===  this.data.isOnece && this.data.isOnece!=='') {
+            element.isShowDateQd = false
+          } else {
+            element.isShowDateQd = true
+            this.data.isOnece = element.createTime.substring(0, 10)
+          }
+        })
+        this.setData({ [nowList]: respList, total: result.data.total, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false })
       } else {
         this.setData({ finished: true, requesting: false, loading: false })
       }
diff --git a/pages/agent/order/index.wxml b/pages/agent/order/index.wxml
index 9a27871..8c880ec 100644
--- a/pages/agent/order/index.wxml
+++ b/pages/agent/order/index.wxml
@@ -12,7 +12,7 @@
 </view>
 
 <refresh-view id="refreshview" bind:refresh="onRefreshList" height="{{height}}" bind:loadmore="fetchOrderList">
-<!-- <refresh-view bind:refresh="onRefreshList" height="{{height}}" triggered="{{requesting}}" scrollTop="{{top}}" bind:scrolltolower="fetchOrderList"> -->
+<!-- <refresh-view bind:refresh="onRefreshList" height="{{height}}" triggered="{{requesting}}" bind:scrolltolower="fetchOrderList"> -->
 	<view wx:if="{{!orderList.length}}">
 		<view class="list-empty" style="height:{{height}}rpx">
 			<view class="load-spinner text-gray" style="margin-bottom:24px" wx:if="{{loading}}" />
diff --git a/pages/moment/fragment/index.wxml b/pages/moment/fragment/index.wxml
index c2b4815..929791c 100644
--- a/pages/moment/fragment/index.wxml
+++ b/pages/moment/fragment/index.wxml
@@ -46,13 +46,13 @@
   </swiper-item>
 </swiper>
 
-<!-- <view class="booking-tool" style="bottom:{{336 + safeBottom}}rpx" bindtap="feedback">
+<view class="booking-tool" style="bottom:{{200 + safeBottom}}rpx;z-index: 22" bindtap="feedback" wx:if="{{tabIndex== 3}}">
 	<view class="roder-add flex flex-center">
-		<image src="/assets/image/icon-{{tabIndex == 3 ? 'printer' : 'feedback'}}.png" style="width: 100rpx;height: 100rpx;"></image>
+		<image src="/assets/image/icon-printer.png" style="width: 100rpx;height: 100rpx;"></image>
 	</view>
-</view> -->
+</view>
 
-<view class="booking-tool" style="bottom:{{200 + safeBottom}}rpx;z-index: 22" bindtap="postMoment" wx:if="{{tabIndex== 3}}">
+<view class="booking-tool" style="bottom:{{336 + safeBottom}}rpx;z-index: 22" bindtap="postMoment" wx:if="{{tabIndex== 3}}">
 	<view class="roder-add flex flex-center" style="background-color: #007AFF;">
 		<text class="cuIcon-add text-white" style="font-size:32px"></text>
 	</view>