From 80cee152c8c7f314d43a05ae1994aeeecd28b08a Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 20 九月 2024 18:35:47 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 pages/home/home.js |   50 ++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/pages/home/home.js b/pages/home/home.js
index 4f8fb6e..f85bf4e 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -39,7 +39,7 @@
     baseRefresh: {
       value: false
     },
-    loading: true
+    loading: true,
   },
   onShow() {
     this.setData({
@@ -66,16 +66,17 @@
       loginInfo(app, (data) => {
         // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
         if (data) {
-          // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+          this.init();
+          this.registe()
         } else {
-          // 鍑虹幇閿欒锛岃繑鍥瀎alse
+          this.init();
         }
       })
     } else {
-      // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
+      this.init();
+      this.registe()
     }
-    this.registe()
-    this.init();
+
   },
   onReachBottom() {},
   onPullDownRefresh() {
@@ -453,9 +454,22 @@
     // })
     const item = e.currentTarget.dataset.book
     console.log(item);
+    // 缃戦〉绫诲瀷璺宠浆鍒扮綉鍧�澶嶅埗椤碉紝鍥犱负url浼犲弬涓嶈兘浼� 甯﹀弬鏁扮殑缃戠粶鍦板潃锛屾墍浠ユ澶勮鎶婄綉缁滃湴鍧�閲岀殑浼犲弬鎽樺嚭鏉ワ紝鏀惧埌url閲�
+    let urlData = ''
+    const flags = item.jsek_link.indexOf("?")
+    if (flags > -1) {
+      urlData = item.jsek_link.slice(flags + 1, item.jsek_link.length)
+    }
+    let url = '/packageBookService/pages/bookServices/linkPage/index'
     wx.navigateTo({
-      url: '/pages/specialDiscussion/webView/index?link=' + item.jsek_link
-    });
+      url: urlData ? url + `?path=${item.jsek_link.slice(0,flags)}` + '&' + urlData : url + `?path=${item.jsek_link}`
+    })
+    // wx.navigateTo({
+    //   url: '/pages/specialDiscussion/webView/index?link=' + item.jsek_link
+    // });
+
+
+
   },
   goCourseDetail(e) {
     // return wx.showToast({
@@ -463,9 +477,11 @@
     //   icon: 'none',
     //   duration: 1000
     // })
+
     const {
       book
     } = e.currentTarget.dataset;
+    console.log(book);
     wx.navigateTo({
       url: '/pages/digitalCourses/digitalCoursesDetails/index?id=' + book.id + '&path=' + book.idPath,
     });
@@ -505,7 +521,7 @@
       })
     })
   },
-  addCart(e) {
+  async addCart(e) {
     const {
       info
     } = e.currentTarget.dataset;
@@ -535,7 +551,7 @@
               agentCode: '鐢靛瓙涔�'
             }]
           }
-          const addRes = app.MG.store.addShoppingCart(query)
+          const addRes = await app.MG.store.addShoppingCart(query)
           if (addRes) {
             wx.showToast({
               title: "娣诲姞鎴愬姛",
@@ -641,12 +657,16 @@
     if (this.data.scoll) {
       if (e.detail.scrollTop < 20) {
         this.data.scoll = false
-        this.isChange(false);
+        // 閬垮厤棰戠箒璋冪敤 setData
+        if (this.data.isWhite)
+          this.isChange(false);
       }
     } else {
       if (e.detail.scrollTop > 20) {
         this.data.scoll = true
-        this.isChange(true);
+        // 閬垮厤棰戠箒璋冪敤 setData
+        if (!this.data.isWhite)
+          this.isChange(true);
       }
     }
   },
@@ -680,4 +700,10 @@
 
 
   },
+
+  /**
+   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+   */
+  onShareAppMessage() {},
+  onShareTimeline() {}
 });
\ No newline at end of file

--
Gitblit v1.9.1