Merge branch 'master' of http://git.2weisou.com/Acher/newEdition

pages/center/Piabodata/index.vue

@@ -123,7 +123,7 @@
 			<view style="width: 100%;text-align: center;line-height: 300rpx;" v-if="newlisttabinfo.length==0">暂无数据
 			</view>
 			<view v-else class="jindu" style="margin-top: 20rpx;">
-				<scroll-view style="height: 300rpx;" scroll-y="true">
+				<scroll-view scroll-y="true">
 					<view class="jindu-box" v-for="(item,index) in newlisttabinfo" :key="index">
 						<view class="jindu-boxche">
 							<view class="jindu-name">{{item.name.substring(0, 4)}}</view>
@@ -151,7 +151,7 @@
 			<view style="width: 100%;height: 300rpx;text-align: center;line-height: 300rpx;"
 				v-if="newlisttabinfo1.length==0">暂无数据</view>
 			<view class="jindu" v-else>
-				<scroll-view style="height: 300rpx;" scroll-y="true">
+				<scroll-view scroll-y="true">
 					<view class="jindu-box" v-for="(item,index) in newlisttabinfo1" :key="index">
 						<view class="jindu-boxche">
 							<view class="jindu-name">{{item.name.substring(0, 4)}}</view>