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

# Conflicts:
#	dist/index.html

dist/static/js/43.f438cf54ac55c24d121c.js

+webpackJsonp([43],{GS5V:function(n,e,t){n.exports=t.p+"static/img/img@3x.6ac2522.png"},Y0Rf:function(n,e,t){var i=t("mL20");"string"==typeof i&&(i=[[n.i,i,""]]),i.locals&&(n.exports=i.locals);t("rjj0")("391229c9",i,!1,{})},mL20:function(n,e,t){(n.exports=t("FZ+f")(!0)).push([n.i,"\n.index[data-v-4774750c] {\n  height: 100%;\n  background: #eee;\n  overflow: hidden;\n}\n.index .indexImg[data-v-4774750c] {\n  width: 90%;\n}\n.index .box[data-v-4774750c] {\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-4774750c] {\n  width: 331px;\n}\n","",{version:3,sources:["/Users/lin/workspace/sing/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-4774750c] {\n  height: 100%;\n  background: #eee;\n  overflow: hidden;\n}\n.index .indexImg[data-v-4774750c] {\n  width: 90%;\n}\n.index .box[data-v-4774750c] {\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-4774750c] {\n  width: 331px;\n}\n"],sourceRoot:""}])},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 c=!1;var d=t("VU/8")(i,s,!1,function(n){c||t("Y0Rf")},"data-v-4774750c",null);d.options.__file="src/components/main/index.vue";e.default=d.exports}});
\ No newline at end of file