From a9e0bf7aa226964a7e3d86c081b7c4ade3f47537 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 27 Oct 2021 19:07:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/js/common.js                                | 6 +++---
 pages/companyList/companyList.js                   | 4 ++--
 pages/companyList/companyList.json                 | 4 +++-
 pages/meeting/meeting.js                           | 3 ++-
 pages/meetingDetailSigned/meetingDetailSigned.wxss | 2 ++
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/assets/js/common.js b/assets/js/common.js
index 41030c0..08a69d0 100644
--- a/assets/js/common.js
+++ b/assets/js/common.js
@@ -7,8 +7,8 @@ export function wxBind(callback){
         wx.request({
           url: 'https://api.weixin.qq.com/sns/jscode2session',
           data: {
-            appid: 'wx322b63d1e6ff4765',
-            secret: '7d3dd94092bb50981d0a8ded849601a0',
+            appid: 'wx457dfcb58fd556ea',
+            secret: 'e8d2ee25e32c77561efccb7145ba9dc8',
             js_code: res.code,
             grant_type: 'authorization_code'
           },
@@ -39,4 +39,4 @@ export function isLogin(callback){
       })
     }
   })
-}
\ No newline at end of file
+}
diff --git a/pages/companyList/companyList.js b/pages/companyList/companyList.js
index 6711fe8..f71ee16 100644
--- a/pages/companyList/companyList.js
+++ b/pages/companyList/companyList.js
@@ -11,7 +11,7 @@ Page({
     // 列表查询条件
     searchParams: {
       pageNo: 1,
-      pageSize: 10,
+      pageSize: 20,
       companyName: '',
        // 创建时间倒叙排序
        column:'createTime',
@@ -198,7 +198,7 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
-
+    console.log(12343241352);
     this.data.searchParams.pageNo++
     this.loadData()
   },
diff --git a/pages/companyList/companyList.json b/pages/companyList/companyList.json
index e9a5284..0173f08 100644
--- a/pages/companyList/companyList.json
+++ b/pages/companyList/companyList.json
@@ -1,4 +1,6 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "选择企业"
+  "navigationBarTitleText": "选择企业",
+  "enablePullDownRefresh":true,
+  "onReachBottomDistance":200
 }
\ No newline at end of file
diff --git a/pages/meeting/meeting.js b/pages/meeting/meeting.js
index 4663ef0..c9dbfeb 100644
--- a/pages/meeting/meeting.js
+++ b/pages/meeting/meeting.js
@@ -106,7 +106,8 @@ Page({
   queryMeetingList() {
     wx.showToast({
       title: '加载中...',
-      icon: 'loading'
+      icon: 'loading',
+      duration:3000
     })
     MeetingApi.meetingList(this.data.searchParams).then(res => {
       if (res.success) {
diff --git a/pages/meetingDetailSigned/meetingDetailSigned.wxss b/pages/meetingDetailSigned/meetingDetailSigned.wxss
index 16a0227..d76b55a 100644
--- a/pages/meetingDetailSigned/meetingDetailSigned.wxss
+++ b/pages/meetingDetailSigned/meetingDetailSigned.wxss
@@ -61,12 +61,14 @@ page{
 .file-name view text{
  overflow: hidden;
 }
+
 .file-name view image{
   width: 30px;
   min-width: 30px;
   height: 30px;
   margin-right: 10px;
 }
+
 .basic-info .meeting-files .file-name .look-file{
   min-width: 40px;
   color: #069F99;