Merge remote-tracking branch 'origin/master'

src/apis/payment.js

@@ -0,0 +1,27 @@
+import request from '$project/utils/request'
+import Qs from 'qs';
+
+//购买页面商品详情
+export function getGoodsDetail(params) {
+    return request({
+        url: '/mobile/cameraApi/getGoodsDetail',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}
+
+//微信支付
+export function wxJsapiPay(params) {
+    return request({
+        url: '/wxPay/wxJsapiPay?orderId='+params,
+
+        method: 'get',
+    })
+}
+//支付宝支付
+export function tradePrecreatePay(params) {
+    return request({
+        url: '/aliPay/tradePrecreatePay?orderId='+params,
+        method: 'get',
+    })
+}

src/projects/pension/apis/Master/live.js

@@ -0,0 +1,42 @@
+import request from '$project/utils/request'
+import Qs from 'qs';
+
+//购买状态详情
+export function queryCameraList(params) {
+
+    return request({
+        url: '/mobile/cameraApi/cameraList',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}
+
+export function queryAdminCameraList(params) {
+
+    return request({
+        url: '/mobile/cameraApi/cameraAdminList',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}
+//提交登记表
+export function submit(params) {
+
+    return request({
+
+        url: '/mobile/cameraApi/submit',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}
+
+
+//观看直播
+export function cameraDetail(params) {
+
+    return request({
+        url: '/mobile/cameraApi/cameraDetail',
+        data: Qs.stringify(params),
+        method: 'post',
+    })
+}

src/projects/pension/router/master.js

@@ -252,7 +252,7 @@ const routesMaster = [
 
 			//直播
 			{
-				path: 'live',
+				path: 'line',
 				component: () => import('../views/Layout.vue'),
 				children: [
 					//功能主页
@@ -276,7 +276,7 @@ const routesMaster = [
 							requireAuth: false,
 							role: [],
 							title: '产品介绍',
-							mode: true
+
 						}
 					},
 					//直播房间
@@ -288,7 +288,7 @@ const routesMaster = [
 							requireAuth: false,
 							role: [],
 							title: '直播房间',
-							mode: true
+
 						}
 					},
 					//收银台
@@ -300,7 +300,7 @@ const routesMaster = [
 							requireAuth: false,
 							role: [],
 							title: '收银台',
-							mode: true
+
 						}
 					},
 					//支付成功
@@ -312,7 +312,7 @@ const routesMaster = [
 							requireAuth: false,
 							role: [],
 							title: '支付成功',
-							mode: true
+
 						}
 					},