From 32986b54a0e2661f7ad6ed79f3ef12c4289eace9 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期五, 20 十二月 2024 17:52:52 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 pages/home/home.js |  106 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/pages/home/home.js b/pages/home/home.js
index 953b47e..a70fd1b 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -1,7 +1,6 @@
 import {
   fetchHome
 } from '../../services/home/home';
-import moment from 'moment'
 import {
   loginInfo
 } from '../../assets/js/login';
@@ -50,6 +49,7 @@
     if (token) {
       this.getShoppingCartList()
     }
+    this.init();
   },
 
   onLoad() {
@@ -76,7 +76,7 @@
         }
       })
     }
-    this.init();
+
   },
   onReachBottom() {},
   onPullDownRefresh() {
@@ -114,6 +114,9 @@
       path: 'jsek_banner\\jsek_homeBannerApplet',
       fields: {
         jsek_link: []
+      },
+      coverSize: {
+        width: 400
       },
       paging: {
         start: 0,
@@ -203,8 +206,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({
@@ -270,6 +273,7 @@
     app.MG.store.getProductList(obj).then((res) => {
       res.datas.forEach((item) => {
         item.price = item.price ? item.price.toFixed(2) : item.price;
+        item.isbuy = item.purchasedSaleMethodIdList.indexOf(item.defaultSaleMethodId) > -1
       });
       this.setData({
         courseList: res.datas
@@ -399,6 +403,7 @@
     app.MG.store.getProductList(obj).then((res) => {
       res.datas.forEach((item) => {
         item.price = item.price ? item.price.toFixed(2) : item.price;
+        item.isbuy = item.purchasedSaleMethodIdList.indexOf(item.defaultSaleMethodId) > -1
       });
       this.setData({
         textbookList: res.datas
@@ -463,11 +468,6 @@
     wx.navigateTo({
       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) {
@@ -525,46 +525,54 @@
       info
     } = e.currentTarget.dataset;
     if (wx.getStorageSync(app.config.tokenKey)) {
-      let query = {
-        start: 0,
-        size: 999,
-        filterList: [],
-        searchList: []
-      }
-      try {
-        if (
-          this.data.shoppingCartGetId.includes(
-            info.defaultSaleMethodId
-          )
-        ) {
-          wx.showToast({
-            title: "璇ュ晢鍝佸凡鍦ㄨ喘鐗╄溅锛岃鍕块噸澶嶆坊鍔�",
-            icon: 'none',
-            duration: 1000
-          })
-        } else {
-          let query = {
-            requests: [{
-              saleMethodId: info.defaultSaleMethodId,
-              storeEventId: null,
-              agentCode: '鐢靛瓙涔�'
-            }]
-          }
-          const addRes = await app.MG.store.addShoppingCart(query)
-          if (addRes) {
+      if (info.isbuy) {
+        wx.showToast({
+          title: "璇ュ晢鍝佸凡璐拱",
+          icon: 'none',
+          duration: 1000
+        })
+      } else {
+        let query = {
+          start: 0,
+          size: 999,
+          filterList: [],
+          searchList: []
+        }
+        try {
+          if (
+            this.data.shoppingCartGetId.includes(
+              info.defaultSaleMethodId
+            )
+          ) {
             wx.showToast({
-              title: "娣诲姞鎴愬姛",
-              icon: 'success',
+              title: "璇ュ晢鍝佸凡鍦ㄨ喘鐗╄溅锛岃鍕块噸澶嶆坊鍔�",
+              icon: 'none',
               duration: 1000
             })
+          } else {
+            let query = {
+              requests: [{
+                saleMethodId: info.defaultSaleMethodId,
+                storeEventId: null,
+                agentCode: '鐢靛瓙涔�'
+              }]
+            }
+            const addRes = await app.MG.store.addShoppingCart(query)
+            if (addRes) {
+              wx.showToast({
+                title: "娣诲姞鎴愬姛",
+                icon: 'success',
+                duration: 1000
+              })
+            }
+            this.getShoppingCartList()
           }
-          this.getShoppingCartList()
+
+        } catch (error) {
+          console.error('鍑洪敊浜嗭細', error)
         }
-      } catch (error) {
-        console.error('鍑洪敊浜嗭細', error)
       }
     }
-
   },
   onMoreGuide(e) {
     let type = e.currentTarget.dataset.info
@@ -640,10 +648,16 @@
       success(res) {
         console.log(res);
         if (res.errMsg == "scanCode:ok" && res.path || res.result) {
-          let path = res.path || res.result
-          wx.redirectTo({
-            url: '/' + path,
-          })
+          if (res.path) {
+            let path = res.path || res.result
+            wx.redirectTo({
+              url: '/' + path,
+            })
+          } else {
+            wx.redirectTo({
+              url: '/pages/scanResult/index?result=' + res.result,
+            })
+          }
         }
       }
     })

--
Gitblit v1.9.1