Merge branch 'shipanpan' into 'master'

Shipanpan

See merge request !59

app.js

@@ -58,7 +58,7 @@ App({
 	codeChangeToken(code, cb) {
 		let that = this
 		wx.request({
-			url: 'https://wandoutiyu.test.xueyoubangedu.com/api/getsessionkey',
+			url: 'https://wandoutiyu.xueyoubangedu.com/api/getsessionkey',
 			data: {
 				code: code
 			},
@@ -87,7 +87,7 @@ App({
 		wx.checkSession({
 			success() {
 				wx.request({
-					url: 'https://wandoutiyu.test.xueyoubangedu.com/api/saveinfo',
+					url: 'https://wandoutiyu.xueyoubangedu.com/api/saveinfo',
 					data: {
 						encryptedData: encodeURIComponent(info.encryptedData),
 						iv: encodeURIComponent(info.iv),

pages/my/teachingArea/teachingArea.js

@@ -176,6 +176,7 @@ Page({
 				type: 'POST',
 				callback: (data) => {
 					base.toast('保存区域成功')
+					base.goBack(2)
 				}
 			}
 			base.newRequest(params)

pages/tabbar/financial/financial.wxss

@@ -205,6 +205,7 @@
 	font-size: 24rpx;
 	color: #333333;
 	padding: 0 10rpx;
+	text-align: center;
 }
 
 .content1_body {

utils/base.js

@@ -3,8 +3,8 @@ var app = getApp()
 const qiniuUploader = require("./qiniuUploader.js");
 class Base {
 	constructor() {
-		// this.baseUrl = 'https://wandoutiyu.xueyoubangedu.com/api/' //线上接口
-		this.baseUrl = 'https://wandoutiyu.test.xueyoubangedu.com/api/' //测试接口
+		this.baseUrl = 'https://wandoutiyu.xueyoubangedu.com/api/' //线上接口
+		// this.baseUrl = 'https://wandoutiyu.test.xueyoubangedu.com/api/' //测试接口
 	}
 	newRequest(params, flag = false, tips = true) {	
 		let that = this