Merge branch 'master' of http://git.mydig.net/Sagoo-Cloud/sagoo-admin-ui

src/views/rule-engine/edit.vue

@@ -65,7 +65,7 @@ const onSubmit = async () => {
 
 	if (!formData.id) {
 		const { data } = await axios.post(
-			window.location.protocol + '//' + window.location.hostname + ':1880/flow',
+			window.location.protocol + '//' + window.location.hostname + '/rule-engine/flow',
 			{
 				label: formData.name,
 				disabled: false,

src/views/rule-engine/index.vue

@@ -80,7 +80,9 @@ const setStatus = (id: number, status: number) => {
 };
 
 const edit = async (row: any) => {
-	const url = window.location.protocol + '//' + window.location.hostname + ':1880/?access_token=' + Session.get('token') + '#flow/' + row.flowId;
+	localStorage.setItem('auth-tokens',`{"access_token":"${Session.get('token')}"}`);
+	// const url = window.location.protocol + '//' + window.location.hostname + ':1880/?access_token=' + Session.get('token') + '#flow/' + row.flowId;
+	const url = '/rule-engine/#flow/' + row.flowId;
 	window.open(url);
 };
 

src/views/rule-engine/send.vue

@@ -80,7 +80,9 @@ const setStatus = (id: number, status: number) => {
 };
 
 const edit = async (row: any) => {
-	const url = window.location.protocol + '//' + window.location.hostname + ':1880/?access_token=' + Session.get('token') + '#flow/' + row.flowId;
+	localStorage.setItem('auth-tokens',`{"access_token":"${Session.get('token')}"}`);
+	// const url = window.location.protocol + '//' + window.location.hostname + ':1880/?access_token=' + Session.get('token') + '#flow/' + row.flowId;
+	const url = '/rule-engine/#flow/' + row.flowId;
 	window.open(url);
 };