diff --git a/app/data/controller/api/Login.php b/app/data/controller/api/Login.php index 7d7b049f4..18c1ae6e4 100644 --- a/app/data/controller/api/Login.php +++ b/app/data/controller/api/Login.php @@ -30,7 +30,7 @@ class Login extends Controller */ protected function initialize() { - $this->type = input('api', UserService::APITYPE_WAP); + $this->type = input('api', UserService::API_TYPE_WAP); if (empty(UserService::TYPES[$this->type])) { $this->error("接口通道[{$this->type}]未定义规则!"); } diff --git a/app/data/controller/api/Wechat.php b/app/data/controller/api/Wechat.php index 8f693f948..e56605239 100644 --- a/app/data/controller/api/Wechat.php +++ b/app/data/controller/api/Wechat.php @@ -25,7 +25,7 @@ class Wechat extends Controller * 接口认证类型 * @var string */ - private $type = UserService::APITYPE_WECHAT; + private $type = UserService::API_TYPE_WECHAT; /** * 唯一绑定字段 diff --git a/app/data/controller/api/Wxapp.php b/app/data/controller/api/Wxapp.php index dbd358907..789f6151c 100644 --- a/app/data/controller/api/Wxapp.php +++ b/app/data/controller/api/Wxapp.php @@ -21,7 +21,7 @@ class Wxapp extends Controller * 接口认证类型 * @var string */ - private $type = UserService::APITYPE_WXAPP; + private $type = UserService::API_TYPE_WXAPP; /** * 唯一绑定字段 diff --git a/app/data/controller/api/auth/Order.php b/app/data/controller/api/auth/Order.php index 43da630cc..75d601668 100644 --- a/app/data/controller/api/auth/Order.php +++ b/app/data/controller/api/auth/Order.php @@ -293,7 +293,7 @@ class Order extends Auth if ($order['payment_status'] > 0) $this->error('已经完成支付'); try { $openid = ''; - if (in_array($this->type, [UserService::APITYPE_WXAPP, UserService::APITYPE_WECHAT])) { + if (in_array($this->type, [UserService::API_TYPE_WXAPP, UserService::API_TYPE_WECHAT])) { $openid = $this->user[UserService::TYPES[$this->type]['auth']] ?? ''; if (empty($openid)) $this->error("发起支付失败"); } diff --git a/app/data/service/PaymentService.php b/app/data/service/PaymentService.php index 5c353f028..94858d817 100644 --- a/app/data/service/PaymentService.php +++ b/app/data/service/PaymentService.php @@ -53,71 +53,71 @@ abstract class PaymentService 'type' => 'BALANCE', 'name' => '账号余额支付', 'bind' => [ - UserService::APITYPE_WAP, UserService::APITYPE_WEB, - UserService::APITYPE_WXAPP, UserService::APITYPE_WECHAT, - UserService::APITYPE_IOSAPP, UserService::APITYPE_ANDROID, + UserService::API_TYPE_WAP, UserService::API_TYPE_WEB, + UserService::API_TYPE_WXAPP, UserService::API_TYPE_WECHAT, + UserService::API_TYPE_IOSAPP, UserService::API_TYPE_ANDROID, ], ], self::PAYMENT_VOUCHER => [ 'type' => 'VOUCHER', 'name' => '单据凭证支付', 'bind' => [ - UserService::APITYPE_WAP, UserService::APITYPE_WEB, - UserService::APITYPE_WXAPP, UserService::APITYPE_WECHAT, - UserService::APITYPE_IOSAPP, UserService::APITYPE_ANDROID, + UserService::API_TYPE_WAP, UserService::API_TYPE_WEB, + UserService::API_TYPE_WXAPP, UserService::API_TYPE_WECHAT, + UserService::API_TYPE_IOSAPP, UserService::API_TYPE_ANDROID, ], ], self::PAYMENT_WECHAT_WAP => [ 'type' => 'MWEB', 'name' => '微信WAP支付', - 'bind' => [UserService::APITYPE_WAP], + 'bind' => [UserService::API_TYPE_WAP], ], self::PAYMENT_WECHAT_APP => [ 'type' => 'APP', 'name' => '微信APP支付', - 'bind' => [UserService::APITYPE_IOSAPP, UserService::APITYPE_ANDROID], + 'bind' => [UserService::API_TYPE_IOSAPP, UserService::API_TYPE_ANDROID], ], self::PAYMENT_WECHAT_XCX => [ 'type' => 'JSAPI', 'name' => '微信小程序支付', - 'bind' => [UserService::APITYPE_WXAPP], + 'bind' => [UserService::API_TYPE_WXAPP], ], self::PAYMENT_WECHAT_GZH => [ 'type' => 'JSAPI', 'name' => '微信公众号支付', - 'bind' => [UserService::APITYPE_WECHAT], + 'bind' => [UserService::API_TYPE_WECHAT], ], self::PAYMENT_WECHAT_QRC => [ 'type' => 'NATIVE', 'name' => '微信二维码支付', - 'bind' => [UserService::APITYPE_WEB], + 'bind' => [UserService::API_TYPE_WEB], ], // 支付宝支持配置(不需要的直接注释) self::PAYMENT_ALIPAY_WAP => [ 'type' => '', 'name' => '支付宝WAP支付', - 'bind' => [UserService::APITYPE_WAP], + 'bind' => [UserService::API_TYPE_WAP], ], self::PAYMENT_ALIPAY_WEB => [ 'type' => '', 'name' => '支付宝WEB支付', - 'bind' => [UserService::APITYPE_WEB], + 'bind' => [UserService::API_TYPE_WEB], ], self::PAYMENT_ALIAPY_APP => [ 'type' => '', 'name' => '支付宝APP支付', - 'bind' => [UserService::APITYPE_ANDROID, UserService::APITYPE_IOSAPP], + 'bind' => [UserService::API_TYPE_ANDROID, UserService::API_TYPE_IOSAPP], ], // 汇聚支持配置(不需要的直接注释) self::PAYMENT_JOINPAY_XCX => [ 'type' => 'WEIXIN_XCX', 'name' => '汇聚小程序支付', - 'bind' => [UserService::APITYPE_WXAPP], + 'bind' => [UserService::API_TYPE_WXAPP], ], self::PAYMENT_JOINPAY_GZH => [ 'type' => 'WEIXIN_GZH', 'name' => '汇聚公众号支付', - 'bind' => [UserService::APITYPE_WECHAT], + 'bind' => [UserService::API_TYPE_WECHAT], ], ]; diff --git a/app/data/service/UserService.php b/app/data/service/UserService.php index e2ba8ff3f..4ec799167 100644 --- a/app/data/service/UserService.php +++ b/app/data/service/UserService.php @@ -13,39 +13,39 @@ use think\db\exception\DbException; */ class UserService extends Service { - const APITYPE_WAP = 'wap'; - const APITYPE_WEB = 'web'; - const APITYPE_WXAPP = 'wxapp'; - const APITYPE_WECHAT = 'wechat'; - const APITYPE_IOSAPP = 'iosapp'; - const APITYPE_ANDROID = 'android'; + const API_TYPE_WAP = 'wap'; + const API_TYPE_WEB = 'web'; + const API_TYPE_WXAPP = 'wxapp'; + const API_TYPE_WECHAT = 'wechat'; + const API_TYPE_IOSAPP = 'iosapp'; + const API_TYPE_ANDROID = 'android'; const TYPES = [ // 接口通道配置(不需要的直接注释) - UserService::APITYPE_WAP => [ + UserService::API_TYPE_WAP => [ 'name' => '手机浏览器', 'auth' => 'phone', ], - UserService::APITYPE_WEB => [ + UserService::API_TYPE_WEB => [ 'name' => '电脑浏览器', 'auth' => 'phone', ], - UserService::APITYPE_IOSAPP => [ - 'name' => '苹果应用', - 'auth' => 'phone', - ], - UserService::APITYPE_ANDROID => [ - 'name' => '安卓应用', - 'auth' => 'phone', - ], - UserService::APITYPE_WXAPP => [ + UserService::API_TYPE_WXAPP => [ 'name' => '微信小程序', 'auth' => 'openid1', ], - UserService::APITYPE_WECHAT => [ + UserService::API_TYPE_WECHAT => [ 'name' => '微信服务号', 'auth' => 'openid2', ], + UserService::API_TYPE_IOSAPP => [ + 'name' => '苹果APP应用', + 'auth' => 'phone', + ], + UserService::API_TYPE_ANDROID => [ + 'name' => '安卓APP应用', + 'auth' => 'phone', + ], ]; /** diff --git a/app/data/view/config/cropper.html b/app/data/view/config/cropper.html index 81ebfd4bc..26bda2651 100644 --- a/app/data/view/config/cropper.html +++ b/app/data/view/config/cropper.html @@ -48,6 +48,9 @@ // 背景图片切换 $('[data-upload-image]').uploadFile(function (url) { image.src = url; + console.log(cropper) + // cropper.refresh(); + // cropper.resize(); cropper.replace(url, true).reset(); }); // 保存设置参数 diff --git a/app/data/view/user_rebate/config.html b/app/data/view/user_rebate/config.html index ca26d5c7d..fa08dcb88 100644 --- a/app/data/view/user_rebate/config.html +++ b/app/data/view/user_rebate/config.html @@ -25,8 +25,8 @@
团队结算
- {php}$data['teams_type'] = $data['teams_type'] ?? 1;{/php} - {foreach [1 => '实时结算',2 => '次月结算'] as $key=>$val}{if $data.teams_type eq $key} + {php} $data['teams_type'] = $data['teams_type'] ?? 1; {/php} + {foreach [1 => '实时结算', 2 => '次月结算'] as $key=>$val}{if $data.teams_type eq $key} {else}