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

---
 pages/agent/fragment/index.js       | 2 +-
 pages/mall/fragment/index.json      | 1 -
 pages/mall/fragment/index.wxml      | 1 -
 pages/moment/information/index.js   | 8 +++++---
 pages/moment/information/index.json | 1 +
 pages/moment/information/index.wxml | 7 +++----
 pages/moment/moment-item/index.js   | 3 ++-
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pages/agent/fragment/index.js b/pages/agent/fragment/index.js
index 3a140c6..89617d0 100644
--- a/pages/agent/fragment/index.js
+++ b/pages/agent/fragment/index.js
@@ -17,7 +17,7 @@ Component({
    * 页面的初始数据
    */
   data: {
-    mHeight: app.globalData.fragmentHeight - 90,
+    mHeight: app.globalData.safeFragmentHeight - 190,
     loading: true,
     requesting: false,
     finished: false,
diff --git a/pages/mall/fragment/index.json b/pages/mall/fragment/index.json
index e49db14..2d20be6 100644
--- a/pages/mall/fragment/index.json
+++ b/pages/mall/fragment/index.json
@@ -11,7 +11,6 @@
     "refresh-view": "/components/refresher/index",
     "wux-sticky": "/components/sticky/index",
     "wux-divider": "/components/divider/index",
-    "wux-button": "/components/button/index",
     "information-item": "/pages/mall/information-item/index"
   }
 }
\ No newline at end of file
diff --git a/pages/mall/fragment/index.wxml b/pages/mall/fragment/index.wxml
index ceee68e..508cc83 100644
--- a/pages/mall/fragment/index.wxml
+++ b/pages/mall/fragment/index.wxml
@@ -101,7 +101,6 @@
 	</view>
 	<view class="flex flex-center" style="padding: 24rpx;">
 		<view id="moment" class="btn-more" catchtap="gridTap">查看更多行情</view>
-		<!-- <wux-button id="moment" outline type="stable" size="small" bind:click="gridTap">查看更多行情</wux-button> -->
 	</view>
 
 </scroll-view>
\ No newline at end of file
diff --git a/pages/moment/information/index.js b/pages/moment/information/index.js
index 0504c63..85a35a7 100644
--- a/pages/moment/information/index.js
+++ b/pages/moment/information/index.js
@@ -1,4 +1,3 @@
-// pages/message/index.js
 import { getPreferType, getPreferList } from "../../../api/moment"
 const util = require('../../../utils/util')
 const app = getApp()
@@ -12,6 +11,7 @@ Component({
     height: { type: Number, value: 0 }
   },
   data: {
+    mHeight: app.globalData.safeFragmentHeight - 190,
     tabList: [],
     tabIndex: 0,
     typeList: [],
@@ -29,6 +29,7 @@ Component({
     onRestart: function () {
       this.fetchTypeList()
       if(!this.firstShow){
+        this.setData({mHeight: app.globalData.safeFragmentHeight - 360 })
         this.fetchList()
       }
       this.firstShow = true
@@ -65,8 +66,9 @@ Component({
       if (this.data.requesting || this.data.finished) {
         return
       }
-      // this.data.requesting = true
-      this.setData({ requesting: true })
+      if(this.data.orderList.length > 0){
+        this.setData({ requesting: true })
+      }
       getPreferList(this.data.form).then(result => {
         if (result.data && result.data.records.length) {
           var respList = result.data.records
diff --git a/pages/moment/information/index.json b/pages/moment/information/index.json
index 7b890d8..f1123b7 100644
--- a/pages/moment/information/index.json
+++ b/pages/moment/information/index.json
@@ -2,6 +2,7 @@
   "component": true,
   "usingComponents": {
     "wux-tabi": "/components/tabi/index",
+    "refresh-view": "/components/refresher/index",
     "wux-skeleton": "/components/skeleton/index",
     "wux-skeleton-paragraph": "/components/skeleton-paragraph/index",
     "info-item": "/pages/moment/info-item/index",
diff --git a/pages/moment/information/index.wxml b/pages/moment/information/index.wxml
index 65a615a..63cac92 100644
--- a/pages/moment/information/index.wxml
+++ b/pages/moment/information/index.wxml
@@ -1,15 +1,13 @@
 <!--pages/message/index.wxml-->
 <view class="bg-white" style="height: 90rpx;border-bottom: 1rpx solid #f3f3f3;position: relative;" wx:if="{{tabList.length}}">
 	<wux-tabi scroll="{{scrolled}}" tab-data="{{tabList}}" disable="{{requesting}}" tab-index="{{tabIndex}}" bind:change="onTabChange"></wux-tabi>
-	<!-- <view class="flex flex-justify bg-white" style="height: 88rpx;position: absolute;right: 0px;top: 0px;padding: 0rpx 24rpx;">
-		<text class="cuIcon-right text-blue" style="padding-top: 4rpx;"></text>
-	</view> -->
 </view>
 <wux-skeleton active wx:else>
 	<view class="flex bg-white" style="height: 90rpx;padding:32rpx;border-bottom: 1rpx solid #f3f3f3">
 		<wux-skeleton-paragraph rounded rows="1" wux-class="case3-class" />
 	</view>
 </wux-skeleton>
+<!-- <refresh-view bind:refresh="onRefreshList" height="{{mHeight}}" triggered="{{requesting}}" bind:scrolltolower="fetchList"> -->
 <scroll-view scroll-y style="height: {{height - 90}}rpx;" bind:scrolltolower="fetchList">
 	<wux-skeleton active wx:if="{{!orderList.length}}">
 		<view class="flex item-content">
@@ -30,4 +28,5 @@
 			</view>
 		</wux-divider>
 	</view>
-</scroll-view>
\ No newline at end of file
+</scroll-view>
+<!-- </refresh-view> -->
\ No newline at end of file
diff --git a/pages/moment/moment-item/index.js b/pages/moment/moment-item/index.js
index 1294906..ab86ce6 100644
--- a/pages/moment/moment-item/index.js
+++ b/pages/moment/moment-item/index.js
@@ -25,6 +25,7 @@ Component({
       if(this.data.item.isCooperate === 1) {
         if(!app.globalData.userInfo || !app.globalData.userInfo.isVIP){
           event.emit('EventMessage', {what: 223, desc: 'Logout'})
+          
           return
         }
       }
@@ -45,7 +46,7 @@ Component({
       userPushFollowMill({ paperMillId: this.data.item.paperMillId, follow: !this.data.item.hasFollowed }).then(result => {
         this.data.item.hasFollowed = !this.data.item.hasFollowed
         this.setData({ loading: false, ['item.hasFollowed']: this.data.item.hasFollowed })
-        this.triggerEvent("attention", this.data.item)
+        setTimeout(() => { this.triggerEvent("attention", this.data.item) }, 100)
       }).catch(err => {
         this.setData({ loading: false })
       })