Skip to content

I
integral-mall
Commit f9f7cbd7 by caoyanzhi
Options

Merge branch 'feature/3月迭代' into dev 

# Conflicts:
#	dist/index.html
#	dist/js/main.61536dd2cd9baf94f8f7.js
#	dist/js/main.61536dd2cd9baf94f8f7.js.LICENSE.txt
#	dist/js/main.7da6b9ae30580e4be601.js
#	dist/js/main.7da6b9ae30580e4be601.js.LICENSE.txt
#	dist/js/main.85298c64958e2cab1531.js
#	dist/js/main.85298c64958e2cab1531.js.LICENSE.txt
parents f61f7c9d e3e6fcb7
Showing with 54 additions and 23 deletions
dist/index.html
<<<<<<< HEAD
<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title></title><script defer="defer" src="/integral-mall/js/main.7da6b9ae30580e4be601.js"></script><link href="/integral-mall/css/main.ff82526b8444e449655c.css" rel="stylesheet"></head><body><div id="app"><div class="el-loading-spinner" style="width: 98%;"><svg viewBox="25 25 50 50" class="circular"><circle cx="50" cy="50" r="20" fill="none" class="path"></circle></svg></div></div><script>(function() {
=======
<!doctype html><html><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="stylesheet" href="./static/css/iconfont.css"><link rel="stylesheet" href="./static/css/common.css"><link rel="shortcut icon" type="image/x-icon" href="./static/img/favicon.ico"><title></title><script defer="defer" src="/integral-mall/js/main.61536dd2cd9baf94f8f7.js"></script><link href="/integral-mall/css/main.8a0e43bfa49b1adaa714.css" rel="stylesheet"></head><body><div id="app"><div class="el-loading-spinner" style="width: 98%;"><svg viewBox="25 25 50 50" class="circular"><circle cx="50" cy="50" r="20" fill="none" class="path"></circle></svg></div></div><script>(function() {
>>>>>>> feature/3月迭代
var src = '/component/static/import-component.js?timestrap=' + new Date().getTime();
var host = window.location.host;
host = host.indexOf('localhost') > -1 || host.indexOf('192.168') > -1 ? 'gicdev.demogic.com' : host;
......
dist/js/main.61536dd2cd9baf94f8f7.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.61536dd2cd9baf94f8f7.js.LICENSE.txt 0 → 100644
/*!
* @overview es6-promise - a tiny implementation of Promises/A+.
* @copyright Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors (Conversion to ES6 API by Jake Archibald)
* @license Licensed under MIT license
* See https://raw.githubusercontent.com/stefanpenner/es6-promise/master/LICENSE
* @version v4.2.6+9869a4bc
*/
/*!
* clipboard.js v2.0.1
* https://zenorocha.github.io/clipboard.js
*
* Licensed MIT © Zeno Rocha
*/
/*!
* vue-treeselect v0.0.35 | (c) 2017-2018 Riophae Lee
* Released under the MIT License.
* https://vue-treeselect.js.org/
*/
/**!
* Sortable 1.10.2
* @author RubaXa <trash@rubaxa.org>
* @author owenm <owen23355@gmail.com>
* @license MIT
*/
dist/js/main.7da6b9ae30580e4be601.js
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/theme/index.css
......@@ -11263,7 +11263,7 @@
.el-button:focus {
color: #2F54EB;
border-color: #2F54EB;
background-color: #e8f4ff;
background-color: #EBEFFE;
}
.el-button:active {
......@@ -11385,8 +11385,8 @@
.el-button--primary.is-plain {
color: #2F54EB;
background: #e8f4ff;
border-color: #a3d3ff;
background: #EBEFFE;
border-color: #2f54eb;
}
.el-button--primary.is-plain:hover,
......@@ -11408,7 +11408,7 @@
.el-button--primary.is-plain.is-disabled:focus,
.el-button--primary.is-plain.is-disabled:active {
color: #74bcff;
background-color: #e8f4ff;
background-color: #EBEFFE;
border-color: #d1e9ff;
}
......@@ -12526,7 +12526,7 @@
.el-dropdown-menu__item:not(.is-disabled):hover,
.el-dropdown-menu__item:focus {
background-color: #e8f4ff;
background-color: #EBEFFE;
color: #597EF7;
}
......@@ -13663,7 +13663,7 @@
.el-menu-item:hover,
.el-menu-item:focus {
outline: none;
background-color: #e8f4ff;
background-color: #EBEFFE;
}
.el-menu-item.is-disabled {
......@@ -13721,7 +13721,7 @@
.el-submenu__title:hover,
.el-submenu__title:focus {
outline: none;
background-color: #e8f4ff;
background-color: #EBEFFE;
}
.el-submenu__title.is-disabled {
......@@ -13731,7 +13731,7 @@
}
.el-submenu__title:hover {
background-color: #e8f4ff;
background-color: #EBEFFE;
}
.el-submenu .el-menu {
......@@ -25704,7 +25704,7 @@
.el-button:focus {
color: #2F54EB;
border-color: #2F54EB;
background-color: #e8f4ff;
background-color: #EBEFFE;
}
.el-button:active {
......@@ -25826,8 +25826,8 @@
.el-button--primary.is-plain {
color: #2F54EB;
background: #e8f4ff;
border-color: #a3d3ff;
background: #EBEFFE;
border-color: #2f54eb;
}
.el-button--primary.is-plain:hover,
......@@ -25849,7 +25849,7 @@
.el-button--primary.is-plain.is-disabled:focus,
.el-button--primary.is-plain.is-disabled:active {
color: #74bcff;
background-color: #e8f4ff;
background-color: #EBEFFE;
border-color: #d1e9ff;
}
......@@ -29649,18 +29649,18 @@
}
.el-table--striped .el-table__body tr.el-table__row--striped.current-row td {
background-color: #e8f4ff;
background-color: #EBEFFE;
}
.el-table__body tr.hover-row>td,
.el-table__body tr.hover-row.current-row>td,
.el-table__body tr.hover-row.el-table__row--striped>td,
.el-table__body tr.hover-row.el-table__row--striped.current-row>td {
background-color: #e8f4ff;
background-color: #EBEFFE;
}
.el-table__body tr.current-row>td {
background-color: #e8f4ff;
background-color: #EBEFFE;
}
.el-table__column-resize-proxy {
......@@ -31933,7 +31933,7 @@
}
.el-table-filter__list-item:hover {
background-color: #e8f4ff;
background-color: #EBEFFE;
color: #597EF7;
}
......@@ -49301,7 +49301,7 @@
.el-button:focus {
color: #2F54EB;
border-color: #2F54EB;
background-color: #e8f4ff;
background-color: #EBEFFE;
}
.el-button:active {
......@@ -49423,8 +49423,8 @@
.el-button--primary.is-plain {
color: #2F54EB;
background: #e8f4ff;
border-color: #a3d3ff;
background: #EBEFFE;
border-color: #2f54eb;
}
.el-button--primary.is-plain:hover,
......@@ -49446,7 +49446,7 @@
.el-button--primary.is-plain.is-disabled:focus,
.el-button--primary.is-plain.is-disabled:active {
color: #74bcff;
background-color: #e8f4ff;
background-color: #EBEFFE;
border-color: #d1e9ff;
}
......@@ -77880,8 +77880,8 @@
.el-button--primary.is-plain {
color: #2F54EB;
background: #e8f4ff;
border-color: #a3d3ff;
background: #EBEFFE;
border-color: #2f54eb;
}
.el-button--primary.is-plain:hover,
......@@ -77901,7 +77901,7 @@
/* .el-button--primary.is-plain.is-disabled, .el-button--primary.is-plain.is-disabled:hover, .el-button--primary.is-plain.is-disabled:focus, .el-button--primary.is-plain.is-disabled:active {
color: #74bcff;
background-color: #e8f4ff;
background-color: #EBEFFE;
border-color: #d1e9ff; } */
.el-button--success {
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment