Commit 0deb1bae authored by 赵茹林's avatar 赵茹林

Merge branch 'dev' of git.singsingenglish.com:new-sing/admin into dev

parents 4a5ead26 1f6d6e4c
...@@ -26,7 +26,7 @@ module.exports = { ...@@ -26,7 +26,7 @@ module.exports = {
proxyTable: { proxyTable: {
'/api': { '/api': {
// target: 'http://10.1.23.103', // 接口的域名 // target: 'http://10.1.23.103', // 接口的域名
target: 'https://wechat-test.changchangenglish.com/', target: 'https://wechat-pre.changchangenglish.com/',
changeOrigin: true, // 如果接口跨域,需要进行这个参数配置 changeOrigin: true, // 如果接口跨域,需要进行这个参数配置
} }
}, },
...@@ -51,9 +51,9 @@ module.exports = { ...@@ -51,9 +51,9 @@ module.exports = {
}, },
build: { build: {
// Template for index.html // Template for index.html
index: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist/index.html') : path.resolve(__dirname, '../dev/index.html'), index: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist/index.html') : path.resolve(__dirname, '../pre/index.html'),
// Paths // Paths
assetsRoot: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist') : path.resolve(__dirname, '../dev'), assetsRoot: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist') : path.resolve(__dirname, '../pre'),
assetsSubDirectory: 'static', assetsSubDirectory: 'static',
assetsPublicPath: '/', assetsPublicPath: '/',
......
...@@ -6,5 +6,5 @@ module.exports = { ...@@ -6,5 +6,5 @@ module.exports = {
MAX_FILESIZE:'1024*1024*10', MAX_FILESIZE:'1024*1024*10',
SHOP_URL:'"https://w.url.cn/s/AX5b5QN"', SHOP_URL:'"https://w.url.cn/s/AX5b5QN"',
PERIODS_URL:'"https://w.url.cn/s/ARs9XI5"', PERIODS_URL:'"https://w.url.cn/s/ARs9XI5"',
INVITE_URL:'"https://wechat-test.changchangenglish.com/"', INVITE_URL:'"https://wechat-pre.changchangenglish.com/"',
} }
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https://at.alicdn.com/t/font_746649_x1rivf5f5.css><link rel=stylesheet href=https://lib.baomitu.com/element-ui/2.11.1/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://lib.baomitu.com/vue/2.5.17/vue.js></script><script src=https://lib.baomitu.com/vuex/3.0.1/vuex.min.js></script><script src=https://lib.baomitu.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.11.1/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.c901230a626e450396cf.js></script><script type=text/javascript src=/static/js/vendor.e17f712b043f8cffc82a.js></script><script type=text/javascript src=/static/js/app.26d3f70b300463e08311.js></script></body><script>let el = document.getElementsByTagName("script"); <!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=never><link rel=stylesheet href=https://at.alicdn.com/t/font_746649_x1rivf5f5.css><link rel=stylesheet href=https://lib.baomitu.com/element-ui/2.11.1/theme-chalk/index.css><title>唱唱启蒙-后台</title></head><body><script src=https://lib.baomitu.com/vue/2.5.17/vue.js></script><script src=https://lib.baomitu.com/vuex/3.0.1/vuex.min.js></script><script src=https://lib.baomitu.com/axios/0.18.0/axios.min.js></script><script src=https://lib.baomitu.com/element-ui/2.11.1/index.js></script><div id=app></div><script type=text/javascript src=/static/js/manifest.4fa8c3e44c5f2cb7e588.js></script><script type=text/javascript src=/static/js/vendor.fdfa49e267f48089768a.js></script><script type=text/javascript src=/static/js/app.771316ce36eae7e98b65.js></script></body><script>let el = document.getElementsByTagName("script");
el.onerror = function(a,b,c){ el.onerror = function(a,b,c){
console.log('error:',a,b,c); console.log('error:',a,b,c);
}; };
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
webpackJsonp([43],{GS5V:function(n,e,t){n.exports=t.p+"static/img/img@3x.6ac2522.png"},Ok4M:function(n,e,t){(n.exports=t("FZ+f")(!0)).push([n.i,"\n.index[data-v-5722a15f] {\n height: 100%;\n background: #eee;\n overflow: hidden;\n}\n.index .indexImg[data-v-5722a15f] {\n width: 90%;\n}\n.index .box[data-v-5722a15f] {\n margin: auto;\n text-align: center;\n font-size: 28px;\n font-weight: bold;\n margin-top: 130px;\n}\n.index .box img[data-v-5722a15f] {\n width: 331px;\n}\n","",{version:3,sources:["C:/Users/Administrator/Desktop/后台/admin/src/components/main/index.vue"],names:[],mappings:";AACA;EACE,aAAa;EACb,iBAAiB;EACjB,iBAAiB;CAClB;AACD;EACE,WAAW;CACZ;AACD;EACE,aAAa;EACb,mBAAmB;EACnB,gBAAgB;EAChB,kBAAkB;EAClB,kBAAkB;CACnB;AACD;EACE,aAAa;CACd",file:"index.vue",sourcesContent:["\n.index[data-v-5722a15f] {\n height: 100%;\n background: #eee;\n overflow: hidden;\n}\n.index .indexImg[data-v-5722a15f] {\n width: 90%;\n}\n.index .box[data-v-5722a15f] {\n margin: auto;\n text-align: center;\n font-size: 28px;\n font-weight: bold;\n margin-top: 130px;\n}\n.index .box img[data-v-5722a15f] {\n width: 331px;\n}\n"],sourceRoot:""}])},knv9:function(n,e,t){var i=t("Ok4M");"string"==typeof i&&(i=[[n.i,i,""]]),i.locals&&(n.exports=i.locals);t("rjj0")("3a1d608a",i,!1,{})},sJm1:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i={data:function(){return{content:"我是富文本编辑器的内容",editorSetting:{height:400}}},mounted:function(){var n=localStorage.getItem("phoneNum");console.log(n),n&&("teacher_leader"!=(n=JSON.parse(n)).teacher_type?this.$router.push("/teacher/"+n.id):this.$router.push("/teacher"))},components:{}},a=function(){var n=this.$createElement;this._self._c;return this._m(0)},o=[function(){var n=this.$createElement,e=this._self._c||n;return e("div",{staticClass:"index"},[e("div",{staticClass:"box"},[e("img",{attrs:{src:t("GS5V"),alt:""}}),this._v(" "),e("div",{staticStyle:{"text-align":"center","margin-top":"2%"}},[this._v("Welcome!")])])])}];a._withStripped=!0;var r={render:a,staticRenderFns:o},s=r;var d=!1;var c=t("VU/8")(i,s,!1,function(n){d||t("knv9")},"data-v-5722a15f",null);c.options.__file="src\\components\\main\\index.vue";e.default=c.exports}});
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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