Frans 7 years ago
parent
commit
458dbfa788
3 changed files with 14 additions and 13 deletions
  1. 11 11
      build/webpack.demo.base.conf.js
  2. 2 1
      sites/demo/app.js
  3. 1 1
      sites/demo/index.html

+ 11 - 11
build/webpack.demo.base.conf.js

@@ -22,17 +22,17 @@ module.exports = merge(webpackBaseConf, {
     module: {
     module: {
         rules: [
         rules: [
             //自定义主题
             //自定义主题
-            {
-                test: /\.(sa|sc|c)ss$/,
-                use: [
-                    {
-                        loader: 'sass-loader',
-                        options: {
-                            data: `@import "./sites/demo/asset/css/custom.scss";@import "./src/styles/index.scss"; `,
-                        },
-                    }
-                ],
-            }
+            // {
+            //     test: /\.(sa|sc|c)ss$/,
+            //     use: [
+            //         {
+            //             loader: 'sass-loader',
+            //             options: {
+            //                 data: `@import "./sites/demo/asset/css/custom.scss";@import "./src/styles/index.scss"; `,
+            //             },
+            //         }
+            //     ],
+            // }
         ]
         ]
     },
     },
     plugins: [
     plugins: [

+ 2 - 1
sites/demo/app.js

@@ -1,4 +1,3 @@
-//import 'babel-polyfill';
 import "core-js/modules/es6.promise";
 import "core-js/modules/es6.promise";
 import "core-js/modules/es6.array.iterator";
 import "core-js/modules/es6.array.iterator";
 import Vue from 'vue';
 import Vue from 'vue';
@@ -8,6 +7,8 @@ import Conf from '../../src/config.json';
 import NutUI from '../../src/nutui';
 import NutUI from '../../src/nutui';
 // import en from '../../src/locales/lang/en-US';
 // import en from '../../src/locales/lang/en-US';
 // import demoEN from './lang/en-US';
 // import demoEN from './lang/en-US';
+
+
 import './asset/css/common.scss';
 import './asset/css/common.scss';
 
 
 import './asset/img/logo_share.png';
 import './asset/img/logo_share.png';

+ 1 - 1
sites/demo/index.html

@@ -7,7 +7,7 @@
   <link rel="shortcut icon" href="/favicon.ico">
   <link rel="shortcut icon" href="/favicon.ico">
   <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
   <meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" />
   <title>NutUI - 移动端Vue组件库</title>
   <title>NutUI - 移动端Vue组件库</title>
-  <script src="//misc.360buyimg.com/felibs/vue/2.5.16/vue.min.js"></script>
+  <!-- <script src="//misc.360buyimg.com/felibs/vue/2.5.16/vue.min.js"></script> -->
   <script src="https://h5.m.jd.com/babelDiy/Zeus/2846ykuM7PwipD9E2RzMj2BGEQpA/plugin/share.min.js"></script>
   <script src="https://h5.m.jd.com/babelDiy/Zeus/2846ykuM7PwipD9E2RzMj2BGEQpA/plugin/share.min.js"></script>
   <!-- <script src="//misc.360buyimg.com/felibs/fastclick/1.0.6/fastclick.min.js"></script> -->
   <!-- <script src="//misc.360buyimg.com/felibs/fastclick/1.0.6/fastclick.min.js"></script> -->
   <style>
   <style>