From 8b00513c1615018f65b7e8f66a31bc23aa673aff Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 19 Apr 2021 16:35:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/models/user/User.php | 10 +++++-----
 template/xcx/utils/util.js     |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crmeb/app/models/user/User.php b/crmeb/app/models/user/User.php
index cfe7f0429..2d7921a50 100644
--- a/crmeb/app/models/user/User.php
+++ b/crmeb/app/models/user/User.php
@@ -111,15 +111,15 @@ class User extends BaseModel
         }
         if ($userInfo->spread_uid) {
             return self::edit([
-                'nickname' => $wechatUser['nickname'] ?: '',
-                'avatar' => $wechatUser['headimgurl'] ?: '',
+                'nickname' => $userInfo['nickname'] == '' ? $wechatUser['nickname'] ?: '' : $userInfo['nickname'],
+                'avatar' => $userInfo['avatar'] == '' ? $wechatUser['headimgurl'] ?: '' : $userInfo['avatar'],
                 'is_promoter' => $status ? 1 : $userInfo->is_promoter,
                 'login_type' => isset($wechatUser['login_type']) ? $wechatUser['login_type'] : $userInfo->login_type,
             ], $uid, 'uid');
         } else {
             $data = [
-                'nickname' => $wechatUser['nickname'] ?: '',
-                'avatar' => $wechatUser['headimgurl'] ?: '',
+                'nickname' => $userInfo['nickname'] == '' ? $wechatUser['nickname'] ?: '' : $userInfo['nickname'],
+                'avatar' => $userInfo['avatar'] == '' ? $wechatUser['headimgurl'] ?: '' : $userInfo['avatar'],
                 'is_promoter' => $status ? 1 : $userInfo->is_promoter,
                 'login_type' => isset($wechatUser['login_type']) ? $wechatUser['login_type'] : $userInfo->login_type,
                 'spread_uid' => 0,
@@ -455,7 +455,7 @@ class User extends BaseModel
         if ($orderBy === '') $orderBy = 'u.add_time desc';
         $model = $model->alias(' u');
         $sql = StoreOrder::where('o.paid', 1)->group('o.uid')->field(['SUM(o.pay_price) as numberCount', 'o.uid', 'o.order_id'])
-            ->where('o.is_del', 0)->where('o.refund_status', 'in', [0,1])->where('o.is_system_del', 0)->alias('o')->fetchSql(true)->select();
+            ->where('o.is_del', 0)->where('o.refund_status', 'in', [0, 1])->where('o.is_system_del', 0)->alias('o')->fetchSql(true)->select();
         $model = $model->join("(" . $sql . ") p", 'u.uid = p.uid', 'LEFT');
         $model = $model->where('u.uid', 'IN', $uid);
         $model = $model->field("u.uid,u.nickname,u.avatar,from_unixtime(u.add_time,'%Y/%m/%d') as time,u.spread_count as childCount,u.pay_count as orderCount,p.numberCount");
diff --git a/template/xcx/utils/util.js b/template/xcx/utils/util.js
index 7f63c2532..df93b5e86 100644
--- a/template/xcx/utils/util.js
+++ b/template/xcx/utils/util.js
@@ -214,7 +214,7 @@ const chekWxLogin = function() {
 						fail() {
 							getCodeLogin((code) => {
 								wxgetUserInfo().then(userInfo => {
-									userInfo.code = code;
+									userInfo.code = code.code;
 									return resolve({
 										userInfo: userInfo,
 										isLogin: false
@@ -620,4 +620,4 @@ module.exports = {
 	autoLogin: autoLogin,
 	logout: logout,
 	getUserProfile: getUserProfile
-}
+}