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

2696c67b · 俞嘉婷 · a846476f · 51528ea3 · 2696c67b · 2696c67b
Commit 2696c67b authored Jul 15, 2025 by 俞嘉婷
Showing with 25 additions and 10 deletions

index.html dist/index.html +6 -6

index.ts mock/index.ts +3 -2

index.ts src/api/index.ts +1 -1

ResPage.module.less src/pages/ResPage/ResPage.module.less +9 -0

ResPage.tsx src/pages/ResPage/ResPage.tsx +6 -1

No files found.
--- a/dist/index.html
+++ b/dist/index.html
@@ -46,10 +46,10 @@
      // alert("【警告】检测到活动url中没有appID参数\n缺少该参数会导致埋点、分享、app信息获取错误。")
    }
  </script>
-  <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1752564413015/assets/index-Br4MAZYL.js"></script>
-  <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1752564413015/assets/vendor-pyrxJLW_.js">
-  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1752564413015/assets/vendor-BQh5NVNk.css">
-  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1752564413015/assets/index-S-sJ21vf.css">
+  <script type="module" crossorigin src="https://yun.duiba.com.cn/db_games/spark/v3/1752573276972/assets/index-COaUeq91.js"></script>
+  <link rel="modulepreload" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1752573276972/assets/vendor-pyrxJLW_.js">
+  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1752573276972/assets/vendor-BQh5NVNk.css">
+  <link rel="stylesheet" crossorigin href="https://yun.duiba.com.cn/db_games/spark/v3/1752573276972/assets/index-Cj1ku7Mt.css">
  <script type="module">import.meta.url;import("_").catch(()=>1);(async function*(){})().next();if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
  <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 </head>
@@ -57,8 +57,8 @@
 <body>
  <div id="root"></div>
  <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1752564413015/assets/polyfills-legacy-D0AVcSo7.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1752564413015/assets/index-legacy-kdiNVcby.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="https://yun.duiba.com.cn/db_games/spark/v3/1752573276972/assets/polyfills-legacy-D0AVcSo7.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="https://yun.duiba.com.cn/db_games/spark/v3/1752573276972/assets/index-legacy-CxVLUZ6C.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
 </body>

 </html>

--- a/mock/index.ts
+++ b/mock/index.ts
@@ -59,7 +59,7 @@ export default [
    },
  },
  {
-    url: '/records.do',
+    url: '/draw/myRucksack.do',
    response: ({ query }) => {
      return {
        "code": "code",
@@ -73,7 +73,8 @@ export default [
              "icon": "//yun.dui88.com/images/201907/tua0um9jjp.jpg",
              "refType": "coupon",
              "refId": "49354",
-              "type": 2
+              "type": 2,
+              "receiveStatus": true,
            },
            "strategyId": 11,
            "gmtCreate": 1565213353000,

--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -21,7 +21,7 @@ const API = generateAPI({
  },

  // 奖品记录
-  records: "records.query",
+  records: "draw/myRucksack.do",
  // 红包补领
  redpacket: "common/moneyReissue.do",


--- a/src/pages/ResPage/ResPage.module.less
+++ b/src/pages/ResPage/ResPage.module.less
@@ -187,6 +187,15 @@
        .webpBg("ResPage/去查看.png");
      }

+      .itemBtnEd {
+        position: absolute;
+        left: 530px;
+        top: 37px;
+        width: 157px;
+        height: 64px;
+        .webpBg("ResPage/已使用.png");
+      }
+
    }

  }

--- a/src/pages/ResPage/ResPage.tsx
+++ b/src/pages/ResPage/ResPage.tsx
@@ -81,7 +81,12 @@ class ResPage extends React.Component<any, any> {
                                    <img className={styles.itemImg} src={item.extra.icon}/>
                                    <div className={styles.itemName}>{item.extra.name}</div>
                                    <div className={styles.itemDate}>{dateFormatter(item.gmtCreate, "yyyy-MM-dd hh:mm:ss 获得")}</div>
-                                    <Button className={styles.itemBtn} onClick={() => this.clickItem(item)}/>
+                                    {
+                                        item.extra.receiveStatus == 1
+                                            ? <Button className={styles.itemBtnEd}/>
+                                            : <Button className={styles.itemBtn} onClick={() => this.clickItem(item)}/>
+                                    }
+
                                </div>
                            })}
                        </div>