Skip to content

C
clique-web
Commit 969e2faa by caoyanzhi
Options

Merge branch 'feature/组件引入调整' 

# Conflicts:
#	dist/index.html
#	dist/static/js/11.1313bab962008b7d57ae.js
#	dist/static/js/12.5cf1a714af685cf7e660.js
#	dist/static/js/13.45c27de40fd84a7a5a5e.js
#	dist/static/js/13.45c27de40fd84a7a5a5e.js.map
#	dist/static/js/14.54bf708f7452b9370f43.js
#	dist/static/js/15.ace0a4b648edbdb19fed.js
#	dist/static/js/18.9e9f658bcf6bd85267ff.js
#	dist/static/js/20.1911d12749e4e14cb406.js
#	dist/static/js/21.d2159549c2911ce36c38.js
#	dist/static/js/22.2fdcae270e03d780578b.js
#	dist/static/js/24.9ea347b66d2b4d8d47af.js
#	dist/static/js/25.b527765b6c9f12434e39.js
#	dist/static/js/25.b527765b6c9f12434e39.js.map
#	dist/static/js/26.3ac203fc423243a87146.js
#	dist/static/js/27.e01ab8c4ddc119dbf611.js
#	dist/static/js/27.e01ab8c4ddc119dbf611.js.map
#	dist/static/js/28.1519fc01dec579627353.js
#	dist/static/js/29.1a7ea029bdc870805744.js
#	dist/static/js/29.1a7ea029bdc870805744.js.map
#	dist/static/js/30.0c1029866b6183f5bcc7.js
#	dist/static/js/30.0c1029866b6183f5bcc7.js.map
#	dist/static/js/31.17a6c63f27e686669763.js
#	dist/static/js/31.8357340bca71b3619149.js
#	dist/static/js/31.9ff68b0fadb91c34c9f3.js
#	dist/static/js/32.02df071160562b22e44e.js
#	dist/static/js/32.6e1035bcc8bab3787127.js
#	dist/static/js/32.7c4dfd235f32d0901f19.js
#	dist/static/js/33.3b0e6d224c9fc03199a5.js
#	dist/static/js/34.e30398b690c76bb55695.js
#	dist/static/js/34.e30398b690c76bb55695.js.map
#	dist/static/js/35.d5fa042a919b0a7b0536.js
#	dist/static/js/35.d5fa042a919b0a7b0536.js.map
#	dist/static/js/36.525bd9448d857e3e3b6f.js
#	dist/static/js/38.d6df329050dc256742fb.js
#	dist/static/js/38.d6df329050dc256742fb.js.map
#	dist/static/js/39.bf184337ea038ee03723.js
#	dist/static/js/39.bf184337ea038ee03723.js.map
#	dist/static/js/40.20043e2a392f70796604.js
#	dist/static/js/40.aa1deef176b420fd3ccb.js
#	dist/static/js/40.c502c6a8aff7b5fafad5.js
#	dist/static/js/main.7c5590dfd44a5fea3e33.js
#	dist/static/js/main.7c5590dfd44a5fea3e33.js.map
#	dist/static/js/manifest.0eb0bf764f60bcd98aef.js.map
#	dist/static/js/manifest.34bc9e4fe3620e1e830e.js.map
#	dist/static/js/manifest.e4c4b3cad01e18fa6dab.js.map
#	package-lock.json
parents 8fbb23db abae7449
Showing with 39 additions and 13 deletions
build/webpack.base.conf.js
...@@ -32,9 +32,11 @@ module.exports = { ...@@ -32,9 +32,11 @@ module.exports = {
}, },
// 新增配置 cdn 忽略不需要打包的库 // 新增配置 cdn 忽略不需要打包的库
externals: { externals: {
'vue': 'Vue', vue: 'Vue',
axios: 'axios',
vuex: 'Vuex',
'vue-router': 'VueRouter', 'vue-router': 'VueRouter',
'vuex': 'Vuex' 'element-ui': 'ELEMENT',
}, },
// end // end
resolve: { resolve: {
......
build/webpack.dev.conf.js
...@@ -42,7 +42,12 @@ const devWebpackConfig = merge(baseWebpackConfig, { ...@@ -42,7 +42,12 @@ const devWebpackConfig = merge(baseWebpackConfig, {
quiet: true, // necessary for FriendlyErrorsPlugin quiet: true, // necessary for FriendlyErrorsPlugin
watchOptions: { watchOptions: {
poll: config.dev.poll, poll: config.dev.poll,
} },
before(app) {
app.get('/', (req, res) => {
res.redirect(config.dev.assetsPublicPath);
})
},
}, },
plugins: [ plugins: [
new webpack.DefinePlugin({ new webpack.DefinePlugin({
...@@ -83,7 +88,7 @@ module.exports = new Promise((resolve, reject) => { ...@@ -83,7 +88,7 @@ module.exports = new Promise((resolve, reject) => {
// Add FriendlyErrorsPlugin // Add FriendlyErrorsPlugin
devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({ devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
compilationSuccessInfo: { compilationSuccessInfo: {
messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`], messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}${config.dev.assetsPublicPath}`],
}, },
onErrors: config.dev.notifyOnErrors onErrors: config.dev.notifyOnErrors
? utils.createNotifierCallback() ? utils.createNotifierCallback()
......
config/index.js
...@@ -9,7 +9,7 @@ module.exports = { ...@@ -9,7 +9,7 @@ module.exports = {
// Paths // Paths
assetsSubDirectory: 'static', assetsSubDirectory: 'static',
assetsPublicPath: '/', assetsPublicPath: '/gic-clique/',
proxyTable: {},//proxyConfig.proxyList, proxyTable: {},//proxyConfig.proxyList,
// Various Dev Server settings // Various Dev Server settings
......
dist/index.html
<<<<<<< HEAD
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.d16db51a2bbc7f97783c90e4d9916492.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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.57.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/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.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/export.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js></script><script type=text/javascript src=./static/js/manifest.34bc9e4fe3620e1e830e.js></script><script type=text/javascript src=./static/js/vendor.76fbf4bb21345adce0ab.js></script><script type=text/javascript src=./static/js/main.172e0ed0e42ad7be142c.js></script></body></html> <!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.d16db51a2bbc7f97783c90e4d9916492.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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.57.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/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.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/export.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js></script><script type=text/javascript src=./static/js/manifest.34bc9e4fe3620e1e830e.js></script><script type=text/javascript src=./static/js/vendor.76fbf4bb21345adce0ab.js></script><script type=text/javascript src=./static/js/main.172e0ed0e42ad7be142c.js></script></body></html>
=======
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-集团后台</title><link href=./static/css/main.2d8d766232d4927c106c7fa13337d9af.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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.57.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/group-people.2.0.08.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-group.2.0.10.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.05.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.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/export.1.0.1.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js></script><script type=text/javascript src=./static/js/manifest.0eb0bf764f60bcd98aef.js></script><script type=text/javascript src=./static/js/vendor.47e68d3d4559b1b4f29c.js></script><script type=text/javascript src=./static/js/main.7c5590dfd44a5fea3e33.js></script></body></html>
>>>>>>> feature/组件引入调整
dist/static/css/main.2d8d766232d4927c106c7fa13337d9af.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/main.2d8d766232d4927c106c7fa13337d9af.css.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/10.ed9f7b4596e55cc26e09.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/11.1313bab962008b7d57ae.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/11.1313bab962008b7d57ae.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/12.5cf1a714af685cf7e660.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/12.5cf1a714af685cf7e660.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/13.45c27de40fd84a7a5a5e.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/14.54bf708f7452b9370f43.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/15.ace0a4b648edbdb19fed.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/16.936e7f687521bf5f7f3e.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/17.0cd6c8f3a5a43c34946a.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/18.9e9f658bcf6bd85267ff.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/19.7cf4d2373e2fb7a236d7.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/20.1911d12749e4e14cb406.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/21.d2159549c2911ce36c38.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/23.554dac83441f4ece0a52.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/25.b527765b6c9f12434e39.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/26.3ac203fc423243a87146.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/27.e01ab8c4ddc119dbf611.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/28.1519fc01dec579627353.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/31.17a6c63f27e686669763.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/31.8357340bca71b3619149.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/31.8357340bca71b3619149.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/32.6e1035bcc8bab3787127.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/32.6e1035bcc8bab3787127.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/32.7c4dfd235f32d0901f19.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/4.082b511b6a2b89ef3c49.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/4.082b511b6a2b89ef3c49.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/40.20043e2a392f70796604.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/40.aa1deef176b420fd3ccb.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/40.aa1deef176b420fd3ccb.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/5.1420d181bb96deeba4c2.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/5.1420d181bb96deeba4c2.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.f917530a2a584129ba12.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.f917530a2a584129ba12.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.2f2be7c64a1437091b0d.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/8.284e55ecf6ff7f131bf2.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/9.b184836b431bc3baca6e.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/main.7c5590dfd44a5fea3e33.js 0 → 100644
webpackJsonp([44],{0:function(e,t,n){n("briU"),e.exports=n("NHnr")},"4qCZ":function(e,t){},"5reh":function(e,t,n){"use strict";n.d(t,"a",function(){return o}),n.d(t,"b",function(){return r}),n.d(t,"d",function(){return m}),n.d(t,"c",function(){return a});var o="login",r="logout",m="title",a="show"},"5tgt":function(e,t,n){e.exports=function(e,t){return function(o){n("Vna/")("./"+e+"/"+t+".vue").then(function(e){o(e)})}}},"7Krh":function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.dateFormat=function(e,t){if(!e)return;e=10===e.toString().length?1e3*e:e;var n=new Date(e),o={"M+":n.getMonth()+1,"D+":n.getDate(),W:"日一二三四五六".charAt(n.getDay()),"h+":n.getHours(),"m+":n.getMinutes(),"s+":n.getSeconds(),"q+":Math.floor((n.getMonth()+3)/3),S:n.getMilliseconds()};/(Y+)/.test(t)&&(t=t.replace(RegExp.$1,(n.getFullYear()+"").substr(4-RegExp.$1.length)));for(var r in o)new RegExp("("+r+")").test(t)&&(t=t.replace(RegExp.$1,1===RegExp.$1.length?o[r]:("00"+o[r]).substr((""+o[r]).length)));return t}},"91wA":function(e,t){},IUJe:function(e,t){},NHnr:function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var o=n("rVsN"),r=n.n(o),m=n("ZLEe"),a=n.n(m),p=n("lRwf"),i=n.n(p),u={render:function(){var e=this.$createElement,t=this._self._c||e;return t("div",{attrs:{id:"app"}},[t("transition",{attrs:{name:"fade",mode:"out-in"}},[t("router-view")],1)],1)},staticRenderFns:[]};var s=n("C7Lr")({name:"App",data:function(){return{}}},u,!1,function(e){n("91wA")},null,null).exports,c=n("pRNm"),l=n.n(c),d=n("5tgt"),y=n.n(d);i.a.use(l.a);var h=function(e){n.e(0).then(n.bind(null,"EE2z")).then(function(t){e(t)})};window.sessionStorage.getItem("token")&&store.commit(types.LOGIN,window.sessionStorage.getItem("token"));var b,g=[{path:"/",name:"index",component:y()("index","index"),children:[{path:"/companyGroup",name:"集团信息",component:y()("companyGroup/membershipSystem","companyGroupInfo")},{path:"/memberCardSet",name:"会员卡设置",component:y()("companyGroup/membershipSystem","memberCardSet")},{path:"/memberCardSetEnterprise",component:y()("companyGroup/membershipSystem","memberCardSetEnterprise")},{path:"/memberGrade",name:"会员等级列表",component:y()("companyGroup/membershipSystem","memberGrade")},{path:"/addMemberGrade",name:"添加等级列表",component:y()("companyGroup/membershipSystem","addMemberGrade")},{path:"/editMemberGrade",name:"编辑等级列表",component:y()("companyGroup/membershipSystem","editMemberGrade")},{path:"/addGroupGrade",name:"添加集团会员等级",component:y()("companyGroup/membershipSystem","addGroupGrade")},{path:"/editGroupGrade",name:"编辑集团会员等级",component:y()("companyGroup/membershipSystem","editGroupGrade")},{path:"/addGroupCate",name:"添加集团折扣策略",component:y()("companyGroup/membershipSystem","addGroupCate")},{path:"/editGroupCate",name:"编辑集团折扣策略",component:y()("companyGroup/membershipSystem","editGroupCate")},{path:"/pointSystem",name:"积分制度",component:y()("companyGroup/membershipSystem","pointSystem")},{path:"/addPointSystem",name:"新增积分获取策略",component:y()("companyGroup/membershipSystem","addPointSystem")},{path:"/editPointSystem",name:"编辑积分获取策略",component:y()("companyGroup/membershipSystem","editPointSystem")},{path:"/addIntegralSytem",name:"新增积分抵现策略",component:y()("companyGroup/membershipSystem","addIntegralSytem")},{path:"/editIntegralSytem",name:"编辑积分抵现策略",component:y()("companyGroup/membershipSystem","editIntegralSytem")},{path:"/nearStoreSet",name:"附近门店",component:y()("companyGroup/membershipSystem","nearStoreSet")},{path:"/memberAchievement",name:"会员成就",component:y()("companyGroup/memberServices","memberAchievement")},{path:"/memberTask",name:"会员任务",component:y()("companyGroup/memberServices","memberTask")},{path:"/originalCostSet",name:"原始成本主体配置",component:y()("companyGroup/integral","originalCostSet")},{path:"/settlementConfig",name:"结算归属配置",component:y()("companyGroup/integral","settlementConfig")},{path:"/integralReport",name:"积分结算报表",component:y()("companyGroup/integral","integralReport")},{path:"/brokerageRule",name:"佣金结算规则",component:y()("companyGroup/brokerage","brokerageRule")},{path:"/belongCloseDtl",name:"归属成交明细",component:y()("companyGroup/brokerage","belongCloseDtl")},{path:"/belongRefundDtl",name:"归属退款明细",component:y()("companyGroup/brokerage","belongRefundDtl")},{path:"/reportCenter",name:"报表中心",component:y()("companyGroup/reportCenter","reportCenter")}]},{path:"/memberInfoTemplate",name:"开卡字段配置模板",component:y()("companyGroup/membershipSystem","memberInfoTemplate")},{path:"/login",name:"集团商户登录",component:y()("companyGroup","login")},{path:"/403",name:"无权访问",component:h},{path:"/404",name:"error404",component:h},{path:"/500",name:"error500",component:h},{path:"*",redirect:"/404",hidden:!0}],G=new l.a({routes:g,scrollBehavior:function(){return{y:0}}}),v=n("A4sf"),f=n("Iufj"),S=n.n(f),k=n("84iU"),C=n.n(k),x=n("a3Yh"),w=n.n(x),R=n("SJI6"),E=n.n(R),I=n("5reh");i.a.use(E.a);var P=new E.a.Store({state:{user:{},token:null,title:"",show:!1},mutations:(b={},w()(b,I.a,function(e,t){sessionStorage.token=t,e.token=t}),w()(b,I.b,function(e){sessionStorage.removeItem("token"),e.token=null}),w()(b,I.d,function(e,t){e.title=t}),w()(b,I.c,function(e,t){e.show=t}),b)}),M=(n("4qCZ"),n("Q7nf"),n("uKUT"),n("IUJe"),n("Xcu2"),{name:"dm-delete",props:{tips:{type:String,default:"是否删除?"}},data:function(){return{visible:!1}},methods:{cancel:function(){this.visible=!1},confirm:function(){this.visible=!1,this.$emit("confirm")}}}),_={render:function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("el-popover",{staticClass:"el-button el-button--text",attrs:{placement:"top",width:"186"},model:{value:e.visible,callback:function(t){e.visible=t},expression:"visible"}},[n("p",{staticStyle:{"line-height":"1.5",padding:"10px 10px 20px",color:"#606266"}},[e._v(e._s(e.tips))]),e._v(" "),n("div",{staticStyle:{"text-align":"right",margin:"0"}},[n("el-button",{attrs:{size:"mini",type:"text"},on:{click:e.cancel}},[e._v("取消")]),e._v(" "),n("el-button",{attrs:{type:"primary",size:"mini"},on:{click:e.confirm}},[e._v("确定")])],1),e._v(" "),n("span",{attrs:{slot:"reference"},slot:"reference"},[e._t("default")],2)])},staticRenderFns:[]},D=n("C7Lr")(M,_,!1,null,null,null).exports,j=n("7Krh");i.a.component("delete-tip",D),i.a.config.productionTip=!1,i.a.use(S.a,C.a),a()(j).forEach(function(e){i.a.filter(e,j[e])}),i.a.axios.defaults.withCredentials=!0,i.a.axios.interceptors.request.use(function(e){return e},function(e){return r.a.reject(e)}),i.a.axios.interceptors.response.use(function(e){return 200==e.status&&e.data.errorCode,e},function(e){if(e.response)switch(e.response.status){case 401:window.location.href=window.location.origin+"/gic-web/#/";case 500:v.Message.error("服务器500")}return r.a.reject(e.response.data)}),new i.a({el:"#app",router:G,store:P,components:{App:s},template:"<App/>"})},Q7nf:function(e,t){},SJI6:function(e,t){e.exports=Vuex},"Vna/":function(e,t,n){var o={"./companyGroup/brokerage/belongCloseDtl.vue":["V1os",28],"./companyGroup/brokerage/belongRefundDtl.vue":["qkav",26],"./companyGroup/brokerage/brokerageRule.vue":["UN4n",27],"./companyGroup/integral/cardExcel.vue":["bkUg",34],"./companyGroup/integral/cliqueCard.vue":["u+DB",36],"./companyGroup/integral/cliqueList.vue":["6bm4",37],"./companyGroup/integral/closeAllExcel.vue":["v/Se",38],"./companyGroup/integral/integralExcel.vue":["elV0",35],"./companyGroup/integral/integralReport.vue":["kNvF",13],"./companyGroup/integral/originalCostSet.vue":["kXAv",14],"./companyGroup/integral/settlementConfig.vue":["kj0T",16],"./companyGroup/login.vue":["gOFg",39],"./companyGroup/memberServices/memberAchievement.vue":["j6GH",15],"./companyGroup/memberServices/memberTask.vue":["cxQk",23],"./companyGroup/memberTableEdit.vue":["PDVn",24],"./companyGroup/membershipSystem/addGroupCate.vue":["DaJb",10],"./companyGroup/membershipSystem/addGroupGrade.vue":["y9jV",20],"./companyGroup/membershipSystem/addIntegralSytem.vue":["tFd/",7],"./companyGroup/membershipSystem/addMemberGrade.vue":["ge0i",19],"./companyGroup/membershipSystem/addPointSystem.vue":["ewsH",12],"./companyGroup/membershipSystem/companyGroupInfo.vue":["1H9E",17],"./companyGroup/membershipSystem/editGroupCate.vue":["+Lzv",9],"./companyGroup/membershipSystem/editGroupGrade.vue":["QwkL",21],"./companyGroup/membershipSystem/editIntegralSytem.vue":["KjG/",8],"./companyGroup/membershipSystem/editMemberGrade.vue":["Iz3c",18],"./companyGroup/membershipSystem/editPointSystem.vue":["GJjE",11],"./companyGroup/membershipSystem/memberCardSet.vue":["fZcc",4],"./companyGroup/membershipSystem/memberCardSetEnterprise.vue":["rC+Z",25],"./companyGroup/membershipSystem/memberGrade.vue":["C6vQ",22],"./companyGroup/membershipSystem/memberInfoTemplate.vue":["zCRq",5],"./companyGroup/membershipSystem/nearStoreSet.vue":["Z9/t",30],"./companyGroup/membershipSystem/pointSystem.vue":["b5xz",6],"./companyGroup/reportCenter/reportCenter.vue":["cbok",29],"./errorPage/401.vue":["4KSJ",41],"./errorPage/403.vue":["aM+6",2],"./errorPage/404.vue":["PRsh",1],"./errorPage/500.vue":["/HCr",3],"./errorPage/index.vue":["EE2z",0],"./index/index.vue":["YPWR",42],"./linktools/linktools.vue":["Lc2x",32],"./linktools/linktoolsold.vue":["/8lq",40],"./linktools/linktoolspage.vue":["HLON",31],"./login/login.vue":["6Qob",33]};function r(e){var t=o[e];return t?n.e(t[1]).then(function(){return n(t[0])}):Promise.reject(new Error("Cannot find module '"+e+"'."))}r.keys=function(){return Object.keys(o)},r.id="Vna/",e.exports=r},Xcu2:function(e,t){},lRwf:function(e,t){e.exports=Vue},pRNm:function(e,t){e.exports=VueRouter},uKUT:function(e,t){}},[0]);
//# sourceMappingURL=main.7c5590dfd44a5fea3e33.js.map
\ No newline at end of file
dist/static/js/manifest.0eb0bf764f60bcd98aef.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,n,r){for(var t,o,d,i=0,u=[];i<a.length;i++)o=a[i],f[o]&&u.push(f[o][0]),f[o]=0;for(t in n)Object.prototype.hasOwnProperty.call(n,t)&&(e[t]=n[t]);for(c&&c(a,n,r);u.length;)u.shift()();if(r)for(i=0;i<r.length;i++)d=b(b.s=r[i]);return d};var a={},f={45:0};function b(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,b),f.l=!0,f.exports}b.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,b){c=f[e]=[a,b]});c[2]=a;var n=document.getElementsByTagName("head")[0],r=document.createElement("script");r.type="text/javascript",r.charset="utf-8",r.async=!0,r.timeout=12e4,b.nc&&r.setAttribute("nonce",b.nc),r.src=b.p+"static/js/"+e+"."+{0:"2f33ab3e109a5841fc0f",1:"385e557f391e558f5b52",2:"4400b301e978f2178b70",3:"603ec5bcb8045fafa6c6",4:"082b511b6a2b89ef3c49",5:"1420d181bb96deeba4c2",6:"f917530a2a584129ba12",7:"2f2be7c64a1437091b0d",8:"284e55ecf6ff7f131bf2",9:"b184836b431bc3baca6e",10:"ed9f7b4596e55cc26e09",11:"1313bab962008b7d57ae",12:"5cf1a714af685cf7e660",13:"45c27de40fd84a7a5a5e",14:"54bf708f7452b9370f43",15:"ace0a4b648edbdb19fed",16:"936e7f687521bf5f7f3e",17:"0cd6c8f3a5a43c34946a",18:"9e9f658bcf6bd85267ff",19:"7cf4d2373e2fb7a236d7",20:"1911d12749e4e14cb406",21:"d2159549c2911ce36c38",22:"2fdcae270e03d780578b",23:"554dac83441f4ece0a52",24:"9ea347b66d2b4d8d47af",25:"b527765b6c9f12434e39",26:"3ac203fc423243a87146",27:"e01ab8c4ddc119dbf611",28:"1519fc01dec579627353",29:"1a7ea029bdc870805744",30:"0c1029866b6183f5bcc7",31:"8357340bca71b3619149",32:"6e1035bcc8bab3787127",33:"3b0e6d224c9fc03199a5",34:"e30398b690c76bb55695",35:"d5fa042a919b0a7b0536",36:"525bd9448d857e3e3b6f",37:"d8958e2bdaee0ec81260",38:"d6df329050dc256742fb",39:"bf184337ea038ee03723",40:"aa1deef176b420fd3ccb",41:"4f76d3c2b4f43c67636e",42:"a1a5a3c5369ebb863e1a"}[e]+".js";var t=setTimeout(o,12e4);function o(){r.onerror=r.onload=null,clearTimeout(t);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return r.onerror=r.onload=o,n.appendChild(r),a},b.m=e,b.c=a,b.d=function(e,c,a){b.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},b.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return b.d(c,"a",c),c},b.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},b.p="./",b.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.0eb0bf764f60bcd98aef.js.map
\ No newline at end of file
dist/static/js/vendor.47e68d3d4559b1b4f29c.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.47e68d3d4559b1b4f29c.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
index.html
...@@ -8,13 +8,21 @@ ...@@ -8,13 +8,21 @@
<body style="background-color: #f0f2f5;min-width: 1400px;"> <body style="background-color: #f0f2f5;min-width: 1400px;">
<div id="app"></div> <div id="app"></div>
<!-- built files will be auto injected --> <!-- built files will be auto injected -->
<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;
document.write('<script src="//'+ host + src +'"><\/script>')
})()
</script>
<!-- 库引用cdn --> <!-- 库引用cdn -->
<script src="//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js"></script> <!-- <script src="//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/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/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/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/lib/elementUI/index.2.5.4.js"></script> -->
<!-- 组件引用cdn --> <!-- 组件引用cdn -->
<script src="//web-1251519181.file.myqcloud.com/components/header.2.0.57.js"></script> <!-- <script src="//web-1251519181.file.myqcloud.com/components/header.2.0.57.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/footer.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/img-preview.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/group-people.2.0.08.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/group-people.2.0.08.js"></script>
...@@ -23,6 +31,6 @@ ...@@ -23,6 +31,6 @@
<script src="//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/area-ab.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/input.2.0.00.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/export.1.0.1.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/export.1.0.1.js"></script>
<script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js"></script> <script src="//web-1251519181.file.myqcloud.com/components/store-new.2.0.46.js"></script> -->
</body> </body>
</html> </html>
package.json
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
"dependencies": { "dependencies": {
"@riophae/vue-treeselect": "0.0.29", "@riophae/vue-treeselect": "0.0.29",
"@tinymce/tinymce-vue": "^1.0.8", "@tinymce/tinymce-vue": "^1.0.8",
"element-ui": "^2.3.9", "element-ui": "^2.15.6",
"file-saver": "^1.3.8", "file-saver": "^1.3.8",
"script-loader": "^0.7.2", "script-loader": "^0.7.2",
"tinymce": "^4.8.3", "tinymce": "^4.8.3",
"vue": "^2.5.2", "vue": "2.6.6",
"vue-clipboard2": "^0.2.0", "vue-clipboard2": "^0.2.0",
"vue-router": "^3.0.1", "vue-router": "^3.0.1",
"xlsx": "^0.13.0" "xlsx": "^0.13.0"
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
"less": "^3.0.4", "less": "^3.0.4",
"less-loader": "^4.1.0", "less-loader": "^4.1.0",
"node-notifier": "^5.1.2", "node-notifier": "^5.1.2",
"node-sass": "^4.9.0", "node-sass": "^4.14.1",
"onchange": "^5.2.0", "onchange": "^5.2.0",
"optimize-css-assets-webpack-plugin": "^3.2.0", "optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0", "ora": "^1.2.0",
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
"vue-axios": "^2.1.1", "vue-axios": "^2.1.1",
"vue-loader": "^13.3.0", "vue-loader": "^13.3.0",
"vue-style-loader": "^3.0.1", "vue-style-loader": "^3.0.1",
"vue-template-compiler": "^2.5.2", "vue-template-compiler": "2.6.6",
"vuedraggable": "^2.16.0", "vuedraggable": "^2.16.0",
"vuex": "^3.0.1", "vuex": "^3.0.1",
"webpack": "^3.6.0", "webpack": "^3.6.0",
......
src/router/index.js
...@@ -35,6 +35,7 @@ if (window.sessionStorage.getItem('token')) { ...@@ -35,6 +35,7 @@ if (window.sessionStorage.getItem('token')) {
export const constantRouterMap = [ export const constantRouterMap = [
{ {
path: '/', path: '/',
redirect: '/companyGroup',
name: 'index', name: 'index',
component: _import('index', 'index'), component: _import('index', 'index'),
children: [ children: [
......
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