diff --git a/app/admin/view/default/appmini/config.html b/app/admin/view/default/appmini/config.html
index df8acd951..8e1113a42 100755
--- a/app/admin/view/default/appmini/config.html
+++ b/app/admin/view/default/appmini/config.html
@@ -7,11 +7,14 @@
     <!-- second nav end -->
 	<div class="content">
 		<!-- 新版本小程序主题提示 -->
-	    <div class="am-alert am-radius">
-	        <p class="am-text-lg">已发布新版本小程序主题、建议使用新版本主题，老版本主题已停止维护开发、将在后续版本中剔除。</p>
+	    <div class="am-alert am-alert-warning am-radius">
+	        <p class="am-text-lg">已发布新版本小程序主题（支持6端小程序+H5）建议使用新版本主题，老版本主题已停止维护开发、将在后续版本中剔除。</p>
 	        <p class="am-margin-top-xs">
 	            <a href="https://gitee.com/zongzhige/shopxo-uniapp" target="_blank">查看新版本小程序主题 <i class="am-icon-external-link"></i></a>
 	        </p>
+	        <p class="am-margin-top-xs">
+	            <a href="https://doc.shopxo.net/article/1/293727233598554112.html" target="_blank">uniapp版本打包教程 <i class="am-icon-external-link"></i></a>
+	        </p>
 	    </div>
 
 		<!-- form start -->
diff --git a/app/admin/view/default/appmini/package.html b/app/admin/view/default/appmini/package.html
index 2d5dc9a10..9408c4dba 100755
--- a/app/admin/view/default/appmini/package.html
+++ b/app/admin/view/default/appmini/package.html
@@ -10,10 +10,13 @@
 {{block name="form_navigation"}}
     {{include file="appmini/base_nav" /}}
     <!-- 新版本小程序主题提示 -->
-    <div class="am-alert am-radius">
-        <p class="am-text-lg">已发布新版本小程序主题、建议使用新版本主题，老版本主题已停止维护开发、将在后续版本中剔除。</p>
+    <div class="am-alert am-alert-warning am-radius">
+        <p class="am-text-lg">已发布新版本小程序主题（支持6端小程序+H5）建议使用新版本主题，老版本主题已停止维护开发、将在后续版本中剔除。</p>
         <p class="am-margin-top-xs">
-            <a href="https://gitee.com/zongzhige/shopxo-uniapp" target="_blank">查看新版本小程序主题 <i class="am-icon-external-link"></i></a>
+            <a href="https://gitee.com/zongzhige/shopxo-uniapp" target="_blank">查看新版本小程序主题源码 <i class="am-icon-external-link"></i></a>
+        </p>
+        <p class="am-margin-top-xs">
+            <a href="https://doc.shopxo.net/article/1/293727233598554112.html" target="_blank">uniapp版本打包教程 <i class="am-icon-external-link"></i></a>
         </p>
     </div>
 
diff --git a/app/layout/service/BaseLayout.php b/app/layout/service/BaseLayout.php
index 56c6902aa..a872264aa 100644
--- a/app/layout/service/BaseLayout.php
+++ b/app/layout/service/BaseLayout.php
@@ -860,7 +860,10 @@ class BaseLayout
                     $temp = array_column($ret['data'], null, 'id');
                     foreach($params['goods_ids'] as $v)
                     {
-                        $goods[] = $temp[$v];
+                        if(array_key_exists($v, $temp))
+                        {
+                            $goods[] = $temp[$v];
+                        }
                     }
                     $ret['data'] = $goods;
                 }
