From 6048d396513fd20b644fc2b879da29ce4af984e2 Mon Sep 17 00:00:00 2001
From: huziyuan <huziyuan@qniao.cn>
Date: Sat, 6 Feb 2021 21:40:38 +0800
Subject: [PATCH] ----

---
 pages/article/newInfo/index.js   | 6 ++++--
 pages/article/newInfo/index.wxml | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pages/article/newInfo/index.js b/pages/article/newInfo/index.js
index 2ce7ce1..90c097e 100644
--- a/pages/article/newInfo/index.js
+++ b/pages/article/newInfo/index.js
@@ -26,15 +26,17 @@ Component({
       queryWay: 0,
       priceSort:1
     },
-    factoryList:[]
+    factoryList:[],
+    scorllHeight:app.globalData.fragmentHeight
 
   },
   methods: {
     onRestart: function () {
-      console.log(app.globalData.safeFragmentHeight)
+      console.log(app.globalData.fragmentHeight)
       this.setData({
         StatusBar: app.globalData.StatusBar || 40,
         CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 80),
+        scorllHeight:app.globalData.fragmentHeight
       })
       this.data.querFrom.queryWay=0
       this.getPaperMillOfInformationListFct(this.data.querFrom)
diff --git a/pages/article/newInfo/index.wxml b/pages/article/newInfo/index.wxml
index 7e2d8f9..2a89e7f 100644
--- a/pages/article/newInfo/index.wxml
+++ b/pages/article/newInfo/index.wxml
@@ -32,7 +32,7 @@
 	</view>
 </view>
 <view style="width:100%;height:15rpx;"></view>
-<scroll-view scroll-y="true" style='max-height:950rpx;width:100%;background-color:white'>
+<scroll-view scroll-y="true" style='max-height:{{scorllHeight-266}}rpx;width:100%;background-color:white'>
 	<view class="zt">
 		<view class="flex flex-justify" style="width:100%;height:80rpx;lineheight:80rpx;font-size: 28px;color: rgba(0,0,0,0.65);letter-spacing: 0;padding: 0rpx 40rpx 0rpx 40rpx;">
 			<view class="text-df text-gray" style="flex:1.2;overflow: hidden;">纸厂名称</view>