diff --git a/app/admin/form/Appcenternav.php b/app/admin/form/Appcenternav.php
index 9cf5d1fb0..95ffc8572 100644
--- a/app/admin/form/Appcenternav.php
+++ b/app/admin/form/Appcenternav.php
@@ -201,6 +201,7 @@ class AppCenterNav
                 'is_page'               => 1,
                 'order_by'              => 'sort asc,id asc',
                 'is_handle_time_field'  => 1,
+                'is_handle_annex_field' => 1,
             ],
         ];
     }
diff --git a/app/admin/form/Apphomenav.php b/app/admin/form/Apphomenav.php
index eff4ed1f9..ca4e6c8b5 100644
--- a/app/admin/form/Apphomenav.php
+++ b/app/admin/form/Apphomenav.php
@@ -189,6 +189,7 @@ class AppHomeNav
                 'is_page'               => 1,
                 'order_by'              => 'sort asc,id asc',
                 'is_handle_time_field'  => 1,
+                'is_handle_annex_field' => 1,
             ],
         ];
     }
diff --git a/app/admin/form/Customview.php b/app/admin/form/Customview.php
index c0d92a18f..fed9a08d4 100644
--- a/app/admin/form/Customview.php
+++ b/app/admin/form/Customview.php
@@ -169,9 +169,10 @@ class CustomView
             ],
             // 数据配置
             'data'  => [
-                'table_name'    => 'CustomView',
-                'data_handle'   => 'CustomViewService::CustomViewListHandle',
-                'is_page'       => 1,
+                'table_name'             => 'CustomView',
+                'data_handle'            => 'CustomViewService::CustomViewListHandle',
+                'is_page'                => 1,
+                'is_handle_annex_field'  => 1,
             ],
         ];
     }
diff --git a/app/admin/form/Design.php b/app/admin/form/Design.php
index a0669c0d5..085d279e8 100644
--- a/app/admin/form/Design.php
+++ b/app/admin/form/Design.php
@@ -195,9 +195,10 @@ class Design
             ],
             // 数据配置
             'data'  => [
-                'table_name'    => 'Design',
-                'data_handle'   => 'DesignService::DesignListHandle',
-                'is_page'       => 1,
+                'table_name'             => 'Design',
+                'data_handle'            => 'DesignService::DesignListHandle',
+                'is_page'                => 1,
+                'is_handle_annex_field'  => 1,
             ],
         ];
     }
diff --git a/app/admin/form/Quicknav.php b/app/admin/form/Quicknav.php
index 6e23aad92..fb8c69f0f 100644
--- a/app/admin/form/Quicknav.php
+++ b/app/admin/form/Quicknav.php
@@ -172,6 +172,7 @@ class QuickNav
                 'is_page'               => 1,
                 'order_by'              => 'sort asc,id asc',
                 'is_handle_time_field'  => 1,
+                'is_handle_annex_field' => 1,
             ],
         ];
     }
diff --git a/app/admin/form/Slide.php b/app/admin/form/Slide.php
index 5de9bbc1f..f0582e547 100644
--- a/app/admin/form/Slide.php
+++ b/app/admin/form/Slide.php
@@ -171,6 +171,7 @@ class Slide
                 'is_page'               => 1,
                 'order_by'              => 'sort asc,id asc',
                 'is_handle_time_field'  => 1,
+                'is_handle_annex_field' => 1,
             ],
         ];
     }
diff --git a/app/admin/view/default/public/tips_error.html b/app/admin/view/default/public/tips_error.html
index aa4b7f06c..22bb4a00f 100755
--- a/app/admin/view/default/public/tips_error.html
+++ b/app/admin/view/default/public/tips_error.html
@@ -17,7 +17,7 @@
     </div>
 </div>
 <!-- right content end  -->
-        
+
 <!-- footer start -->
 {{include file="public/footer" /}}
 <!-- footer end -->
\ No newline at end of file
diff --git a/app/module/FormHandleModule.php b/app/module/FormHandleModule.php
index 3f727aaac..7e85470ee 100644
--- a/app/module/FormHandleModule.php
+++ b/app/module/FormHandleModule.php
@@ -428,7 +428,7 @@ class FormHandleModule
 
                 // 附件字段
                 $is_handle_annex_field = isset($form_data['is_handle_annex_field']) && $form_data['is_handle_annex_field'] == 1;
-                $handle_annex_fields = empty($form_data['handle_annex_fields']) ? ['icon', 'images', 'images_url', 'video', 'video_url'] : (is_array($form_data['handle_annex_fields']) ? $form_data['handle_annex_fields'] : explode(',', $form_data['handle_annex_fields']));
+                $handle_annex_fields = empty($form_data['handle_annex_fields']) ? ['logo', 'icon', 'images', 'images_url', 'video', 'video_url'] : (is_array($form_data['handle_annex_fields']) ? $form_data['handle_annex_fields'] : explode(',', $form_data['handle_annex_fields']));
 
                 // 1. 展示字段指定数组转换处理
                 // 2. 状态字段按照搜索列表转换处理
diff --git a/app/service/AppMiniUserService.php b/app/service/AppMiniUserService.php
index 0fbb11ace..ee898f39d 100644
--- a/app/service/AppMiniUserService.php
+++ b/app/service/AppMiniUserService.php
@@ -200,7 +200,7 @@ class AppMiniUserService
                 // 是否重新获取用户信息
                 if($status)
                 {
-                    $user = UserService::AppUserInfoHandle(['where_field'=>'user_id', 'where_value'=>$user['id']]);
+                    $user = UserService::AppUserInfoHandle(['where_field'=>'id', 'where_value'=>$user['id']]);
                 }
             }
 