diff --git a/app/service/UserService.php b/app/service/UserService.php
index 82658e159..3cf3c6806 100755
--- a/app/service/UserService.php
+++ b/app/service/UserService.php
@@ -519,59 +519,65 @@ class UserService
      */
     public static function UserHandle($user)
     {
-        // 基础数据处理
-        if(isset($user['add_time']))
+        if(!empty($user))
         {
-            $user['add_time_text']  =   date('Y-m-d H:i:s', $user['add_time']);
-        }
-        if(isset($user['upd_time']))
-        {
-            $user['upd_time_text']  =   date('Y-m-d H:i:s', $user['upd_time']);
-        }
-        if(isset($user['gender']))
-        {
-            $user['gender_text']    =   MyConst('common_gender_list')[$user['gender']]['name'];
-        }
-        if(isset($user['birthday']))
-        {
-            $user['birthday_text']  =   empty($user['birthday']) ? '' : date('Y-m-d', $user['birthday']);
-        }
+            // 基础数据处理
+            if(isset($user['add_time']))
+            {
+                $user['add_time_text']  =   date('Y-m-d H:i:s', $user['add_time']);
+            }
+            if(isset($user['upd_time']))
+            {
+                $user['upd_time_text']  =   date('Y-m-d H:i:s', $user['upd_time']);
+            }
+            if(isset($user['gender']))
+            {
+                $user['gender_text']    =   MyConst('common_gender_list')[$user['gender']]['name'];
+            }
+            if(isset($user['birthday']))
+            {
+                $user['birthday_text']  =   empty($user['birthday']) ? '' : date('Y-m-d', $user['birthday']);
+            }
 
-        // 邮箱/手机
-        if(isset($user['mobile']))
-        {
-            $user['mobile_security']=   empty($user['mobile']) ? '' : mb_substr($user['mobile'], 0, 3, 'utf-8').'***'.mb_substr($user['mobile'], -3, null, 'utf-8');
-        }
-        if(isset($user['email']))
-        {
-            $user['email_security'] =   empty($user['email']) ? '' : mb_substr($user['email'], 0, 3, 'utf-8').'***'.mb_substr($user['email'], -3, null, 'utf-8');
-        }
+            // 邮箱/手机
+            if(isset($user['mobile']))
+            {
+                $user['mobile_security']=   empty($user['mobile']) ? '' : mb_substr($user['mobile'], 0, 3, 'utf-8').'***'.mb_substr($user['mobile'], -3, null, 'utf-8');
+            }
+            if(isset($user['email']))
+            {
+                $user['email_security'] =   empty($user['email']) ? '' : mb_substr($user['email'], 0, 3, 'utf-8').'***'.mb_substr($user['email'], -3, null, 'utf-8');
+            }
 
-        // 显示名称,根据规则优先展示
-        $user['user_name_view'] = isset($user['username']) ? $user['username'] : '';
-        if(empty($user['user_name_view']) && isset($user['nickname']))
-        {
-            $user['user_name_view'] = $user['nickname'];
-        }
-        if(empty($user['user_name_view']) && isset($user['mobile_security']))
-        {
-            $user['user_name_view'] = $user['mobile_security'];
-        }
-        if(empty($user['user_name_view']) && isset($user['email_security']))
-        {
-            $user['user_name_view'] = $user['email_security'];
-        }
+            // 显示名称,根据规则优先展示
+            $user['user_name_view'] = isset($user['username']) ? $user['username'] : '';
+            if(empty($user['user_name_view']) && isset($user['nickname']))
+            {
+                $user['user_name_view'] = $user['nickname'];
+            }
+            if(empty($user['user_name_view']) && isset($user['mobile_security']))
+            {
+                $user['user_name_view'] = $user['mobile_security'];
+            }
+            if(empty($user['user_name_view']) && isset($user['email_security']))
+            {
+                $user['user_name_view'] = $user['email_security'];
+            }
 
-        // 头像
-        if(!empty($user['avatar']))
-        {
-            $user['avatar'] = ResourcesService::AttachmentPathViewHandle($user['avatar']);
-        } else {
-            $user['avatar'] = SystemBaseService::AttachmentHost().'/static/index/'.strtolower(MyFileConfig('common_default_theme', '', 'default', true)).'/images/default-user-avatar.jpg';
-        }
+            // 头像
+            if(isset($user['avatar']))
+            {
+                if(!empty($user['avatar']))
+                {
+                    $user['avatar'] = ResourcesService::AttachmentPathViewHandle($user['avatar']);
+                } else {
+                    $user['avatar'] = SystemBaseService::AttachmentHost().'/static/index/'.strtolower(MyFileConfig('common_default_theme', '', 'default', true)).'/images/default-user-avatar.jpg';
+                }
+            }
 
-        // 移除特殊数据
-        unset($user['pwd'], $user['salt']);
+            // 移除特殊数据
+            unset($user['pwd'], $user['salt']);
+        }
 
         return $user;
     }
