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

@@ -120,6 +120,13 @@ class tmqueryCtl extends CtlBase {
         var opGsbPayPageInfoResult = await this.opGsbPayPageInfo(pobj, result, req);
         var opGsbPayPageInfoResult = await this.opGsbPayPageInfo(pobj, result, req);
         return opGsbPayPageInfoResult;
         return opGsbPayPageInfoResult;
       }
       }
+      if (["userPinByLgoin", "userPinByLgoinVcode", "userPinByRegister"].indexOf(pobj.actionType) >= 0) {
+        req.session.userPinInfo = {
+          encryptChannelUserId: result.data.channelUserId,
+          userpin: result.data.userpin,
+          userName: result.data.userName
+        };
+      }//login
       return result;
       return result;
     } catch (e) {
     } catch (e) {
       console.log(e.stack, "操作error...................");
       console.log(e.stack, "操作error...................");