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

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

@@ -35,7 +35,7 @@ module.exports = function (app) {
 				return;
 			}
 		}
-		var skipUrl = "/#/jd/" + params.state + "?channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId);
+		var skipUrl = "/#/jd/" + params.state + "?sdsId=FW_GOODS-582206-1&channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId);
 		res.redirect(skipUrl);
 	});
 	app.get("/jd/orderNotify", async function (req, res) {
@@ -70,7 +70,7 @@ module.exports = function (app) {
 			res.redirect("/#/jd/jdtrademark");
 			return;
 		}
-		res.redirect("/#/jd/jdindentlist?channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId));
+		res.redirect("/#/jd/jdindentlist?sdsId=FW_GOODS-582206-1&channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId));
 		return;
 	});
 
@@ -237,15 +237,6 @@ module.exports = function (app) {
 			console.log(error.stack, "get/admin，error.............");
 		}
 	});
-	app.get("/admin", async function (req, res) {
-		try {
-			var appinfo = await metaCtl.getAppInfo(req);
-			res.render("admin", appinfo);
-		} catch (error) {
-			console.log(error.stack, "get/admin，error.............");
-		}
-
-	});
 	app.get('/web/:gname/:qname/:method', function (req, res) {
 		try {
 			var classPath = req.params["qname"];