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

@@ -119,8 +119,8 @@ class tmqueryCtl extends CtlBase {
     if (!params.sign) {
     if (!params.sign) {
       return system.getResult(null, "请求参数sign为空");
       return system.getResult(null, "请求参数sign为空");
     }
     }
-    if (!params.times_tamp) {
-      return system.getResult(null, "请求参数times_tamp为空");
+    if (!params.timeStamp) {
+      return system.getResult(null, "请求参数timeStamp为空");
     }
     }
     var signArr = [];
     var signArr = [];
     var keys = Object.keys(params).sort();
     var keys = Object.keys(params).sort();

igirl-channel-web/app/front/entry/public/js/index.js

@@ -198,7 +198,7 @@ axios.get("/web/common/metaCtl/getRouteConfig").then(d => {
         data.requrl = this.host + url;
         data.requrl = this.host + url;
         data.isUser = isUser;
         data.isUser = isUser;
         let currentDate = Math.floor(new Date().getTime() / 1000);
         let currentDate = Math.floor(new Date().getTime() / 1000);
-        data.actionBody.timestamp = currentDate;
+        data.actionBody.timeStamp = currentDate;
         var newObj = JSON.parse(JSON.stringify(data));
         var newObj = JSON.parse(JSON.stringify(data));
         return newObj;
         return newObj;
       },
       },