Merge branch 'master' of http://81.70.224.233:10080/yichael/ZhongChuan_Manager

# Conflicts:
#	components/introductionToTheExperiment/syjj_second.vue
#	components/manager/assets.vue
#	components/manager/project.vue
#	components/manager/user.vue

main.js

@@ -14,6 +14,9 @@ const app = new Vue({
 })
 app.$mount()
 
+Vue.prototype.$Api="http://39.105.166.141:8085"
+Vue.prototype.$UserId="mp.xyueds.com"
+
 import './public.css';
 import './uni.scss';