diff --git a/application/admin/controller/Plugins.php b/application/admin/controller/Plugins.php index ee3adb8deb03cb9b499ed6d2b877413150b47f67..43b0e089a8ba6f3f3397c35d31dcf02095489514 100755 --- a/application/admin/controller/Plugins.php +++ b/application/admin/controller/Plugins.php @@ -87,71 +87,27 @@ class Plugins extends Common $pluginscontrol = strtolower($params['pluginscontrol']); $pluginsaction = strtolower($params['pluginsaction']); - // 应用校验 - $ret = $this->PluginsCheck($pluginsname, $pluginscontrol, $pluginsaction); - if($ret['code'] != 0) - { - if(IS_AJAX) - { - return $ret; - } else { - $this->assign('msg', $ret['msg']); - return $this->fetch('public/tips_error'); - } - } - // 视图初始化 $this->PluginsViewInit($pluginsname, $pluginscontrol, $pluginsaction); // 编辑器文件存放地址定义 $this->assign('editor_path_type', 'plugins_'.$pluginsname); - // 应用控制器 - $plugins = '\app\plugins\\'.$pluginsname.'\admin\\'.ucfirst($pluginscontrol); - if(!class_exists($plugins)) + // 调用 + $ret = PluginsService::PluginsControlCall($pluginsname, $pluginscontrol, $pluginsaction, 'admin', $params); + if($ret['code'] == 0) { - if(IS_AJAX) - { - return DataReturn(ucfirst($pluginscontrol).' 应用控制器未定义', -1); - } else { - $this->assign('msg', ucfirst($pluginscontrol).' 应用控制器未定义'); - return $this->fetch('public/tips_error'); - } + return $ret['data']; } - // 调用方法 - $obj = new $plugins(); - if(!method_exists($obj, $pluginsaction)) - { - if(IS_AJAX) - { - return DataReturn(ucfirst($pluginsaction).' 应用方法未定义', -1); - } else { - $this->assign('msg', ucfirst($pluginsaction).' 应用方法未定义'); - return $this->fetch('public/tips_error'); - } - } - return $obj->$pluginsaction($params); - } - - /** - * 应用校验 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-05-27T00:13:50+0800 - * @param [string] $plugins_name [应用名称] - * @param [string] $plugins_control [控制器名称] - * @param [string] $plugins_action [方法] - */ - private function PluginsCheck($pluginsname, $pluginscontrol, $pluginsaction) - { - $ret = PluginsService::PluginsField($pluginsname, 'id'); - if(empty($ret['data'])) + // 调用失败 + if(IS_AJAX) { - return DataReturn('应用不存在', -10); + return $ret; + } else { + $this->assign('msg', $ret['msg']); + return $this->fetch('public/tips_error'); } - return DataReturn('验证成功', 0); } /** diff --git a/application/api/controller/Coupon.php b/application/api/controller/Coupon.php deleted file mode 100644 index b44dfca6d78149a064215fd97e08e33973105eaa..0000000000000000000000000000000000000000 --- a/application/api/controller/Coupon.php +++ /dev/null @@ -1,116 +0,0 @@ - [ - 'is_enable' => 1, - 'is_user_receive' => 1, - ], - 'm' => 0, - 'n' => 0, - 'is_sure_receive' => 1, - 'user' => $this->user, - ]; - $ret = CallPluginsServiceMethod('coupon', 'CouponService', 'CouponList', $coupon_params); - - // 返回数据 - $result = [ - 'base' => $base['data'], - 'data' => $ret['data'], - ]; - return DataReturn('处理成功', 0, $result); - } - - /** - * 用户优惠劵列表 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2019-10-15 - * @desc description - */ - public function User() - { - // 是否登录 - $this->IsLogin(); - - // 获取用户优惠劵 - $coupon_params = [ - 'user' => $this->user, - 'where' => [ - 'user_id' => $this->user['id'], - 'is_valid' => 1, - ], - ]; - return CallPluginsServiceMethod('coupon', 'UserCouponService', 'CouponUserList', $coupon_params); - } - - /** - * 领取优惠劵 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @date 2019-10-15 - * @desc description - */ - public function Receive() - { - // 是否登录 - $this->IsLogin(); - - // 是否ajax请求 - if(!IS_AJAX) - { - return $this->error('非法访问'); - } - - // 领取优惠劵 - return CallPluginsServiceMethod('coupon', 'CouponService', 'UserReceiveCoupon', $this->data_post); - } -} -?> \ No newline at end of file diff --git a/application/api/controller/Plugins.php b/application/api/controller/Plugins.php new file mode 100644 index 0000000000000000000000000000000000000000..7778e4fbebc5f6d02a5a113d3dbec679bba2aefd --- /dev/null +++ b/application/api/controller/Plugins.php @@ -0,0 +1,87 @@ + 'empty', + 'key_name' => 'pluginsname', + 'error_msg' => '应用名称有误', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'pluginscontrol', + 'error_msg' => '应用控制器有误', + ], + [ + 'checked_type' => 'empty', + 'key_name' => 'pluginsaction', + 'error_msg' => '应用操作方法有误', + ], + ]; + $ret = ParamsChecked($this->data_request, $p); + if($ret !== true) + { + return DataReturn($ret, -5000); + } + + // 应用名称/控制器/方法 + $pluginsname = $this->data_request['pluginsname']; + $pluginscontrol = strtolower($this->data_request['pluginscontrol']); + $pluginsaction = strtolower($this->data_request['pluginsaction']); + + // 调用 + $ret = PluginsService::PluginsControlCall($pluginsname, $pluginscontrol, $pluginsaction, 'api', $this->data_request); + if($ret['code'] == 0) + { + return $ret['data']; + } + + // 调用失败 + return $ret; + } +} +?> \ No newline at end of file diff --git a/application/common.php b/application/common.php index eae72180314a2dc5c8645c9e1cf53a495509ed9f..a629b7b7879b657b679efa44ef36dcd068973211 100755 --- a/application/common.php +++ b/application/common.php @@ -100,7 +100,7 @@ function PathToParams($key = null, $default = null, $path = '') } /** - * 调用插件方法 - 获取插件配置信息 + * 调用插件服务层方法 - 获取插件配置信息 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 @@ -118,8 +118,15 @@ function CallPluginsData($plugins, $attachment_field = [], $service_name = '', $ return DataReturn('插件状态异常['.$plugins.']', -1); } + // 查看是否存在基础服务层并且定义获取基础配置方法 + $plugins_class = 'app\plugins\\'.$plugins.'\service\BaseService'; + if(class_exists($plugins_class) && method_exists($plugins_class, 'BaseConfig')) + { + return $plugins_class::BaseConfig(); + } + // 未指定附件字段则自动去获取 - $attachment = []; + $attachment = $attachment_field; if(empty($attachment_field) && !empty($attachment_property)) { // 类自定义或者默认两个类 @@ -141,7 +148,7 @@ function CallPluginsData($plugins, $attachment_field = [], $service_name = '', $ } /** - * 调用插件方法 - 访问为静态 + * 调用插件服务层方法 - 访问为静态 * @author Devil * @blog http://gong.gg/ * @version 1.0.0 diff --git a/application/index/controller/Plugins.php b/application/index/controller/Plugins.php index 891c51ad8157ca9824d032ca86a467c8d51e7560..346acf4fdf6d038f3e18c709a7baaf8d07a84a71 100755 --- a/application/index/controller/Plugins.php +++ b/application/index/controller/Plugins.php @@ -81,75 +81,27 @@ class Plugins extends Common $pluginscontrol = strtolower($params['pluginscontrol']); $pluginsaction = strtolower($params['pluginsaction']); - // 应用校验 - $ret = $this->PluginsCheck($pluginsname, $pluginscontrol, $pluginsaction); - if($ret['code'] != 0) - { - if(IS_AJAX) - { - return $ret; - } else { - $this->assign('msg', $ret['msg']); - return $this->fetch('public/tips_error'); - } - } - // 视图初始化 $this->PluginsViewInit($pluginsname, $pluginscontrol, $pluginsaction); // 编辑器文件存放地址定义 $this->assign('editor_path_type', 'plugins_'.$pluginsname); - // 应用控制器 - $plugins = '\app\plugins\\'.$pluginsname.'\index\\'.ucfirst($pluginscontrol); - if(!class_exists($plugins)) + // 调用 + $ret = PluginsService::PluginsControlCall($pluginsname, $pluginscontrol, $pluginsaction, 'index', $params); + if($ret['code'] == 0) { - if(IS_AJAX) - { - return DataReturn(ucfirst($pluginscontrol).' 应用控制器未定义', -1); - } else { - $this->assign('msg', ucfirst($pluginscontrol).' 应用控制器未定义'); - return $this->fetch('public/tips_error'); - } + return $ret['data']; } - // 调用方法 - $obj = new $plugins(); - if(!method_exists($obj, $pluginsaction)) - { - if(IS_AJAX) - { - return DataReturn(ucfirst($pluginsaction).' 应用方法未定义', -1); - } else { - $this->assign('msg', ucfirst($pluginsaction).' 应用方法未定义'); - return $this->fetch('public/tips_error'); - } - } - return $obj->$pluginsaction($params); - } - - /** - * 应用校验 - * @author Devil - * @blog http://gong.gg/ - * @version 1.0.0 - * @datetime 2019-05-27T00:13:50+0800 - * @param [string] $plugins_name [应用名称] - * @param [string] $plugins_control [控制器名称] - * @param [string] $plugins_action [方法] - */ - private function PluginsCheck($pluginsname, $pluginscontrol, $pluginsaction) - { - $ret = PluginsService::PluginsField($pluginsname, 'is_enable'); - if($ret['data'] === null) - { - return DataReturn('应用未安装['.$pluginsname.']', -10); - } - if($ret['data'] != 1) + // 调用失败 + if(IS_AJAX) { - return DataReturn('应用未启用['.$pluginsname.']', -10); + return $ret; + } else { + $this->assign('msg', $ret['msg']); + return $this->fetch('public/tips_error'); } - return DataReturn('验证成功', 0); } /** diff --git a/application/service/PluginsService.php b/application/service/PluginsService.php index 97e6accbde43a983ff31e2bfb2219b9b488005af..9848abd405e406b4781263d349c6663444ec38f1 100755 --- a/application/service/PluginsService.php +++ b/application/service/PluginsService.php @@ -187,5 +187,66 @@ class PluginsService $ret = self::PluginsField($plugins, 'is_enable'); return $ret['data']; } + + /** + * 应用校验 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2020-01-02 + * @param [string] $plugins [应用标记] + */ + public static function PluginsCheck($plugins) + { + $ret = self::PluginsStatus($plugins); + if($ret === null) + { + return DataReturn('应用未安装['.$plugins.']', -10); + } + if($ret != 1) + { + return DataReturn('应用未启用['.$plugins.']', -10); + } + return DataReturn('验证成功', 0); + } + + /** + * 应用控制器调用 + * @author Devil + * @blog http://gong.gg/ + * @version 1.0.0 + * @date 2020-01-02 + * @param [string] $plugins [应用标记] + * @param [string] $control [应用控制器] + * @param [string] $action [应用方法] + * @param [string] $group [应用组(admin, index, api)] + * @param [array] $params [输入参数] + */ + public static function PluginsControlCall($plugins, $control, $action, $group = 'index', $params = []) + { + // 应用校验 + $ret = self::PluginsCheck($plugins); + if($ret['code'] != 0) + { + return $ret; + } + + // 应用控制器 + $control = ucfirst($control); + $plugins = '\app\plugins\\'.$plugins.'\\'.$group.'\\'.$control; + if(!class_exists($plugins)) + { + return DataReturn('应用控制器未定义['.$control.']', -1); + } + + // 调用方法 + $action = ucfirst($action); + $obj = new $plugins(); + if(!method_exists($obj, $action)) + { + return DataReturn('应用方法未定义['.$action.']', -1); + } + return DataReturn('验证成功', 0, $obj->$action($params)); + } } ?> \ No newline at end of file diff --git a/application/tags.php b/application/tags.php index 7fb4b4ce8cf21ddb6f5dd9c94f67aad0e78b5245..adc21245641261734e27d740df656166bd55b97f 100755 --- a/application/tags.php +++ b/application/tags.php @@ -32,5 +32,102 @@ return array ( 'log_write' => array ( ), + 'plugins_css' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + 1 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_service_navigation_header_handle' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + 1 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_service_goods_handle_end' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + ), + 'plugins_service_goods_spec_base' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + ), + 'plugins_service_buy_handle' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + 1 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_service_user_login_success_record' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + ), + 'plugins_service_goods_spec_extends_handle' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + ), + 'plugins_view_admin_user_save' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + ), + 'plugins_service_user_save_handle' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + ), + 'plugins_service_goods_save_handle' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + ), + 'plugins_view_goods_detail_panel_price_top' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + ), + 'plugins_view_home_goods_inside_bottom' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + ), + 'plugins_view_search_goods_inside_bottom' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + ), + 'plugins_service_goods_spec_type' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + ), + 'plugins_service_users_center_left_menu_handle' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + 1 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_service_header_navigation_top_right_handle' => + array ( + 0 => 'app\\plugins\\membershiplevelvip\\Hook', + 1 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_js' => + array ( + 0 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_view_goods_detail_panel_bottom' => + array ( + 0 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_view_buy_goods_bottom' => + array ( + 0 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_view_buy_form_inside' => + array ( + 0 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_service_buy_order_insert_success' => + array ( + 0 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_service_order_status_change_history_success_handle' => + array ( + 0 => 'app\\plugins\\coupon\\Hook', + ), + 'plugins_service_user_register_end' => + array ( + 0 => 'app\\plugins\\coupon\\Hook', + ), ); ?> \ No newline at end of file diff --git a/public/appmini/old/alipay/app.js b/public/appmini/old/alipay/app.js index 2f3fb289ab61c32edcea02f3221654a311722678..bd33e3d31ac253a2ee611cfce058e91b3a7c3f31 100644 --- a/public/appmini/old/alipay/app.js +++ b/public/appmini/old/alipay/app.js @@ -169,26 +169,42 @@ App({ /** * 请求地址生成 + * a 方法 + * c 控制器 + * plugins 插件标记(传参则表示为插件请求) + * params url请求参数 */ - get_request_url(a, c, m, params) { + get_request_url(a, c, plugins, params) { a = a || "index"; c = c || "index"; - m = m || "api"; + + // 是否插件请求 + var plugins_params = ""; + if ((plugins || null) != null) + { + plugins_params = "&pluginsname=" + plugins + "&pluginscontrol=" + c + "&pluginsaction=" + a; + + // 走api统一插件调用控制器 + c = "plugins" + a = "index" + } + + // 参数处理 params = params || ""; if (params != "" && params.substr(0, 1) != "&") { params = "&" + params; } + + // 用户信息 var user = this.get_user_cache_info(); var token = (user == false) ? '' : user.token || ''; - return ( - this.data.request_url + - "index.php?s=/" + m + "/" + c + "/" + a + - "&application=app&application_client_type=alipay" + + return this.data.request_url + + "index.php?s=/api/" + c + "/" + a + plugins_params+ + "&application=app&application_client_type=weixin" + "&token=" + token + "&ajax=ajax" + - params - ); + params; }, /** diff --git a/public/appmini/old/alipay/pages/coupon/coupon.js b/public/appmini/old/alipay/pages/coupon/coupon.js index fafd4aa9586e43028a01595b36b68f9002774b4b..fb0d3f65e1de8dd4f81c98fe69621473afbde986 100644 --- a/public/appmini/old/alipay/pages/coupon/coupon.js +++ b/public/appmini/old/alipay/pages/coupon/coupon.js @@ -37,7 +37,7 @@ Page({ } my.request({ - url: app.get_request_url("index", "coupon"), + url: app.get_request_url("index", "index", "coupon"), method: "POST", data: {}, dataType: "json", @@ -112,7 +112,7 @@ Page({ if (temp_list[index]['is_operable'] != 0) { my.showLoading({ title: "处理中..." }); my.request({ - url: app.get_request_url("receive", "coupon"), + url: app.get_request_url("receive", "coupon", "coupon"), method: "POST", data: { "coupon_id": value }, dataType: "json", diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js index 2e184c30dfa0364a7374af173f797f7b53e3b8db..151579e0b31cfd1debf81963240094ad9405deb7 100644 --- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.js @@ -803,7 +803,7 @@ Page({ if (temp_list[index]['is_operable'] != 0) { my.showLoading({ title: "处理中..." }); my.request({ - url: app.get_request_url("receive", "coupon"), + url: app.get_request_url("receive", "coupon", "coupon"), method: "POST", data: { "coupon_id": value }, dataType: "json", diff --git a/public/appmini/old/alipay/pages/user-coupon/user-coupon.js b/public/appmini/old/alipay/pages/user-coupon/user-coupon.js index f4ac181cb900723aa4445ce3214259d5330a3141..c4cd9b0ed7b158a17e76dbf337fe82e96a9a1411 100644 --- a/public/appmini/old/alipay/pages/user-coupon/user-coupon.js +++ b/public/appmini/old/alipay/pages/user-coupon/user-coupon.js @@ -54,7 +54,7 @@ Page({ } my.request({ - url: app.get_request_url("user", "coupon"), + url: app.get_request_url("index", "coupon", "coupon"), method: "POST", data: {}, dataType: "json", diff --git a/public/appmini/old/baidu/app.js b/public/appmini/old/baidu/app.js index 4690a02e5b349651e84cf3fc1a0583db71f6bfa3..b9fe4369f985dbf70d073bf66d05ac021d529b72 100755 --- a/public/appmini/old/baidu/app.js +++ b/public/appmini/old/baidu/app.js @@ -153,21 +153,44 @@ App({ return system_info; }, - /** /** * 请求地址生成 + * a 方法 + * c 控制器 + * plugins 插件标记(传参则表示为插件请求) + * params url请求参数 */ - get_request_url(a, c, m, params) { + get_request_url(a, c, plugins, params) { a = a || "index"; c = c || "index"; - m = m || "api"; + + // 是否插件请求 + var plugins_params = ""; + if ((plugins || null) != null) + { + plugins_params = "&pluginsname=" + plugins + "&pluginscontrol=" + c + "&pluginsaction=" + a; + + // 走api统一插件调用控制器 + c = "plugins" + a = "index" + } + + // 参数处理 params = params || ""; if (params != "" && params.substr(0, 1) != "&") { params = "&" + params; } + + // 用户信息 var user = this.get_user_cache_info(); - var token = user == false ? '' : user.token || ''; - return this.data.request_url + "index.php?s=/" + m + "/" + c + "/" + a + "&application=app&application_client_type=baidu" + "&token=" + token + "&ajax=ajax" + params; + var token = (user == false) ? '' : user.token || ''; + return this.data.request_url + + "index.php?s=/api/" + c + "/" + a + plugins_params+ + "&application=app&application_client_type=weixin" + + "&token=" + + token + + "&ajax=ajax" + + params; }, /** diff --git a/public/appmini/old/baidu/pages/coupon/coupon.js b/public/appmini/old/baidu/pages/coupon/coupon.js index 984026f2e15ebc068dabd901405015529e1fc5d8..e9e6cafcea41b665233a5b6b34a2b8423836eb7e 100644 --- a/public/appmini/old/baidu/pages/coupon/coupon.js +++ b/public/appmini/old/baidu/pages/coupon/coupon.js @@ -37,7 +37,7 @@ Page({ } swan.request({ - url: app.get_request_url("index", "coupon"), + url: app.get_request_url("index", "index", "coupon"), method: "POST", data: {}, dataType: "json", @@ -109,7 +109,7 @@ Page({ if (temp_list[index]['is_operable'] != 0) { swan.showLoading({ title: "处理中..." }); swan.request({ - url: app.get_request_url("receive", "coupon"), + url: app.get_request_url("receive", "coupon", "coupon"), method: "POST", data: { "coupon_id": value }, dataType: "json", diff --git a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js index eff026938e5b26b92d06029966afc36ed0b90da3..f4b22fe719c28d78ba9c497dd13d25076182c392 100755 --- a/public/appmini/old/baidu/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/baidu/pages/goods-detail/goods-detail.js @@ -732,7 +732,7 @@ Page({ if (temp_list[index]['is_operable'] != 0) { swan.showLoading({ title: "处理中..." }); swan.request({ - url: app.get_request_url("receive", "coupon"), + url: app.get_request_url("receive", "coupon", "coupon"), method: "POST", data: { "coupon_id": value }, dataType: "json", diff --git a/public/appmini/old/baidu/pages/user-coupon/user-coupon.js b/public/appmini/old/baidu/pages/user-coupon/user-coupon.js index 89a045bbc26a760e668913fbd1d682e87a97fe4f..ee6fc1c0c9ff5f8b2d087e0979bb3ddcb4212f09 100644 --- a/public/appmini/old/baidu/pages/user-coupon/user-coupon.js +++ b/public/appmini/old/baidu/pages/user-coupon/user-coupon.js @@ -50,7 +50,7 @@ Page({ } swan.request({ - url: app.get_request_url("user", "coupon"), + url: app.get_request_url("index", "coupon", "coupon"), method: "POST", data: {}, dataType: "json", diff --git a/public/appmini/old/qq/app.js b/public/appmini/old/qq/app.js index 90023dbb15092bb740d041bfa253fd50c9d0d5e7..ff22e6d2268b06334fa1747103674345ea3e0dd5 100755 --- a/public/appmini/old/qq/app.js +++ b/public/appmini/old/qq/app.js @@ -129,29 +129,44 @@ App({ return system_info; }, - /** /** * 请求地址生成 + * a 方法 + * c 控制器 + * plugins 插件标记(传参则表示为插件请求) + * params url请求参数 */ - get_request_url(a, c, m, params) { + get_request_url(a, c, plugins, params) { a = a || "index"; c = c || "index"; - m = m || "api"; + + // 是否插件请求 + var plugins_params = ""; + if ((plugins || null) != null) + { + plugins_params = "&pluginsname=" + plugins + "&pluginscontrol=" + c + "&pluginsaction=" + a; + + // 走api统一插件调用控制器 + c = "plugins" + a = "index" + } + + // 参数处理 params = params || ""; if (params != "" && params.substr(0, 1) != "&") { params = "&" + params; } + + // 用户信息 var user = this.get_user_cache_info(); var token = (user == false) ? '' : user.token || ''; - return ( - this.data.request_url + - "index.php?s=/" + m + "/" + c + "/" + a + - "&application=app&application_client_type=qq" + + return this.data.request_url + + "index.php?s=/api/" + c + "/" + a + plugins_params+ + "&application=app&application_client_type=weixin" + "&token=" + token + "&ajax=ajax" + - params - ); + params; }, /** diff --git a/public/appmini/old/qq/pages/coupon/coupon.js b/public/appmini/old/qq/pages/coupon/coupon.js index 3ddf606eff73cad32b7e2f50b01001631a783329..30acf72e713ea3b03dccb0e071ed60905536fe30 100644 --- a/public/appmini/old/qq/pages/coupon/coupon.js +++ b/public/appmini/old/qq/pages/coupon/coupon.js @@ -37,7 +37,7 @@ Page({ } qq.request({ - url: app.get_request_url("index", "coupon"), + url: app.get_request_url("index", "index", "coupon"), method: "POST", data: {}, dataType: "json", @@ -110,7 +110,7 @@ Page({ if (temp_list[index]['is_operable'] != 0) { qq.showLoading({ title: "处理中..." }); qq.request({ - url: app.get_request_url("receive", "coupon"), + url: app.get_request_url("receive", "coupon", "coupon"), method: "POST", data: { "coupon_id": value }, dataType: "json", diff --git a/public/appmini/old/qq/pages/goods-detail/goods-detail.js b/public/appmini/old/qq/pages/goods-detail/goods-detail.js index 325993a1c96e3f42639386214455b8d75cf5c1ff..2f14c443595e74b96abefeed19566c966ebca053 100755 --- a/public/appmini/old/qq/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/qq/pages/goods-detail/goods-detail.js @@ -843,7 +843,7 @@ Page({ if (temp_list[index]['is_operable'] != 0) { qq.showLoading({ title: "处理中..." }); qq.request({ - url: app.get_request_url("receive", "coupon"), + url: app.get_request_url("receive", "coupon", "coupon"), method: "POST", data: { "coupon_id": value }, dataType: "json", diff --git a/public/appmini/old/qq/pages/user-coupon/user-coupon.js b/public/appmini/old/qq/pages/user-coupon/user-coupon.js index 80c43e40978c401552fae7397c0d6503b286dc03..d415d15267095cb5c67ee37e6c53fbb31d23bfd0 100644 --- a/public/appmini/old/qq/pages/user-coupon/user-coupon.js +++ b/public/appmini/old/qq/pages/user-coupon/user-coupon.js @@ -54,7 +54,7 @@ Page({ } qq.request({ - url: app.get_request_url("user", "coupon"), + url: app.get_request_url("index", "coupon", "coupon"), method: "POST", data: {}, dataType: "json", diff --git a/public/appmini/old/toutiao/app.js b/public/appmini/old/toutiao/app.js index 0fb470ee94a349653f999afd018f534fa59d42be..76ab9c86d15fd4874b2a12ed626f8f660d14b31f 100755 --- a/public/appmini/old/toutiao/app.js +++ b/public/appmini/old/toutiao/app.js @@ -129,29 +129,44 @@ App({ return system_info; }, - /** /** * 请求地址生成 + * a 方法 + * c 控制器 + * plugins 插件标记(传参则表示为插件请求) + * params url请求参数 */ - get_request_url(a, c, m, params) { + get_request_url(a, c, plugins, params) { a = a || "index"; c = c || "index"; - m = m || "api"; + + // 是否插件请求 + var plugins_params = ""; + if ((plugins || null) != null) + { + plugins_params = "&pluginsname=" + plugins + "&pluginscontrol=" + c + "&pluginsaction=" + a; + + // 走api统一插件调用控制器 + c = "plugins" + a = "index" + } + + // 参数处理 params = params || ""; if (params != "" && params.substr(0, 1) != "&") { params = "&" + params; } + + // 用户信息 var user = this.get_user_cache_info(); var token = (user == false) ? '' : user.token || ''; - return ( - this.data.request_url + - "index.php?s=/" + m + "/" + c + "/" + a + - "&application=app&application_client_type=toutiao" + + return this.data.request_url + + "index.php?s=/api/" + c + "/" + a + plugins_params+ + "&application=app&application_client_type=weixin" + "&token=" + token + "&ajax=ajax" + - params - ); + params; }, /** diff --git a/public/appmini/old/toutiao/pages/coupon/coupon.js b/public/appmini/old/toutiao/pages/coupon/coupon.js index 7d00fc7a6e2c52d1a7b394a4a7fd478bb8953715..dfac3a61581feb000cf367b34b36b82c90862780 100644 --- a/public/appmini/old/toutiao/pages/coupon/coupon.js +++ b/public/appmini/old/toutiao/pages/coupon/coupon.js @@ -37,7 +37,7 @@ Page({ } tt.request({ - url: app.get_request_url("index", "coupon"), + url: app.get_request_url("index", "index", "coupon"), method: "POST", data: {}, dataType: "json", @@ -110,7 +110,7 @@ Page({ if (temp_list[index]['is_operable'] != 0) { tt.showLoading({ title: "处理中..." }); tt.request({ - url: app.get_request_url("receive", "coupon"), + url: app.get_request_url("receive", "coupon", "coupon"), method: "POST", data: { "coupon_id": value }, dataType: "json", diff --git a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js index 0f2b8f956bd10dc8eb7be82c7490c2187ae78b9f..d6fefb1e882e9cc86fd4bf3716807ae1f3adf03d 100755 --- a/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/toutiao/pages/goods-detail/goods-detail.js @@ -843,7 +843,7 @@ Page({ if (temp_list[index]['is_operable'] != 0) { tt.showLoading({ title: "处理中..." }); tt.request({ - url: app.get_request_url("receive", "coupon"), + url: app.get_request_url("receive", "coupon", "coupon"), method: "POST", data: { "coupon_id": value }, dataType: "json", diff --git a/public/appmini/old/toutiao/pages/user-coupon/user-coupon.js b/public/appmini/old/toutiao/pages/user-coupon/user-coupon.js index 3aeb0da0ecd361db6caf1145288830b348c82e70..e230c1ec9da3e4bb6e3184a089abdf987dc4dabb 100644 --- a/public/appmini/old/toutiao/pages/user-coupon/user-coupon.js +++ b/public/appmini/old/toutiao/pages/user-coupon/user-coupon.js @@ -54,7 +54,7 @@ Page({ } tt.request({ - url: app.get_request_url("user", "coupon"), + url: app.get_request_url("index", "coupon", "coupon"), method: "POST", data: {}, dataType: "json", diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index b1a6ee113a313a29d7a970b58c306cf160ea762f..ba05bbdd934bd1eebdd559e0494503ceb7caf102 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -67,7 +67,7 @@ App({ // 请求地址 request_url: "{{request_url}}", - // request_url: 'http://tp5-dev.com/', + // request_url: 'http://shopxo.com/', // request_url: 'https://dev.shopxo.net/', // 基础信息 @@ -129,29 +129,44 @@ App({ return system_info; }, - /** /** * 请求地址生成 + * a 方法 + * c 控制器 + * plugins 插件标记(传参则表示为插件请求) + * params url请求参数 */ - get_request_url(a, c, m, params) { + get_request_url(a, c, plugins, params) { a = a || "index"; c = c || "index"; - m = m || "api"; + + // 是否插件请求 + var plugins_params = ""; + if ((plugins || null) != null) + { + plugins_params = "&pluginsname=" + plugins + "&pluginscontrol=" + c + "&pluginsaction=" + a; + + // 走api统一插件调用控制器 + c = "plugins" + a = "index" + } + + // 参数处理 params = params || ""; if (params != "" && params.substr(0, 1) != "&") { params = "&" + params; } + + // 用户信息 var user = this.get_user_cache_info(); var token = (user == false) ? '' : user.token || ''; - return ( - this.data.request_url + - "index.php?s=/" + m + "/" + c + "/" + a + + return this.data.request_url + + "index.php?s=/api/" + c + "/" + a + plugins_params+ "&application=app&application_client_type=weixin" + "&token=" + token + "&ajax=ajax" + - params - ); + params; }, /** diff --git a/public/appmini/old/weixin/pages/coupon/coupon.js b/public/appmini/old/weixin/pages/coupon/coupon.js index 1971c9519ba129330e3f6c5d5daad31f451fbbbc..bf2fe068a2fd553ae8de77a564123286a6712800 100644 --- a/public/appmini/old/weixin/pages/coupon/coupon.js +++ b/public/appmini/old/weixin/pages/coupon/coupon.js @@ -37,7 +37,7 @@ Page({ } wx.request({ - url: app.get_request_url("index", "coupon"), + url: app.get_request_url("index", "index", "coupon"), method: "POST", data: {}, dataType: "json", @@ -110,7 +110,7 @@ Page({ if (temp_list[index]['is_operable'] != 0) { wx.showLoading({ title: "处理中..." }); wx.request({ - url: app.get_request_url("receive", "coupon"), + url: app.get_request_url("receive", "coupon", "coupon"), method: "POST", data: { "coupon_id": value }, dataType: "json", diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js index fa2ee8734adb375c6ba8eb42145bf58b546d6ab8..d2bf89bb4a85af1d8acd4f24f7e962e60bd8547a 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js @@ -854,7 +854,7 @@ Page({ if (temp_list[index]['is_operable'] != 0) { wx.showLoading({ title: "处理中..." }); wx.request({ - url: app.get_request_url("receive", "coupon"), + url: app.get_request_url("receive", "coupon", "coupon"), method: "POST", data: { "coupon_id": value }, dataType: "json", diff --git a/public/appmini/old/weixin/pages/user-coupon/user-coupon.js b/public/appmini/old/weixin/pages/user-coupon/user-coupon.js index 300fe76c0ab8aa65745bc4cc072968a7fff2822c..9170b402aea6ccf2725de7879febef2b8de1a4e1 100644 --- a/public/appmini/old/weixin/pages/user-coupon/user-coupon.js +++ b/public/appmini/old/weixin/pages/user-coupon/user-coupon.js @@ -54,7 +54,7 @@ Page({ } wx.request({ - url: app.get_request_url("user", "coupon"), + url: app.get_request_url("index", "coupon", "coupon"), method: "POST", data: {}, dataType: "json",