Merge branch 'xqc_970' into debug

pages-roadshow/addActivity/common.js

@@ -1,10 +1,10 @@
 // 研究员
-export const RESEARCHLIST = ['ficc_researcher', 'researcher', 'rai_researcher','ficc_admin', 'rai_admin',];
+export const RESEARCHLIST = ['ficc_researcher', 'researcher', 'rai_researcher','ficc_admin',];
 
 // 销售/组长
 const SELLERLIST = ['ficc_seller',  'ficc_group', 'ficc_team'];
 // 权益销售/组长
-const SELLERLIST_RAI = [ 'rai_seller',  'rai_group'];
+const SELLERLIST_RAI = [ 'rai_seller',  'rai_group', 'rai_admin'];
 
 // admin
 const ADMINLIST = ['admin'];
@@ -55,7 +55,7 @@ export const getDefaultOption = (role,fromType) => {
 			break;
 		case 5:
 			res = {
-				defaultActivityType: '报告电话会',
+				defaultActivityType: fromType === 1 ? '路演' : '内部会议',
 				activityTypeList:['路演','沙龙'],
 				startTime: defaultStartTime(),
 				endTime: defaultEndTime()

pages-roadshow/addActivity/mixin.js

@@ -605,8 +605,8 @@ export default {
 					},
 				}
 				case '沙龙' : return {
-					text: '活动申请已提交，请等待研究员处理',
-					content: `可前往【我的日历】-【活动申请】查看`,
+					text: '添加活动成功,研究员日程已添加成功',
+					content: `可前往【研究员日历】查看`,
 					link: '/pages-approve/activity/list',
 					query: {
 						type: '活动申请'