Merge branch 'master' of gitlab2.dui88.com:sparkprojects/20250310_RBSpringOuting

ac2e58ee · 徐士卿 · 29bea5dd · a38ccaa1 · ac2e58ee · ac2e58ee
Commit ac2e58ee authored Mar 14, 2025 by 徐士卿
6 changed files
--- a/dist/index.html
+++ b/dist/index.html
+<!doctype html><html lang="zh"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="dns-prefetch" href="//yun.duiba.com.cn"/><link rel="preconnect" href="//embedlog.duiba.com.cn"><title>人保春游记</title><script>if (localStorage && localStorage.isWebp) {
+            document
+                .getElementsByTagName('html')[0]
+                .setAttribute('duiba-webp', 'true');
+        }</script><script src="//res.wx.qq.com/open/js/jweixin-1.6.0.js"></script><script src="//yun.duiba.com.cn/spark/v2/spark.base.fz.wxpollyfill.js"></script><script src="//yun.duiba.com.cn/js-libs/rem/1.1.3/rem.min.js"></script><script src="//yun.duiba.com.cn/h5/lib/zepto.min.js"></script><script src="https://m.picclife.cn/Life-H5/html/clause/PICCLifeJsBrage.js"></script><script>"use strict";
+var CFG = CFG || {};
+CFG.projectId = location.pathname.split('/')[2] || '1';
+function getUrlParam(name) {
+  var search = window.location.search;
+  var matched = search.slice(1).match(new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i'));
+  return search.length ? matched && matched[2] : null;
+}
+CFG.operationId = '6130';
+CFG.appID = "${APPID}";
+CFG.domain = location.origin;
+// 首页
+CFG.indexUrl = "/projectx/" + CFG.projectId + "/index.html?appID=" + getUrlParam("appID");
+// 普通分享落地页
+CFG.shareUrl = "/projectx/" + CFG.projectId + "/sharepage.html?appID=" + getUrlParam("appID");
+// CFG.shareUrl = '/projectx/' + CFG.projectId + '/share.html?appKey=4AoRyTuR6XNfjNa4w5exe1bPmqDS&openBs=openbs&appID=' + CFG.appID;
+// 普通分享落地页
+// CFG.fireShareUrl = "/projectx/" + CFG.projectId + "/firesharepage.html?appID=" + getUrlParam("appID");
+// 我的奖品页
+CFG.prizeUrl = "/projectx/" + CFG.projectId + "/prize.html?appID=" + getUrlParam("appID");
+// 作品详情页
+CFG.workPage = "/projectx/" + CFG.projectId + "/workPage.html?appID=" + getUrlParam("appID");
+//actPlatforms
+CFG.actPlatforms = getUrlParam("actPlatforms") || "";
+//actPlatforms
+CFG.agentCode = getUrlParam("agentCode") || "";
+//actPlatforms
+CFG.actId = getUrlParam("actId") || "";
+// 特殊的业务员code
+CFG.spcCode = getUrlParam("code") || "";
+// 业务员code
+CFG.workerCode = getUrlParam("ykCode") || CFG.spcCode;
+// 渠道 1-9
+CFG.channel = getUrlParam("channel") || "2";
+// 默认渠道 除了友客渠道，其他统一按照2处理
+// CFG.defaultChannel = CFG.channel == 5 ? 5 : CFG.channel == 3 ? 3 : 2;
+CFG.defaultChannel = CFG.channel || "2";
+// 助力参数
+CFG.inviteCode = getUrlParam("inviteCode");
+// 微信授权链接
+CFG.indexLogin = "/wechat/access?apk=4AoRyTuR6XNfjNa4w5exe1bPmqDS&dbredirect=";
+// 奖品页唤端链接
+CFG.toAppPrizeUrl = "https://lifeapp.picclife.cn/portal/app_manager/downloadapps.html?operate_link=https%3A%2F%2Flifeapp-api.picclife.cn%2Flifeapi%2Flifeapp-svc-gw%2Fapi%2Fauth_code%2Fauthorize%2Fv1%3Factivity_code%3D612102%26redirect_type%3D0%26redirect_uri%3Dhttps%3A%2F%2F96094.activity-19.m.duiba.com.cn%2FcustomShare%2Fshare%3Fid%3DDid1NTgxOTk&isBindManager=1&isNeedAuth=1";
+CFG.sensorUrl = "https://mdglfxpt.piccgroup.cn:18443/sa?project=picclife_consumer";
+//代理人仅分享渠道
+CFG.agentShare = getUrlParam("agentShare") || 0;
+// 环境，test测试,prod生产 todo
+CFG.env = "prod"; //注意sdk 也分环境！
+if (CFG.env == "test") {
+  // 测试
+  // eslint-disable-next-line @spark/best-practices/no-url-in-js
+  CFG.sensorUrl = "https://mdglfxpt-test.piccgroup.cn:18443/sa?project=picclife_consumer";
+  CFG.toAppPrizeUrl = "https://lifeapp-test.picclife.cn/portal-web/app_manager/downloadapps.html?operate_link=https%3A%2F%2Flifeapp-api-test.picclife.cn%2Flifeapi%2Flifeapp-svc-rel-gw%2Fapi%2Fauth_code%2Fauthorize%2Fv1%3Factivity_code%3D612102%26redirect_type%3D0%26redirect_uri%3Dhttps%253A%252F%252F96094.activity-19.m.duiba.com.cn%252FcustomShare%252Fshare%253Fid%253DDid1NTgxNTE&isBindManager=1&isNeedAuth=1";
+}
+if (!getUrlParam("appID")) {
+  // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
+}</script><link href="//yun.duiba.com.cn/spark/v2/temp_base/1741937606230/styles/vendors.d1a8e42332fb08181e02.css" rel="stylesheet"><link href="//yun.duiba.com.cn/spark/v2/temp_base/1741937606230/styles/main.d1a8e42332fb08181e02.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>"use strict";
+CFG.___G___ = 'master%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250310_RBSpringOuting.git%20(fetch)%3Borigin%09git%40gitlab2.dui88.com%3Asparkprojects%2F20250310_RBSpringOuting.git%20(push)%3Byujiating%3B';</script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1741937606230/js/runtime-main.2a25d833.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1741937606230/js/vendors.bc2b1502.js" crossorigin="anonymous"></script><script src="//yun.duiba.com.cn/spark/v2/temp_base/1741937606230/js/main.36950c8a.js" crossorigin="anonymous"></script></body></html>
\ No newline at end of file
--- a/loc.json
+++ b/loc.json
 {"numOfComponents":5048,"numOfProject":4157}
\ No newline at end of file
--- a/src/components/taskpop/taskpop.jsx
+++ b/src/components/taskpop/taskpop.jsx
@@ -121,9 +121,9 @@ class Taskpop extends React.Component {
      button_name: "返回按钮",
    });
