shawenguan 1 年之前
父節點
當前提交
d8cfea570a
共有 3 個文件被更改,包括 16 次插入8 次删除
  1. 8 1
      BoxJsSub/wubian.json
  2. 3 3
      Scripts/wubian/wubianHelper.js
  3. 5 4
      Scripts/wubian/wubianSynthesis.js

+ 8 - 1
BoxJsSub/wubian.json

@@ -52,6 +52,13 @@
                     "val": "",
                     "type": "text",
                     "desc": "当前兑换活动ID"
+                },
+                {
+                    "id": "WubianActivityListData#0",
+                    "name": "当前所有活动列表",
+                    "val": "",
+                    "type": "text",
+                    "desc": "当前所有活动列表"
                 }
             ]
         },
@@ -67,7 +74,7 @@
             ],
             "keys": [
                 "WubianProToken",
-                "WubianActivityCvtGoodsList"
+                "WubianActivityGoodsList"
             ],
             "settings": [
                 {

+ 3 - 3
Scripts/wubian/wubianHelper.js

@@ -19,8 +19,8 @@ const WuBianConstKey = {
     // 基础数据
     Token: 'WubianProToken',
     ActivityListData: 'WubianActivityListData',
+    ActivityGoodsList: 'WubianActivityGoodsList',
     ActivityTaskCaptureEnabled: 'WubianActivityTaskCaptureEnabled',
-    ActivityCvtGoodsList: 'WubianActivityCvtGoodsList',
     ActivityTagName: 'WubianActivityActivityTagName',
     ActivityIndexName: 'WubianActivityIndexName',
     ActivityId: 'WubianActivityId',
@@ -320,7 +320,7 @@ function handleCvtGoodsList() {
         activityInfo.type = 1;
         magicJS.notification.appendNotifyInfo(`🎉[${activityInfo.name}]数据采集成功!`);
     }
-    let key = `${WuBianConstKey.ActivityCvtGoodsList}#${activityId}`;
+    let key = `${WuBianConstKey.ActivityGoodsList}#${activityId}`;
     magicJS.data.write(key, rspData.data);
 }
 
@@ -343,7 +343,7 @@ function handleCompositeGoodsList() {
         activityInfo.type = 0;
         magicJS.notification.appendNotifyInfo(`🎉[${activityInfo.name}]数据采集成功!`);
     }
-    let key = `${WuBianConstKey.ActivityCvtGoodsList}#${activityId}`;
+    let key = `${WuBianConstKey.ActivityGoodsList}#${activityId}`;
     magicJS.data.write(key, rspData.data);
 }
 

+ 5 - 4
Scripts/wubian/wubianSynthesis.js

@@ -10,7 +10,8 @@ const WuBianConstKey = {
     // 基础数据
     Token: 'WubianProToken',
     ActivityListData: 'WubianActivityListData',
-    ActivityCvtGoodsList: 'WubianActivityCvtGoodsList',
+    ActivityGoodsList: 'WubianActivityGoodsList',
+    ActivityTaskCaptureEnabled: 'WubianActivityTaskCaptureEnabled',
     ActivityTagName: 'WubianActivityActivityTagName',
     ActivityIndexName: 'WubianActivityIndexName',
     ActivityId: 'WubianActivityId',
@@ -207,7 +208,7 @@ async function getWillActivityData() {
         }
     }
     if (!activityData) {
-        let key = `${WuBianConstKey.ActivityCvtGoodsList}#${activityId}`;
+        let key = `${WuBianConstKey.ActivityGoodsList}#${activityId}`;
         let retCvtData = magicJS.data.read(key, null);
         if (retCvtData) {
             activityData = retCvtData.activityInfo;
@@ -402,7 +403,7 @@ async function queryActivityList(activityType, page, status = 0) {
 }
 
 async function getCvtGoodsList(activityId, noCache) {
-    let key = `${WuBianConstKey.ActivityCvtGoodsList}#${activityId}`;
+    let key = `${WuBianConstKey.ActivityGoodsList}#${activityId}`;
     let data = magicJS.data.read(key, null);
     if (!data || noCache) {
         let ret = await queryCvtGoodsList(activityId);
@@ -443,7 +444,7 @@ async function queryCvtGoodsList(activityId) {
 
 
 async function getCompositeGoodsList(activityId, noCache) {
-    let key = `${WuBianConstKey.ActivityCvtGoodsList}#${activityId}`;
+    let key = `${WuBianConstKey.ActivityGoodsList}#${activityId}`;
     let data = magicJS.data.read(key, null);
     if (!data || noCache) {
         let ret = await queryCompositeGoodsList(activityId);