Skip to content

html / happiness-plus-platform-admin

Go to a project
Commit 28c49e55 by dongjipeng
Options

add

parent dd807a2c
Showing with 75 additions and 75 deletions
package-lock.json
...@@ -2585,9 +2585,9 @@ ...@@ -2585,9 +2585,9 @@
"dev": true "dev": true
}, },
"cacache": { "cacache": {
"version": "11.3.3", "version": "12.0.2",
"resolved": "https://registry.npm.taobao.org/cacache/download/cacache-11.3.3.tgz", "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.2.tgz",
"integrity": "sha1-i9Kd+ManGKbr0tAQ2k15cq47utw=", "integrity": "sha512-ifKgxH2CKhJEg6tNdAwziu6Q33EvuG26tYcda6PT3WKisZcYDXsnEdnRv67Po3yCzFfaSoMjGZzJyD2c3DT1dg==",
"dev": true, "dev": true,
"requires": { "requires": {
"bluebird": "^3.5.5", "bluebird": "^3.5.5",
...@@ -2595,6 +2595,7 @@ ...@@ -2595,6 +2595,7 @@
"figgy-pudding": "^3.5.1", "figgy-pudding": "^3.5.1",
"glob": "^7.1.4", "glob": "^7.1.4",
"graceful-fs": "^4.1.15", "graceful-fs": "^4.1.15",
"infer-owner": "^1.0.3",
"lru-cache": "^5.1.1", "lru-cache": "^5.1.1",
"mississippi": "^3.0.0", "mississippi": "^3.0.0",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
...@@ -6710,6 +6711,12 @@ ...@@ -6710,6 +6711,12 @@
"integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
"dev": true "dev": true
}, },
"infer-owner": {
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
"integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
"dev": true
},
"inflight": { "inflight": {
"version": "1.0.6", "version": "1.0.6",
"resolved": "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz", "resolved": "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz",
...@@ -11053,9 +11060,9 @@ ...@@ -11053,9 +11060,9 @@
} }
}, },
"source-map-support": { "source-map-support": {
"version": "0.5.12", "version": "0.5.13",
"resolved": "https://registry.npm.taobao.org/source-map-support/download/source-map-support-0.5.12.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.12.tgz", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
"integrity": "sha1-tPOxDVGFelrwE4086AA7IBYT1Zk=", "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
"dev": true, "dev": true,
"requires": { "requires": {
"buffer-from": "^1.0.0", "buffer-from": "^1.0.0",
...@@ -11064,8 +11071,8 @@ ...@@ -11064,8 +11071,8 @@
"dependencies": { "dependencies": {
"source-map": { "source-map": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true "dev": true
} }
} }
...@@ -11508,9 +11515,9 @@ ...@@ -11508,9 +11515,9 @@
} }
}, },
"terser": { "terser": {
"version": "4.1.2", "version": "4.1.4",
"resolved": "https://registry.npm.taobao.org/terser/download/terser-4.1.2.tgz?cache=0&sync_timestamp=1562580696479&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser%2Fdownload%2Fterser-4.1.2.tgz", "resolved": "https://registry.npmjs.org/terser/-/terser-4.1.4.tgz",
"integrity": "sha1-smVsilBvfOgFo/MAov9I2wIvo5E=", "integrity": "sha512-+ZwXJvdSwbd60jG0Illav0F06GDJF0R4ydZ21Q3wGAFKoBGyJGo34F63vzJHgvYxc1ukOtIjvwEvl9MkjzM6Pg==",
"dev": true, "dev": true,
"requires": { "requires": {
"commander": "^2.20.0", "commander": "^2.20.0",
...@@ -11520,34 +11527,33 @@ ...@@ -11520,34 +11527,33 @@
"dependencies": { "dependencies": {
"source-map": { "source-map": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true "dev": true
} }
} }
}, },
"terser-webpack-plugin": { "terser-webpack-plugin": {
"version": "1.3.0", "version": "1.4.1",
"resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-1.3.0.tgz", "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz",
"integrity": "sha1-aaoiQmKZ9LWzd1y+2MssXUGaodQ=", "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
"dev": true, "dev": true,
"requires": { "requires": {
"cacache": "^11.3.2", "cacache": "^12.0.2",
"find-cache-dir": "^2.0.0", "find-cache-dir": "^2.1.0",
"is-wsl": "^1.1.0", "is-wsl": "^1.1.0",
"loader-utils": "^1.2.3",
"schema-utils": "^1.0.0", "schema-utils": "^1.0.0",
"serialize-javascript": "^1.7.0", "serialize-javascript": "^1.7.0",
"source-map": "^0.6.1", "source-map": "^0.6.1",
"terser": "^4.0.0", "terser": "^4.1.2",
"webpack-sources": "^1.3.0", "webpack-sources": "^1.4.0",
"worker-farm": "^1.7.0" "worker-farm": "^1.7.0"
}, },
"dependencies": { "dependencies": {
"schema-utils": { "schema-utils": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
"integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
"dev": true, "dev": true,
"requires": { "requires": {
"ajv": "^6.1.0", "ajv": "^6.1.0",
...@@ -11557,9 +11563,19 @@ ...@@ -11557,9 +11563,19 @@
}, },
"source-map": { "source-map": {
"version": "0.6.1", "version": "0.6.1",
"resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
"dev": true "dev": true
},
"webpack-sources": {
"version": "1.4.3",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
"integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
"dev": true,
"requires": {
"source-list-map": "^2.0.0",
"source-map": "~0.6.1"
}
} }
} }
}, },
......
package.json
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
"eslint-plugin-vue": "^5.0.0", "eslint-plugin-vue": "^5.0.0",
"node-sass": "^4.9.0", "node-sass": "^4.9.0",
"sass-loader": "^7.1.0", "sass-loader": "^7.1.0",
"terser-webpack-plugin": "^1.4.1",
"vue-template-compiler": "^2.6.10" "vue-template-compiler": "^2.6.10"
} }
} }
src/components/breadcrumb.vue
<template> <template>
<el-breadcrumb class="app-breadcrumb" separator-class="el-icon-arrow-right" separator="/"> <el-breadcrumb class="app-breadcrumb" separator-class="el-icon-arrow-right" separator="/">
<el-breadcrumb-item v-for="(item) in levelList" :key="item.path" v-if="item.meta.title"> <el-breadcrumb-item v-for="(item) in levelList" :key="item.path" :v-if="item.meta.title">
<!--<router-link :to="item.redirect||item.path">{{item.meta.title}}</router-link>--> <!--<router-link :to="item.redirect||item.path">{{item.meta.title}}</router-link>-->
<span>{{item.meta.title}}</span> <span>{{item.meta.title}}</span>
</el-breadcrumb-item> </el-breadcrumb-item>
......
src/main.js
...@@ -23,20 +23,21 @@ axios.defaults.timeout = 50000 ...@@ -23,20 +23,21 @@ axios.defaults.timeout = 50000
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8' axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
axios.defaults.withCredentials = true axios.defaults.withCredentials = true
const DOMAIN_NAME = 'cfldpe' // 测试
var ssoHttp = '' var ssoHttp = ''
if (process.env.VUE_APP_API_PREFIX === 'development') { // 开发 if (process.env.NODE_ENV === 'development') { // 开发
ssoHttp = 'http://sso.cfldpe.com/' ssoHttp = 'http://sso.' + DOMAIN_NAME + '.com/'
Vue.prototype.$ssoHttp = ssoHttp Vue.prototype.$ssoHttp = ssoHttp
axios.defaults.baseURL = 'http://10.2.98.32:8091/admin/' axios.defaults.baseURL = 'http://10.2.98.32:8091/admin/'
Vue.prototype.$baseURL = 'http://10.2.98.32:8091/admin/' Vue.prototype.$baseURL = 'http://10.2.98.32:8091/admin/'
Vue.prototype.$imgUrl = 'http://10.2.98.32:8091/admin/images/' Vue.prototype.$imgUrl = 'http://10.2.98.32:8091/admin/images/'
} else { // 生产 } else { // 生产
ssoHttp = 'http://sso.cfldpe.com/' ssoHttp = 'http://sso.' + DOMAIN_NAME + '.com/'
Vue.prototype.$ssoHttp = ssoHttp Vue.prototype.$ssoHttp = ssoHttp
getCookie() getCookie()
axios.defaults.baseURL = 'http://happy.cfldpe.com/admin/' axios.defaults.baseURL = 'http://happy.' + DOMAIN_NAME + '.com/admin/'
Vue.prototype.$baseURL = 'http://happy.cfldpe.com/admin/' Vue.prototype.$baseURL = 'http://happy.' + DOMAIN_NAME + '.com/admin/'
Vue.prototype.$imgUrl = 'http://happy.cfldpe.com/admin/images/' Vue.prototype.$imgUrl = 'http://happy.' + DOMAIN_NAME + '.com/admin/images/'
} }
function getCookie () { function getCookie () {
......
src/router.js
...@@ -8,7 +8,7 @@ import BannerAdd from './views/home/BannerAdd' ...@@ -8,7 +8,7 @@ import BannerAdd from './views/home/BannerAdd'
import ActivityPropaganda from './views/home/ActivityPropaganda' import ActivityPropaganda from './views/home/ActivityPropaganda'
import CommonLink from './views/home/CommonLink' import CommonLink from './views/home/CommonLink'
import MessageManagement from './views/home/MessageManagement' import MessageManagement from './views/home/MessageManagement'
import BannerEdit from './views/home/BannerEdit' // import BannerEdit from './views/home/BannerEdit'
import TextEditing from './views/home/TextEditing' import TextEditing from './views/home/TextEditing'
import ArticleLink from './views/home/ArticleLink' import ArticleLink from './views/home/ArticleLink'
...@@ -66,14 +66,14 @@ export default new Router({ ...@@ -66,14 +66,14 @@ export default new Router({
title: 'banner管理' title: 'banner管理'
} }
}, },
{ // {
path: '/home/bannerEdit', // path: '/home/bannerEdit',
name: 'bannerEdit', // name: 'bannerEdit',
component: BannerEdit, // component: BannerEdit,
meta: { // meta: {
title: '编辑banner' // title: '编辑banner'
} // }
}, // },
{ {
path: '/home/bannerAdd', path: '/home/bannerAdd',
name: 'bannerAdd', name: 'bannerAdd',
......
src/views/home/BannerEdit.vue deleted 100644 → 0
<template>
</template>
<script>
export default {
name: 'bannerEdit'
}
</script>
<style scoped>
</style>
src/views/home/CommonLink.vue
...@@ -165,7 +165,7 @@ export default { ...@@ -165,7 +165,7 @@ export default {
}, },
myLink () { // 添加 myLink () { // 添加
let _this = this let _this = this
var params = {}, requestUrl = '' var params = {}; var requestUrl = ''
if (_this.isAdd) { if (_this.isAdd) {
params = { params = {
'linksOrder': _this.linkOrder, 'linksOrder': _this.linkOrder,
......
src/views/restaurant/RestaurantMenus.vue
...@@ -108,8 +108,9 @@ ...@@ -108,8 +108,9 @@
<el-col :sm="20"> <el-col :sm="20">
<el-upload <el-upload
class="avatar-uploader" class="avatar-uploader"
action="http://10.2.98.32:8081/admin/diningroom/menu/upload" :action="$baseURL + 'diningroom/menu/upload'"
:show-file-list="false" :show-file-list="false"
accept="image/jpeg,image/png"
:on-success="handleAvatarSuccess"> :on-success="handleAvatarSuccess">
<img v-if="imageUrl" :src="$imgUrl + imageUrl" class="avatar"> <img v-if="imageUrl" :src="$imgUrl + imageUrl" class="avatar">
<i v-else class="el-icon-plus avatar-uploader-icon"></i> <i v-else class="el-icon-plus avatar-uploader-icon"></i>
......
src/views/wash/WashBranches.vue
...@@ -145,7 +145,7 @@ export default { ...@@ -145,7 +145,7 @@ export default {
if (this.formInline.province) { if (this.formInline.province) {
this.searchWash() this.searchWash()
} else { } else {
this.searchWash1() this.searchDefaultWash()
} }
}, },
searchDefaultWash () { searchDefaultWash () {
...@@ -208,19 +208,6 @@ export default { ...@@ -208,19 +208,6 @@ export default {
}, },
bannerEdit (id) { // 跳转编辑 bannerEdit (id) { // 跳转编辑
this.$router.push({ name: 'newBranches', params: { laundryId: id } }) this.$router.push({ name: 'newBranches', params: { laundryId: id } })
},
_getExportUrl () { // 导出
let _this = this
let params = {
'province': _this.formInline.province,
'city': _this.formInline.city,
'laundryName': _this.formInline.laundryName,
'pickWay': _this.formInline.pickWay
}
this.$axios.post('/laundry/export', params)
.then(function (res) {
_this.marathonExportHref = res
})
} }
} }
} }
......
vue.config.js
const isProduction = process.env.NODE_ENV === 'production'
module.exports = { module.exports = {
publicPath: './', publicPath: './',
productionSourceMap: false, productionSourceMap: false,
configureWebpack: {
externals: {
'BMap': 'BMap'
}
},
chainWebpack: config => { chainWebpack: config => {
// 移除 prefetch 插件 // 移除 prefetch 插件
config.plugins.delete('prefetch') config.plugins.delete('prefetch')
// 移除 preload 插件 // 移除 preload 插件
config.plugins.delete('preload') config.plugins.delete('preload')
},
configureWebpack: config => {
Object.assign(config, {
externals: {
'BMap': 'BMap'
}
})
if (isProduction) {
config.optimization.minimizer[0].options.terserOptions.compress.drop_console = true
}
} }
} }
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 sign in to comment