From fe5648367bbbbb21aaca3154c26775f16233c5f3 Mon Sep 17 00:00:00 2001
From: dong_bo0602 <358256383@qq.com>
Date: Fri, 26 Jun 2020 15:19:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=B4=E5=83=8F1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                 | 2 +-
 pages/center/center.js | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/app.js b/app.js
index 78f7845..3d3a4cd 100644
--- a/app.js
+++ b/app.js
@@ -3,7 +3,7 @@ var restAjax = require('utils/restAjax.js');
 var dialog = require('utils/dialog.js');
 App({
   loginUrl: 'http://192.168.0.113:7001/usercenter',
-  usercenterUrl: 'http://192.168.0.113:7001/usesrcenter',
+  usercenterUrl: 'http://192.168.0.113:7001/usercenter',
   newsUrl: 'http://192.168.0.113:8082/news',
   libraryUrl: 'http://192.168.0.113:8081/library',
   activityUrl: 'http://192.168.0.111:8080/culturalactivity/',
diff --git a/pages/center/center.js b/pages/center/center.js
index 9d572b2..d9e589a 100644
--- a/pages/center/center.js
+++ b/pages/center/center.js
@@ -33,9 +33,7 @@ Page({
       success: function (res) {
         var avatar = res.tempFilePaths[0];
         console.log(avatar)
-        app.restAjax.post(app.restAjax.path('{usercenterUrl}/app/file/uploadimage', [app.usercenterUrl]), {
-          image: avatar
-        }, {
+        app.restAjax.post(app.restAjax.path('{usercenterUrl}/app/file/uploadimage', [app.usercenterUrl]), avatar, 'image', {
           headers: {
             token: self.data.token
           }
@@ -62,8 +60,6 @@ Page({
       },
     })
   },
-<<<<<<< HEAD
-=======
   /**
    * 跳转到我的志愿团队页面
    */
@@ -81,7 +77,6 @@ Page({
     })
   },
 
->>>>>>> 8efd16995df21586c7ff79678f34b0547afeb3e4
   /**
    * 生命周期函数--监听页面加载
    */