Merge branch 'igirl-channel-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-web

igirl-channel-web/app/base/controller/impl/trademark/tmqueryCtl.js

@@ -46,13 +46,15 @@ class tmqueryCtl extends CtlBase {
       var oldActionBody = reqobj.actionBody;
       if (reqobj.isDecryptUser == "yes") {
         reqobj.actionType = "decryptStr";
-        reqobj.actionBody = { opStr: oldActionBody.channelUserId };
+        let currentDate = Math.floor(new Date().getTime() / 1000);
+        reqobj.actionBody = { opStr: oldActionBody.channelUserId, timeStamp: currentDate };
         var decryptSignResult = await this.createSign(reqobj.actionBody, tokenInfo.data.secret);
         if (decryptSignResult.status != 0) {
           return decryptSignResult;
         }
         reqobj.sign = decryptSignResult.data;
-        var decryptResult = await this.execClient.execPostTK(reqobj, reqUrl, tokenInfo.data.token);
+        var decrypReqUrl = this.channelApiUrl + pobj.requrl;
+        var decryptResult = await this.execClient.execPostTK(reqobj, decrypReqUrl, tokenInfo.data.token);
         if (!decryptResult) {
           return system.getResult(null, "处理decryptStr请求失败");
         }

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js

@@ -319,6 +319,8 @@
                             item.CreateDate = new Date(item.CreateDate).toLocaleDateString('chinese', { hour12: false });
                             item.submitTime = new Date(item.submitTime).toLocaleString('chinese', { hour12: false });
                         });
+                    }else{
+                        console.log(d,"getTmOrderList...........");
                     }
                 });
             }