update

v2.0/dist/config/index.js

@@ -6,7 +6,8 @@ var online_1 = require("./online");
 var test_1 = require("./test");
 var configs = {
     online: online_1.default,
-    test: test_1.default
+    test: test_1.default,
+    mock: test_1.default
 };
 exports.getConfig = function (context) {
     var env = context.env;

v2.0/dist/config/index.js.map

-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";AAAA,cAAc;;;AAEd,mCAA6B;AAC7B,+BAAyB;AAMzB,IAAM,OAAO,GAAG;IACd,MAAM,kBAAA;IACN,IAAI,gBAAA;CACL,CAAA;AAEY,QAAA,SAAS,GAAG,UAAC,OAAgB;IACxC,IAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;IACvB,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAA;AACrC,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":";AAAA,cAAc;;;AAEd,mCAA6B;AAC7B,+BAAyB;AAMzB,IAAM,OAAO,GAAG;IACd,MAAM,kBAAA;IACN,IAAI,gBAAA;IACJ,IAAI,EAAE,cAAI;CACX,CAAA;AAEY,QAAA,SAAS,GAAG,UAAC,OAAgB;IACxC,IAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;IACvB,OAAO,OAAO,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAA;AACrC,CAAC,CAAA"}
\ No newline at end of file

v2.0/dist/config/online.js

 "use strict";
 /** @format */
 Object.defineProperty(exports, "__esModule", { value: true });
+var appId = '消费端ID';
 exports.default = {
-    VIP_CALLBACK_URL: 'testUrl'
+    VIP_CALLBACK_URL: "https://m.duanqu.com/?_ariver_appid=" + appId
 };
 //# sourceMappingURL=online.js.map
\ No newline at end of file

v2.0/dist/config/online.js.map

-{"version":3,"file":"online.js","sourceRoot":"","sources":["../../src/config/online.ts"],"names":[],"mappings":";AAAA,cAAc;;AAEd,kBAAe;IACb,gBAAgB,EAAE,SAAS;CAC5B,CAAA"}
+{"version":3,"file":"online.js","sourceRoot":"","sources":["../../src/config/online.ts"],"names":[],"mappings":";AAAA,cAAc;;AAEd,IAAM,KAAK,GAAG,OAAO,CAAA;AAErB,kBAAe;IACb,gBAAgB,EAAE,yCAAuC,KAAO;CACjE,CAAA"}
\ No newline at end of file

v2.0/dist/config/test.js

@@ -2,6 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 /** @format */
 exports.default = {
-    VIP_CALLBACK_URL: 'onlineUrl'
+    VIP_CALLBACK_URL: 'testUrl'
 };
 //# sourceMappingURL=test.js.map
\ No newline at end of file

v2.0/dist/config/test.js.map

-{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/config/test.ts"],"names":[],"mappings":";;AAAA,cAAc;AACd,kBAAe;IACb,gBAAgB,EAAE,WAAW;CAC9B,CAAA"}
+{"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/config/test.ts"],"names":[],"mappings":";;AAAA,cAAc;AACd,kBAAe;IACb,gBAAgB,EAAE,SAAS;CAC5B,CAAA"}
\ No newline at end of file

v2.0/dist/controller/task.controller.js

