From 999412b2204252ea0216db15dd21801890371962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=81=A5?= <itgaojian@163.com>
Date: Mon, 6 Sep 2021 16:28:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8D=E7=89=87=E6=A8=A1=E6=9D=BF,=E6=B5=B7?=
 =?UTF-8?q?=E6=8A=A5=E5=88=97=E8=A1=A8=E6=BB=91=E5=8A=A8bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packagecard/cardList/cardList.js           |  9 +++++++--
 packagecard/cardList/cardList.wxml         |  6 +++---
 packagecard/marketing/marketingposter.js   |  8 ++++++--
 packagecard/marketing/marketingposter.wxml | 10 +++++-----
 packagecard/paypage/paypage.js             |  8 ++++----
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/packagecard/cardList/cardList.js b/packagecard/cardList/cardList.js
index ff8b6b6..b4964bc 100644
--- a/packagecard/cardList/cardList.js
+++ b/packagecard/cardList/cardList.js
@@ -18,12 +18,17 @@ Page({
     isRefresh: false,
     isShowCodeInput: false, //测试true
     code: '', //邀请码
+    conentHeight: 550, //滚动内容的高度
   },
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
     // this.getPayState()
+    //屏幕高度-标题的高度
+    this.setData({
+      conentHeight: app.globalData.windowHeight
+    })
   },
   onShow() {
     this.dorefreshList()
@@ -56,8 +61,8 @@ Page({
         if (res.data.length > 0) {
           _self.setData({
             optionsList: res.data,
-            curTypeId: res.data[0].dataId,
-            currentIndex: 0
+            curTypeId: res.data[_self.data.currentIndex].dataId,
+            currentIndex: _self.data.currentIndex
           })
           //根据第一条获取数据
           _self.getList()
diff --git a/packagecard/cardList/cardList.wxml b/packagecard/cardList/cardList.wxml
index 1724f33..0c69c80 100644
--- a/packagecard/cardList/cardList.wxml
+++ b/packagecard/cardList/cardList.wxml
@@ -11,9 +11,9 @@
     </block>
   </van-tabs>
 </view>
-<scroll-view style="margin-top: 70rpx;" refresher-enabled="true" refresher-threshold="{{50}}"
-  refresher-background="#fff" enhanced="{{true}}" scroll-y bindrefresherrefresh="dorefreshList"
-  refresher-triggered="{{isRefreshing}}">
+<scroll-view style="margin-top: 70rpx;height: {{conentHeight}}px;" refresher-enabled="true"
+  refresher-threshold="{{50}}" refresher-background="#fff" enhanced="{{true}}" scroll-y
+  bindrefresherrefresh="dorefreshList" refresher-triggered="{{isRefreshing}}">
   <block wx:if="{{cardList.length>0}}">
     <view class="page-box">
       <block wx:for="{{cardList}}" wx:key="index">
diff --git a/packagecard/marketing/marketingposter.js b/packagecard/marketing/marketingposter.js
index 959c61f..426a625 100644
--- a/packagecard/marketing/marketingposter.js
+++ b/packagecard/marketing/marketingposter.js
@@ -27,7 +27,8 @@ Page({
         curTypeId: '',
         isShowOptions: false, //是否显示选项
         curItemIndex: -1, //点击分享按钮弹出的
-        curTypeName: '全部'
+        curTypeName: '全部',
+        contentHeight: 550, //内容区域的高度
     },
 
     /**
@@ -37,6 +38,9 @@ Page({
         var _self = this
         //获取类型
         _self.getOptionsList()
+        this.setData({
+            contentHeight: app.globalData.windowHeight
+        })
     },
     //获取类型
     getOptionsList() {
@@ -95,7 +99,7 @@ Page({
         _self.setData({
             currentTypeIndex: idx,
             curTypeId: id,
-            curTypeName:name ,
+            curTypeName: name,
             posterHistoryList: [],
             posterTempleteList: [],
             isShowOptions: false
diff --git a/packagecard/marketing/marketingposter.wxml b/packagecard/marketing/marketingposter.wxml
index bd0bc7a..85eed1c 100644
--- a/packagecard/marketing/marketingposter.wxml
+++ b/packagecard/marketing/marketingposter.wxml
@@ -29,8 +29,8 @@
 </view>
 
 <!-- 模板 -->
-<scroll-view style="margin-top: 70rpx;" refresher-enabled="true" refresher-threshold="{{50}}"
-    wx:if="{{currentIndex == 0}}" refresher-background="#fff" enhanced="{{true}}" scroll-y
+<scroll-view style="margin-top: 70rpx;height: {{contentHeight}}px;" refresher-enabled="true"
+    refresher-threshold="{{50}}" wx:if="{{currentIndex == 0}}" refresher-background="#fff" enhanced="{{true}}" scroll-y
     bindrefresherrefresh="dorefreshList" refresher-triggered="{{isRefreshing}}">
     <block wx:if="{{posterTempleteList.length>0}}">
         <view class="img-box">
@@ -63,9 +63,9 @@
     </view>
 </scroll-view>
 <!-- 发布历史 -->
-<scroll-view style="margin-top: 70rpx;" refresher-enabled="true" refresher-threshold="{{50}}"
-    refresher-background="#fff" enhanced="{{true}}" scroll-y bindrefresherrefresh="dorefreshList"
-    refresher-triggered="{{isRefreshing}}" wx:else>
+<scroll-view style="margin-top: 70rpx;height: {{contentHeight}}px;" refresher-enabled="true"
+    refresher-threshold="{{50}}" refresher-background="#fff" enhanced="{{true}}" scroll-y
+    bindrefresherrefresh="dorefreshList" refresher-triggered="{{isRefreshing}}" wx:else>
     <block wx:if="{{posterHistoryList.length>0}}">
         <view class="img-box">
             <block wx:for="{{posterHistoryList}}" wx:key="index">
diff --git a/packagecard/paypage/paypage.js b/packagecard/paypage/paypage.js
index 82cad3d..19c31bf 100644
--- a/packagecard/paypage/paypage.js
+++ b/packagecard/paypage/paypage.js
@@ -223,10 +223,10 @@ Page({
                 }
             })
             .catch(err => {
-                wx.showToast({
-                    title: '获取订单失败',
-                    icon: 'err'
-                })
+                // wx.showToast({
+                //     title: '获取订单失败',
+                //     icon: 'err'
+                // })
             })
     },
     //用户协议