From 7974f3266c323e4cd4fdff7d457fe75f39b8c199 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 25 九月 2024 15:59:06 +0800
Subject: [PATCH] 云学习跳转逻辑修改

---
 pages/home/home.js |   54 ++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/pages/home/home.js b/pages/home/home.js
index 1b2f624..b94578d 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -39,14 +39,18 @@
     baseRefresh: {
       value: false
     },
-    loading: true
+    loading: true,
   },
   onShow() {
     this.setData({
       searchVal: "",
     });
-    console.log(this.data.searchVal)
     this.loadHomePage();
+    const token = wx.getStorageSync(app.config.tokenKey)
+    if (token) {
+      this.getShoppingCartList()
+    }
+    this.init();
   },
 
   onLoad() {
@@ -66,16 +70,13 @@
       loginInfo(app, (data) => {
         // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
         if (data) {
-          // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+          this.init();
+          this.registe()
         } else {
-          // 鍑虹幇閿欒锛岃繑鍥瀎alse
+          this.init();
         }
       })
-    } else {
-      // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
     }
-    this.registe()
-    this.init();
   },
   onReachBottom() {},
   onPullDownRefresh() {
@@ -202,8 +203,8 @@
     }
     app.MG.store.getProductList(obj).then((res) => {
       res.datas.forEach((item) => {
-        item.liveTime = item.liveTime ? moment(item.liveTime).format("MM-DD HH:mm:ss") : '';
-        item.startTime = item.startTime ? moment(item.startTime).format("MM-DD HH:mm:ss") : '';
+        item.liveTime = item.liveTime ? item.liveTime.substring(5) : '';
+        item.startTime = item.startTime ? item.startTime.substring(5) : '';
         item.price = item.price ? item.price.toFixed(2) : item.price;
       });
       this.setData({
@@ -452,10 +453,17 @@
     //   duration: 1000
     // })
     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}`
+    })
+
   },
   goCourseDetail(e) {
     // return wx.showToast({
@@ -507,7 +515,7 @@
       })
     })
   },
-  addCart(e) {
+  async addCart(e) {
     const {
       info
     } = e.currentTarget.dataset;
@@ -525,7 +533,7 @@
           )
         ) {
           wx.showToast({
-            title: "璇ヤ功宸插湪璐墿杞︼紝璇峰嬁閲嶅娣诲姞绌�",
+            title: "璇ュ晢鍝佸凡鍦ㄨ喘鐗╄溅锛岃鍕块噸澶嶆坊鍔�",
             icon: 'none',
             duration: 1000
           })
@@ -537,7 +545,7 @@
               agentCode: '鐢靛瓙涔�'
             }]
           }
-          const addRes = app.MG.store.addShoppingCart(query)
+          const addRes = await app.MG.store.addShoppingCart(query)
           if (addRes) {
             wx.showToast({
               title: "娣诲姞鎴愬姛",
@@ -643,12 +651,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);
       }
     }
   },
@@ -682,4 +694,10 @@
 
 
   },
+
+  /**
+   * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+   */
+  onShareAppMessage() {},
+  onShareTimeline() {}
 });
\ No newline at end of file

--
Gitblit v1.9.1