@@ -67,7 +67,7 @@ var Task = /** @class */ (function () {
         var userInfo = _a.userInfo, vipInfo = _a.vipInfo, activityInfo = _a.activityInfo, session = _a.session;
         var taskService = _b[0];
         return __awaiter(this, void 0, void 0, function () {
-            var tasks, updatedUserInfo, _c, _d, _e, _f, vipTask, followTask;
+            var tasks, updatedUserInfo, _c, _d, _e, _f, vipTask, followTask, browseGoodsTask;
             return __generator(this, function (_g) {
                 switch (_g.label) {
                     case 0:
@@ -85,15 +85,12 @@ var Task = /** @class */ (function () {
                         updatedUserInfo = _g.sent();
                         vipTask = taskService.initVipTask(updatedUserInfo, vipInfo, tasks);
                         followTask = taskService.initFollowTask(updatedUserInfo, tasks);
-                        // // 下单任务
-                        // const orderGoodsTask = taskService.initOrderGoodsTask(updatedUserInfo, tasks)
-                        // // 浏览商品任务
-                        // const browseGoodsTask = taskService.initBrowseGoodsTask(updatedUserInfo, tasks)
+                        browseGoodsTask = taskService.initBrowseGoodsTask(updatedUserInfo, tasks);
                         // // 邀请任务
                         // const invitesTask = taskService.initInvitesTask(updatedUserInfo, tasks)
                         // 积分兑换
                         //const exchangeCreditsTask = taskService.initExchangeCreditsTask(updatedUserInfo, tasks)
-                        return [2 /*return*/, sdk_1.resultsModel.success([vipTask, followTask])];
+                        return [2 /*return*/, sdk_1.resultsModel.success([vipTask, followTask, browseGoodsTask])];
                 }
             });
         });
@@ -131,15 +128,15 @@ var Task = /** @class */ (function () {
         var userInfo = _a.userInfo, activityInfo = _a.activityInfo, session = _a.session;
         var userService = _b[0], taskService = _b[1];
         return __awaiter(this, void 0, void 0, function () {
-            var openId, credits, _id, taskInfo, taskType, _c, value, times, taskRateType, today, todayTimes, myCredits, result;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
+            var openId, credits, _id, _c, taskInfo, taskType, _d, value, times, taskRateType, today, todayTimes, myCredits, result;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         openId = context.openId;
                         credits = context.data.credits;
-                        _id = userInfo._id, taskInfo = userInfo.taskInfo;
+                        _id = userInfo._id, _c = userInfo.taskInfo, taskInfo = _c === void 0 ? {} : _c;
                         taskType = "exchangeCredits";
-                        _c = activityInfo.tasks.exchangeCredits, value = _c.value, times = _c.times, taskRateType = _c.taskRateType;
+                        _d = activityInfo.tasks.exchangeCredits, value = _d.value, times = _d.times, taskRateType = _d.taskRateType;
                         today = utils_1.getToday();
                         todayTimes = taskService.getTodayCompleteTask(taskType, userInfo).todayTimes;
                         // 如果每日限制次数并到达了限制次数
@@ -148,7 +145,7 @@ var Task = /** @class */ (function () {
                         }
                         return [4 /*yield*/, sdk_1.TBAPIS.queryCredits(context, session)];
                     case 1:
-                        myCredits = _d.sent();
+                        myCredits = _e.sent();
                         console.log('myCredits', myCredits);
                         // 积分不足
                         if (myCredits < credits)
@@ -162,7 +159,7 @@ var Task = /** @class */ (function () {
                                 remark: "\u79EF\u5206\u5151\u6362\u4EFB\u52A1\u51CF\u79EF\u5206"
                             })];
                     case 2:
-                        result = _d.sent();
+                        result = _e.sent();
                         if (!result)
                             return [2 /*return*/, sdk_1.resultsModel.error(constants_1.CODE_TYPES.SYSTEM_ERROR)
                                 // 更新user表
@@ -171,7 +168,7 @@ var Task = /** @class */ (function () {
                         return [4 /*yield*/, taskService.updateUserTaskRecord(taskType, value, userInfo)];
                     case 3:
                         // 更新user表
-                        _d.sent();
+                        _e.sent();
                         return [2 /*return*/, sdk_1.resultsModel.success(true)];
                 }
             });

v2.0/dist/controller/task.controller.js.map

-{"version":3,"file":"task.controller.js","sourceRoot":"","sources":["../../src/controller/task.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task.controller.js","sourceRoot":"","sources":["../../src/controller/task.controller.ts"],"names":[],"mappings":";AAAA,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEd,4CAA2D;AAC3D,0CAA2F;AAE3F,8BAA6C;AAC7C,kCAAqD;AACrD,sCAAkE;AAElE,IAAI;AACJ,8BAA8B;AAC9B,cAAc;AACd,+CAA+C;AAC/C,MAAM;AACN,IAAI;AACJ;IAAA;IA+JA,CAAC;IA9JC;;OAEG;IAKG,0BAAW,GAAjB,UACE,OAAgB,EAChB,EAA8D,EAC9D,EAA4B;YAD1B,QAAQ,cAAA,EAAE,OAAO,aAAA,EAAE,YAAY,kBAAA,EAAE,OAAO,aAAA;YACzC,WAAW,QAAA;;;;;;wBAEJ,KAAK,GAAK,YAAY,MAAjB,CAAiB;wBAGF,KAAA,CAAA,KAAA,WAAW,CAAA,CAAC,WAAW,CAAA;8BAAC,QAAQ,CAAC,GAAG;8BAC9D,WAAW,CAAC,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC;wBACzD,qBAAM,WAAW,CAAC,oBAAoB,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,EAAA;4BAF5C,qBAAM;gCAE1B,SAAgE;iCAChE;wBAEF,OAAO;sBAFL;;wBAHE,eAAe,GAAG,SAGpB;wBAGI,OAAO,GAAG,WAAW,CAAC,WAAW,CAAC,eAAe,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;wBAElE,UAAU,GAAG,WAAW,CAAC,cAAc,CAAC,eAAe,EAAE,KAAK,CAAC,CAAA;wBAI/D,eAAe,GAAG,WAAW,CAAC,mBAAmB,CAAC,eAAe,EAAE,KAAK,CAAC,CAAA;wBAC/E,UAAU;wBACV,0EAA0E;wBAC1E,OAAO;wBACP,yFAAyF;wBAEzF,sBAAO,kBAAY,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,UAAU,EAAE,eAAe,CAAC,CAAC,EAAA;;;;KACpE;IAED;;OAEG;IAIG,2BAAY,GAAlB,UAAmB,OAAgB,EAAE,EAA4C,EAAE,EAA4B;YAAxE,QAAQ,cAAA,EAAE,YAAY,kBAAA;YAAuB,WAAW,QAAA;;;;;;wBACvF,MAAM,GAAK,QAAQ,OAAb,CAAa;wBAEjB,IAAI,GAAgB,MAAM,KAAtB,EAAE,SAAS,GAAK,MAAM,UAAX,CAAW;wBAG5B,WAAW,GAAG,IAAI,IAAI,SAAS,CAAA;wBACrC,IAAI,WAAW;4BAAE,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,mBAAmB,CAAC;gCAE1E,OAAO;8BAFmE;wBAG3D,qBAAM,WAAW,CAAC,gBAAgB,CAAC,QAAQ,EAAE,YAAY,CAAC,EAAA;;wBAAnE,MAAM,GAAG,SAA0D;wBACzE,sBAAO,MAAM,CAAC,CAAC,CAAC,kBAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,CAAC,EAAA;;;;KACzF;IAED;;OAEG;IAKG,oCAAqB,GAA3B,UACE,OAAgB,EAChB,EAAqD,EACrD,EAAsD;YADpD,QAAQ,cAAA,EAAE,YAAY,kBAAA,EAAE,OAAO,aAAA;YAChC,WAAW,QAAA,EAAE,WAAW,QAAA;;;;;;wBAEjB,MAAM,GAAK,OAAO,OAAZ,CAAY;wBAClB,OAAO,GAAK,OAAO,CAAC,IAAI,QAAjB,CAAiB;wBACxB,GAAG,GAAoB,QAAQ,IAA5B,EAAE,KAAkB,QAAQ,SAAb,EAAb,QAAQ,mBAAG,EAAE,KAAA,CAAa;wBACjC,QAAQ,GAAG,iBAAiB,CAAA;wBAG9B,KAEA,YAAY,sBAFmC,EAA5B,KAAK,WAAA,EAAE,KAAK,WAAA,EAAE,YAAY,kBAAA,CAEjC;wBAEV,KAAK,GAAG,gBAAQ,EAAE,CAAA;wBAChB,UAAU,GAAK,WAAW,CAAC,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,WAAzD,CAAyD;wBAE3E,mBAAmB;wBACnB,IAAI,KAAK,IAAI,KAAK,KAAK,UAAU,IAAI,YAAY,KAAK,0BAAc,CAAC,QAAQ,EAAE;4BAC7E,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,gBAAgB,CAAC,EAAA;yBACvD;wBAEiB,qBAAM,YAAM,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,EAAA;;wBAAvD,SAAS,GAAG,SAA2C;wBAE7D,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;wBAEnC,OAAO;wBACP,IAAI,SAAS,GAAG,OAAO;4BAAE,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,gBAAgB,CAAC;gCAE/E,MAAM;8BAFyE;wBAGlE,qBAAM,YAAM,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE;gCACxD,QAAQ,EAAE,CAAC,OAAO;gCAClB,WAAW,EAAE,CAAC;gCACd,QAAQ,EAAE,GAAG;gCACb,MAAM,EAAE,wDAAW;6BACpB,CAAC,EAAA;;wBALE,MAAM,GAAG,SAKX;wBAEF,IAAI,CAAC,MAAM;4BAAE,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,CAAC;gCAE/D,UAAU;8BAFqD;wBAE/D,UAAU;wBACV,qBAAM,WAAW,CAAC,oBAAoB,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAA;;wBADjE,UAAU;wBACV,SAAiE,CAAA;wBAEjE,sBAAO,kBAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAA;;;;KAClC;IAED;;OAEG;IAKG,gCAAiB,GAAvB,UACE,OAAgB,EAChB,EAA4C,EAC5C,EAA4B;YAD1B,QAAQ,cAAA,EAAE,YAAY,kBAAA;YACvB,WAAW,QAAA;;;;;;wBAEN,QAAQ,GAAG,aAAa,CAAA;wBACtB,MAAM,GAAK,OAAO,CAAC,IAAI,OAAjB,CAAiB;wBAG3B,KAEA,YAAY,kBAFwC,EAArC,YAAY,kBAAA,EAAE,KAAK,WAAA,EAAE,OAAO,aAAA,EAAE,KAAK,WAAA,CAEtC;wBAIV,WAAW,GAAa,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,EAAF,CAAE,CAAC,CAAA;wBAEhG,iBAAiB;wBACjB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;4BAAE,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,SAAS,CAAC,EAAA;wBAE3F,KAAgC,WAAW,CAAC,oBAAoB,CAAC,aAAa,EAAE,QAAQ,CAAC,EAAvF,aAAa,mBAAA,EAAE,UAAU,gBAAA,CAA8D;wBAEzF,gBAAgB,GACpB,aAAa,CAAC,MAAM,CAAC,UAAC,CAAqB,IAAK,OAAA,CAAC,CAAC,MAAM,KAAK,MAAM,EAAnB,CAAmB,CAAC,CAAC,MAAM;4BAC3E,YAAY,KAAK,0BAAc,CAAC,QAAQ,CAAA;wBAE1C,WAAW;wBACX,IAAI,gBAAgB,EAAE;4BACpB,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,YAAY,EAAE,YAAY,CAAC,EAAA;yBACjE;wBACD,OAAO;wBACP,IAAI,KAAK,IAAI,KAAK,KAAK,UAAU,IAAI,YAAY,KAAK,0BAAc,CAAC,QAAQ,EAAE;4BAC7E,sBAAO,kBAAY,CAAC,KAAK,CAAC,sBAAU,CAAC,gBAAgB,CAAC,EAAA;yBACvD;wBAED,UAAU;wBACV,qBAAM,WAAW,CAAC,oBAAoB,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;gCAChE,MAAM,QAAA;6BACP,CAAC,EAAA;;wBAHF,UAAU;wBACV,SAEE,CAAA;wBAEF,sBAAO,kBAAY,CAAC,OAAO,CAAC,IAAI,CAAC,EAAA;;;;KAClC;IAtJD;QAJC,uBAAW,CAAC,CAAC,YAAY,CAAC,CAAC;QAC3B,qBAAS,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QAC9B,6BAAiB;QACjB,oBAAQ,CAAC,CAAC,qBAAW,CAAC,CAAC;;;;2CA4BvB;IAQD;QAHC,uBAAW,CAAC,CAAC,YAAY,CAAC,CAAC;QAC3B,6BAAiB;QACjB,oBAAQ,CAAC,CAAC,qBAAW,CAAC,CAAC;;;;4CAavB;IASD;QAJC,uBAAW,CAAC,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;QACtC,qBAAS,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QAC9B,6BAAiB;QACjB,oBAAQ,CAAC,CAAC,qBAAW,EAAE,qBAAW,CAAC,CAAC;;;;qDA6CpC;IASD;QAJC,uBAAW,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QACrC,qBAAS,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QAC9B,6BAAiB;QACjB,oBAAQ,CAAC,CAAC,qBAAW,CAAC,CAAC;;;;iDA0CvB;IACH,WAAC;CAAA,AA/JD,IA+JC;kBA/JoB,IAAI"}
\ No newline at end of file

v2.0/dist/service/task.service.d.ts

@@ -10,6 +10,8 @@ interface ITaskInfo {
     rewards: number;
     done?: boolean;
     itemIds?: string;
+    todayCompleteTimes?: number;
+    taskLimitTimes?: number;
     waitReceive?: number;
     title: string;
 }

v2.0/dist/service/task.service.js

@@ -100,7 +100,7 @@ var TaskService = /** @class */ (function (_super) {
     TaskService.prototype.initOrderGoodsTask = function (userInfo, tasks) {
         var _a;
         var _b = tasks.orderGoods, value = _b.value, itemIds = _b.itemIds, taskRateType = _b.taskRateType, times = _b.times;
-        var remainTimes = userInfo.remainTimes, taskInfo = userInfo.taskInfo;
+        var remainTimes = userInfo.remainTimes, _c = userInfo.taskInfo, taskInfo = _c === void 0 ? {} : _c;
         var orderTask = {
             taskType: "orderGoods",
             title: "\u4E0B\u5355\u5546\u54C1",
@@ -125,13 +125,16 @@ var TaskService = /** @class */ (function (_super) {
     TaskService.prototype.initBrowseGoodsTask = function (userInfo, tasks) {
         var _a;
         var _b = tasks.browseGoods, value = _b.value, itemIds = _b.itemIds, taskRateType = _b.taskRateType, times = _b.times;
-        var remainTimes = userInfo.remainTimes, taskInfo = userInfo.taskInfo;
+        var remainTimes = userInfo.remainTimes, _c = userInfo.taskInfo, taskInfo = _c === void 0 ? {} : _c;
+        var today = utils_1.getToday();
         var orderTask = {
             taskType: "browseGoods",
             title: "\u6D4F\u89C8\u5546\u54C1",
             itemIds: itemIds,
             rewards: value,
             waitReceive: remainTimes.browseGoods,
+            //  todayCompeleTimes: taskInfo?.[today]?.browseGoods.length,
+            taskRateType: taskRateType,
             done: false
         };
         var browseGoodsCompleteList = this.getCompleteTaskByUserTaskInfo('browseGoods', userInfo);
@@ -140,8 +143,7 @@ var TaskService = /** @class */ (function (_super) {
             orderTask.done = true;
         }
         // 每日限制完成且完成次数达到限制
-        var today = utils_1.getToday();
-        if (taskRateType === constants_1.TASK_RATE_TYPE.EVERYDAY && ((_a = taskInfo === null || taskInfo === void 0 ? void 0 : taskInfo[today]) === null || _a === void 0 ? void 0 : _a.browseGoods) >= times) {
+        if (taskRateType === constants_1.TASK_RATE_TYPE.EVERYDAY && ((_a = taskInfo === null || taskInfo === void 0 ? void 0 : taskInfo[today]) === null || _a === void 0 ? void 0 : _a.browseGoods.length) >= times) {
             orderTask.done = true;
         }
         return orderTask;
@@ -270,12 +272,12 @@ var TaskService = /** @class */ (function (_super) {
      */
     TaskService.prototype.updateFollowTask = function (userInfo, activityInfo) {
         return __awaiter(this, void 0, void 0, function () {
-            var today, remainTimes, _id, taskInfo, follow, tasks, value, followInfo;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var today, remainTimes, _id, _a, taskInfo, follow, tasks, value, followInfo;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         today = utils_1.getToday();
-                        remainTimes = userInfo.remainTimes, _id = userInfo._id, taskInfo = userInfo.taskInfo, follow = userInfo.follow;
+                        remainTimes = userInfo.remainTimes, _id = userInfo._id, _a = userInfo.taskInfo, taskInfo = _a === void 0 ? {} : _a, follow = userInfo.follow;
                         tasks = activityInfo.tasks;
                         value = (tasks || {}).attentionStore.value;
                         followInfo = __assign(__assign({}, follow), { newFollow: true, followTime: Date.now(), followDay: today });
@@ -291,7 +293,7 @@ var TaskService = /** @class */ (function (_super) {
                                     taskInfo: taskInfo
                                 }
                             })];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 1: return [2 /*return*/, _b.sent()];
                 }
             });
         });

v2.0/dist/service/user.service.js

@@ -116,13 +116,15 @@ var UserService = /** @class */ (function (_super) {
         if (activityUserNick === void 0) { activityUserNick = ''; }
         if (callbackUrl === void 0) { callbackUrl = ''; }
         return __awaiter(this, void 0, void 0, function () {
-            var result, shopUrl, e_1;
+            var activityId, result, shopUrl, cbUrl, e_1;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
+                        console.log(activityUserNick, 'activityUserNick');
                         if (utils_1.isUseVipMock(this.context, activityUserNick)) {
                             return [2 /*return*/, vipMock_1.VIP_MOCK];
                         }
+                        activityId = this.context.data.activityId;
                         result = {
                             result: {
                                 member_info: ''
@@ -133,6 +135,7 @@ var UserService = /** @class */ (function (_super) {
                                 result: ''
                             }
                         };
+                        cbUrl = callbackUrl + "&query=activityId%3D" + activityId;
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 4, , 5]);
@@ -142,7 +145,7 @@ var UserService = /** @class */ (function (_super) {
                         return [4 /*yield*/, sdk_1.TBAPIS.getShopVipUrl(this.context, session, {
                                 source: 'isvapp',
                                 entrance: 'duiba'
-                            }, callbackUrl)];
+                            }, cbUrl)];
                     case 3:
                         shopUrl = _a.sent();
                         return [3 /*break*/, 5];

v2.0/dist/service/user.service.js.map

-{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/service/user.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../src/service/user.service.ts"],"names":[],"mappings":"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"}
\ No newline at end of file

v2.0/src/config/index.ts

@@ -9,7 +9,8 @@ interface Iconfig {
 
 const configs = {
   online,
-  test
+  test,
+  mock: test
 }
 
 export const getConfig = (context: Context): Iconfig => {

v2.0/src/controller/task.controller.ts

@@ -41,14 +41,13 @@ export default class Task {
     // // 下单任务
     // const orderGoodsTask = taskService.initOrderGoodsTask(updatedUserInfo, tasks)
     // // 浏览商品任务
-    // const browseGoodsTask = taskService.initBrowseGoodsTask(updatedUserInfo, tasks)
+    const browseGoodsTask = taskService.initBrowseGoodsTask(updatedUserInfo, tasks)
     // // 邀请任务
     // const invitesTask = taskService.initInvitesTask(updatedUserInfo, tasks)
-
     // 积分兑换
     //const exchangeCreditsTask = taskService.initExchangeCreditsTask(updatedUserInfo, tasks)
 
-    return resultsModel.success([vipTask, followTask])
+    return resultsModel.success([vipTask, followTask, browseGoodsTask])
   }
 
   /**
@@ -85,7 +84,7 @@ export default class Task {
   ) {
     const { openId } = context
     const { credits } = context.data
-    const { _id, taskInfo } = userInfo
+    const { _id, taskInfo = {} } = userInfo
     const taskType = `exchangeCredits`
     const {
       tasks: {

v2.0/src/service/task.service.ts

@@ -16,6 +16,8 @@ interface ITaskInfo {
   rewards: number
   done?: boolean
   itemIds?: string
+  todayCompleteTimes?: number
+  taskLimitTimes?: number // 任务每日限制次数
   waitReceive?: number
   title: string
 }
@@ -56,7 +58,7 @@ export default class TaskService extends UserService {
       orderGoods: { value, itemIds, taskRateType, times }
     } = tasks
 
-    const { remainTimes, taskInfo } = userInfo
+    const { remainTimes, taskInfo = {} } = userInfo
 
     let orderTask: ITaskInfo = {
       taskType: `orderGoods`,
@@ -89,7 +91,8 @@ export default class TaskService extends UserService {
       browseGoods: { value, itemIds, taskRateType, times }
     } = tasks
 
-    const { remainTimes, taskInfo } = userInfo
+    const { remainTimes, taskInfo = {} } = userInfo
+    const today = getToday()
 
     let orderTask: ITaskInfo = {
       taskType: `browseGoods`,
@@ -97,6 +100,8 @@ export default class TaskService extends UserService {
       itemIds,
       rewards: value,
       waitReceive: remainTimes.browseGoods,
+      //  todayCompeleTimes: taskInfo?.[today]?.browseGoods.length,
+      taskRateType: taskRateType,
       done: false
     }
 
@@ -108,8 +113,8 @@ export default class TaskService extends UserService {
     }
 
     // 每日限制完成且完成次数达到限制
-    const today = getToday()
-    if (taskRateType === TASK_RATE_TYPE.EVERYDAY && taskInfo?.[today]?.browseGoods >= times) {
+
+    if (taskRateType === TASK_RATE_TYPE.EVERYDAY && taskInfo?.[today]?.browseGoods.length >= times) {
       orderTask.done = true
     }
 
@@ -267,7 +272,7 @@ export default class TaskService extends UserService {
    */
   async updateFollowTask(userInfo: IUserInfo, activityInfo: IActivityInfo) {
     const today = getToday()
-    let { remainTimes, _id, taskInfo, follow } = userInfo
+    let { remainTimes, _id, taskInfo = {}, follow } = userInfo
     // 获取活动基本信息
     const { tasks } = activityInfo
     // 获取关注店铺奖励

v2.0/src/service/user.service.ts

@@ -45,6 +45,7 @@ class UserService extends BaseService {
    * @returns {isVip: boolean(是否是会员), url: string(入会链接) }
    */
   async getShopVip(session: string, activityUserNick: string = '', callbackUrl: string = ''): Promise<IVipInfo> {
+    console.log(activityUserNick, 'activityUserNick')
     if (isUseVipMock(this.context, activityUserNick)) {
       return VIP_MOCK
     }