diff --git a/extend/payment/Alipay.php b/extend/payment/Alipay.php
index f9d637eb9..88677ac54 100755
--- a/extend/payment/Alipay.php
+++ b/extend/payment/Alipay.php
@@ -50,7 +50,7 @@ class Alipay
         // 基础信息
         $base = [
             'name'          => '支付宝',  // 插件名称
-            'version'       => '1.1.3',  // 插件版本
+            'version'       => '1.1.4',  // 插件版本
             'apply_version' => '不限',  // 适用系统版本描述
             'apply_terminal'=> ['pc','h5', 'ios', 'android'], // 适用终端 默认全部 ['pc', 'h5', 'ios', 'android', 'alipay', 'weixin', 'baidu', 'toutiao']
             'desc'          => '2.0版本，适用PC+H5+APP，即时到帐支付方式，买家的交易资金直接打入卖家支付宝账户，快速回笼交易资金。 <a href="http://www.alipay.com/" target="_blank">立即申请</a>',  // 插件描述（支持html）
diff --git a/extend/payment/AlipayCert.php b/extend/payment/AlipayCert.php
index 99d89fa8d..dab8ed723 100644
--- a/extend/payment/AlipayCert.php
+++ b/extend/payment/AlipayCert.php
@@ -49,8 +49,8 @@ class AlipayCert
     {
         // 基础信息
         $base = [
-            'name'          => '支付宝',  // 插件名称
-            'version'       => '1.0.0',  // 插件版本
+            'name'          => '支付宝证书支付',  // 插件名称
+            'version'       => '1.0.1',  // 插件版本
             'apply_version' => '不限',  // 适用系统版本描述
             'apply_terminal'=> ['pc','h5', 'ios', 'android'], // 适用终端 默认全部 ['pc', 'h5', 'ios', 'android', 'alipay', 'weixin', 'baidu', 'toutiao']
             'desc'          => '2.0证书通信版本，适用PC+H5+APP，即时到帐支付方式，买家的交易资金直接打入卖家支付宝账户，快速回笼交易资金。 <a href="http://www.alipay.com/" target="_blank">立即申请</a>',  // 插件描述（支持html）
diff --git a/extend/payment/AlipayFace.php b/extend/payment/AlipayFace.php
index 1eabc40a8..f7f2e3bbb 100644
--- a/extend/payment/AlipayFace.php
+++ b/extend/payment/AlipayFace.php
@@ -49,8 +49,8 @@ class AlipayFace
     {
         // 基础信息
         $base = [
-            'name'          => '支付宝',  // 插件名称
-            'version'       => '1.0.0',  // 插件版本
+            'name'          => '支付宝当面付',  // 插件名称
+            'version'       => '1.0.1',  // 插件版本
             'apply_version' => '不限',  // 适用系统版本描述
             'apply_terminal'=> ['pc', 'h5', 'weixin'], // 适用终端 默认全部 ['pc', 'h5', 'app', 'alipay', 'weixin', 'baidu']
             'desc'          => '支付宝当面付、适用web端，用户主动扫码支付方式，买家的交易资金直接打入卖家支付宝账户，快速回笼交易资金。 <a href="http://www.alipay.com/" target="_blank">立即申请</a>',  // 插件描述（支持html）
diff --git a/extend/payment/CashPayment.php b/extend/payment/CashPayment.php
index 8b0521994..aa101a391 100755
--- a/extend/payment/CashPayment.php
+++ b/extend/payment/CashPayment.php
@@ -50,7 +50,7 @@ class CashPayment
         // 基础信息
         $base = [
             'name'          => '现金支付',  // 插件名称
-            'version'       => '2.0.0',  // 插件版本
+            'version'       => '2.0.1',  // 插件版本
             'apply_version' => '不限',  // 适用系统版本描述
             'desc'          => '现金方式支付货款、支持配置自定义支付信息',  // 插件描述（支持html）
             'author'        => 'Devil',  // 开发者
diff --git a/extend/payment/QQ.php b/extend/payment/QQ.php
index 991979455..fbb6bb404 100644
--- a/extend/payment/QQ.php
+++ b/extend/payment/QQ.php
@@ -50,7 +50,7 @@ class QQ
         // 基础信息
         $base = [
             'name'          => 'QQ支付',  // 插件名称
-            'version'       => '1.0.0',  // 插件版本
+            'version'       => '1.0.1',  // 插件版本
             'apply_version' => '不限',  // 适用系统版本描述
             'apply_terminal'=> ['pc', 'h5', 'qq', 'ios', 'android'], // 适用终端 默认全部 ['pc', 'h5', 'app', 'alipay', 'weixin', 'baidu']
             'desc'          => '适用PC+H5+APP+QQ小程序，即时到帐支付方式，买家的交易资金直接打入卖家账户，快速回笼交易资金。 <a href="https://qpay.qq.com/" target="_blank">立即申请</a>',  // 插件描述（支持html）
diff --git a/extend/payment/Weixin.php b/extend/payment/Weixin.php
index 5033beb6a..4968ce8e0 100755
--- a/extend/payment/Weixin.php
+++ b/extend/payment/Weixin.php
@@ -50,7 +50,7 @@ class Weixin
         // 基础信息
         $base = [
             'name'          => '微信',  // 插件名称
-            'version'       => '1.1.4',  // 插件版本
+            'version'       => '1.1.5',  // 插件版本
             'apply_version' => '不限',  // 适用系统版本描述
             'apply_terminal'=> ['pc', 'h5', 'ios', 'android', 'weixin', 'qq'], // 适用终端 默认全部 ['pc', 'h5', 'app', 'alipay', 'weixin', 'baidu']
             'desc'          => '适用公众号+PC+H5+APP+微信小程序，即时到帐支付方式，买家的交易资金直接打入卖家账户，快速回笼交易资金。 <a href="https://pay.weixin.qq.com/" target="_blank">立即申请</a>',  // 插件描述（支持html）