Merge branch 'dev' into 'master'

Dev See merge request !18

Merge branch 'dev' into 'master'
Dev See merge request !18
97c7d269 · damodmg · 15f9fa64 · fb196147 · 97c7d269 · 97c7d269
Commit 97c7d269 authored Feb 15, 2019 by damodmg
8 changed files
--- a/dist/index.html
+++ b/dist/index.html
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.84b3c9128e17b961834dadc04a29a1e8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.ca5b0aafba5ef9e8b684.js></script><script type=text/javascript src=/integral-mall/static/js/app.8ebf3f61795b617aa6c2.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel="shortcut icon" href=./static/img/favicon.ico><title>GIC后台</title><link rel=stylesheet type=text/css href=static/css/iconfont.css><link rel=stylesheet type=text/css href=static/css/common.css><link href=/integral-mall/static/css/app.84b3c9128e17b961834dadc04a29a1e8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/integral-mall/static/js/manifest.003beacb9c9ae622c7f2.js></script><script type=text/javascript src=/integral-mall/static/js/vendor.8354522d5c354e281806.js></script><script type=text/javascript src=/integral-mall/static/js/app.1799cebad8326545dc50.js></script></body></html>
\ No newline at end of file
--- a/dist/static/js/app.1799cebad8326545dc50.js
+++ b/dist/static/js/app.1799cebad8326545dc50.js
--- a/dist/static/js/app.8ebf3f61795b617aa6c2.js
+++ b/dist/static/js/app.8ebf3f61795b617aa6c2.js
--- a/dist/static/js/vendor.8354522d5c354e281806.js
+++ b/dist/static/js/vendor.8354522d5c354e281806.js
--- a/dist/static/js/vendor.ca5b0aafba5ef9e8b684.js
+++ b/dist/static/js/vendor.ca5b0aafba5ef9e8b684.js
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,9 +22,9 @@
      }
    },
    "@gic-test/vue-gic-header": {
-      "version": "1.4.2",
-      "resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-header/download/@gic-test/vue-gic-header-1.4.2.tgz",
-      "integrity": "sha1-waBkoKJo/e5FTNMmkmZqAwnvyfc=",
+      "version": "1.4.3",
+      "resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-header/download/@gic-test/vue-gic-header-1.4.3.tgz",
+      "integrity": "sha1-Ka6W9Wa029A46zzZr3e2doAmEsk=",
      "requires": {
        "axios": "0.18.0",
        "vue": "2.5.17"

--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
  },
  "dependencies": {
    "@gic-test/vue-gic-footer": "^1.0.9",
-    "@gic-test/vue-gic-header": "^1.4.2",
+    "@gic-test/vue-gic-header": "^1.4.3",
    "@gic-test/vue-gic-img-preview": "^1.0.13",
    "@gic-test/vue-gic-store-linkage": "^1.0.7",
    "@gic-test/vue-gic-store-new": "^1.0.5",

--- a/src/components/layout/index.vue
+++ b/src/components/layout/index.vue
 <template>
  <div class="layout-container">
-    <vue-gic-header class="user-header-pop" style="z-index: 1999;" :projectName="projectName" :collapseFlag="collapseFlag" @collapseTag="collapseTagHandler" @toRouterView="toRouterView"></vue-gic-header>
+    <vue-gic-header class="user-header-pop" style="z-index: 1999;min-width:1400px" :projectName="projectName" :collapseFlag="collapseFlag" @collapseTag="collapseTagHandler" @toRouterView="toRouterView"></vue-gic-header>
    <div class="layout">
      <vue-gic-aside-menu class="layout-left" v-if="asideShow" :projectName="projectName" :leftModulesName="leftModulesName" :collapseFlag.sync="collapseFlag"></vue-gic-aside-menu>
      <div class="layout-right" :class="[{'asideShow': asideShow},{'collapseFlag':asideShow && collapseFlag}]">