tj

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

@@ -9,7 +9,7 @@ class tmqueryCtl extends CtlBase {
     this.appInfo = {
     this.appInfo = {
       jd: { appkey: "201911251551", secret: "56006077354d48858026c80c0e10bef6" },
       jd: { appkey: "201911251551", secret: "56006077354d48858026c80c0e10bef6" },
       1688: { appkey: "201911131657", secret: "eeb18393aade40149287b024d8ba0850" },
       1688: { appkey: "201911131657", secret: "eeb18393aade40149287b024d8ba0850" },
-      gsb: { appkey: "201912141625", secret: "8cbb846776874167b5c7e01cd0116c66" }
+      gsbhome: { appkey: "201912141625", secret: "8cbb846776874167b5c7e01cd0116c66" }
     };
     };
     this.execClient = system.getObject("util.execClient");
     this.execClient = system.getObject("util.execClient");
 
 
@@ -118,7 +118,7 @@ class tmqueryCtl extends CtlBase {
         var opJdPayPageInfoResult = await this.opJdPayPageInfo(pobj, result, req);
         var opJdPayPageInfoResult = await this.opJdPayPageInfo(pobj, result, req);
         return opJdPayPageInfoResult;
         return opJdPayPageInfoResult;
       }
       }
-      else if (["gsb"].indexOf(pobj.actionProcess) >= 0 && pobj.actionType == "subTmOrder") {
+      else if (["gsbhome"].indexOf(pobj.actionProcess) >= 0 && pobj.actionType == "subTmOrder") {
         var opGsbPayPageInfoResult = await this.opGsbPayPageInfo(pobj, result, req);
         var opGsbPayPageInfoResult = await this.opGsbPayPageInfo(pobj, result, req);
         return opGsbPayPageInfoResult;
         return opGsbPayPageInfoResult;
       }
       }
@@ -140,8 +140,8 @@ class tmqueryCtl extends CtlBase {
       case "1688":
       case "1688":
         reqParam = self.appInfo["1688"];
         reqParam = self.appInfo["1688"];
         break;
         break;
-      case "gsb":
-        reqParam = self.appInfo["gsb"];
+      case "gsbhome":
+        reqParam = self.appInfo["gsbhome"];
         break;
         break;
       default:
       default:
         break;
         break;

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

@@ -166,8 +166,8 @@ module.exports = function (app) {
 		res.redirect(skipUrl);
 		res.redirect(skipUrl);
 	});
 	});
 
 
-	app.get("/gsb", async function (req, res) {
-		var skipUrl = "/#/gsb/selftmreg?channelUserId=";
+	app.get("/gsbhome", async function (req, res) {
+		var skipUrl = "/#/gsbhome/selftmreg?channelUserId=";
 		var params = req.query;
 		var params = req.query;
 		if (!params.state) {
 		if (!params.state) {
 			res.redirect(skipUrl);
 			res.redirect(skipUrl);
@@ -191,7 +191,7 @@ module.exports = function (app) {
 			return;
 			return;
 		}
 		}
 		var getUserparams = {
 		var getUserparams = {
-			actionProcess: "gsb",
+			actionProcess: "gsbhome",
 			channelUserId: userInfo.data.phone + "_" + userInfo.data.id
 			channelUserId: userInfo.data.phone + "_" + userInfo.data.id
 		};
 		};
 		var userItemResult = await tmqueryCtl.getUserIdEncryptStr(getUserparams, req.query, req);
 		var userItemResult = await tmqueryCtl.getUserIdEncryptStr(getUserparams, req.query, req);
@@ -199,10 +199,10 @@ module.exports = function (app) {
 			res.redirect(skipUrl);
 			res.redirect(skipUrl);
 			return;
 			return;
 		}
 		}
-		skipUrl = "/#/gsb/" + params.state + "?channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId);
+		skipUrl = "/#/gsbhome/" + params.state + "?channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId);
 		res.redirect(skipUrl);
 		res.redirect(skipUrl);
 	});
 	});
-	app.get("/gsb/orderNotify", async function (req, res) {
+	app.get("/gsbhome/orderNotify", async function (req, res) {
 		logClient.payLog("jd", {
 		logClient.payLog("jd", {
 			optitle: "###操作订单结果参数...orderNotify",
 			optitle: "###操作订单结果参数...orderNotify",
 			op: "/jd/orderNotify",
 			op: "/jd/orderNotify",

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

@@ -1286,7 +1286,7 @@
         this.form.tmName = this.form.tmFormType == "5" ? this.form.tmName + '及图' : this.form.tmName;
         this.form.tmName = this.form.tmFormType == "5" ? this.form.tmName + '及图' : this.form.tmName;
         this.savehistory();
         this.savehistory();
         console.log(this.$root.channelName, "///////////////");
         console.log(this.$root.channelName, "///////////////");
-        if (this.$root.channelName == "jd" || this.$root.channelName == "gsb") {
+        if (this.$root.channelName == "jd" || this.$root.channelName == "gsbhome") {
           /**提报接口 */
           /**提报接口 */
 
 
           var obj = {
           var obj = {