diff --git a/application/index/view/default/user/login_info.html b/application/index/view/default/user/login_info.html index bf114af38..33be46aba 100755 --- a/application/index/view/default/user/login_info.html +++ b/application/index/view/default/user/login_info.html @@ -26,7 +26,7 @@
{{if in_array('sms', MyC('home_user_reg_state')) or in_array('email', MyC('home_user_reg_state'))}} 还没有帐号？ - 立即注册 + 注册 {{/if}} diff --git a/application/plugins/touristbuy/Hook.php b/application/plugins/touristbuy/Hook.php index 8bda422a7..a64e9986c 100755 --- a/application/plugins/touristbuy/Hook.php +++ b/application/plugins/touristbuy/Hook.php @@ -137,8 +137,7 @@ class Hook extends Controller public function Style($params = []) { return ''; } @@ -166,8 +165,8 @@ class Hook extends Controller // 获取应用数据 $ret = PluginsService::PluginsData('touristbuy'); - $login_name = empty($ret['data']['login_name']) ? '游客登录' : $ret['data']['login_name']; - return ''.$login_name.''; + $login_name = empty($ret['data']['login_name']) ? '游客' : $ret['data']['login_name']; + return ''.$login_name.''; } return ''; } @@ -188,8 +187,8 @@ class Hook extends Controller { // 获取应用数据 $ret = PluginsService::PluginsData('touristbuy'); - $login_name = empty($ret['data']['login_name']) ? '游客登录' : $ret['data']['login_name']; - return ''.$login_name.''; + $login_name = empty($ret['data']['login_name']) ? '游客' : $ret['data']['login_name']; + return ''.$login_name.''; } return ''; } diff --git a/application/plugins/view/touristbuy/admin/admin/index.html b/application/plugins/view/touristbuy/admin/admin/index.html index 44c362849..4436ac1fb 100755 --- a/application/plugins/view/touristbuy/admin/admin/index.html +++ b/application/plugins/view/touristbuy/admin/admin/index.html @@ -25,7 +25,7 @@ {{if !empty($data['login_name'])}} {{$data.login_name}} {{else /}} - 游客登录 + 游客 {{/if}}
diff --git a/application/plugins/view/touristbuy/admin/admin/saveinfo.html b/application/plugins/view/touristbuy/admin/admin/saveinfo.html index 9f806e905..8a52c5eb8 100755 --- a/application/plugins/view/touristbuy/admin/admin/saveinfo.html +++ b/application/plugins/view/touristbuy/admin/admin/saveinfo.html @@ -16,13 +16,13 @@
- - + +
- - + +
diff --git a/application/plugins/view/weixinwebauthorization/admin/admin/index.html b/application/plugins/view/weixinwebauthorization/admin/admin/index.html index 7c498a3b6..6fb0121ce 100755 --- a/application/plugins/view/weixinwebauthorization/admin/admin/index.html +++ b/application/plugins/view/weixinwebauthorization/admin/admin/index.html @@ -40,6 +40,27 @@
+
+ +
+ {{if !empty($data['login_name'])}} + {{$data.login_name}} + {{else /}} + 微信 + {{/if}} +
+
+
+ +
+ {{if !empty($data['nickname'])}} + {{$data.nickname}} + {{else /}} + 微信 + {{/if}} +
+
+
diff --git a/application/plugins/view/weixinwebauthorization/admin/admin/saveinfo.html b/application/plugins/view/weixinwebauthorization/admin/admin/saveinfo.html index 139179477..e46822501 100755 --- a/application/plugins/view/weixinwebauthorization/admin/admin/saveinfo.html +++ b/application/plugins/view/weixinwebauthorization/admin/admin/saveinfo.html @@ -20,6 +20,16 @@
+
+ + +
+ +
+ + +
+
diff --git a/application/plugins/view/weixinwebauthorization/index/public/auth_button.html b/application/plugins/view/weixinwebauthorization/index/public/auth_button.html index 5e6140958..71454ae93 100755 --- a/application/plugins/view/weixinwebauthorization/index/public/auth_button.html +++ b/application/plugins/view/weixinwebauthorization/index/public/auth_button.html @@ -1 +1 @@ - \ No newline at end of file +{{if empty($plugins_data['login_name'])}}微信{{else /}}{{$plugins_data.login_name}}{{/if}} \ No newline at end of file diff --git a/application/plugins/view/weixinwebauthorization/index/public/auth_text.html b/application/plugins/view/weixinwebauthorization/index/public/auth_text.html index 4363c7ebc..b84bf3370 100644 --- a/application/plugins/view/weixinwebauthorization/index/public/auth_text.html +++ b/application/plugins/view/weixinwebauthorization/index/public/auth_text.html @@ -1 +1 @@ -微信登录 \ No newline at end of file + {{if empty($plugins_data['login_name'])}}微信{{else /}}{{$plugins_data.login_name}}{{/if}} \ No newline at end of file diff --git a/application/plugins/weixinwebauthorization/Hook.php b/application/plugins/weixinwebauthorization/Hook.php index b5b65d2cb..f661c431d 100644 --- a/application/plugins/weixinwebauthorization/Hook.php +++ b/application/plugins/weixinwebauthorization/Hook.php @@ -11,6 +11,7 @@ namespace app\plugins\weixinwebauthorization; use think\Controller; +use app\service\PluginsService; /** * 微信登录 - 钩子入口 @@ -31,14 +32,15 @@ class Hook extends Controller */ public function run($params = []) { - if(!empty($params['hook_name'])) + // 目前微信登录只针对手机端 + if(!empty($params['hook_name']) && IsMobile()) { switch($params['hook_name']) { // 用户登录页面顶部钩子 // 用户注册页面钩子 case 'plugins_view_user_login_info_top' : - case 'plugins_view_user_reg_info_top' : + case 'plugins_view_user_reg_info' : $ret = $this->ButtonHtml($params); break; @@ -47,6 +49,11 @@ class Hook extends Controller $ret = $this->NavTextHtml($params); break; + // header代码 + case 'plugins_common_header' : + $ret = $this->Style($params); + break; + default : $ret = ''; } @@ -54,6 +61,21 @@ class Hook extends Controller } } + /** + * css + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @datetime 2019-02-06T16:16:34+0800 + * @param [array] $params [输入参数] + */ + public function Style($params = []) + { + return ''; + } + /** * 登录登录html * @author Devil @@ -65,6 +87,8 @@ class Hook extends Controller */ private function ButtonHtml($params = []) { + $ret = PluginsService::PluginsData('weixinwebauthorization'); + $this->assign('plugins_data', $ret['data']); return $this->fetch('../../../plugins/view/weixinwebauthorization/index/public/auth_button'); } @@ -79,6 +103,8 @@ class Hook extends Controller */ private function NavTextHtml($params = []) { + $ret = PluginsService::PluginsData('weixinwebauthorization'); + $this->assign('plugins_data', $ret['data']); return $this->fetch('../../../plugins/view/weixinwebauthorization/index/public/auth_text'); } } diff --git a/application/plugins/weixinwebauthorization/config.json b/application/plugins/weixinwebauthorization/config.json index 83f519d81..9265c2592 100644 --- a/application/plugins/weixinwebauthorization/config.json +++ b/application/plugins/weixinwebauthorization/config.json @@ -20,11 +20,14 @@ "plugins_view_user_login_info_top":[ "app\\plugins\\weixinwebauthorization\\Hook" ], - "plugins_view_user_reg_info_top":[ + "plugins_view_user_reg_info":[ "app\\plugins\\weixinwebauthorization\\Hook" ], "plugins_view_header_navigation_top_left":[ "app\\plugins\\weixinwebauthorization\\Hook" + ], + "plugins_common_header":[ + "app\\plugins\\weixinwebauthorization\\Hook" ] } } \ No newline at end of file diff --git a/application/tags.php b/application/tags.php index cdcd9c78f..76dac03e0 100755 --- a/application/tags.php +++ b/application/tags.php @@ -87,6 +87,7 @@ return array ( 0 => 'app\\plugins\\expressforkdn\\Hook', 1 => 'app\\plugins\\touristbuy\\Hook', 2 => 'app\\plugins\\homemiddleadv\\Hook', + 3 => 'app\\plugins\\weixinwebauthorization\\Hook', ), 'plugins_admin_common_header' => array ( @@ -113,6 +114,7 @@ return array ( 'plugins_view_user_reg_info' => array ( 0 => 'app\\plugins\\touristbuy\\Hook', + 1 => 'app\\plugins\\weixinwebauthorization\\Hook', ), 'plugins_service_buy_handle' => array ( @@ -156,9 +158,5 @@ return array ( array ( 0 => 'app\\plugins\\wallet\\Hook', ), - 'plugins_view_user_reg_info_top' => - array ( - 0 => 'app\\plugins\\weixinwebauthorization\\Hook', - ), ); ?> \ No newline at end of file diff --git a/extend/payment/Weixin.php b/extend/payment/Weixin.php index 28c2e9bc9..82f5a2042 100755 --- a/extend/payment/Weixin.php +++ b/extend/payment/Weixin.php @@ -233,15 +233,25 @@ class Weixin return DataReturn('支付类型不匹配', -1); } + // openid + if(APPLICATION == 'app') + { + $openid = isset($params['user']['weixin_openid']) ? $params['user']['weixin_openid'] : ''; + } else { + $openid = isset($params['user']['weixin_web_openid']) ? $params['user']['weixin_web_openid'] : ''; + } + // appid - $appid = (APPLICATION_CLIENT_TYPE == 'weixin') ? $this->config['mini_appid'] : $this->config['appid']; + $appid = (APPLICATION == 'app') ? $this->config['mini_appid'] : $this->config['appid']; + + // 请求参数 $data = [ 'appid' => $appid, 'mch_id' => $this->config['mch_id'], 'body' => $params['site_name'].'-'.$params['name'], 'nonce_str' => md5(time().rand().$params['order_no']), 'notify_url' => (__MY_HTTP__ == 'https') ? 'http'.mb_substr($params['notify_url'], 5, null, 'utf-8') : $params['notify_url'], - 'openid' => ($trade_type == 'JSAPI') ? $params['user']['weixin_openid'] : '', + 'openid' => ($trade_type == 'JSAPI') ? $openid : '', 'out_trade_no' => $params['order_no'].GetNumberCode(6), 'spbill_create_ip' => GetClientIP(), 'total_fee' => intval($params['total_price']*100),