liting2017 6 years ago
parent
commit
1848290df7
4 changed files with 135 additions and 131 deletions
  1. 4 1
      src/css/newMenu/quill.bubble.css
  2. 1 0
      src/css/newMenu/serviceList.css
  3. 30 30
      webpack.config.js
  4. 100 100
      webpack/entry.config.js

+ 4 - 1
src/css/newMenu/quill.bubble.css

@@ -34,7 +34,6 @@
   line-height: 1.42;
   height: 100%;
   outline: none;
-  overflow-y: auto;
   padding: 0;
   tab-size: 4;
   -moz-tab-size: 4;
@@ -45,6 +44,9 @@
 .ql-editor > * {
   cursor: text;
 }
+.ql-editor p{
+  margin-bottom: 15px;
+}
 .ql-editor p,
 .ql-editor ol,
 .ql-editor ul,
@@ -382,6 +384,7 @@
 }
 .ql-editor .ql-align-justify {
   text-align: justify;
+  margin-bottom: 3px;
 }
 .ql-editor .ql-align-right {
   text-align: right;

+ 1 - 0
src/css/newMenu/serviceList.css

@@ -462,6 +462,7 @@
     line-height: 28px;
     border: 1px solid #ccc;
     cursor: pointer;
+    margin-right: 10px;
 }
 .objList div span.active{
     font-weight: 700;

+ 30 - 30
webpack.config.js

@@ -143,12 +143,12 @@ module.exports = (function () {
             template: './template/thinkTank/policyDetail.html',
             chunks: ['thinkTank/policyDetail', 'vendors']
         }),
-        // new HtmlWebpackPlugin({
-        //     title: '智库咨询-智政列表',
-        //     filename: 'html/thinkTank/policyList.html',
-        //     template: './template/thinkTank/policyList.html',
-        //     chunks: ['thinkTank/policyList', 'vendors']
-        // }),
+        new HtmlWebpackPlugin({
+            title: '智库咨询-智政列表',
+            filename: 'html/thinkTank/policyList.html',
+            template: './template/thinkTank/policyList.html',
+            chunks: ['thinkTank/policyList', 'vendors']
+        }),
         new HtmlWebpackPlugin({
             title: '智库咨询-智者详情',
             filename: 'html/thinkTank/thinkerDetail.html',
@@ -204,12 +204,12 @@ module.exports = (function () {
         //     template: './template/news/appCognizance.html',
         //     chunks: ['news/appCognizance', 'vendors']
         // }),
-        // new HtmlWebpackPlugin({
-        //     title: '注册协议',
-        //     filename: 'html/news/agreement.html',
-        //     template: './template/news/agreement.html',
-        //     chunks: ['news/agreement', 'vendors']
-        // }),
+        new HtmlWebpackPlugin({
+            title: '注册协议',
+            filename: 'html/news/agreement.html',
+            template: './template/news/agreement.html',
+            chunks: ['news/agreement', 'vendors']
+        }),
         /*  2018-6 改版后科技需求 */
         new HtmlWebpackPlugin({
             title: '科技需求',
@@ -326,24 +326,24 @@ module.exports = (function () {
             chunks: ['newMenu/safeguarding', 'vendors']
         }),
         //app
-        new HtmlWebpackPlugin({
-            title: '评估',
-            filename: 'html/newMenu/app/assessment.html',
-            template: './template/newMenu/app/assessment.html',
-            chunks: ['newMenu/app/assessment', 'vendors']
-        }),
-        new HtmlWebpackPlugin({
-            title: '托管',
-            filename: 'html/newMenu/app/trusteeship.html',
-            template: './template/newMenu/app/trusteeship.html',
-            chunks: ['newMenu/app/trusteeship', 'vendors']
-        }),
-        new HtmlWebpackPlugin({
-            title: 'app维权',
-            filename: 'html/newMenu/app/safeguardApp.html',
-            template: './template/newMenu/app/safeguardApp.html',
-            chunks: ['newMenu/app/safeguardApp', 'vendors']
-        })
+        // new HtmlWebpackPlugin({
+        //     title: '评估',
+        //     filename: 'html/newMenu/app/assessment.html',
+        //     template: './template/newMenu/app/assessment.html',
+        //     chunks: ['newMenu/app/assessment', 'vendors']
+        // }),
+        // new HtmlWebpackPlugin({
+        //     title: '托管',
+        //     filename: 'html/newMenu/app/trusteeship.html',
+        //     template: './template/newMenu/app/trusteeship.html',
+        //     chunks: ['newMenu/app/trusteeship', 'vendors']
+        // }),
+        // new HtmlWebpackPlugin({
+        //     title: 'app维权',
+        //     filename: 'html/newMenu/app/safeguardApp.html',
+        //     template: './template/newMenu/app/safeguardApp.html',
+        //     chunks: ['newMenu/app/safeguardApp', 'vendors']
+        // })
     ];
     if (!isDev) {
         //这个使用uglifyJs压缩你的js代码

+ 100 - 100
webpack/entry.config.js

@@ -2,31 +2,31 @@ module.exports = {
     prod: {
         'index': './src/js/newMenu/index.js',
         'aboutUs': './src/js/aboutUs.js',
-        'APPaboutUs': './src/js/APPaboutUs.js',
+        // 'APPaboutUs': './src/js/APPaboutUs.js',
         'contactUs': './src/js/contactUs.js',
-        'toPayment': './src/js/toPayment.js',
-        'service': './src/js/service.js',
+        // 'toPayment': './src/js/toPayment.js',
+        // 'service': './src/js/service.js',
         'register': './src/js/register.js',
-        'member': './src/js/member.js',
-        'technologyTrading': './src/js/technologyTrading.js',
+        // 'member': './src/js/member.js',
+        // 'technologyTrading': './src/js/technologyTrading.js',
         'thinkTank': './src/js/thinkTank.js',
-        'financialIndex': './src/js/financialIndex.js',
-        'technologyTrading/achievement': './src/js/technologyTrading/achievement.js',
-        'technologyTrading/demand': './src/js/technologyTrading/demand.js',
+        // 'financialIndex': './src/js/financialIndex.js',
+        // 'technologyTrading/achievement': './src/js/technologyTrading/achievement.js',
+        // 'technologyTrading/demand': './src/js/technologyTrading/demand.js',
         'technologyTrading/achievementDetail': './src/js/technologyTrading/achievementDetail.js',
         'technologyTrading/demandDetail': './src/js/technologyTrading/demandDetail.js',
-        'technologyTrading/assessMent': './src/js/technologyTrading/assessMent.js',
-        'technologyTrading/achievementOrder': './src/js/technologyTrading/achievementOrder.js',
-        'technologyTrading/demandOrder': './src/js/technologyTrading/demandOrder.js',
+        // 'technologyTrading/assessMent': './src/js/technologyTrading/assessMent.js',
+        // 'technologyTrading/achievementOrder': './src/js/technologyTrading/achievementOrder.js',
+        // 'technologyTrading/demandOrder': './src/js/technologyTrading/demandOrder.js',
         'thinkTank/policyDetail': './src/js/thinkTank/policyDetail.js',
         'thinkTank/policyList': './src/js/thinkTank/policyList.js',
         'thinkTank/thinkerDetail': './src/js/thinkTank/thinkerDetail.js',
-        'financial/investmentInstitution': './src/js/financial/investmentInstitution.js',
-        'financial/investmentDetail': './src/js/financial/investmentDetail.js',
-        'service/propertyRight': './src/js/service/propertyRight.js',
-        'service/projectDetails': './src/js/service/projectDetails.js',
-        'service/purpose': './src/js/service/purpose.js',
-        'service/highTechCognizance': './src/js/service/highTechCognizance.js',
+        // 'financial/investmentInstitution': './src/js/financial/investmentInstitution.js',
+        // 'financial/investmentDetail': './src/js/financial/investmentDetail.js',
+        // 'service/propertyRight': './src/js/service/propertyRight.js',
+        // 'service/projectDetails': './src/js/service/projectDetails.js',
+        // 'service/purpose': './src/js/service/purpose.js',
+        // 'service/highTechCognizance': './src/js/service/highTechCognizance.js',
         //newsApp
         'news/newsDetailApp': './src/js/news/newsDetailApp.js',
         'news/appCognizance': './src/js/news/appCognizance.js',
@@ -52,9 +52,9 @@ module.exports = {
         'newMenu/practicalPatentApp': './src/js/newMenu/continueHighApp.js',
         'newMenu/safeguarding': './src/js/newMenu/safeguarding.js',
         //app
-        'newMenu/app/assessment': './src/js/newMenu/app/assessment.js',
-        'newMenu/app/trusteeship': './src/js/newMenu/app/trusteeship.js',
-        'newMenu/app/safeguardApp': './src/js/newMenu/app/safeguardApp.js'
+        // 'newMenu/app/assessment': './src/js/newMenu/app/assessment.js',
+        // 'newMenu/app/trusteeship': './src/js/newMenu/app/trusteeship.js',
+        // 'newMenu/app/safeguardApp': './src/js/newMenu/app/safeguardApp.js'
     },
     watch: {
         'index': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
@@ -65,66 +65,66 @@ module.exports = {
             'webpack/hot/only-dev-server',
             './src/js/aboutUs.js'
         ], 
-        'APPaboutUs': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/APPaboutUs.js'
-        ],  
+        // 'APPaboutUs': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/APPaboutUs.js'
+        // ],  
         'contactUs': ['webpack-dev-server/client?http://192.168.1.188',
             'webpack/hot/only-dev-server',
             './src/js/contactUs.js'
         ],
-        'toPayment': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/toPayment.js'
-        ],
-        'service': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/service.js'
-        ],
+        // 'toPayment': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/toPayment.js'
+        // ],
+        // 'service': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/service.js'
+        // ],
         'register': ['webpack-dev-server/client?http://192.168.1.188',
             'webpack/hot/only-dev-server',
             './src/js/register.js'
         ],
-        'member': ['webpack-dev-server/client?http://192.168.1.188',
-            'webpack/hot/only-dev-server',
-            './src/js/member.js'
-        ],
-        'technologyTrading': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/technologyTrading.js'
-        ],
+        // 'member': ['webpack-dev-server/client?http://192.168.1.188',
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/member.js'
+        // ],
+        // 'technologyTrading': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/technologyTrading.js'
+        // ],
         'thinkTank': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/thinkTank.js'
         ],
-        'financialIndex': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/financialIndex.js'
-        ],
-        'technologyTrading/achievement': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/technologyTrading/achievement.js'
-        ],
-        'technologyTrading/demand': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/technologyTrading/demand.js'
-        ],
+        // 'financialIndex': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/financialIndex.js'
+        // ],
+        // 'technologyTrading/achievement': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/technologyTrading/achievement.js'
+        // ],
+        // 'technologyTrading/demand': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/technologyTrading/demand.js'
+        // ],
         'technologyTrading/achievementDetail': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/achievementDetail.js'
         ],
-        'technologyTrading/assessMent': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/technologyTrading/assessMent.js'
-         ],   
-        'technologyTrading/achievementOrder': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/technologyTrading/achievementOrder.js'
-        ],
-        'technologyTrading/demandOrder': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/technologyTrading/demandOrder.js'
-        ],
+        // 'technologyTrading/assessMent': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/technologyTrading/assessMent.js'
+        //  ],   
+        // 'technologyTrading/achievementOrder': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/technologyTrading/achievementOrder.js'
+        // ],
+        // 'technologyTrading/demandOrder': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/technologyTrading/demandOrder.js'
+        // ],
         'technologyTrading/demandDetail': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
             './src/js/technologyTrading/demandDetail.js'
