修改合并冲突

897e9610 · 石盼盼 · 0a3089d6 · 897e9610
Commit 897e9610 authored Dec 14, 2020 by 石盼盼
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

app.js app.js +0 -8

No files found.
--- a/app.js
+++ b/app.js
@@ -58,11 +58,7 @@ App({
 	codeChangeToken(code, cb) {
 		let that = this
 		wx.request({
-<<<<<<< HEAD
-			url: 'https://wandoutiyu.test.xueyoubangedu.com/api/getsessionkey',
-=======
 			url: that.globalData.baseUrl + 'getsessionkey',
->>>>>>> 9b5fba64e12f4260ccfb533045accbeb74c16f37
 			data: {
 				code: code
 			},
@@ -91,11 +87,7 @@ App({
 		wx.checkSession({
 			success() {
 				wx.request({
-<<<<<<< HEAD
-					url: 'https://wandoutiyu.test.xueyoubangedu.com/api/saveinfo',
-=======
 					url: that.globalData.baseUrl + 'saveinfo',
->>>>>>> 9b5fba64e12f4260ccfb533045accbeb74c16f37
 					data: {
 						encryptedData: encodeURIComponent(info.encryptedData),
 						iv: encodeURIComponent(info.iv),