@@ -447,7 +447,7 @@ class AppMiniUserService
                 // 是否重新获取用户信息
                 if($status)
                 {
-                    $user = UserService::AppUserInfoHandle(['where_field'=>'user_id', 'where_value'=>$user['id']]);
+                    $user = UserService::AppUserInfoHandle(['where_field'=>'id', 'where_value'=>$user['id']]);
                 }
             }
 
@@ -659,7 +659,7 @@ class AppMiniUserService
                     // 是否重新获取用户信息
                     if($status)
                     {
-                        $user = UserService::AppUserInfoHandle(['where_field'=>'user_id', 'where_value'=>$user['id']]);
+                        $user = UserService::AppUserInfoHandle(['where_field'=>'id', 'where_value'=>$user['id']]);
                     }
                 }
 
diff --git a/app/service/CustomViewService.php b/app/service/CustomViewService.php
index a990f565a..f65426a7c 100755
--- a/app/service/CustomViewService.php
+++ b/app/service/CustomViewService.php
@@ -60,6 +60,12 @@ class CustomViewService
             $common_is_text_list = MyLang('common_is_text_list');
             foreach($data as &$v)
             {
+                // logo
+                if(array_key_exists('logo', $v))
+                {
+                    $v['logo'] = ResourcesService::AttachmentPathViewHandle($v['logo']);
+                }
+
                 // 内容
                 if(isset($v['html_content']))
                 {
diff --git a/app/service/GoodsService.php b/app/service/GoodsService.php
index f6a26b183..423489e20 100755
--- a/app/service/GoodsService.php
+++ b/app/service/GoodsService.php
@@ -2918,7 +2918,7 @@ class GoodsService
     public static function GoodsBreadcrumbData($goods)
     {
         // 从缓存获取
-        $key = SystemService::CacheKey('shopxo.cache_goods_detail_breadcrumb_key');
+        $key = SystemService::CacheKey('shopxo.cache_goods_detail_breadcrumb_key').$goods['id'];
         $data = MyCache($key);
         if($data === null || MyEnv('app_debug'))
         {
diff --git a/app/service/UserService.php b/app/service/UserService.php
index 239943b6f..d6e18ad8f 100755
--- a/app/service/UserService.php
+++ b/app/service/UserService.php
@@ -255,18 +255,6 @@ class UserService
                 }
             }
         }
-
-        // 非退出操作则重新设置用户信息
-        if(!empty($user_login_info) && RequestAction() != 'logout' && MyInput('pluginsaction') != 'logout')
-        {
-            // 重新更新用户session或cookie缓存
-            self::UserLoginRecord($user_login_info['id']);
-            // 重新存储用户缓存
-            if(!empty($user_login_info['token']))
-            {
-                MyCache(SystemService::CacheKey('shopxo.cache_user_info').$user_login_info['token'], $user_login_info);
-            }
-        }
         return $user_login_info;
     }
 
@@ -1495,7 +1483,7 @@ class UserService
                 // 成功返回
                 if(APPLICATION == 'app')
                 {
-                    $result = self::AppUserInfoHandle(['where_field'=>'user_id', 'where_value'=>$user_ret['data']['user_id']]);
+                    $result = self::AppUserInfoHandle(['where_field'=>'id', 'where_value'=>$user_ret['data']['user_id']]);
                 } else {
                     $result = $user_ret['data'];
                 }
@@ -2223,7 +2211,7 @@ class UserService
                         ];
                         if(Db::name('User')->where(['id'=>$user['id']])->update($upd_data))
                         {
-                            return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle(['where_field'=>'user_id', 'where_value'=>$user['id']]));
+                            return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle(['where_field'=>'id', 'where_value'=>$user['id']]));
                         }
                     } else {
                         if($user['id'] != $temp['id'])
@@ -2283,7 +2271,7 @@ class UserService
                                 }
                             }
                         }
-                        return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle(['where_field'=>'user_id', 'where_value'=>$unionid_user_base['id']]));
+                        return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle(['where_field'=>'id', 'where_value'=>$unionid_user_base['id']]));
                     }
                 }
 
@@ -2315,7 +2303,7 @@ class UserService
                         }
                         if(self::UserPlatformInsert($user_platform_insert, $params))
                         {
-                            return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle(['where_field'=>'user_id', 'where_value'=>$user['id']]));
+                            return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle(['where_field'=>'id', 'where_value'=>$user['id']]));
                         }
                     } else {
                         $is_insert_user = true;
@@ -2340,7 +2328,7 @@ class UserService
                 {
                     return DataReturn(MyLang('common_service.user.user_not_audit_tips'), -110);
                 }
-                return DataReturn(MyLang('auth_success'), 0, self::AppUserInfoHandle(['where_field'=>'user_id', 'where_value'=>$ret['data']['user_id']]));
+                return DataReturn(MyLang('auth_success'), 0, self::AppUserInfoHandle(['where_field'=>'id', 'where_value'=>$ret['data']['user_id']]));
             }
             return $ret;
         }
@@ -2922,7 +2910,7 @@ class UserService
         {
             // 清除验证码
             $obj->Remove();
-            return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle(['where_field'=>'user_id', 'where_value'=>$user_id]));
+            return DataReturn(MyLang('bind_success'), 0, self::AppUserInfoHandle(['where_field'=>'id', 'where_value'=>$user_id]));
         }
         return DataReturn(MyLang('bind_fail'), -100);
     }