Merge remote-tracking branch 'remotes/origin/dev-mvp-20200331' into release

build/webpack.base.conf.js

@@ -12,7 +12,6 @@ var useCssSourceMap = cssSourceMapDev || cssSourceMapProd
 
 
 module.exports = {
-    devtool: 'source-map',
     entry: {
         app: './src/main.js'
     },

config/index.js

@@ -11,7 +11,7 @@ module.exports = {
         assetsRoot: path.resolve(__dirname, '../dist'),
         assetsSubDirectory: './static',
         assetsPublicPath: './',
-        productionSourceMap: false,
+        productionSourceMap: true,
         // Surge or Netlify already gzip all static assets for you.
         // Before setting to `true`, make sure to:
         // npm install --save-dev compression-webpack-plugin

src/components/education/template/templateMessage.vue

@@ -299,6 +299,9 @@ export default {
       },
       pickerOptions1: {
         disabledDate: time => {
+          if( !(time.getTime() < new Date(vm.formData.projectBegintime).getTime() || time.getTime() > new Date(vm.formData.projectBegintime).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay)) {
+            console.log('可以使用的天数');
+          }
           return (
             time.getTime() < new Date(vm.formData.projectBegintime).getTime() || time.getTime() > new Date(vm.formData.projectBegintime).getTime() + 1000 * 60 * 60 * 24 * vm.formData.expireDay
           ); //减去一天的时间代表可以选择同一天;

src/utils/fetch.js

@@ -55,7 +55,7 @@ service.interceptors.request.use(config => {
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
       // config.headers['token'] = '29D71EAAB92E4580AFB16A8011BE7206';
-      config.headers['token'] = 'FC436958A7344D2A8C86E2857CBBAF3A';
+      config.headers['token'] = '2141D101894D43C9BC7A14C54837EDCD';
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')