Skip to content

I
integral-mall
Commit e727cb55 by chenyu
Options

update: dist

parent a507b882
Showing with 9 additions and 40 deletions
dist/css/main.70787b26575cf0f512d2.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/css/main.8673a0342ef2c8b2831d.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/css/main.babffbd6df172456aa32.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
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.0ef40464728ad647a33f.js"></script><link href="/integral-mall/css/main.8673a0342ef2c8b2831d.css" rel="stylesheet"></head><body><div id="app"></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.f4e5097dcfe68b6375b8.js"></script><link href="/integral-mall/css/main.70787b26575cf0f512d2.css" rel="stylesheet"></head><body><div id="app"></div><script>(function() {
>>>>>>> feature/3月迭代-菜单
<!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.e27babb88c66d4478d90.js"></script><link href="/integral-mall/css/main.babffbd6df172456aa32.css" rel="stylesheet"></head><body><div id="app"></div><script>(function() {
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.0ef40464728ad647a33f.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.e27babb88c66d4478d90.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.0ef40464728ad647a33f.js.LICENSE.txt → dist/js/main.e27babb88c66d4478d90.js.LICENSE.txt
......@@ -3,13 +3,13 @@
* @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
* @version v4.2.8+1e68dce6
*/
/*!
* clipboard.js v2.0.1
* https://zenorocha.github.io/clipboard.js
*
* clipboard.js v2.0.8
* https://clipboardjs.com/
*
* Licensed MIT © Zeno Rocha
*/
......
dist/js/main.f4e5097dcfe68b6375b8.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/main.f4e5097dcfe68b6375b8.js.LICENSE.txt deleted 100644 → 0
/*!
* @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/static/css/common.css
......@@ -227,11 +227,11 @@ input:focus {
}
/*页面头部*/
.mall-section-container{
flex:1;
/*margin-bottom:40px;*/
min-width:1200px;
padding:20px;
}
.mall-content-section{
/* .mall-content-section{
height:100%;
}
.mall-content-title{
......@@ -263,7 +263,7 @@ input:focus {
background: #fff;
margin: 24px;
padding: 24px;
}
} */
/*编辑按钮*/
.el-icon-edit{
......
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