From 251083c9df5b9241db42564371d913d967b83141 Mon Sep 17 00:00:00 2001
From: huziyuan <huziyuan@qniao.cn>
Date: Wed, 3 Feb 2021 00:04:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/attentionPaperList/index.wxml |  8 ++++----
 pages/home/index/index.js                |  2 +-
 pages/home/tab4/index.wxml               | 26 +++++++++++++-----------
 pages/home/tab5/index.wxml               | 26 +++++++++++++-----------
 4 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/pages/home/attentionPaperList/index.wxml b/pages/home/attentionPaperList/index.wxml
index f2bba7f..edc7917 100644
--- a/pages/home/attentionPaperList/index.wxml
+++ b/pages/home/attentionPaperList/index.wxml
@@ -20,10 +20,10 @@
 	</view>
 	<scroll-view scroll-y="true" style='height:500rpx;margin-top:15rpx'>
 		<view class="bg-white list-empty" style="height:{{height}}rpx" wx:if="{{!categoryListone.length}}">
-		<view class="load-spinner text-gray" style="margin-bottom:24px" wx:if="{{loading}}" />
-		<image class="img-empty" src="/assets/image/list_empty.png" wx:else></image>
-		<view class="text-empty">{{loading? '正在加载' : '暂无数据'}}</view>
-	</view>
+			<view class="load-spinner text-gray" style="margin-bottom:24px" wx:if="{{loading}}" />
+			<image class="img-empty" src="/assets/image/list_empty.png" wx:else></image>
+			<view class="text-empty">{{loading? '正在加载' : '暂无数据'}}</view>
+		</view>
 		<view class="bottom">
 			<view>
 				<checkbox-group bindchange="checkboxChange">
diff --git a/pages/home/index/index.js b/pages/home/index/index.js
index e02e025..d2e2413 100644
--- a/pages/home/index/index.js
+++ b/pages/home/index/index.js
@@ -48,7 +48,7 @@ Component({
         console.log(this.data.height)
         if (app.globalData.userInfo && app.globalData.userInfo.memberExpiredAt) {
           this.setData({
-            'userInfo.memberExpiredAt': app.globalData.userInfo.memberExpiredAt.memberExpiredAt
+            'userInfo.memberExpiredAt': app.globalData.userInfo.memberExpiredAt
           })
         }
       }
diff --git a/pages/home/tab4/index.wxml b/pages/home/tab4/index.wxml
index 614c982..0f63adf 100644
--- a/pages/home/tab4/index.wxml
+++ b/pages/home/tab4/index.wxml
@@ -18,18 +18,20 @@
 	<view class="mid">
 		<text>你希望采购的品类是？</text>
 	</view>
-	<view class="bottom">
-		<view>
-			<wux-accordion-group title="">
-				<checkbox-group bindchange="checkboxChange">
-					<wux-accordion wx:for="{{ categoryListone }}" wx:key="index" title="{{index+1+'、'+item.categoryName}}">
-						<checkbox class="interestthreecheckbox" style="width:100%;margin-top:30rpx" wx:for="{{ item.childCategoryDtoList }}" wx:for-item="cell" wx:key="index" value="{{cell.categoryId}}" checked="{{cell.isSelected}}">{{cell.categoryName}}</checkbox>
-					</wux-accordion>
-				</checkbox-group>
-			</wux-accordion-group>
+	<scroll-view scroll-y="true" style='height:500rpx;margin-top:15rpx'>
+		<view class="bottom">
+			<view>
+				<wux-accordion-group title="">
+					<checkbox-group bindchange="checkboxChange">
+						<wux-accordion wx:for="{{ categoryListone }}" wx:key="index" title="{{index+1+'、'+item.categoryName}}">
+							<checkbox class="interestthreecheckbox" style="width:100%;margin-top:30rpx" wx:for="{{ item.childCategoryDtoList }}" wx:for-item="cell" wx:key="index" value="{{cell.categoryId}}" checked="{{cell.isSelected}}">{{cell.categoryName}}</checkbox>
+						</wux-accordion>
+					</checkbox-group>
+				</wux-accordion-group>
+			</view>
 		</view>
-	</view>
-	<view style="width:100%;height:130rpx;padding-top:10rpx;padding-right:10rpx">
-		<button class="cu-btn offer-btn" disabled="{{loopRequesting}}" bindtap="submitForm">确认</button>
+	</scroll-view>
+	<view class="cu-bar bg-white foot" style="height:{{120 + safeBottom}}rpx;padding: 32rpx 32rpx {{safeBottom + 32}}rpx 32rpx;">
+		<button class="cu-btn bg-red round shadow-blur page-btn" bindtap="submitForm">确认</button>
 	</view>
 </view>
\ No newline at end of file
diff --git a/pages/home/tab5/index.wxml b/pages/home/tab5/index.wxml
index 43b62b8..cd018bc 100644
--- a/pages/home/tab5/index.wxml
+++ b/pages/home/tab5/index.wxml
@@ -18,18 +18,20 @@
 	<view class="mid">
 		<text>你希望卖品类是？</text>
 	</view>
-	<view class="bottom">
-		<view>
-			<wux-accordion-group title="">
-				<checkbox-group bindchange="checkboxChange">
-					<wux-accordion wx:for="{{ categoryListone }}" wx:key="index" title="{{index+1+'、'+item.categoryName}}">
-						<checkbox class="interestthreecheckbox" style="width:100%;margin-top:30rpx" wx:for="{{ item.childCategoryDtoList }}" wx:for-item="cell" wx:key="index" value="{{cell.categoryId}}" checked="{{cell.isSelected}}">{{cell.categoryName}}</checkbox>
-					</wux-accordion>
-				</checkbox-group>
-			</wux-accordion-group>
+	<scroll-view scroll-y="true" style='height:500rpx;margin-top:15rpx'>
+		<view class="bottom">
+			<view>
+				<wux-accordion-group title="">
+					<checkbox-group bindchange="checkboxChange">
+						<wux-accordion wx:for="{{ categoryListone }}" wx:key="index" title="{{index+1+'、'+item.categoryName}}">
+							<checkbox class="interestthreecheckbox" style="width:100%;margin-top:30rpx" wx:for="{{ item.childCategoryDtoList }}" wx:for-item="cell" wx:key="index" value="{{cell.categoryId}}" checked="{{cell.isSelected}}">{{cell.categoryName}}</checkbox>
+						</wux-accordion>
+					</checkbox-group>
+				</wux-accordion-group>
+			</view>
 		</view>
-	</view>
-	<view style="width:100%;height:130rpx;padding-top:10rpx;padding-right:10rpx">
-		<button class="cu-btn offer-btn" disabled="{{loopRequesting}}" bindtap="submitForm">确认</button>
+	</scroll-view>
+	<view class="cu-bar bg-white foot" style="height:{{120 + safeBottom}}rpx;padding: 32rpx 32rpx {{safeBottom + 32}}rpx 32rpx;">
+		<button class="cu-btn bg-red round shadow-blur page-btn" bindtap="submitForm">确认</button>
 	</view>
 </view>
\ No newline at end of file