shawenguan 1 gadu atpakaļ
vecāks
revīzija
a1ccba6079

+ 45 - 0
BoxJsSub/wubian.json

@@ -165,6 +165,51 @@
                     "desc": "当前合成/兑换执行此次(n次每秒)"
                 }
             ]
+        },
+        {
+            "id": "lkWubianConsignment",
+            "name": "无边一键寄售",
+            "author": "@jojo",
+            "repo": "https://git.jojo21.top/shawenguan/Quantumult-X/raw/master/Scripts/wubian/wubianConsignment.js",
+            "script": "https://git.jojo21.top/shawenguan/Quantumult-X/raw/master/Scripts/wubian/wubianConsignment.js",
+            "icons": [
+                "https://git.jojo21.top/shawenguan/Quantumult-X/raw/master/Icons/wubian.png",
+                "https://git.jojo21.top/shawenguan/Quantumult-X/raw/master/Icons/wubian.png"
+            ],
+            "keys": [
+                "WubianProToken",
+                "WubianMyCollectListData"
+            ],
+            "settings": [
+                {
+                    "id": "WubianConsignmentCaptureEnabled",
+                    "name": "开启/关闭一键寄售产品采集",
+                    "val": true,
+                    "type": "boolean",
+                    "desc": "默认开启"
+                },
+                {
+                    "id": "WubianConsignmentArtName",
+                    "name": "当前需寄售产品名称关键字",
+                    "val": "",
+                    "type": "text",
+                    "desc": "当前需寄售产品名称关键字"
+                },
+                {
+                    "id": "WubianConsignmentArtId",
+                    "name": "当前需寄售产品ID",
+                    "val": "",
+                    "type": "text",
+                    "desc": "当前需寄售产品ID"
+                },
+                {
+                    "id": "WubianConsignmentArtAmount",
+                    "name": "当前需寄售产品数量",
+                    "val": 0,
+                    "type": "number",
+                    "desc": "当前需寄售产品数量"
+                }
+            ]
         }
     ]
 }

+ 1 - 0
Scripts/wubian/wubianConsignment.js

