欢迎页调整

modules/all_models/welcome_setting.js

@@ -13,7 +13,14 @@ let modelSchema = {
         index: true
     },
     compilationId: String,
-    showType:{type:Number,default:0},// 1 每天一次 2 每次登录显示，0 关闭
-    context:String
+    normal:{
+      showType:{type:Number,default:0},// 1 每天一次 2 每次登录显示，0 关闭
+      context:String
+    },
+    // 专业用户
+    professional: {
+       showType:{type:Number,default:0},// 1 每天一次 2 每次登录显示，0 关闭
+       context:String
+    }
 };
 mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));

modules/pm/controllers/pm_controller.js

@@ -332,7 +332,7 @@ module.exports = {
         let absoluteUrl = compilationData.overWriteUrl ? request.app.locals.rootDir + compilationData.overWriteUrl : request.app.locals.rootDir;
         let overWriteUrl = fs.existsSync(absoluteUrl) && fs.statSync(absoluteUrl).isFile()? compilationData.overWriteUrl : null;
         //欢迎页显示控制
-        let [isShow,context] = await pm_facade.getWelcomeInfo(sessionCompilation._id,request.session.sessionUser);
+        let [isShow,context] = await pm_facade.getWelcomeInfo(sessionCompilation._id,request.session.sessionUser,request.session.compilationVersion.includes('免费'));
         let renderData = {
             isFirst: isFirst,
             isShow:isShow,

modules/pm/facade/pm_facade.js

@@ -2536,10 +2536,15 @@ async function isTenderOverrun(tenderCount, session) {
     return tenderCount + curTenderCount > limit;
 }
 
-async function getWelcomeInfo(compilationId,sessionUser) {
-    let setting = await welcomeModel.findOne({compilationId:compilationId});
+async function getWelcomeInfo(compilationId,sessionUser,isFree=true) {
+    let welcom_setting = await welcomeModel.findOne({compilationId:compilationId});
     let isShow = false;
     let context = "";
+    let setting = null
+    if(welcom_setting){
+      setting = isFree? welcom_setting.normal:welcom_setting.professional;//区分专业版和免费版
+    }
+
     if(setting){
         if(setting.showType == 0) return [false,""];//关闭
         context = setting.context;