Merge branch 'liwei' of http://8.136.197.230:3000/ZheJiangNingBo/pingAnQiYeWeb into liwei

src/views/home/workspace.vue

@@ -98,6 +98,7 @@ export default {
   background: url("~@/assets/images/home/bg.png") no-repeat center center;
   background-size: 100% 100%;
   box-sizing: border-box;
+
   .funMenu {
     position: absolute;
     top: 80px;
@@ -110,6 +111,7 @@ export default {
     background: url("~@/assets/images/home/bg2.png") no-repeat center center;
     background-size: 100% 100%;
     box-sizing: border-box;
+    overflow: hidden;
     /* 旋转动画 */
     .diPan {
       position: absolute;

vue.config.js

@@ -1,18 +1,25 @@
-const CopyWebpackPlugin = require('copy-webpack-plugin');
+const CopyWebpackPlugin = require("copy-webpack-plugin");
 module.exports = {
-  publicPath: '/',
+  publicPath: "/",
   configureWebpack: {
     plugins: [
       new CopyWebpackPlugin([
-        { from: 'node_modules/@liveqing/liveplayer/dist/component/crossdomain.xml' },
+        {
-        { from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer.swf' },
+          from: "node_modules/@liveqing/liveplayer/dist/component/crossdomain.xml",
-        { from: 'node_modules/@liveqing/liveplayer/dist/component/liveplayer-lib.min.js', to: 'js/' },
+        },
+        {
+          from: "node_modules/@liveqing/liveplayer/dist/component/liveplayer.swf",
+        },
+        {
+          from: "node_modules/@liveqing/liveplayer/dist/component/liveplayer-lib.min.js",
+          to: "js/",
+        },
         // {
         //   patterns: [{
         //     from: './public/static', to: 'static'
         //   }]
         // }
-      ])
+      ]),
     ],
     // externals: {
     //   'BMap': 'BMap',
@@ -22,10 +29,11 @@ module.exports = {
   css: {
     loaderOptions: {
       sass: {
-        prependData:`@import "~@/loveflow/assets/index.scss";`
+        prependData: `@import "~@/loveflow/assets/index.scss";`,
-      }
+      },
-    }
+    },
-  }
+  },
-}
+  devServer: {
-
+    port: "2911",
-
+  },
+};