Merge remote-tracking branch 'origin/master'

src/projects/pension/router/master.js

@@ -213,6 +213,66 @@ const routesMaster = [
 				path: 'live',
 				component: () => import('../views/Layout.vue'),
 				children: [
+					//功能主页
+					{
+						path: 'info',
+						name: 'MasterLineInfo',
+						component: () => import('../views/Master/Line/Info.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '功能主页',
+							mode: true
+						}
+					},
+					//产品介绍
+					{
+						path: 'show',
+						name: 'MasterLineShow',
+						component: () => import('../views/Master/Line/Show.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '产品介绍',
+							mode: true
+						}
+					},
+					//直播房间
+					{
+						path: 'room',
+						name: 'MasterLineRoom',
+						component: () => import('../views/Master/Line/Room.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '直播房间',
+							mode: true
+						}
+					},
+					//收银台
+					{
+						path: 'pay',
+						name: 'MasterLinePay',
+						component: () => import('../views/Master/Line/Pay.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '收银台',
+							mode: true
+						}
+					},
+					//支付成功
+					{
+						path: 'paySuccess',
+						name: 'MasterLinePaySuccess',
+						component: () => import('../views/Master/Line/PaySuccess.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '支付成功',
+							mode: true
+						}
+					},
 
 				],
 			},

src/projects/pension/views/Master/Line/info.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/pension/views/Master/Line/pay.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/pension/views/Master/Line/paySucess.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/pension/views/Master/Line/room.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>

src/projects/pension/views/Master/Line/show.vue

@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>