@@ -141,30 +141,30 @@ module.exports = {
             'webpack/hot/only-dev-server',
             './src/js/thinkTank/policyList.js'
         ],
-        'financial/investmentInstitution': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/financial/investmentInstitution.js'
-        ],
-        'financial/investmentDetail': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/financial/investmentDetail.js'
-        ],
-        'service/highTechCognizance': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/service/highTechCognizance.js'
-        ],
-        'service/propertyRight': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/service/propertyRight.js'
-        ],
-		'service/projectDetails': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/service/projectDetails.js'
-        ],
-        'service/purpose': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-            'webpack/hot/only-dev-server',
-            './src/js/service/purpose.js'
-        ],
+        // 'financial/investmentInstitution': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/financial/investmentInstitution.js'
+        // ],
+        // 'financial/investmentDetail': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/financial/investmentDetail.js'
+        // ],
+        // 'service/highTechCognizance': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/service/highTechCognizance.js'
+        // ],
+        // 'service/propertyRight': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/service/propertyRight.js'
+        // ],
+		// 'service/projectDetails': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/service/projectDetails.js'
+        // ],
+        // 'service/purpose': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        //     'webpack/hot/only-dev-server',
+        //     './src/js/service/purpose.js'
+        // ],
         // newsApp 
         'news/newsDetailApp': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
             'webpack/hot/only-dev-server',
@@ -255,17 +255,17 @@ module.exports = {
         'webpack/hot/only-dev-server',
         './src/js/newMenu/safeguarding.js'
         ],
-        'newMenu/app/assessment': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-        'webpack/hot/only-dev-server',
-        './src/js/newMenu/app/assessment.js'
-        ],
-        'newMenu/app/trusteeship': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-        'webpack/hot/only-dev-server',
-        './src/js/newMenu/app/trusteeship.js'
-        ],
-        'newMenu/app/safeguardApp': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
-        'webpack/hot/only-dev-server',
-        './src/js/newMenu/app/safeguardApp.js'
-        ]
+        // 'newMenu/app/assessment': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        // 'webpack/hot/only-dev-server',
+        // './src/js/newMenu/app/assessment.js'
+        // ],
+        // 'newMenu/app/trusteeship': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        // 'webpack/hot/only-dev-server',
+        // './src/js/newMenu/app/trusteeship.js'
+        // ],
+        // 'newMenu/app/safeguardApp': ['webpack-dev-server/client?http://192.168.1.188', // WebpackDevServer host and port
+        // 'webpack/hot/only-dev-server',
+        // './src/js/newMenu/app/safeguardApp.js'
+        // ]
     }
 };