Merge branch 'master' of https://t-git.51gjj.com/data_server/sb_h5

app/controller/order.js

@@ -149,7 +149,7 @@ class OrderController extends Controller {
     if (!(appKeyInfo && appKeyInfo.valid === true && appKeyInfo.enableSsView === true)) {
       return ctx.fail('未开通此服务');
     }
-    const data = await service.order.getOneByOrderId({ orderId });
+    const data = await service.order.getOneByOrderId({ orderId, status: 'success' });
     if (data) {
       if (data.status === 'success' && (data.appKey === appKey)) {
         const result = await service.storage.read(orderId, appKey);

app/controller/task.js

@@ -120,7 +120,7 @@ class TaskController extends Controller {
     case 1:
       taskNote = {
         status: 'next',
-        note: { message: 'waiting ', nextStep: result.data.loginParam },
+        note: { message: 'waiting ', nextStep: result.data },
       };
       break;
     case 110:

app/service/task.js

@@ -48,11 +48,12 @@ class TaskService extends Service {
   async fetchCapture({ taskId, type }) {
     const { taskAPI, ctx } = this;
     const { fetchCodeUrl } = taskAPI;
+    
     const result = await this._request(fetchCodeUrl, {
       method: 'post',
       data: {
         taskId,
-        type,
+        type: type === "code" ? "shebaoV2_yzm":"shebaoV2_phone_code",
       },
       contentType: 'json',
     });