diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php index d18793438..3812ce2c1 100644 --- a/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php +++ b/crmeb/app/adminapi/controller/v1/setting/SystemCrud.php @@ -352,6 +352,15 @@ class SystemCrud extends AuthController { $comment = $request->param('comment'); $filepath = $request->param('filepath'); + $pwd = $request->param('pwd'); + + if ($pwd == '') { + return app('json')->fail('请输入文件管理密码'); + } + if (config('filesystem.password') != $pwd) { + return app('json')->fail('文件管理密码错误'); + } + if (empty($filepath) || !$id) { return app('json')->fail(410087); } diff --git a/crmeb/app/services/user/UserServices.php b/crmeb/app/services/user/UserServices.php index dd4521b37..29ecfd7cc 100644 --- a/crmeb/app/services/user/UserServices.php +++ b/crmeb/app/services/user/UserServices.php @@ -1569,6 +1569,7 @@ class UserServices extends BaseServices $user['integral'] = intval($user['integral']); $user['is_agent_level'] = $agentLevelServices->count(['status' => 1, 'is_del' => 0]) > 0 ? 1 : 0; $user['division_open'] = (int)sys_config('division_status', 0); + $user['agent_apply_open'] = (int)sys_config('agent_apply_open', 0); $user['is_default_avatar'] = $user['avatar'] == sys_config('h5_avatar') ? 1 : 0; $user['avatar'] = strpos($user['avatar'], '/statics/system_images/') !== false ? set_file_url($user['avatar']) : $user['avatar']; return $user; diff --git a/crmeb/crmeb/services/pay/storage/WechatPay.php b/crmeb/crmeb/services/pay/storage/WechatPay.php index 153c57c9a..ef230cddc 100644 --- a/crmeb/crmeb/services/pay/storage/WechatPay.php +++ b/crmeb/crmeb/services/pay/storage/WechatPay.php @@ -111,14 +111,16 @@ class WechatPay extends BasePay implements PayInterface $refundAccount = $opt['refund_account'] ?? 'REFUND_SOURCE_UNSETTLED_FUNDS'; if (isset($opt['wechat'])) { $result = WechatService::refund($outTradeNo, $refundNo, $totalFee, $refundFee, $opUserId, $refundReason, $type, $refundAccount); - if ($result['status'] != 'SUCCESS') throw new AdminException($result['status']); + if(isset($result['return_code']) && $result['return_code'] != 'SUCCESS') throw new AdminException($result['return_msg']); + if(isset($result['status']) && $result['status'] != 'SUCCESS') throw new AdminException($result['status']); } else { if ($opt['pay_new_weixin_open']) { $result = MiniProgramService::miniRefund($outTradeNo, $totalFee, $refundFee, $opt); if ($result['errcode'] != 0) throw new AdminException($result['errmsg']); } else { $result = MiniProgramService::refund($outTradeNo, $refundNo, $totalFee, $refundFee, $opUserId, $refundReason, $type, $refundAccount); - if ($result['status'] != 'SUCCESS') throw new AdminException($result['status']); + if(isset($result['return_code']) && $result['return_code'] != 'SUCCESS') throw new AdminException($result['return_msg']); + if(isset($result['status']) && $result['status'] != 'SUCCESS') throw new AdminException($result['status']); } } } diff --git a/template/admin/src/pages/system/backendRouting/index.vue b/template/admin/src/pages/system/backendRouting/index.vue index 0aa9e26be..3efd885e9 100644 --- a/template/admin/src/pages/system/backendRouting/index.vue +++ b/template/admin/src/pages/system/backendRouting/index.vue @@ -588,9 +588,9 @@ export default { }, methods: { syncRoute() { - this.$Modal.warning({ + this.$Modal.confirm({ title: '立即同步', - content: '您确认立即同步路由权限?', + content: '同步之后,路由文件中新增的接口添加到接口列表中,路由文件中删除的路由会同步的在接口列表中删除', onOk: () => { syncRoute(this.app_name).then((res) => { this.getInterfaceList('one'); diff --git a/template/uni-app/pages/users/user_spread_user/index.vue b/template/uni-app/pages/users/user_spread_user/index.vue index ab114f5f0..348ec8d69 100644 --- a/template/uni-app/pages/users/user_spread_user/index.vue +++ b/template/uni-app/pages/users/user_spread_user/index.vue @@ -27,7 +27,7 @@ + v-if="userInfo.division_open && userInfo.agent_apply_open && ((userInfo.is_division && userInfo.division_invite && userInfo.division_status) || (!userInfo.is_division && !userInfo.is_agent))"> {{$t(`邀请码`)}}:{{userInfo.division_invite}}