Skip to content

I
integral-mall
Commit 63d1fe11 by damodmg
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !22
parents 41fd33f7 e33d7d97
Showing with 25 additions and 15 deletions
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=./static/css/app.942c6f5abeccc49b8da1e0d54a1a0877.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.07.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-image.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.264a1f7323512c77f7a5.js></script><script type=text/javascript src=./static/js/app.9319f03054d1022a1d1c.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=./static/css/app.7b535e3b70a1741bee9b0dece52b4867.css rel=stylesheet></head><body><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.5.2/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.07.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/upload-image.2.0.04.js></script><script src=//web-1251519181.file.myqcloud.com/components/input.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/delete.2.0.00.js></script><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b29cb584e8615d548909.js></script><script type=text/javascript src=./static/js/app.2386d135771ebcfafb94.js></script></body></html>
\ No newline at end of file
dist/static/js/vendor.264a1f7323512c77f7a5.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.b29cb584e8615d548909.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
......@@ -26,7 +26,8 @@
<script src='//web-1251519181.file.myqcloud.com/components/export-excel.2.0.02.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/img-preview.2.0.00.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/upload-image.2.0.00.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/store-linkage.2.0.00.js'></script>
<script src='//web-1251519181.file.myqcloud.com/components/upload-image.2.0.04.js'></script>
<!-- 二次封装的input -->
<script src='//web-1251519181.file.myqcloud.com/components/input.2.0.00.js'></script>
<!-- 删除确认弹窗 -->
......
package-lock.json
......@@ -165,15 +165,6 @@
"integrity": "sha512-6xnwtvp9DY1EINIKdTfvfeAtCYw4OqBZJhtiqkT3ivjnEfa25VQ3TsKvaFfKm8MyGIEfE95qLe+bNEt3nB0Ylg==",
"dev": true
},
"@gic-test/vue-gic-store-linkage": {
"version": "1.0.7",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-store-linkage/download/@gic-test/vue-gic-store-linkage-1.0.7.tgz",
"integrity": "sha1-ObbHNM1C2thlglQBad5+t36H0uI=",
"requires": {
"axios": "0.18.0",
"vue": "2.5.17"
}
},
"@gic-test/vue-gic-store-new": {
"version": "1.1.0",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-store-new/download/@gic-test/vue-gic-store-new-1.1.0.tgz",
......@@ -1281,6 +1272,23 @@
"esutils": "2.0.2"
}
},
"babel-polyfill": {
"version": "6.26.0",
"resolved": "http://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz",
"integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
"requires": {
"babel-runtime": "6.26.0",
"core-js": "2.5.7",
"regenerator-runtime": "0.10.5"
},
"dependencies": {
"regenerator-runtime": {
"version": "0.10.5",
"resolved": "http://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.10.5.tgz",
"integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
}
}
},
"babel-preset-env": {
"version": "1.7.0",
"resolved": "http://registry.npm.taobao.org/babel-preset-env/download/babel-preset-env-1.7.0.tgz",
......
package.json
......@@ -13,11 +13,11 @@
"formater": "onchange \"test/**/*.js\" \"src/**/*.js\" \"src/**/*.vue\" -- prettier --write {{changed}}"
},
"dependencies": {
"@gic-test/vue-gic-store-linkage": "^1.0.7",
"@gic-test/vue-gic-store-new": "^1.0.5",
"@riophae/vue-treeselect": "^0.0.36",
"@tinymce/tinymce-vue": "^1.1.0",
"axios": "^0.18.0",
"babel-polyfill": "^6.26.0",
"element-ui": "^2.4.1",
"scriptjs": "^2.5.8",
"tinymce": "^4.8.5",
......
src/main.js
......@@ -4,11 +4,12 @@ import router from './router';
import store from './store';
import { axios } from './service/api/index';
import ElementUI from 'element-ui';
import 'babel-polyfill';
// import vueGicHeader from '@gic-test/vue-gic-header'
// import vueGicFooter from '@gic-test/vue-gic-footer'
// 单个图片预览插件
// import vueGicImgPreview from '@gic-test/vue-gic-img-preview'
import vueGicStoreLinkage from '@gic-test/vue-gic-store-linkage/src/lib';
// import vueGicStoreLinkage from '@gic-test/vue-gic-store-linkage/src/lib';
// import vueGicAsideMenu from '@/components/aside-menu'
// 图片墙上传插件
// import vueGicUploadImage from '@gic-test/vue-gic-upload-image/src/lib'
......@@ -19,7 +20,7 @@ Vue.use(ElementUI);
// Vue.use(vueGicHeader)
// Vue.use(vueGicFooter)
// Vue.use(vueGicAsideMenu)
Vue.use(vueGicStoreLinkage);
// Vue.use(vueGicStoreLinkage);
// Vue.use(vueGicImgPreview)
// Vue.use(vueGicUploadImage)
Vue.use(VueClipboard);
......
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