Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan…

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

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

@@ -19,10 +19,10 @@ class tmqueryCtl extends CtlBase {
         return system.getResult(null, "verify channelUserId is not empty");
         return system.getResult(null, "verify channelUserId is not empty");
       }
       }
       if (!req.session.userPinInfo) {
       if (!req.session.userPinInfo) {
-        return system.getResult(null, "ueser is not login");
+        return system.getResult(null, "user is not login");
       }
       }
       if (req.session.userPinInfo.encryptChannelUserId != pobj.actionBody.channelUserId) {
       if (req.session.userPinInfo.encryptChannelUserId != pobj.actionBody.channelUserId) {
-        return system.getResult(null, "ueser login is error");
+        return system.getResult(null, "user login is error");
       }
       }
       pobj.isDecryptUser = "yes";
       pobj.isDecryptUser = "yes";
     }
     }
@@ -206,6 +206,9 @@ class tmqueryCtl extends CtlBase {
   }
   }
   async getUserInfo(pobj, qobj, req) {
   async getUserInfo(pobj, qobj, req) {
     try {
     try {
+      if (req.session.userPinInfo) {
+        return system.getResultSuccess({ encryptChannelUserId: req.session.userPinInfo.encryptChannelUserId });
+      }
       var authUrl = pobj.authUrl;
       var authUrl = pobj.authUrl;
       var authToken = pobj.authToken;
       var authToken = pobj.authToken;
       var actionProcess = pobj.actionProcess;
       var actionProcess = pobj.actionProcess;

igirl-channel-jdweb/app/config/routes/web.js

@@ -21,6 +21,13 @@ module.exports = function (app) {
 			res.redirect("/#/jd/jdtrademark");
 			res.redirect("/#/jd/jdtrademark");
 			return;
 			return;
 		}
 		}
+		if (!userItemResult.data.encryptChannelUserId || userItemResult.data.encryptChannelUserId == "undefined") {
+			userItemResult = await tmqueryCtl.getUserInfo(getUserparams, req.query, req);
+			if (userItemResult.status != 0) {
+				res.redirect("/#/jd/jdtrademark");
+				return;
+			}
+		}
 		var skipUrl = "/#/jd/" + params.state + "?channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId);
 		var skipUrl = "/#/jd/" + params.state + "?channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId);
 		res.redirect(skipUrl);
 		res.redirect(skipUrl);
 	});
 	});
@@ -44,7 +51,7 @@ module.exports = function (app) {
 		}
 		}
 		var skipUrl = "/#/jd/" + params.state + "?channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId);
 		var skipUrl = "/#/jd/" + params.state + "?channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId);
 		res.redirect(skipUrl);
 		res.redirect(skipUrl);
-	});	
+	});
 	app.get("/jd/orderNotify", async function (req, res) {
 	app.get("/jd/orderNotify", async function (req, res) {
 		// oplogCtl.info({
 		// oplogCtl.info({
 		// 	optitle: "########################################################.................orderNotify",
 		// 	optitle: "########################################################.................orderNotify",