处理冲突

api/api.js

@@ -23,12 +23,10 @@ const api = {
 	smsLogin(data,header){
 		return request('/expertAPI/smsLogin', data, 'post', true,'application/json',header);
 	},
-	
 	// 密码登录
 	pwdLogin(data){
 		return request('/expertAPI/login', data, 'post', true);
 	},
-	
 	// 获取短信验证码
 	getCode(data,header) {
 		return request('/expertAPI/smsSend', data, 'post', true,'application/json',header);
@@ -81,11 +79,65 @@ const api = {
 		return request('/expertAPI/my', data, 'post', false);
 	},
 	
+	getVideoList(data) {
+		return request('/video/list', data, 'get', true);
+	},
+	getVideoDetail(data) {
+		return request('/video/detail', data, 'get', true);
+	},
+	getVideoHistory(data) {
+		return request('/expertAPI/VideoWatchRecord', data, 'post', false);
+	},
+	deleteRecord(data) {
+		return request('/expertAPI/deleteRecord', data, 'post', false);
+	},
+
+	getCollectList(data) {
+		return request('/expertAPI/collectList', data, 'post', false);
+	},
+
+	getCollectionList(data) {
+		return request('/expertAPI/collectionList', data, 'post', false);
+	},
+	//我的账户
+	getMyAccount(data) {
+		return request('/expertPay/getBalanceU', data, 'post', false);
+	},
+
+	// 订单列表
+	getOrderList(data) {
+		return request('/expertPay/orderList', data, 'post', false);
+	},
+
+	// 我的积分
+	myBonusPoints(data) {
+		return request('/expertAPI/myBonusPoints', data, 'post', false);
+	},
 	// 新闻详情
 	getNewsDetail(data) {
 		return request('/expertAPI/newsDetail', data, 'post', false);
 	},
-	
+	// 积分支付列表
+	bonusPointsPayList(data) {
+		return request('/expertAPI/bonusPointsPayList', data, 'post', false);
+	},
+	// 积分列表
+	bonusPointsList(data) {
+		return request('/expertAPI/bonusPointsList', data, 'post', false);
+	},
+
+	getWelfarePage(data) {
+		return request('/expertAPI/getWelfarePage', data, 'post', false);
+	},
+
+	useWelfarePage(data) {
+		return request('/expertAPI/useWelfarePage', data, 'post', false);
+	},
+
+	getFlowerList(data) {
+		return request('/expertPay/getFlowerList', data, 'post', false);
+	},
+
 	// 课件详情
 	getGandanFileDetail(data) {
 		return request('/expertAPI/gandanFileDetail', data, 'post', false);