diff --git a/application/common.php b/application/common.php
index 2b4121d64..3fcb41512 100755
--- a/application/common.php
+++ b/application/common.php
@@ -242,6 +242,62 @@ function IsWeixinEnv()
     return (!empty($_SERVER['HTTP_USER_AGENT']) && stripos($_SERVER['HTTP_USER_AGENT'], 'MicroMessenger') !== false);
 }
 
+/**
+ * 是否微信环境
+ * @author  Devil
+ * @blog    http://gong.gg/
+ * @version 1.0.0
+ * @date    2020-08-26
+ * @desc    description
+ * @return  [boolean] [否false, 是true]
+ */
+function IsDingdingEnv()
+{
+    return (!empty($_SERVER['HTTP_USER_AGENT']) && stripos($_SERVER['HTTP_USER_AGENT'], 'DingTalk') !== false);
+}
+
+/**
+ * 是否QQ环境
+ * @author  Devil
+ * @blog    http://gong.gg/
+ * @version 1.0.0
+ * @date    2020-08-26
+ * @desc    description
+ * @return  [boolean] [否false, 是true]
+ */
+function IsQQEnv()
+{
+    return (!empty($_SERVER['HTTP_USER_AGENT']) && stripos($_SERVER['HTTP_USER_AGENT'], 'MQQBrowser') !== false);
+}
+
+/**
+ * 是否支付宝环境
+ * @author  Devil
+ * @blog    http://gong.gg/
+ * @version 1.0.0
+ * @date    2020-08-26
+ * @desc    description
+ * @return  [boolean] [否false, 是true]
+ */
+function IsAlipayEnv()
+{
+    return (!empty($_SERVER['HTTP_USER_AGENT']) && stripos($_SERVER['HTTP_USER_AGENT'], 'AlipayClient') !== false);
+}
+
+/**
+ * 是否新浪微博环境
+ * @author  Devil
+ * @blog    http://gong.gg/
+ * @version 1.0.0
+ * @date    2020-08-26
+ * @desc    description
+ * @return  [boolean] [否false, 是true]
+ */
+function IsWeiboEnv()
+{
+    return (!empty($_SERVER['HTTP_USER_AGENT']) && stripos($_SERVER['HTTP_USER_AGENT'], 'Weibo') !== false);
+}
+
 /**
  * 笛卡尔积生成规格
  * @author  Devil
@@ -1755,7 +1811,7 @@ function CurlPost($url, $post, $is_json = false, $timeout = 30)
     } else {
         curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($post));
         curl_setopt($ch, CURLOPT_HTTPHEADER, array(
-                "Content-Type: application/x-www-form-urlencoded",
+                "Content-Type: application/x-www-form-urlencoded; charset=utf-8",
                 "cache-control: no-cache"
             )
         );
diff --git a/application/index/view/default/user/login_content.html b/application/index/view/default/user/login_content.html
index 34cbfef23..561a01390 100644
--- a/application/index/view/default/user/login_content.html
+++ b/application/index/view/default/user/login_content.html
@@ -107,7 +107,7 @@
             </div>
         {{/if}}
 
-        <div class="am-padding-horizontal-xs am-padding-vertical-xs am-margin-bottom-sm am-nbfc">
+        <div class="am-padding-horizontal-lg am-padding-vertical-xs am-margin-bottom-sm am-nbfc">
             <!-- 用户登录内底部钩子 -->
             {{if isset($shopxo_is_develop) and $shopxo_is_develop eq true}}
                 <div class="plugins-tag">
@@ -123,8 +123,8 @@
             {{/if}}
             <!-- 右侧快捷入口 -->
             <div class="am-fr">
-                <a href="{{:MyUrl('index/user/reginfo')}}" target="_blank" class="am-text-danger am-margin-right-sm">免费注册</a>
-                <a href="{{:MyUrl('index/user/forgetpwdinfo')}}" target="_blank">忘记密码</a>
+                <a href="{{:MyUrl('index/user/reginfo')}}" target="_blank" class="am-text-danger am-margin-right-sm">注册</a>
+                <a href="{{:MyUrl('index/user/forgetpwdinfo')}}" target="_blank">找回密码</a>
             </div>
         </div>
     </div>
diff --git a/application/tags.php b/application/tags.php
index a7758872a..f29a627fa 100755
--- a/application/tags.php
+++ b/application/tags.php
@@ -42,12 +42,14 @@ return array (
     1 => 'app\\plugins\\excellentbuyreturntocash\\Hook',
     2 => 'app\\plugins\\coupon\\Hook',
     3 => 'app\\plugins\\distribution\\Hook',
+    4 => 'app\\plugins\\exchangerate\\Hook',
   ),
   'plugins_js' => 
   array (
     0 => 'app\\plugins\\shop\\Hook',
     1 => 'app\\plugins\\coupon\\Hook',
     2 => 'app\\plugins\\distribution\\Hook',
+    3 => 'app\\plugins\\exchangerate\\Hook',
   ),
   'plugins_service_navigation_header_handle' => 
   array (
@@ -67,6 +69,7 @@ return array (
     1 => 'app\\plugins\\excellentbuyreturntocash\\Hook',
     2 => 'app\\plugins\\coupon\\Hook',
     3 => 'app\\plugins\\distribution\\Hook',
+    4 => 'app\\plugins\\exchangerate\\Hook',
   ),
   'plugins_service_goods_save_handle' => 
   array (
@@ -128,6 +131,7 @@ return array (
   array (
     0 => 'app\\plugins\\shop\\Hook',
     1 => 'app\\plugins\\distribution\\Hook',
+    2 => 'app\\plugins\\exchangerate\\Hook',
   ),
   'plugins_module_form_admin_goods_index' => 
   array (
@@ -169,6 +173,7 @@ return array (
   'plugins_service_user_register_end' => 
   array (
     0 => 'app\\plugins\\coupon\\Hook',
+    1 => 'app\\plugins\\thirdpartylogin\\Hook',
   ),
   'plugins_service_base_data_return_api_goods_detail' => 
   array (
@@ -205,6 +210,7 @@ return array (
   'plugins_service_goods_spec_base' => 
   array (
     0 => 'app\\plugins\\distribution\\Hook',
+    1 => 'app\\plugins\\exchangerate\\Hook',
   ),
   'plugins_view_goods_detail_panel_price_top' => 
   array (
@@ -221,30 +227,69 @@ return array (
   'plugins_service_quick_navigation_pc' => 
   array (
     0 => 'app\\plugins\\distribution\\Hook',
+    1 => 'app\\plugins\\exchangerate\\Hook',
   ),
   'plugins_service_quick_navigation_h5' => 
   array (
     0 => 'app\\plugins\\distribution\\Hook',
+    1 => 'app\\plugins\\exchangerate\\Hook',
   ),
   'plugins_service_quick_navigation_weixin' => 
   array (
     0 => 'app\\plugins\\distribution\\Hook',
+    1 => 'app\\plugins\\exchangerate\\Hook',
   ),
   'plugins_service_quick_navigation_alipay' => 
   array (
     0 => 'app\\plugins\\distribution\\Hook',
+    1 => 'app\\plugins\\exchangerate\\Hook',
   ),
   'plugins_service_quick_navigation_baidu' => 
   array (
     0 => 'app\\plugins\\distribution\\Hook',
+    1 => 'app\\plugins\\exchangerate\\Hook',
   ),
   'plugins_service_quick_navigation_qq' => 
   array (
     0 => 'app\\plugins\\distribution\\Hook',
+    1 => 'app\\plugins\\exchangerate\\Hook',
   ),
   'plugins_service_quick_navigation_toutiao' => 
   array (
     0 => 'app\\plugins\\distribution\\Hook',
+    1 => 'app\\plugins\\exchangerate\\Hook',
+  ),
+  'plugins_view_common_bottom' => 
+  array (
+    0 => 'app\\plugins\\exchangerate\\Hook',
+  ),
+  'plugins_service_currency_data' => 
+  array (
+    0 => 'app\\plugins\\exchangerate\\Hook',
+  ),
+  'plugins_view_user_login_inside_bottom' => 
+  array (
+    0 => 'app\\plugins\\thirdpartylogin\\Hook',
+  ),
+  'plugins_view_user_reg_info_inside_bottom' => 
+  array (
+    0 => 'app\\plugins\\thirdpartylogin\\Hook',
+  ),
+  'plugins_view_user_login_info_top' => 
+  array (
+    0 => 'app\\plugins\\thirdpartylogin\\Hook',
+  ),
+  'plugins_view_user_reg_info' => 
+  array (
+    0 => 'app\\plugins\\thirdpartylogin\\Hook',
+  ),
+  'plugins_service_user_login_end' => 
+  array (
+    0 => 'app\\plugins\\thirdpartylogin\\Hook',
+  ),
+  'plugins_service_users_personal_show_field_list_handle' => 
+  array (
+    0 => 'app\\plugins\\thirdpartylogin\\Hook',
   ),
 );
 ?>
\ No newline at end of file
diff --git a/config/shopxo.php b/config/shopxo.php
index 622f218aa..1a2930ff5 100755
--- a/config/shopxo.php
+++ b/config/shopxo.php
@@ -28,7 +28,7 @@ if(substr($cdn_public_host, -1) != DS)
 // 配置信息
 return [
     // 开发模式
-    'is_develop'                            => false,
+    'is_develop'                            => true,
 
     // 默认编码
     'default_charset'                       => 'utf-8',
diff --git a/public/static/index/default/css/common.css b/public/static/index/default/css/common.css
index 3ad5cd42c..1f39bf793 100755
--- a/public/static/index/default/css/common.css
+++ b/public/static/index/default/css/common.css
@@ -448,9 +448,9 @@ ul.am-dropdown-content > .am-active > a:focus,
 @media only screen and (min-width: 641px) {
     .common-login-modal {
         max-width: 400px;
-        height: 430px;
+        height: 440px;
         left: calc(50% - 200px);
-        top: calc(50% - 215px);
+        top: calc(50% - 220px);
         margin-left: 0;
         margin-top: 0;
     }
diff --git a/sourcecode/baidu/default/app.js b/sourcecode/baidu/default/app.js
index 79821c1aa..9ebdaffde 100755
--- a/sourcecode/baidu/default/app.js
+++ b/sourcecode/baidu/default/app.js
@@ -259,7 +259,7 @@ App({
       // 加载loding
       swan.showLoading({ title: "授权中..." });
 
-      swan.login({
+      swan.getLoginCode({
         success: function (res) {
           swan.request({
             url: self.get_request_url("baiduuserauth", "user"),