123

347f1481 · 刘泽奇 · dc89e69b · 347f1481 · 347f1481 · 347f1481
Commit 347f1481 authored Nov 18, 2019 by 刘泽奇
6 changed files
--- a/embed_applications/app/front/entry/index.ejs
+++ b/embed_applications/app/front/entry/index.ejs
@@ -19,7 +19,7 @@
 <script src="/js/echarts/echarts.min.js"></script>

 <body>
-	<div id="app" style="">
+	<div id="app" style="visibility: hidden;">
 		<div>
 			<div id="embedwarpper">
 				<div>

--- a/embed_applications/app/front/entry/public/css/index.css
+++ b/embed_applications/app/front/entry/public/css/index.css
 #app {
        width: 100%;
+        overflow: hidden;
+        height: 100vh;
 }

 #embedwarpper {
@@ -11,10 +13,12 @@
 }

 #embedwarpper>div {
+        overflow-y: auto;
+        height: 100vh;
        width: 100%;
        background: #fff;
        box-sizing: border-box;
        padding: 20px;
-        border-radius:2px;
-        border:1px solid rgba(230,232,233,1);
+        border-radius: 2px;
+        border: 1px solid rgba(230, 232, 233, 1);
 }
\ No newline at end of file
--- a/embed_applications/app/front/entry/public/css/pagecom.css
+++ b/embed_applications/app/front/entry/public/css/pagecom.css
--- a/embed_applications/app/front/entry/public/js/main.js
+++ b/embed_applications/app/front/entry/public/js/main.js
@@ -232,6 +232,7 @@ function getQueryStringMap() {
              };
            },
            created() {
+              $("#app").css("visibility",'visible');
              /**是否微信登录 */
              // var arr = location.href.split('?');
              // if(arr && arr.length>1){

--- a/embed_applications/app/front/vues/pages/brandfind/brandfind.css
+++ b/embed_applications/app/front/vues/pages/brandfind/brandfind.css
@@ -284,7 +284,7 @@

 .brandfind-main-equal-form {
        box-sizing: border-box;
-        width: 48%;
+        width: 50%;
        height: 256px;
        border: 1px solid #F7F7F8;
        padding: 20px 30px 30px 30px;
@@ -606,4 +606,5 @@
 .brandfind-list-page .el-pagination {
        margin-top: 18px;
        float: right;
+        margin-bottom: 18px;
 }
\ No newline at end of file
--- a/embed_applications/package.json
+++ b/embed_applications/package.json
@@ -31,6 +31,9 @@
    "express": "^4.16.2",
    "express-session": "^1.15.6",
    "gm": "^1.23.1",
+    "gulp-imagemin": "^6.2.0",
+    "gulp-minify-css": "^1.2.4",
+    "imagemin-pngquant": "^8.0.0",
    "merge-stream": "^2.0.0",
    "method-override": "^2.3.10",
    "mongoose": "^5.6.13",