Skip to content

W
wandouchengzhang_coach
Commit 897e9610 authored by 石盼盼's avatar 石盼盼
Browse files
Options

修改合并冲突

parent 0a3089d6
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 8 deletions
app.js
View file @ 897e9610
...@@ -58,11 +58,7 @@ App({ ...@@ -58,11 +58,7 @@ App({
codeChangeToken(code, cb) { codeChangeToken(code, cb) {
let that = this let that = this
wx.request({ wx.request({
<<<<<<< HEAD
url: 'https://wandoutiyu.test.xueyoubangedu.com/api/getsessionkey',
=======
url: that.globalData.baseUrl + 'getsessionkey', url: that.globalData.baseUrl + 'getsessionkey',
>>>>>>> 9b5fba64e12f4260ccfb533045accbeb74c16f37
data: { data: {
code: code code: code
}, },
...@@ -91,11 +87,7 @@ App({ ...@@ -91,11 +87,7 @@ App({
wx.checkSession({ wx.checkSession({
success() { success() {
wx.request({ wx.request({
<<<<<<< HEAD
url: 'https://wandoutiyu.test.xueyoubangedu.com/api/saveinfo',
=======
url: that.globalData.baseUrl + 'saveinfo', url: that.globalData.baseUrl + 'saveinfo',
>>>>>>> 9b5fba64e12f4260ccfb533045accbeb74c16f37
data: { data: {
encryptedData: encodeURIComponent(info.encryptedData), encryptedData: encodeURIComponent(info.encryptedData),
iv: encodeURIComponent(info.iv), iv: encodeURIComponent(info.iv),
......
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