瀏覽代碼

欢迎页区分免费版和专业版

zhangweicheng 5 年之前
父節點
當前提交
544a2b1303

+ 10 - 2
modules/all_models/welcome_setting.js

@@ -13,7 +13,15 @@ let modelSchema = {
         index: true
         index: true
     },
     },
     compilationId: String,
     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}));
 mongoose.model(collectionName, new Schema(modelSchema, {versionKey: false, collection: collectionName}));

+ 17 - 3
modules/users/controllers/welcome_controller.js

@@ -11,7 +11,7 @@ const uuidV1 = require('uuid/v1');
 class WelcomeController extends BaseController {
 class WelcomeController extends BaseController {
     async index(request, response) {
     async index(request, response) {
         let id = request.query.id;
         let id = request.query.id;
-
+        let type = request.query.type;
         let compilationList = [];
         let compilationList = [];
         let selectedCompilation = {};
         let selectedCompilation = {};
         try {
         try {
@@ -38,11 +38,20 @@ class WelcomeController extends BaseController {
         if (selectedCompilation.example && Array.isArray(selectedCompilation.example)) {
         if (selectedCompilation.example && Array.isArray(selectedCompilation.example)) {
             selectedCompilation.example = selectedCompilation.example.join(';');
             selectedCompilation.example = selectedCompilation.example.join(';');
         }
         }
-        let setting =await welcomeSettingModel.findOne({compilationId:selectedCompilation._id.toString()});
+        let welcome_setting =await welcomeSettingModel.findOne({compilationId:selectedCompilation._id.toString()});
+        let setting = null;
+        let settingID="";
+        console.log(type);
+        if(welcome_setting){
+          setting = type== "professional"?welcome_setting.professional:welcome_setting.normal;
+          settingID = welcome_setting.ID;
+        }
         if(!setting) setting = {showType:0,context:""};
         if(!setting) setting = {showType:0,context:""};
         console.log(setting)
         console.log(setting)
         let renderData = {
         let renderData = {
             id: id,
             id: id,
+            type:type,
+            settingID:settingID,
             compilationList: compilationList,
             compilationList: compilationList,
             selectedCompilation: selectedCompilation,
             selectedCompilation: selectedCompilation,
             layout: 'users/views/layout/layout',
             layout: 'users/views/layout/layout',
@@ -54,7 +63,12 @@ class WelcomeController extends BaseController {
 
 
     async save(request, response){
     async save(request, response){
         let data = request.body;
         let data = request.body;
-        let setting = {compilationId:data.compilationId,showType:data.showType,context:data.context};
+        let setting = {compilationId:data.compilationId};
+        let type = data.type;
+        let info = {showType:data.showType,context:data.context}
+        console.log(type)
+        console.log(info)
+        type == "professional"?setting.professional = info:setting.normal = info
         if(!data.ID || data.ID == ""){
         if(!data.ID || data.ID == ""){
             setting.ID = uuidV1();
             setting.ID = uuidV1();
             await welcomeSettingModel.create(setting);
             await welcomeSettingModel.create(setting);

+ 2 - 1
package.json

@@ -36,6 +36,7 @@
     "lz-string": "^1.4.4"
     "lz-string": "^1.4.4"
   },
   },
   "scripts": {
   "scripts": {
-    "start": "C:\\Users\\mai\\AppData\\Roaming\\npm\\babel-node.cmd operation.js"
+    "start": "C:\\Users\\mai\\AppData\\Roaming\\npm\\babel-node.cmd operation.js",
+    "dev_server":"SET NODE_ENV=qa&& babel-node operation.js"
   }
   }
 }
 }

+ 7 - 2
web/users/views/welcome/index.html

@@ -25,12 +25,17 @@
             </div>
             </div>
         </div>
         </div>
             <div class="content-wrap">
             <div class="content-wrap">
-                <div class="c-header">
+                <div class="c-header" style="padding:0">
+                  <ul class="nav nav-tabs">
+                    <li role="presentation" <% if( type != "professional") { %>class="active"<% } %> ><a href="/welcome?id=<%= selectedCompilation._id.toString()%>">免费版</a></li>
+                    <li role="presentation" <% if( type == "professional") { %>class="active"<% } %>><a href="/welcome?id=<%= selectedCompilation._id.toString()%>&type=professional">专业版</a></li>
+                  </ul>
                 </div>
                 </div>
                 <div class="c-body">
                 <div class="c-body">
                     <form method="post" action="/welcome/save" enctype="application/x-www-form-urlencoded21">
                     <form method="post" action="/welcome/save" enctype="application/x-www-form-urlencoded21">
-                        <input type="hidden" name="ID" value="<%= setting.ID%>">
+                        <input type="hidden" name="ID" value="<%= settingID%>">
                         <input type="hidden" name="compilationId" value="<%= selectedCompilation._id.toString()%>">
                         <input type="hidden" name="compilationId" value="<%= selectedCompilation._id.toString()%>">
+                        <input type="hidden" name="type" value="<%= type%>">
                     <div class="form-group">
                     <div class="form-group">
                         <label for="title">显示频率</label>
                         <label for="title">显示频率</label>
                         <div class="radio">
                         <div class="radio">