123

taobao_jn/client/pages/pagegamemain/pagegamemain.js

@@ -18,9 +18,9 @@ const {
 } = tbcc.tb;
 let updateact = 1;//请求
 let gameatime = 100;//活动倒计时，100，
-const toolwarm = 10;//升温道具+温度值
+const toolwarm = 1;//升温道具+温度值
 const taskwarm = 1;//任务+温度值
-const invitewarm = 1;//邀请+温度值
+const invitewarm = 2;//邀请+温度值
 let gtoolcd = 5;//
 
 const paple1 = "cloud://F03F0071205084B1A58F9C560010C076//paple3.svga";

taobao_jn/client/pages/pagepageindex/pagepageindex.js

@@ -17,7 +17,8 @@ const {
     getAuthUserInfo,
     navigateToOutside,
     getSystemInfo,
-    checkShopFavoredStatus
+    checkShopFavoredStatus,
+    getServerTime,
 } = tbcc.tb;
 const snowSrc = "cloud://B975D7429522C2AA89E6FD651523DC57//snow.svga";
 const fireSrc = "cloud://F03F0071205084B1A58F9C560010C076//fire.svga"
@@ -203,17 +204,20 @@ Page({
             // const favoredStatus =  await checkShopFavoredStatus(3035493001).catch(err => {
             //     console.log('查询关注店铺状态失败', err);
             //   });
-            my.tb.checkShopFavoredStatus({
-                id: 3035493001,
-                success: (res) => {
-                    if (res.isFavor) {
-                        this.favoredStatus = true
-                    } else {
-                        this.favoredStatus = false;
-                    }
-
-                }
+            this.favoredStatus = await checkShopFavoredStatus(3035493001).catch(r=>{
+                console.log("关注不对劲")
             })
+            // my.tb.checkShopFavoredStatus({
+            //     id: 3035493001,
+            //     success: (res) => {
+            //         if (res.isFavor) {
+            //             this.favoredStatus = true
+            //         } else {
+            //             this.favoredStatus = false;
+            //         }
+
+            //     }
+            // })
 
             // this.judgeDoHelp();
             console.log("关注店铺", this.favoredStatus)
@@ -264,6 +268,15 @@ Page({
         }) || {};
 
         if (success) {
+            const nowTime = await getServerTime().catch(()=>{});
+            if(nowTime&&data.startTime>nowTime){
+                my.hideLoading();
+                my.showToast({
+                    content: '活动未开始',
+                    duration: 5000,
+                  });
+                return;
+            }
             this.gameConfigList = data.gameConfigList;
             // my.hideLoading();
             app.activityInfo = data;

taobao_jn/client/tbcc-sdk/lib/tb.js

@@ -117,7 +117,7 @@ export const favorShop = async sellerId => {
  * @param {number} sellerId 店铺归属的卖家Id
  * @returns {boolean} 关注状态
  */
-export const checkShopFavoredStatus = async sellerId => {
+export const checkShopFavoredStatus = async (sellerId) => {
   if (!sellerId) {
     console.error('checkShopFavoredStatus: 请传入卖家Id');
     return false;