Merge branch 'zcwy-master' into 'master'

Zcwy master

See merge request !96

public/index.html

@@ -6,6 +6,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta http-equiv="pragram" content="no-cache">
     <meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate">
+    <meta http-equiv="Cache" content="no-cache">
+    <meta http-equiv="Pragma" content="no-cache">
     <meta http-equiv="expires" content="0">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <meta name="apple-mobile-web-app-capable" content="yes">

src/views/study/coursenew.vue

@@ -246,7 +246,7 @@
                 <div class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
               </div>
               <div  style="padding-top:15px;width:70px;">
-                <followButton :auto="true" size="small" :aid="item.teacherId"></followButton>
+                <followButton v-if="item.teacherName!=='BOE教师'" :auto="true" size="small" :aid="item.teacherId"></followButton>
               </div>
             </div>
           </div>

vue.config.js

@@ -13,7 +13,10 @@ const port = process.env.port || process.env.npm_config_port || 80 // 端口
     // vue.config.js 配置说明
     //官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
     // 这里只列一部分，具体配置参考文档
+    const timeStamp = new Date().getTime()
 module.exports = {
+    filenameHashing:false,
+
 
     // 部署生产环境和开发环境下的URL。
     // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
@@ -29,11 +32,17 @@ module.exports = {
     productionSourceMap: false,
     css: {
         extract: {
-          ignoreOrder: true
+          ignoreOrder: true,
+          filename:`css/[name].css?v=${timeStamp}`,
+          chunkFilename:`css/chunk.[id].css?v=${timeStamp}`
         }
     },
     configureWebpack: {
         name: name,
+        output:{
+            filename:`js/[name].js?v=${timeStamp}`,
+            chunkFilename:`js/chunk.[id].js?v=${timeStamp}`
+        },
         resolve: {
             alias: {
                 '@': resolve('src')