Merge remote-tracking branch 'origin/master'

index.html

@@ -89,8 +89,8 @@
     //代理人仅分享渠道
     CFG.agentShare = getUrlParam("agentShare") || 0;
     
-    // 环境，test测试,prod生产 TIAN_TODO
-    CFG.env = "test"; //注意sdk 也分环境！
+    // 环境，test测试,prod 生产 TIAN_TODO
+    CFG.env = "prod"; //注意sdk 也分环境！
     if (CFG.env == "test") {
       // 测试
       // eslint-disable-next-line @spark/best-practices/no-url-in-js

src/components/prizepop/prizepop.jsx

@@ -15,18 +15,18 @@ class Prizepop extends React.Component {
     super(props);
   }
   componentDidMount(){
-    pageView("b14281", {
+    pageView("b14282", {
       page_name: "抽中中奖弹窗",
     });
 
-    sensorLog(LOG_KEY.exposure, "b14281", "d14283", {
+    sensorLog(LOG_KEY.exposure, "b14282", "d14283", {
         page_name: "抽中中奖弹窗",
         button_name: "开心收下按钮",
     });
   }
 
   handleReceive = _asyncThrottle(() => {
-    sensorLog(LOG_KEY.click, "b14281", "d14283", {
+    sensorLog(LOG_KEY.click, "b14282", "d14283", {
         page_name: "抽中中奖弹窗",
         button_name: "开心收下按钮",
     });

src/components/settlechance/settlechance.jsx

@@ -11,6 +11,7 @@ import { SvgaPlayer } from "@grace/svgaplayer";
 
 import lightSvga from "../../assets/svga/6输出弹窗.svga";
 import Capsulepage from "../../pages/CapsulePage/CapsulePage";
+import { LOG_KEY, MatterShareOpt, MatterViewDuration, MatterViewOpt, pageView, sensorLog } from "../../utils/sensors.js";
 import HomePage from "../../pages/HomePage/HomePage";
 @observer
 class Settlechance extends React.Component {

src/pages/HomePage/HomePage.less

@@ -16,7 +16,7 @@
     left: 0px;
     top: 0px;
     position: absolute;
-    .sparkBg("homePage/bg.png");
+    .sparkBg("HomePage/bg.png");
   }
 
   .equipment {
@@ -25,7 +25,7 @@
     left: 60px;
     top: 499px;
     position: absolute;
-    .sparkBg("homePage/equipment.png");
+    .sparkBg("HomePage/equipment.png");
   }
 
   .icon {
@@ -34,7 +34,7 @@
     left: 400px;
     top: 987px;
     position: absolute;
-    .sparkBg("homePage/icon.png");
+    .sparkBg("HomePage/icon.png");
   }
 
   .book {
@@ -43,7 +43,7 @@
     left: 60px;
     top: 1192px;
     position: absolute;
-    .sparkBg("homePage/book.png");
+    .sparkBg("HomePage/book.png");
   }
 
   .brain {
@@ -52,7 +52,7 @@
     left: 179px;
     top: 573px;
     position: absolute;
-    .sparkBg("homePage/brain.png");
+    .sparkBg("HomePage/brain.png");
   }
 
   .wenhao {
@@ -61,7 +61,7 @@
     left: 326px;
     top: 644px;
     position: absolute;
-    .sparkBg("homePage/wenhao.png");
+    .sparkBg("HomePage/wenhao.png");
   }
 
   .title {
@@ -70,7 +70,7 @@
     left: 29px;
     top: 131px;
     position: absolute;
-    .sparkBg("homePage/title.png");
+    .sparkBg("HomePage/title.png");
   }
 
   .draw {
@@ -79,7 +79,7 @@
     left: 5px;
     top: 1344px;
     position: absolute;
-    .sparkBg("homePage/draw.png");
+    .sparkBg("HomePage/draw.png");
   }
 
   .task {
@@ -88,7 +88,7 @@
     left: 591px;
     top: 1344px;
     position: absolute;
-    .sparkBg("homePage/task.png");
+    .sparkBg("HomePage/task.png");
   }
 
   .matter {
@@ -104,7 +104,7 @@
       left: 0px;
       top: 0px;
       position: absolute;
-      .sparkBg("homePage/m_bg.png");
+      .sparkBg("HomePage/m_bg.png");
     }
 
     .answer {
@@ -113,7 +113,7 @@
       left: 109px;
       top: 32px;
       position: absolute;
-      .sparkBg("homePage/answer.png");
+      .sparkBg("HomePage/answer.png");
     }
 
     .remain {
@@ -143,7 +143,7 @@
       left: 0px;
       top: 0px;
       position: absolute;
-      .sparkBg("homePage/r_bg.png");
+      .sparkBg("HomePage/r_bg.png");
     }
 
     .name {
@@ -153,10 +153,11 @@
       top: 67px;
       position: absolute;
       // font-size: 30px;
-      font-size: 28px;
+      font-size: 27px;
       line-height: 33px;
       color: rgba(30, 76, 169, 1);
-      .lineClamp1();
+      white-space: nowrap;
+      // .lineClamp1();
     }
 
     .head {
@@ -165,7 +166,7 @@
       left: 37px;
       top: 34px;
       position: absolute;
-      // .sparkBg("homePage/head.png");
+      // .sparkBg("HomePage/head.png");
       border-radius: 15px;
     }
 
@@ -175,7 +176,7 @@
       left: 477px;
       top: 103px;
       position: absolute;
-      .sparkBg("homePage/myRank.png");
+      .sparkBg("HomePage/myRank.png");
 
       -webkit-user-select: none;
       user-select: none;
@@ -203,7 +204,7 @@
     left: 636px;
     top: 510px;
     position: absolute;
-    .sparkBg("homePage/prize.png");
+    .sparkBg("HomePage/prize.png");
   }
 
   .rule {
@@ -212,7 +213,7 @@
     left: 0px;
     top: 510px;
     position: absolute;
-    .sparkBg("homePage/rule.png");
+    .sparkBg("HomePage/rule.png");
   }
 
   .visit {
@@ -221,7 +222,7 @@
     left: 566px;
     top: 616px;
     position: absolute;
-    .sparkBg("homePage/visit.png");
+    .sparkBg("HomePage/visit.png");
   }
 
   .share {
@@ -230,7 +231,7 @@
     left: 552px;
     top: 817px;
     position: absolute;
-    .sparkBg("homePage/share.png");
+    .sparkBg("HomePage/share.png");
   }
 
   .logo {
@@ -239,7 +240,7 @@
     left: 232px;
     top: 85px;
     position: absolute;
-    .sparkBg("homePage/logo.png");
+    .sparkBg("HomePage/logo.png");
   }
 
   .musicBtn {

src/pages/HomePage/HomePage.tsx

@@ -22,24 +22,29 @@ import gameStore from "@/store/gameStore.ts";
 import GamePage from "@/pages/GamePage/GamePage.tsx";
 import MusicBtn from '@/core/components/MusicBtn/MusicBtn.tsx';
 import { onInitShare } from '@/utils/share.ts';
-
+const startTime = +new Date()
 @observer
 class Homepage extends React.Component {
   constructor(props) {
     super(props);
-
     this.handleButtonClick = this.handleButtonClick.bind(this);
   }
 
   async componentDidMount() {
-    if (isWeiXin()) {
-      if (!await store.checkBindStatus()) return;
-    }
+    // if (isWeiXin()) {
+    //   if (!await store.checkBindStatus()) return;
+    // }
     await shareStore.doAssist();
     await store.updateIndex();
     this.initSensor();
   }
-
+  componentWillUnmount() {
+    if (CFG.channel == CHANNEL_PARAMS.YK_MINI || CFG.channel == CHANNEL_PARAMS.YK_PUBLIC) {
+      MatterViewDuration("b14268", +new Date() - startTime, {
+        page_name: "友客首页",
+      });
+    }
+  }
   handleButtonClick = _asyncThrottle(async (number) => {
     // 活动时间判断
     // 规则 奖品始终可以点击 我的排名结束可以点击 其余常规逻辑
@@ -121,7 +126,7 @@ class Homepage extends React.Component {
       // 6 拜访清单
       case 6:
         // TODO
-        sensorLog(LOG_KEY.click, "b14268", "d14268", {
+        sensorLog(LOG_KEY.click, "b14268", "d14269", {
           page_name: "友客首页",
           button_name: "拜访清单按钮",
         });

src/pages/agentSharepage/sharepage.jsx

@@ -22,7 +22,6 @@ class AgentSharepage extends React.Component {
     }
     this.startTime = +new Date();
     this.shareRef = null;
-    this.startTime = +new Date();
   }
 
   async componentDidMount() {
@@ -49,6 +48,9 @@ class AgentSharepage extends React.Component {
   }
 
   componentWillUnmount() {
+    MatterViewDuration("b14316", +new Date() - this.startTime, {
+      page_name: "落地页",
+    });
 
   }
 
@@ -74,7 +76,7 @@ class AgentSharepage extends React.Component {
   }
 
   handleShareAct = _throttle(() => {
-    MatterShareOpt("b14316", "d14327", {
+    MatterShareOpt("b14316", "d14317", {
       button_name: "分享活动按钮",
       page_name: "落地页",
     })

src/pages/sharepage/sharepage.jsx

@@ -56,6 +56,9 @@ class Sharepage extends React.Component {
   }
 
   componentWillUnmount() {
+    MatterViewDuration("b14316", +new Date() - this.startTime, {
+      page_name: "落地页",
+    });
 
   }
 
@@ -105,9 +108,9 @@ class Sharepage extends React.Component {
       `${!!CFG.workerCode ? `&ykCode=${CFG.workerCode}` : ""}` +
       `&agentCode=${CFG.agentCode || ""}&actPlatforms=${CFG.actPlatforms || ""}&actId=${CFG.actId || ""}`;
     // alert(url)
-    // MatterViewDuration("b13548", +new Date() - this.startTime, {
-    //   page_name: "非遗-落地页",
-    // });
+    MatterViewDuration("b14316", +new Date() - this.startTime, {
+      page_name: "落地页",
+    });
     setTimeout(() => {
       location.href = url;
     }, 500)

src/panels/taskpop/taskpop.jsx

@@ -71,13 +71,18 @@ class Taskpop extends React.Component {
   /** 去完成 */
   taskDoHandle = _asyncThrottle(async (item) => {
     const {taskStatus, code} = item || {};
-    // if(code == TASK_CODE.INVITE){
-    //   MatterShareOpt(LOG_KEY.click,"b7870","d8729")
-    // }
-    sensorLog(LOG_KEY.click, "b14312", "d14313", {
-      page_name: "做任务，赚次数弹窗",
-      button_name: "去完成按钮",
-    });
+    if(code == TASK_CODE.INVITE){
+      MatterShareOpt("b14312", "d14313", {
+        button_name: "做任务，赚次数弹窗",
+        page_name: "去完成按钮",
+      })
+    }else{
+
+      sensorLog(LOG_KEY.click, "b14312", "d14313", {
+        page_name: "做任务，赚次数弹窗",
+        button_name: "去完成按钮",
+      });
+    }
     await taskStore.doTask(item);
   })