From 1ebf13fcff1d64f0ab9f1981cd60ad3194a2d29c Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 27 九月 2024 11:10:00 +0800
Subject: [PATCH] zf

---
 packagePersonal/pages/activateProduct/index.js |   62 ++++++++++++++++++++++++-------
 1 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/packagePersonal/pages/activateProduct/index.js b/packagePersonal/pages/activateProduct/index.js
index 8328d73..b55e0d0 100644
--- a/packagePersonal/pages/activateProduct/index.js
+++ b/packagePersonal/pages/activateProduct/index.js
@@ -94,20 +94,43 @@
             oldlist.forEach(istrue => {
               istrue.icon = getPublicImage(istrue.icon, "", 400)
             })
+            item.saleMethodList.forEach(async (i) => {
+              if (i.type != 'defaultSaleMethod') {
+                var index = i.name.indexOf('-')
+                if (index !== -1) {
+                  item.type = i.name.substring(0, index)
+                } else {
+                  item.type = i.name
+                }
+              } else {
+                let parentData = await app.MG.store.getProductBySaleMethod({
+                  saleMethodId: i.id
+                })
+                console.log(parentData, 111)
+                if (parentData.storeLinks[0].storeRefCode == 'jsek_digitalCourses') {
+                  item.type = '鏁板瓧璇剧▼'
+                }
+                if (parentData.storeLinks[0].storeRefCode == 'jsek_digitalTextbooks') {
+                  item.type = '鏁板瓧鏁欐潗'
+                }
+              }
+            })
           })
-          let dataList = res.datas;
-          //瑙﹀簳鍔犺浇鏂版暟鎹苟淇濈暀鑰佹暟鎹�
-          if (isReachBottom) {
-            dataList = [...this.data.list, ...dataList] //灏嗘柊鏁版嵁鍔犲叆鑰佹暟鎹腑
-          }
-          this.setData({
-            list: dataList,
-            pageTotalCount: res.totalSize,
-            bottomLoading: false,
-            isMoreData: dataList.length > 0 ? false : true,
-            skeletonLoding: false,
-            loading: false
-          })
+          setTimeout(() => {
+            let dataList = res.datas;
+            //瑙﹀簳鍔犺浇鏂版暟鎹苟淇濈暀鑰佹暟鎹�
+            if (isReachBottom) {
+              dataList = [...this.data.list, ...dataList] //灏嗘柊鏁版嵁鍔犲叆鑰佹暟鎹腑
+            }
+            this.setData({
+              list: dataList,
+              pageTotalCount: res.totalSize,
+              bottomLoading: false,
+              isMoreData: dataList.length > 0 ? false : true,
+              skeletonLoding: false,
+              loading: false
+            })
+          }, 500)
         } else {
           this.setData({
             skeletonLoding: false,
@@ -175,7 +198,18 @@
     }
     this.getDataList(bool);
   },
-
+  // 鐩戝惉婊氬姩璺濈
+  onPageScroll(e) {
+    if (e && e.scrollTop >= 1000) {
+      this.setData({
+        isBackTop: true
+      })
+    } else {
+      this.setData({
+        isBackTop: false
+      })
+    }
+  },
   /**
    * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
    */

--
Gitblit v1.9.1