From 6ea61440843847c07b3a256cdc6981a15b56e1c2 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 30 Aug 2023 14:46:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                        |  3 ++-
 subpkg/shareCapital/shareCapital.vue | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/manifest.json b/manifest.json
index c4e5410..80c8bf7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -48,7 +48,8 @@
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
             },
             /* ios打包配置 */
             "ios" : {
diff --git a/subpkg/shareCapital/shareCapital.vue b/subpkg/shareCapital/shareCapital.vue
index c00d5ef..ba254f2 100644
--- a/subpkg/shareCapital/shareCapital.vue
+++ b/subpkg/shareCapital/shareCapital.vue
@@ -88,6 +88,12 @@
     },
     onLoad() {
       this.initInfo();
+      this.initLoad();
+    },
+    onPullDownRefresh() {
+      this.initLoad();
+    },
+    onReachBottom() {
       this.loadList();
     },
     methods: {
@@ -95,6 +101,12 @@
         let res = await companyShareholderInfo();
         this.shareholder = res.data;
       },
+      async initLoad() {
+      	this.loadConfig.page = 1;
+      	this.loadConfig.status = "loadmore";
+      	this.companyList = [];
+      	await this.loadList();
+      },
       async loadList(){
         if (this.loadConfig.status == "nomore") return;
         this.loadConfig.status = "loading";
@@ -108,9 +120,7 @@
         } else {
         	this.loadConfig.page++;
         }
-        for (var i = 0; i < 20; i++) {
-          this.list = [...this.list, ...res.data.list];
-        }
+        this.list = [...this.list, ...res.data.list];
       },
       navToContract(contract_no) {
         if (!contract_no) return Toast('暂无合同');