@@ -25,6 +25,7 @@ const WuBianConstKey = {
     FirstGrabConcurrentMode: 'WubianFirstGrabConcurrentMode',
     FirstGrabRunsPerSecond: 'WubianFirstGrabRunsPerSecond',
 
+    ConsignmentCaptureEnabled: 'WubianConsignmentCaptureEnabled',
     MyCollectListData: 'WubianMyCollectListData',
     ConsignmentArtName: 'WubianConsignmentArtName',
     ConsignmentArtId: 'WubianConsignmentArtId',

+ 52 - 13
Scripts/wubian/wubianHelper.js

@@ -18,18 +18,31 @@ const WuBianConstKey = {
     // 基础数据
     UserInfo: 'WubianUserInfo',
     Token: 'WubianProToken',
+    TenantId: 'WubianTenantId',
+
     ActivityListData: 'WubianActivityListData',
     ActivityGoodsList: 'WubianActivityGoodsList',
     ActivityTaskCaptureEnabled: 'WubianActivityTaskCaptureEnabled',
     ActivityTagName: 'WubianActivityActivityTagName',
     ActivityIndexName: 'WubianActivityIndexName',
     ActivityId: 'WubianActivityId',
-    TenantId: 'WubianTenantId',
+
+    SynthesisConcurrentMode: 'WubianSynthesisConcurrentMode',
+    SynthesisRunsPerSecond: 'WubianSynthesisRunsPerSecond',
+
     FirstOrderCaptureEnabled: 'WubianFirstOrderCaptureEnabled',
     FirstArtListData: 'WubianFirstArtListData',
     FirstGoodsId: 'WubianFirstGoodsId',
     FirstGoodsName: 'WubianFirstGoodsName',
     CreateFirstOrderData: 'WubianCreateFirstOrderData',
+    FirstGrabConcurrentMode: 'WubianFirstGrabConcurrentMode',
+    FirstGrabRunsPerSecond: 'WubianFirstGrabRunsPerSecond',
+
+    ConsignmentCaptureEnabled: 'WubianConsignmentCaptureEnabled',
+    MyCollectListData: 'WubianMyCollectListData',
+    ConsignmentArtName: 'WubianConsignmentArtName',
+    ConsignmentArtId: 'WubianConsignmentArtId',
+    ConsignmentArtAmount: 'WubianConsignmentArtAmount',
 };
 
 const gUserAgent = `Mozilla/5.0 (iPhone; CPU iPhone OS 16_6_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Html5Plus/1.0 (Immersed/20) uni-app`;
@@ -406,6 +419,11 @@ function isFirstOrderCaptureEnabled() {
     return isEnabled;
 }
 
+function isConsignmentCaptureEnabled() {
+    let isEnabled = magicJS.data.read(WuBianConstKey.ConsignmentCaptureEnabled, true);
+    return isEnabled;
+}
+
 function handleCvtGoodsList() {
     let rspData = getResponsePlainData();
     if (!rspData) {
@@ -422,7 +440,7 @@ function handleCvtGoodsList() {
         activityId = activityInfo.activityId;
         magicJS.data.write(WuBianConstKey.ActivityId, activityId);
         activityInfo.type = 1;
-        magicJS.notification.appendNotifyInfo(`🎉[${activityInfo.name}]数据采集成功!`);
+        magicJS.notification.appendNotifyInfo(`🎉[${activityInfo.name}]兑换数据采集成功!`);
     }
     let key = `${WuBianConstKey.ActivityGoodsList}#${activityId}`;
     magicJS.data.write(key, rspData.data);
@@ -445,7 +463,7 @@ function handleCompositeGoodsList() {
         activityId = activityInfo.activityId;
         magicJS.data.write(WuBianConstKey.ActivityId, activityId);
         activityInfo.type = 0;
-        magicJS.notification.appendNotifyInfo(`🎉[${activityInfo.name}]数据采集成功!`);
+        magicJS.notification.appendNotifyInfo(`🎉[${activityInfo.name}]合成数据采集成功!`);
     }
     let key = `${WuBianConstKey.ActivityGoodsList}#${activityId}`;
     magicJS.data.write(key, rspData.data);
@@ -524,6 +542,10 @@ function handleFirstArtList() {
     // }
     // rspData = result;
     let artDataDict = magicJS.data.read(WuBianConstKey.FirstArtListData, {});
+    let reqData = getRequestPlainData();
+    if (reqData && reqData.page == 1) {
+        artDataDict = {};
+    }
     let artList = rspData.data.list;
     for (let item of artList) {
         const artId = item.artId;
@@ -547,6 +569,16 @@ function getFirstArtName(artId) {
     return `${artId}`;
 }
 
+function checkIsValidFirstArt(artId) {
+    let artData = getFirstArtData(artId);
+    if (artData) {
+        if (artData.status == 1) {
+            return true;
+        }
+    }
+    return false;
+}
+
 
 function handleGoodsInfo() {
     let rspData = getResponsePlainData();
@@ -630,6 +662,9 @@ function handleGoodsInfo() {
     }
     */
     let artInfo = rspData.data.info;
+    if (isisConsignmentCaptureEnabled()) {
+
+    }
     let authorInfo = rspData.data.author;
     let paymentInfo = rspData.data.paymentInfo;
     if (typeof paymentInfo.saleMinPrice == 'string' && paymentInfo.saleMinPrice.length == 0) {
@@ -784,15 +819,19 @@ function handleFirstArtInfo() {
     let authorInfo = rspData.data.authorInfo;
     let payInfo = rspData.data.payInfo;
 
-    if (isFirstOrderCaptureEnabled()) {
-        magicJS.data.write(WuBianConstKey.CreateFirstOrderData, {
-            title: artInfo.title,
-            artId: artInfo.artId,
-            price: artInfo.price,
-            num: payInfo.limited,
-        });
-        magicJS.data.write(WuBianConstKey.FirstGoodsId, artInfo.artId);
-        magicJS.notification.appendNotifyInfo(`🎉产品[${artInfo.title}]数据采集成功!`);
+    if (checkIsValidFirstArt(artInfo.artId)) {
+        if (isFirstOrderCaptureEnabled()) {
+            magicJS.data.write(WuBianConstKey.CreateFirstOrderData, {
+                title: artInfo.title,
+                artId: artInfo.artId,
+                price: artInfo.price,
+                num: payInfo.limited,
+            });
+            magicJS.data.write(WuBianConstKey.FirstGoodsId, artInfo.artId);
+            magicJS.notification.appendNotifyInfo(`🎉产品[${artInfo.title}]首发数据采集成功!`);
+        }
+    } else {
+
     }
 
     artInfo.title = `${artInfo.title}(流通:${artInfo.circulationNum})`;
@@ -834,7 +873,7 @@ function handleCreateFirstOrder() {
             num: reqData.num,
         });
         magicJS.data.write(WuBianConstKey.FirstGoodsId, reqData.artHashId);
-        magicJS.notification.appendNotifyInfo(`🎉产品[${getFirstArtName(reqData.artHashId)}]数据采集成功!`);
+        magicJS.notification.appendNotifyInfo(`🎉产品[${getFirstArtName(reqData.artHashId)}]首发数据采集成功!`);
     }
 }