+    this.props.popData?.onClose && this.props.popData.onClose();
    modalStore.closePop("Taskpop");
    // store.getHomeInfo()
-    this.props.popData?.onClose && this.props.popData.onClose();
  })

--- a/src/pages/drawpage/drawpage.jsx
+++ b/src/pages/drawpage/drawpage.jsx
@@ -80,7 +80,7 @@ class Drawpage extends React.Component {
      this.drawResultInfo = data || {}
      // 转盘停止转动，指针停在index
-      const index = prizeVOs?.findIndex(item => item.prizeId === this.drawResultInfo.prizeId)
+      const index = prizeVOs?.findIndex(item => item.prizeId === (this.drawResultInfo.prizeId || 'thanks'))
      console.info('index', index)
      this.turntableRef.braking(index);
    } else {
@@ -138,10 +138,7 @@ class Drawpage extends React.Component {
            // 渲染奖品信息
            renderOption={(option) => {
              return <div className="prize_item">
-                {option.prizeName?.length > 6
+                <div className="prize_name">{option.prizeName}</div>
-                  ? <div className="prize_name long">{option.prizeName.slice(0, 6)}...</div>
-                  : <div className="prize_name">{option.prizeName}</div>
-                }
                <img className="prize_img"
                  src={option.prizeImg}
                  alt="" />

--- a/src/pages/drawpage/drawpage.less
+++ b/src/pages/drawpage/drawpage.less
@@ -136,20 +136,14 @@
      width: 190px;
      height: 150px;
      color: rgba(248, 103, 89, 1);
-      font-size: 22px;
+      font-size: 28px;
-      padding-left: 16px;
      box-sizing: border-box;
      text-align: center;
      .prize_name {
        width: 100%;
-        &.long {
-          padding-left: 10px;
-          // .lineClamp1();
-        }
        font-weight: bold;
+        .lineClamp1();
      }
      .prize_img {

--- a/src/pages/userhomepage/userhomepage.jsx
+++ b/src/pages/userhomepage/userhomepage.jsx
@@ -202,7 +202,7 @@ class Userhomepage extends React.Component {
                    return <Swiper.Item key={index} className={`prizeItem prizeBg${bgId}`}>
                      <img src={item.image} />
                      <div className="prizeName">{item.name}</div>
-                      <div className="prizeRank">{item.ranking}</div>
+                      <div className="prizeRank">第{item.ranking}名</div>
                    </Swiper.Item>;
                  }
                )}