Merge branch 'master' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/frontend

src/pages/exchangepage/mytemplate/main.js

@@ -26,7 +26,7 @@ const Column = [
     type: "normal",
   },
   {
-    title: '兑换页类型',
+    title: '落地页类型',
     prop: 'client',
     name: 'client',
     type: "slot",

src/pages/exchangepage/template/main.js

@@ -110,7 +110,7 @@ export default class mytemplate extends React.Component{
 		}
 		
 		sessionStorage.setItem("pageInfo", JSON.stringify(row))
-		let link = window.location.href.replace(window.location.hash,"#/home/edittemplate/");
+		let link = window.location.href.replace(window.location.hash,"#/home/edittemplate");
 		window.open(link, "_blank")
 		
 	}

src/pages/home/home.js

@@ -121,8 +121,8 @@ export default class App extends Component {
     name:'落地页管理',
     childmenu:[
 		{
-		  group:'兑换页列表',
-		  items:[{path:'/home/exchangepage',name:'兑换页列表'},{path:'/home/myexchangetemplate',name:'我的模板'}]
+		  group:'落地页列表',
+		  items:[{path:'/home/exchangepage',name:'落地页列表'},{path:'/home/myexchangetemplate',name:'我的模板'}]
 		 }
 	],
     path:'/home/exchangepage'