From e6c822aa8ed5afd9635263d73f71db89d4da24e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=A8=E6=A0=88=E5=B0=8F=E5=AD=A6=E7=94=9F?= <1518079521@qq.com> Date: Thu, 26 Jun 2025 15:07:17 +0800 Subject: [PATCH] up niucloud --- .../app/adminapi/controller/addon/Addon.php | 40 +- .../controller/addon/AddonDevelop.php | 24 +- .../app/adminapi/controller/addon/Backup.php | 15 + .../app/adminapi/controller/addon/Upgrade.php | 27 +- .../app/adminapi/controller/aliapp/Config.php | 9 + .../controller/applet/SiteVersion.php | 6 +- .../adminapi/controller/applet/Version.php | 8 + .../controller/applet/VersionDownload.php | 2 + .../app/adminapi/controller/auth/Auth.php | 10 + .../app/adminapi/controller/channel/H5.php | 7 + .../app/adminapi/controller/channel/Pc.php | 8 + .../app/adminapi/controller/dict/Dict.php | 9 + .../app/adminapi/controller/diy/Config.php | 4 + niucloud/app/adminapi/controller/diy/Diy.php | 30 +- .../app/adminapi/controller/diy/DiyForm.php | 33 +- .../app/adminapi/controller/diy/DiyRoute.php | 11 +- .../controller/generator/Generator.php | 14 +- .../app/adminapi/controller/login/Captcha.php | 10 +- .../app/adminapi/controller/login/Config.php | 9 +- .../app/adminapi/controller/login/Login.php | 13 +- .../adminapi/controller/member/Account.php | 19 + .../adminapi/controller/member/Address.php | 5 + .../adminapi/controller/member/CashOut.php | 22 + .../app/adminapi/controller/member/Config.php | 19 +- .../app/adminapi/controller/member/Member.php | 70 +++- .../controller/member/MemberLabel.php | 12 + .../controller/member/MemberLevel.php | 12 + .../adminapi/controller/member/MemberSign.php | 13 +- .../adminapi/controller/niucloud/Cloud.php | 11 + .../adminapi/controller/niucloud/Module.php | 18 + .../app/adminapi/controller/notice/NiuSms.php | 57 ++- .../app/adminapi/controller/notice/Notice.php | 19 + .../adminapi/controller/notice/NoticeLog.php | 13 + .../app/adminapi/controller/notice/SmsLog.php | 13 + niucloud/app/adminapi/controller/pay/Pay.php | 20 +- .../adminapi/controller/pay/PayChannel.php | 14 +- .../app/adminapi/controller/pay/PayRefund.php | 12 + .../app/adminapi/controller/pay/Transfer.php | 13 +- .../app/adminapi/controller/poster/Poster.php | 3 + .../app/adminapi/controller/sys/Agreement.php | 4 +- niucloud/app/adminapi/controller/sys/App.php | 2 +- niucloud/app/adminapi/controller/sys/Area.php | 17 +- .../adminapi/controller/sys/Attachment.php | 15 + .../app/adminapi/controller/sys/Channel.php | 6 + .../app/adminapi/controller/sys/Common.php | 6 +- .../app/adminapi/controller/sys/Config.php | 22 +- .../app/adminapi/controller/sys/Export.php | 12 + niucloud/app/adminapi/controller/sys/Menu.php | 102 +++-- .../app/adminapi/controller/sys/Poster.php | 13 + .../app/adminapi/controller/sys/Printer.php | 19 + niucloud/app/adminapi/controller/sys/Role.php | 24 +- .../app/adminapi/controller/sys/Schedule.php | 13 +- .../adminapi/controller/sys/ScheduleLog.php | 4 + .../app/adminapi/controller/sys/System.php | 10 + .../app/adminapi/controller/sys/Ueditor.php | 1 + .../adminapi/controller/upload/Storage.php | 9 + .../app/adminapi/controller/upload/Upload.php | 11 + .../app/adminapi/controller/user/User.php | 19 +- .../adminapi/controller/verify/Verifier.php | 18 +- .../app/adminapi/controller/verify/Verify.php | 8 + .../app/adminapi/controller/weapp/Config.php | 8 + .../adminapi/controller/weapp/Delivery.php | 2 + .../adminapi/controller/weapp/Template.php | 6 +- .../app/adminapi/controller/weapp/Version.php | 7 +- .../app/adminapi/controller/wechat/Config.php | 3 + .../app/adminapi/controller/wechat/Media.php | 3 + .../app/adminapi/controller/wechat/Menu.php | 6 +- .../app/adminapi/controller/wechat/Reply.php | 8 + .../adminapi/controller/wechat/Template.php | 4 +- niucloud/app/adminapi/middleware/AdminLog.php | 50 ++- niucloud/app/adminapi/route/addon.php | 2 + niucloud/app/adminapi/route/member.php | 1 + niucloud/app/adminapi/route/sys.php | 4 +- niucloud/app/api/controller/diy/DiyForm.php | 23 ++ niucloud/app/api/controller/sys/Config.php | 43 +- niucloud/app/api/controller/wechat/Wechat.php | 5 + .../app/api/route/dispatch/BindDispatch.php | 1 + niucloud/app/api/route/diy.php | 6 + niucloud/app/api/route/file.php | 14 +- niucloud/app/api/route/route.php | 2 + niucloud/app/common.php | 4 +- niucloud/app/dict/common/CommonActiveDict.php | 56 ++- niucloud/app/dict/diy/PagesDict.php | 6 +- niucloud/app/dict/diy_form/TemplateDict.php | 388 +++++++++++++++++- niucloud/app/dict/diy_form/TypeDict.php | 10 + .../app/dict/member/MemberLoginTypeDict.php | 5 +- niucloud/app/dict/menu/admin.php | 299 +++++++------- niucloud/app/dict/pay/PayDict.php | 4 +- niucloud/app/dict/sys/ConfigKeyDict.php | 1 + niucloud/app/event.php | 3 + niucloud/app/install/source/database.sql | 10 +- niucloud/app/lang/zh-cn/dict.php | 58 +-- .../app/listener/poster/FriendspayPoster.php | 2 +- .../listener/system/ShowMarketingListener.php | 54 +++ niucloud/app/model/sys/SysExport.php | 2 +- .../app/service/admin/addon/AddonService.php | 76 +++- .../app/service/admin/auth/LoginService.php | 38 +- .../admin/install/InstallSystemService.php | 3 +- .../service/admin/member/MemberService.php | 14 +- .../service/admin/notice/NiuSmsService.php | 5 +- .../app/service/admin/sys/MenuService.php | 224 +++++++++- .../app/service/admin/sys/RoleService.php | 105 +++-- .../admin/upgrade/BackupRecordsService.php | 3 + .../app/service/admin/user/UserLogService.php | 4 +- niucloud/app/service/api/diy/DiyService.php | 9 +- .../service/api/diy_form/DiyFormService.php | 79 ++++ .../app/service/api/login/LoginService.php | 48 +++ .../app/service/api/member/MemberService.php | 17 +- .../addon/CoreAddonDevelopBuildService.php | 2 +- .../service/core/addon/CoreAddonService.php | 31 +- niucloud/app/service/core/addon/WapTrait.php | 2 + .../diy_form/CoreDiyFormRecordsService.php | 131 ++++++ .../core/member/CoreMemberConfigService.php | 15 + .../service/core/member/CoreMemberService.php | 246 ++++++----- .../core/niucloud/CoreCloudBuildService.php | 3 + .../core/niucloud/CoreModuleService.php | 22 + .../app/service/core/pay/CorePayService.php | 16 +- .../core/schedule/CoreScheduleService.php | 2 +- .../core/weapp/CoreWeappCloudService.php | 2 +- niucloud/app/upgrade/v155/Upgrade.php | 78 ++++ niucloud/app/upgrade/v155/upgrade.sql | 16 + niucloud/app/validate/member/Member.php | 2 +- niucloud/config/version.php | 4 +- .../{404-dddd8698.js => 404-4ea20bfc.js} | 2 +- niucloud/public/admin/assets/App-513018ee.js | 1 - niucloud/public/admin/assets/App-e76a4de4.js | 1 + ...{Verify-7c0933ac.js => Verify-84a5d087.js} | 2 +- ...s-9a93cadb.js => VerifyPoints-4e90120c.js} | 2 +- ...de-cb9ff497.js => VerifySlide-1adcfaf7.js} | 2 +- ...{access-18c7880b.js => access-68ddd4ed.js} | 2 +- ...{access-9529db40.js => access-eb011b16.js} | 2 +- ...{access-9519e9a5.js => access-f92517fe.js} | 2 +- ...ccount-be31da21.js => account-1a980b5f.js} | 2 +- ...ber-6e5d766e.js => add-member-7835b01d.js} | 2 +- ...e_type_script_setup_true_lang-7c5636c0.js} | 2 +- ...able-98480b28.js => add-table-9361ddc4.js} | 2 +- ...e_type_script_setup_true_lang-f99f2a93.js} | 2 +- ...heme-0a92957a.js => add-theme-11f90583.js} | 2 +- ...e_type_script_setup_true_lang-99bb6249.js} | 2 +- ...gin-c3c8ba87.js => adminlogin-2474e44e.js} | 2 +- .../{adv-6400df2d.js => adv-3a4a4093.js} | 2 +- ...-edit-4c79c3ed.js => adv-edit-1c982547.js} | 2 +- ...e_vue_type_style_index_0_lang-8c175746.js} | 2 +- ...n-ffa8f12a.js => adv_position-ac7ae05b.js} | 2 +- ...ment-1965e3c2.js => agreement-0f301eed.js} | 2 +- .../admin/assets/agreement_edit-155d2f03.js | 1 - .../admin/assets/agreement_edit-333c655b.js | 1 + .../public/admin/assets/aliapp-b0553303.js | 1 - .../public/admin/assets/aliapp-d54a887b.js | 1 + .../admin/assets/app_default-ef62993a.js | 1 + ...age-e19912dc.js => app_manage-cdbb1d82.js} | 2 +- .../admin/assets/attachment-07742802.js | 1 - ...t-307ebd25.css => attachment-0ee1a416.css} | 2 +- .../admin/assets/attachment-153bb8c5.js | 1 + ...ent-942be520.js => attachment-d6e4df9f.js} | 2 +- .../public/admin/assets/auth.log-1ac2078a.js | 1 + .../public/admin/assets/auth.log-71585a97.js | 1 - ...rize-808f7ed5.js => authorize-5a6d8336.js} | 2 +- .../admin/assets/backup_records-39d11bf4.js | 1 - .../admin/assets/backup_records-4a19a30d.css | 1 + .../admin/assets/backup_records-4a7bc4d5.css | 1 - .../admin/assets/backup_records-555fb285.js | 1 + ...alance-7d4b02d1.js => balance-e6c3ecdc.js} | 2 +- .../assets/benefits-discount-2a5d9b64.js | 1 + .../assets/benefits-discount-4c3edaf5.js | 1 - .../public/admin/assets/cash_out-4164faaa.css | 1 + .../public/admin/assets/cash_out-57d53511.css | 1 - ...h_out-734198c8.js => cash_out-65707cf3.js} | 2 +- ...h_out-e6758bf2.js => cash_out-8fcf4bdf.js} | 2 +- .../admin/assets/cloud_compile-6bc999c4.js | 1 + .../admin/assets/cloud_compile-91abc8ec.js | 1 - .../{code-9d8b2523.js => code-bf34d0ac.js} | 2 +- ...ion-269b3499.js => commission-99c39450.js} | 2 +- ...{config-ec186cb6.js => config-141950a2.js} | 2 +- .../public/admin/assets/config-22175760.js | 1 - ...{config-7e480c88.js => config-5705818e.js} | 2 +- .../public/admin/assets/config-a21ba108.js | 1 + ...{config-759366c9.js => config-a9feafd3.js} | 2 +- ...{config-79ef05a5.js => config-e6aeb7a5.js} | 2 +- ...ight-59d893d4.js => copyright-2afd3e36.js} | 2 +- ...{course-b7374adf.js => course-b80b9931.js} | 2 +- ...{course-73e9c4bb.js => course-e8530e11.js} | 2 +- ...{course-739d3de5.js => course-ec3ca394.js} | 2 +- .../{cron-00e7be81.js => cron-49c3c702.js} | 2 +- ...info-c7ff4e95.js => cron-info-a0848435.js} | 2 +- ...e_type_script_setup_true_lang-18efef83.js} | 2 +- ...-terminal-2438a051.js => dark-83a8ed60.js} | 14 +- ...1c9b2.js => detail-form-image-3db03365.js} | 2 +- ...0335.js => detail-form-render-7c332561.js} | 2 +- ...-1ea6c8de.js => detail-member-782c8b57.js} | 2 +- ...ue_vue_type_style_index_0_lang-1445f617.js | 1 - ...ue_vue_type_style_index_0_lang-8151ede9.js | 1 + ...tion-246cc612.js => detection-37685ea2.js} | 2 +- ...2dd8c0e.js => developer_token-e0a5518d.js} | 2 +- .../{dict-896816bc.js => dict-b701ea87.js} | 2 +- .../{dict-8a2367a5.js => dict-c4280ace.js} | 2 +- ...e_vue_type_style_index_0_lang-4589d3ce.js} | 2 +- niucloud/public/admin/assets/diy-17e91366.js | 1 - .../{diy-9db2525d.js => diy-ba9878e3.js} | 2 +- niucloud/public/admin/assets/diy-e412e4fe.js | 1 + .../public/admin/assets/diy.edit-4c63a864.js | 1 + .../public/admin/assets/diy.edit-5e332d68.js | 1 - .../public/admin/assets/diy_form-85a10031.js | 1 - .../public/admin/assets/diy_form-b86ec360.js | 1 + ...-62033e52.js => diy_form.edit-462b3d62.js} | 2 +- .../{dict-1c99c58d.css => edit-1c99c58d.css} | 0 .../{edit-6c0d597f.js => edit-2608b72c.js} | 2 +- niucloud/public/admin/assets/edit-2c23c5c6.js | 1 + .../{edit-b6f95122.js => edit-4420abf8.js} | 2 +- niucloud/public/admin/assets/edit-5161c2c4.js | 1 - .../{edit-1cd1062f.js => edit-75e8d9bf.js} | 2 +- ...6531cb.js => edit-active-cube-e7b0d017.js} | 2 +- ...3b41d3e.js => edit-associated-7253668f.js} | 2 +- ...pt_setup_true_async_true_lang-822e59fc.js} | 2 +- ...71.js => edit-carousel-search-c0a45390.js} | 2 +- .../{edit-10bbe461.js => edit-d0175321.js} | 2 +- .../{edit-f5951c85.js => edit-d163aec9.js} | 2 +- .../{edit-f829ae29.js => edit-dc134f7a.js} | 2 +- ...draw-a83bdbe7.js => edit-draw-3bcfaf2a.js} | 2 +- .../admin/assets/edit-float-btn-119f7914.js | 1 - .../admin/assets/edit-float-btn-d4e1708c.js | 1 + ...0bc59.js => edit-form-address-b2f59e0f.js} | 2 +- .../assets/edit-form-checkbox-2a0fc9bc.js | 1 - .../assets/edit-form-checkbox-3d302028.js | 1 + ...d4986b21.js => edit-form-date-c82a65dd.js} | 2 +- ...ed.js => edit-form-date-scope-4a53ba95.js} | 2 +- ...d8ea8dd.js => edit-form-email-dd081a7a.js} | 2 +- ...2d59f87e.js => edit-form-file-fe66bba6.js} | 2 +- ...56cb.js => edit-form-identity-6391565d.js} | 2 +- ...4f7ee37.js => edit-form-image-48c9a455.js} | 2 +- ...3bdf955.js => edit-form-input-df4d4363.js} | 2 +- ...1f51.js => edit-form-location-c57b34b6.js} | 2 +- ...16d52f.js => edit-form-mobile-31097b34.js} | 2 +- ...35a1cf.js => edit-form-number-39581975.js} | 2 +- .../admin/assets/edit-form-radio-9305698d.js | 1 - .../admin/assets/edit-form-radio-99514d85.js | 1 + ...1cb58b.js => edit-form-submit-72f99bf6.js} | 2 +- ...caaa071.js => edit-form-table-ac8b1bf7.js} | 2 +- ...4601.js => edit-form-textarea-e8bd8efc.js} | 2 +- ...842be722.js => edit-form-time-53cbee0c.js} | 2 +- ...b9.js => edit-form-time-scope-b116a72e.js} | 2 +- ...b3c26ca.js => edit-form-video-e0677f78.js} | 2 +- ...2.js => edit-form-wechat-name-1c905fea.js} | 2 +- ...js => edit-friendspay-message-5984a00d.js} | 2 +- ...b.js => edit-friendspay-money-7f380914.js} | 2 +- ...4c27a5.js => edit-graphic-nav-8794ad38.js} | 2 +- ...g-b3fbe428.js => edit-headimg-f0cb5189.js} | 2 +- ...743fabd.js => edit-horz-blank-d1298573.js} | 2 +- ...307c0d1f.js => edit-horz-line-1246d346.js} | 2 +- ...-4082c593.js => edit-hot-area-a7807e51.js} | 2 +- ...ae7c80a5.js => edit-image-ads-87fdaeb4.js} | 2 +- ...age-a06c5f45.js => edit-image-e91abe32.js} | 2 +- ...bel-1ebf8782.js => edit-label-289a073f.js} | 2 +- ...e_type_script_setup_true_lang-be5fba4c.js} | 2 +- ...er-353ee42c.js => edit-member-1b922747.js} | 2 +- ...a25623.js => edit-member-info-9b8f36cf.js} | 2 +- ...45534.js => edit-member-level-ba61ae29.js} | 2 +- ...ue_type_script_setup_true_lang-7e54db71.js | 1 + ...ue_type_script_setup_true_lang-f57e7a7c.js | 1 - ...menu-c24df583.js => edit-menu-598b8a0c.js} | 2 +- ...ue_type_script_setup_true_lang-87600218.js | 1 - ...ue_type_script_setup_true_lang-bbf234ed.js | 1 + ...-b118de03.js => edit-nickname-632d8b0a.js} | 2 +- ...ce-6bab6d03.js => edit-notice-2f1d219c.js} | 2 +- .../public/admin/assets/edit-page-200aaf74.js | 1 + ...page-7ed95b1e.js => edit-page-89ace8e9.js} | 2 +- .../public/admin/assets/edit-page-cc8339f3.js | 1 - ...f1989.js => edit-picture-show-85a8e95a.js} | 2 +- ...de-2a19f515.js => edit-qrcode-36d32acc.js} | 2 +- ...11f8f182.js => edit-rich-text-60ec5604.js} | 2 +- ...role-78eb0258.js => edit-role-f0867f4e.js} | 2 +- ...ipt_setup_true_async_true_lang-985247f9.js | 1 + ...ipt_setup_true_async_true_lang-a8bb0b16.js | 1 - ...30ca817.js => edit-rubik-cube-8ef6b591.js} | 2 +- ...text-d2f3fbb4.js => edit-text-bd72e0fb.js} | 2 +- ...text-69186b04.js => edit-text-efac261c.js} | 2 +- ...eme-01e02d0b.js => edit-theme-64fed815.js} | 2 +- ...e_type_script_setup_true_lang-742c68e4.js} | 2 +- ...user-5e2e1f5d.js => edit-user-fafd36a5.js} | 2 +- ...e_type_script_setup_true_lang-d38e50d0.js} | 2 +- ...fy-0dab8730.js => edit-verify-3e96cbb6.js} | 2 +- ...pt_setup_true_async_true_lang-3ba717cd.js} | 2 +- ...31ab8b58.js => edit-view-type-5974a597.js} | 2 +- ...pt_setup_true_async_true_lang-404bb72c.js} | 2 +- ...e_vue_type_style_index_0_lang-e44e7fc9.js} | 2 +- ...-fe4369d3.js => edit_personal-f5aa6c96.js} | 2 +- ...{export-8f5a57f3.js => export-ff0eec51.js} | 2 +- ...53b.js => form-select-content-cc844e5a.js} | 2 +- ...d5761.js => form-spread-popup-7ecb169e.js} | 2 +- ...6a55d.js => form-submit-popup-5fe93075.js} | 2 +- ...634658.js => form-write-popup-f333ad16.js} | 2 +- ...e_vue_type_style_index_0_lang-a02e5e5f.js} | 2 +- ...a716.js => friendly-link-edit-4dc2c6a0.js} | 2 +- ...e_vue_type_style_index_0_lang-0734a84d.js} | 2 +- ...-bc9c7ae5.js => friendly_link-2d6918c8.js} | 2 +- ...e-6d487596.js => gift-balance-f3695181.js} | 2 +- ...int-e9b49ca3.js => gift-point-de42d01e.js} | 2 +- ...{growth-c17e39d7.js => growth-b3abd1fb.js} | 2 +- ...91.js => growth-rule-register-acd43525.js} | 2 +- .../admin/assets/growth_rule-19873b55.js | 1 - .../admin/assets/growth_rule-7bb8cf2e.js | 1 + .../public/admin/assets/index-06cf7cb8.js | 1 + .../public/admin/assets/index-0dcbf74f.js | 1 + .../public/admin/assets/index-158186c7.js | 1 - .../public/admin/assets/index-1752f4b7.js | 1 + .../public/admin/assets/index-1f52aff1.css | 1 - .../{index-375dc7ce.js => index-24bb50c1.js} | 2 +- .../{index-64c763fa.js => index-29047b63.js} | 2 +- .../public/admin/assets/index-2a19a473.js | 1 - .../public/admin/assets/index-2f1eedd5.js | 1 + .../{index-f2b08d88.js => index-364de374.js} | 2 +- .../public/admin/assets/index-3a3a07be.js | 1 - .../{index-def9af72.js => index-3e5186f6.js} | 2 +- .../public/admin/assets/index-455f68a7.js | 1 - .../{index-b3926957.js => index-49c9b255.js} | 2 +- .../{index-c42022e4.js => index-54e51196.js} | 2 +- .../public/admin/assets/index-568a9c0f.js | 1 - ...{index-3ac417de.css => index-5795b1d5.css} | 2 +- .../public/admin/assets/index-5a680c44.js | 1 - .../{index-0ad67b0e.js => index-606c6286.js} | 2 +- .../public/admin/assets/index-627b9e4a.js | 1 - .../{index-fef3b0b8.js => index-6c83e205.js} | 2 +- .../public/admin/assets/index-6f3b958f.js | 1 - .../public/admin/assets/index-76d8ad7e.js | 1 - .../public/admin/assets/index-7a3a4168.css | 1 - .../{index-325dfaac.js => index-7c108698.js} | 2 +- .../public/admin/assets/index-7f121e53.css | 1 + .../public/admin/assets/index-83c3ad49.js | 1 - .../public/admin/assets/index-84130c47.css | 1 - .../{index-f4e0ce84.js => index-86c7db3b.js} | 2 +- .../{index-43235816.js => index-9b615147.js} | 2 +- .../public/admin/assets/index-a4ace02e.js | 1 + .../public/admin/assets/index-a796d0a1.js | 1 - .../public/admin/assets/index-a7dbd031.js | 1 + .../{index-3a7858cb.js => index-aff9265a.js} | 2 +- .../public/admin/assets/index-b57321cf.js | 1 + .../{index-0343fd6e.js => index-b61a9a6f.js} | 2 +- .../{index-3f6ca90a.js => index-b7d0aef4.js} | 2 +- .../public/admin/assets/index-b8e21b3f.js | 1 + .../{index-845c3eac.js => index-cba7bc25.js} | 2 +- .../public/admin/assets/index-cc4a5c16.js | 1 - .../public/admin/assets/index-d26bf7a9.js | 1 + .../public/admin/assets/index-d3e6f02b.css | 1 + .../{index-bb45962d.js => index-d5e0e7ce.js} | 2 +- .../public/admin/assets/index-d6634cb6.css | 1 + .../public/admin/assets/index-d948eae0.js | 1 + .../public/admin/assets/index-d97ddbad.js | 1 + .../public/admin/assets/index-d9c1384d.js | 1 + .../public/admin/assets/index-dbbdbe84.js | 1 - .../{index-7b16809d.js => index-dd34c985.js} | 2 +- .../public/admin/assets/index-de471a9b.js | 1 + .../{index-91585447.js => index-e1ac4e63.js} | 2 +- .../{index-73278922.js => index-e2983ebd.js} | 2 +- .../{index-e5242013.js => index-e940c5e1.js} | 2 +- .../public/admin/assets/index-ea035854.js | 1 + .../public/admin/assets/index-efcdf6ce.js | 1 - .../{index-e05985b6.js => index-f99f26c5.js} | 18 +- ...e_type_script_setup_true_lang-4749fc98.js} | 2 +- ...e_type_script_setup_true_lang-5c0ce90b.js} | 2 +- ...e_type_script_setup_true_lang-6dd89d68.js} | 2 +- ...e_type_script_setup_true_lang-72e25793.js} | 2 +- ...e_type_script_setup_true_lang-9f643360.js} | 2 +- ...e_type_script_setup_true_lang-b1bfcd32.js} | 2 +- ...e_type_script_setup_true_lang-db003204.js} | 2 +- ...ue_vue_type_style_index_0_lang-1f18f008.js | 1 + ...e_vue_type_style_index_0_lang-4470b995.js} | 2 +- ...ue_vue_type_style_index_0_lang-4584aedc.js | 1 - ...e_vue_type_style_index_0_lang-5728e7cf.js} | 2 +- ...ue_vue_type_style_index_0_lang-61ec4eeb.js | 1 + ...ue_vue_type_style_index_0_lang-6860038b.js | 1 - ...ue_vue_type_style_index_0_lang-cdc3a85e.js | 1 + ...e_vue_type_style_index_0_lang-ec1fea3a.js} | 2 +- ...ue_vue_type_style_index_0_lang-fa4e0735.js | 1 - ...fbb5.js => keyword_reply_edit-12b18b8d.js} | 2 +- .../{label-ffe7473b.js => label-333137ac.js} | 2 +- ...9d0198ca.js => layout-setting-36ec9cf5.js} | 2 +- ...20d0c27a.js => layout-setting-89cf9be2.js} | 2 +- .../{level-347787dc.js => level-c7f239eb.js} | 2 +- ...dit-53e59fee.js => level_edit-71cfa083.js} | 2 +- niucloud/public/admin/assets/list-06e45cf2.js | 1 - .../{list-fcbb0a3b.js => list-3ed583e8.js} | 2 +- .../{list-f0365979.js => list-44cc2b15.js} | 2 +- niucloud/public/admin/assets/list-5b3ef7be.js | 1 + .../{list-ceca54f6.js => list-c916c20e.js} | 2 +- .../{list-35e1529d.js => list-fe3d6f63.js} | 2 +- niucloud/public/admin/assets/log-14d78f48.js | 1 - niucloud/public/admin/assets/log-9c8e6639.js | 1 + .../public/admin/assets/login-2eee3e1b.js | 1 - .../public/admin/assets/login-41275bea.js | 1 + .../{map-74687cab.js => map-1687fc70.js} | 2 +- .../admin/assets/marketing-2a0a495b.css | 1 + .../public/admin/assets/marketing-bd91818e.js | 1 + .../public/admin/assets/member-54a5604a.js | 1 - .../public/admin/assets/member-688a285d.js | 1 + ...{member-85eebbae.js => member-83732911.js} | 2 +- .../public/admin/assets/member-8ba4505e.js | 1 + .../public/admin/assets/member-a7a443ec.js | 1 + ...f7c.js => member-balance-edit-f0d2092e.js} | 2 +- ...e_type_script_setup_true_lang-f8930d41.js} | 2 +- ...2fb.js => member-balance-info-d42017b9.js} | 2 +- ...e_type_script_setup_true_lang-10227e48.js} | 2 +- .../admin/assets/member-benefits-1dca655a.js | 1 + .../admin/assets/member-benefits-5e936039.js | 1 - ...ue_type_script_setup_true_lang-48442b45.js | 1 - ...ue_type_script_setup_true_lang-d8f2ea98.js | 1 + ....js => member-commission-info-38953fe3.js} | 2 +- ...e_type_script_setup_true_lang-d8767ae5.js} | 2 +- .../public/admin/assets/member-e2c57cc1.js | 1 - .../public/admin/assets/member-eb364a0b.js | 1 - .../admin/assets/member-gift-ab2fba32.js | 1 + .../admin/assets/member-gift-f01c339b.js | 1 - ...ue_type_script_setup_true_lang-0129879c.js | 1 - ...ue_type_script_setup_true_lang-68fa07d1.js | 1 + ...b4b68.js => member-money-info-8bf7c4ca.js} | 2 +- ...52809.js => member-point-edit-144c05a2.js} | 2 +- ...ue_type_script_setup_true_lang-9bd62428.js | 1 + ...ue_type_script_setup_true_lang-d2420e12.js | 1 - ...63ba6.js => member-point-info-1c2a8e78.js} | 2 +- ...e_type_script_setup_true_lang-3ec06dd9.js} | 2 +- .../admin/assets/member.member-8fdc51e9.js | 1 + .../admin/assets/member.member-9c7d2d43.js | 1 - .../assets/member.member_detail-e509facb.js | 1 + .../assets/member.member_detail-e886a35c.js | 1 - .../admin/assets/member_detail-13d2187e.js | 1 + .../admin/assets/member_detail-45612112.js | 1 - .../admin/assets/member_detail-89d9f097.css | 1 + .../admin/assets/member_detail-b89e45de.css | 1 - .../{menu-0addcd33.js => menu-04ae38bb.js} | 2 +- .../{menu-1bb71d5f.js => menu-05fe8cd7.js} | 2 +- ...form-7ff9a1f9.js => menu-form-7fb0078c.js} | 2 +- ...e_type_script_setup_true_lang-48f38e26.js} | 2 +- .../public/admin/assets/menu-item-07d6ab2c.js | 1 - .../public/admin/assets/menu-item-2a33b930.js | 1 + .../public/admin/assets/menu-item-47b58e97.js | 1 + .../public/admin/assets/menu-item-77968513.js | 1 - ...e_vue_type_style_index_0_lang-056e5d63.js} | 2 +- ...ue_vue_type_style_index_0_lang-4e95fedf.js | 1 - ...ue_vue_type_style_index_0_lang-e0111271.js | 1 + ...{module-75300b78.js => module-f77f0a65.js} | 2 +- .../{nav-b5cfd8b9.js => nav-bc1d29b8.js} | 2 +- ...-edit-5779847f.js => nav-edit-1866f8b0.js} | 2 +- ...e_vue_type_style_index_0_lang-8c054f8c.js} | 2 +- ...card-2267e939.js => news-card-9c92072b.js} | 2 +- ...e_type_script_setup_true_lang-86e42f8f.js} | 2 +- ...{notice-dd7d3a4d.js => notice-ca52b9c8.js} | 2 +- ...{notice-19cf93c4.js => notice-fe9f8a40.js} | 2 +- ...381.js => notice-records-info-438dce33.js} | 2 +- ...e_type_script_setup_true_lang-ed3f481e.js} | 2 +- ...sms-1ba0ead3.js => notice-sms-ad6414d9.js} | 2 +- ...e_type_script_setup_true_lang-392b611e.js} | 2 +- ...p-ea1473f5.js => notice-weapp-e97a4785.js} | 2 +- ...e_type_script_setup_true_lang-a727f35f.js} | 2 +- ...-ddaea889.js => notice-wechat-e25b7ec9.js} | 2 +- ...e_type_script_setup_true_lang-c563cd7a.js} | 2 +- ...eeb1e01d.js => notice_records-51f4d444.js} | 2 +- ...pay-ad31e9dd.js => offlinepay-17aa7a24.js} | 2 +- .../{pay-0e948cdb.js => pay-0201ce2a.js} | 2 +- niucloud/public/admin/assets/pay-5e0c1e3d.js | 1 - niucloud/public/admin/assets/pay-754de72f.js | 1 + ...pay-222a45f8.js => pay-alipay-9729b59d.js} | 2 +- ...496202c6.js => pay-friendspay-b84762b6.js} | 2 +- ...1078a7d6.js => pay-offlinepay-9be33707.js} | 2 +- ...-5f3e20e3.js => pay-wechatpay-d8cb05a4.js} | 2 +- .../admin/assets/pay_detail-404dc275.js | 1 + .../admin/assets/pay_detail-d0142901.js | 1 - ...und-789a6b91.js => pay_refund-e7efbae0.js} | 2 +- ...sonal-8fb45ebd.js => personal-7813a3f6.js} | 2 +- ...sonal-5fd613a5.js => personal-966b71f6.js} | 2 +- .../{point-f90ce00f.js => point-16b6eef2.js} | 2 +- ...3a4.js => point-rule-register-4339d43d.js} | 2 +- .../admin/assets/point_rule-6ad1c7e0.js | 1 + .../admin/assets/point_rule-a175eb19.js | 1 - ...{poster-df482fa2.js => poster-436c7587.js} | 2 +- ...{poster-5f51175a.js => poster-979d105b.js} | 2 +- ...w-afb1b4fc.js => preview-draw-5db49238.js} | 2 +- ...review-dae7af73.js => preview-e2d5ec39.js} | 2 +- ...=> preview-friendspay-message-430babbc.js} | 2 +- ...s => preview-friendspay-money-fc9fff06.js} | 2 +- ...6e60e28.js => preview-headimg-168bb01f.js} | 2 +- ...-dabc0ae4.js => preview-image-5ce8a53a.js} | 2 +- ...6cd9b1.js => preview-nickname-a60259ea.js} | 2 +- ...f0a450bf.js => preview-qrcode-e54e4d9b.js} | 2 +- ...t-a0db9206.js => preview-text-fd9ffa31.js} | 2 +- ...rinter-8b3d4a3b.js => printer-a8efb34b.js} | 2 +- .../public/admin/assets/range-37ff0733.js | 1 + .../public/admin/assets/range-e90b089a.js | 1 - ...ecords-f0b6500b.js => records-c56c9217.js} | 2 +- ...ue_vue_type_style_index_0_lang-3e338e6a.js | 1 + ...ue_vue_type_style_index_0_lang-ec4c6a04.js | 1 - ...-241780fb.js => refund-detail-92d4f714.js} | 2 +- ...ue_vue_type_style_index_0_lang-54c2f9a5.js | 1 + ...ue_vue_type_style_index_0_lang-a4604ef7.js | 1 - ...-85ebf2ce.js => refund_detail-d0c9cef9.js} | 2 +- .../{reply-99380ac9.js => reply-1efe51f0.js} | 2 +- .../admin/assets/reply-form-87ee7834.js | 1 - .../admin/assets/reply-form-d3163808.js | 1 + niucloud/public/admin/assets/role-3665f3b4.js | 1 - niucloud/public/admin/assets/role-a970c379.js | 1 + .../{route-9b719db1.js => route-5f22a1cd.js} | 2 +- ...edule-e490684b.js => schedule-168dcd79.js} | 2 +- .../admin/assets/schedule_log-194407ee.js | 1 + .../admin/assets/schedule_log-38e4619c.js | 1 - ...c482b5.js => select-menu-item-e8c6155f.js} | 2 +- ...82f.js => select-wechat-media-6aa61dca.js} | 2 +- ...e_type_script_setup_true_lang-87ffff78.js} | 2 +- .../admin/assets/setting.member-6b40eced.js | 1 + .../admin/assets/setting.member-fdd021e7.js | 1 - niucloud/public/admin/assets/side-b48c3936.js | 1 + niucloud/public/admin/assets/side-c3f9b1e9.js | 1 + niucloud/public/admin/assets/side-d69ec3a8.js | 1 - niucloud/public/admin/assets/side-dded0cde.js | 1 - ...ue_vue_type_style_index_0_lang-7c7c1f53.js | 1 - ...ue_vue_type_style_index_0_lang-86d7e9bc.js | 1 + ...ue_vue_type_style_index_0_lang-bb0b240d.js | 1 - ...ue_vue_type_style_index_0_lang-bec1d3bc.js | 1 + .../admin/assets/sign-continue-30d64fdf.css | 1 + .../admin/assets/sign-continue-551ac63b.js | 1 - .../admin/assets/sign-continue-9a2704bc.js | 1 + .../admin/assets/sign-continue-c2bb25fd.css | 1 - .../public/admin/assets/sign-day-806037d7.js | 1 + .../public/admin/assets/sign-day-bc539902.js | 1 - .../admin/assets/sign_config-09c6013a.css | 1 + .../admin/assets/sign_config-a1b6d2c6.css | 1 - ...ig-3d87f897.js => sign_config-b50b75b7.js} | 2 +- ...list-9d66183e.js => sign_list-06634079.js} | 2 +- niucloud/public/admin/assets/sms-1cb86965.js | 1 + niucloud/public/admin/assets/sms-7102834f.js | 1 - ...ms-ali-75365746.js => sms-ali-e098b74c.js} | 2 +- ...ms-niu-1b823d81.js => sms-niu-74060918.js} | 2 +- ...e908d6.js => sms-records-info-ac10533c.js} | 2 +- ...e_type_script_setup_true_lang-95c41dbf.js} | 2 +- ...nt-12a286c4.js => sms-tencent-5d776163.js} | 2 +- ...ms_niu-f6b9f284.js => sms_niu-4b07e1ac.js} | 2 +- ...-20d3be1b.js => sms_niu_login-91dc39fa.js} | 2 +- ...ue_type_script_setup_true_lang-3cb179cd.js | 1 + ...ue_type_script_setup_true_lang-3cefd0a3.js | 1 - ...4af1.js => sms_niu_pay_result-6ca04bfc.js} | 2 +- ...e-e81123bb.js => sms_recharge-7a8cc25d.js} | 2 +- ...9cb343bc.css => sms_recharge-8aaa62ce.css} | 2 +- ...10e.js => sms_recharge_record-5473d4ff.js} | 2 +- ...e_type_script_setup_true_lang-3fd0a97c.js} | 2 +- ...ds-59c02f51.js => sms_records-ec3b9ef9.js} | 2 +- ..._send-ebb1863e.js => sms_send-5d9feba6.js} | 2 +- ...e_type_script_setup_true_lang-30f1c3a3.js} | 2 +- ...-af299086.js => sms_signature-78845595.js} | 2 +- ...e_type_script_setup_true_lang-91274e09.js} | 2 +- ...e-e6e4aeba.js => sms_template-7bbb1b39.js} | 2 +- ...e_type_script_setup_true_lang-a8e8a8f4.js} | 2 +- .../public/admin/assets/storage-86fb1b4c.js | 1 - .../public/admin/assets/storage-abde39ec.js | 1 + ...li-91590055.js => storage-ali-5c065efd.js} | 2 +- ...-51dc36c9.js => storage-local-e210412d.js} | 2 +- .../admin/assets/storage-qiniu-4446343e.js | 1 - .../admin/assets/storage-qiniu-c5fe741b.js | 1 + .../admin/assets/storage-tencent-34c77286.js | 1 - .../admin/assets/storage-tencent-35bf37a3.js | 1 + .../public/admin/assets/store-4e020d90.js | 1 - .../public/admin/assets/store-c1245c58.css | 1 - .../public/admin/assets/store-d12d0113.js | 1 + .../public/admin/assets/store-e510a652.css | 1 + .../admin/assets/switch-lang-07e55a44.js | 1 - .../admin/assets/switch-lang-2c881054.js | 1 + .../admin/assets/switch-lang-402f2cf0.js | 1 - .../admin/assets/switch-lang-b2c7ecd2.js | 1 + niucloud/public/admin/assets/sys-5553c504.js | 1 - niucloud/public/admin/assets/sys-c0964254.js | 1 + .../public/admin/assets/system-980c7b11.js | 1 - .../public/admin/assets/system-eb083e7f.js | 1 + ...{tabbar-26a76edb.js => tabbar-34d1e749.js} | 2 +- ...it-1cee05e6.js => tabbar_edit-51e7d2fa.js} | 2 +- .../{tabs-159ad055.js => tabs-418cf5ed.js} | 2 +- .../{tabs-9686334c.js => tabs-61f8ec3d.js} | 2 +- ...plate-9ce61014.js => template-2bc9d0e9.js} | 2 +- .../public/admin/assets/template-976997a3.js | 1 + .../public/admin/assets/template-d26d89ce.js | 1 - ...-ba84ee11.js => template_edit-244fcc03.js} | 2 +- ...-b414be53.js => template_list-d1fca4ed.js} | 2 +- ...ist-f08ac484.js => theme-list-ee7ebefe.js} | 2 +- ...le-ed9540c2.js => theme_style-18c8f058.js} | 2 +- .../{tools-dd44aaeb.js => tools-d7b5f3fa.js} | 2 +- ...nsfer-62b5ea6a.js => transfer-e59ba780.js} | 2 +- ...5da77696.js => transfer_scene-c8f1308b.js} | 2 +- ...-c3d03348.css => updatecache-008ea5f2.css} | 2 +- ...he-22a14ddb.js => updatecache-0a78513f.js} | 2 +- .../public/admin/assets/upgrade-12edd4c8.js | 1 + ...pgrade-c7a67f66.js => upgrade-9f463b51.js} | 2 +- .../public/admin/assets/upgrade-d31f0cc1.js | 1 - .../admin/assets/upgrade_records-8d57f8c8.js | 1 + .../admin/assets/upgrade_records-afa55309.js | 1 - ...a-1e855067.js => upload-media-7086ccef.js} | 2 +- ...e_type_script_setup_true_lang-b6f947ca.js} | 2 +- .../{user-52f4bece.js => user-447cfff1.js} | 2 +- .../{user-f69fc257.js => user-6f2af1d4.js} | 2 +- .../public/admin/assets/user-info-2da95214.js | 1 - ...info-ff709d6f.js => user-info-2f444684.js} | 2 +- .../admin/assets/user-info-a664f617.css | 1 - .../public/admin/assets/user-info-ed2c5fa0.js | 1 + .../admin/assets/user-info-f705ad90.css | 1 + ...e718a24.js => user-log-detail-d9a8d408.js} | 2 +- ...ue_type_script_setup_true_lang-3947de51.js | 1 - ...ue_type_script_setup_true_lang-cd57b777.js | 1 + ...ifier-201c9c4c.js => verifier-90e069f6.js} | 2 +- ...{verify-0306afa9.js => verify-6ac0e225.js} | 2 +- ...{verify-a9a6aadc.js => verify-8a5b0052.js} | 2 +- ...-d5ffd177.js => verify-detail-08581d66.js} | 2 +- ...ue_vue_type_style_index_0_lang-63dbad41.js | 1 + ...ue_vue_type_style_index_0_lang-7fa4077d.js | 1 - .../admin/assets/verify_detail-5b8cc1f0.js | 1 - .../admin/assets/verify_detail-f5f681c9.js | 1 + .../public/admin/assets/weapp-4a0120a8.js | 1 - .../public/admin/assets/weapp-6f1d4f67.js | 1 + .../{weapp-d1f4d633.js => weapp-a53675ed.js} | 2 +- .../{web-3284d14b.js => web-c3b3614b.js} | 2 +- .../public/admin/assets/web-link-7583711a.js | 1 - .../public/admin/assets/web-link-7899b4d0.js | 1 + ...e_vue_type_style_index_0_lang-a93c639f.js} | 2 +- ...{wechat-fe9dadcf.js => wechat-73ae38fe.js} | 2 +- niucloud/public/admin/index.html | 4 +- .../diy_form/diy_form_member_info_preview.jpg | Bin 0 -> 86821 bytes .../resource/images/marketing/coupon.png | Bin 0 -> 6143 bytes .../resource/images/marketing/discount.png | Bin 0 -> 6202 bytes .../resource/images/marketing/exchange.png | Bin 0 -> 8162 bytes .../resource/images/marketing/goods_rank.png | Bin 0 -> 56630 bytes .../resource/images/marketing/manjian.png | Bin 0 -> 7591 bytes .../resource/images/marketing/newcomer.png | Bin 0 -> 6766 bytes .../static/resource/images/marketing/sign.png | Bin 0 -> 6238 bytes .../resource/images/marketing/verifier.png | Bin 0 -> 8166 bytes ...ount-d1c92a6a.css => account-b364ea4c.css} | 2 +- .../public/wap/assets/address-01097245.css | 1 - .../public/wap/assets/address-317da341.css | 1 + .../app-pages-auth-agreement.bbee0b90.js | 1 + .../app-pages-auth-agreement.ee39bb7a.js | 1 - .../assets/app-pages-auth-bind.182ec718.js | 1 + .../assets/app-pages-auth-bind.e1fcbaab.js | 1 - .../assets/app-pages-auth-index.b13c9677.js | 1 - .../assets/app-pages-auth-index.e85a2afe.js | 1 + .../assets/app-pages-auth-login.e7472f31.js | 1 + .../assets/app-pages-auth-login.f1df58bb.js | 1 - .../app-pages-auth-register.3b122a44.js | 1 - .../app-pages-auth-register.f88ef37f.js | 1 + .../app-pages-auth-resetpwd.0368d411.js | 1 + .../app-pages-auth-resetpwd.fed796ed.js | 1 - .../app-pages-friendspay-money.7f16d76b.js | 1 + .../app-pages-friendspay-money.badd2ae3.js | 1 - .../app-pages-friendspay-share.753b597a.js | 1 + .../app-pages-friendspay-share.8f25f379.js | 1 - .../assets/app-pages-index-close.64c4c7c2.js | 1 - .../assets/app-pages-index-close.8f3cd8a3.js | 1 + .../assets/app-pages-index-diy.5cf4a6a9.js | 1 - .../assets/app-pages-index-diy.6a163be1.js | 1 + .../app-pages-index-diy_form.2ebf8ab6.js | 1 + .../app-pages-index-diy_form.cd513d47.js | 1 - ...pp-pages-index-diy_form_detail.69e0a1cf.js | 1 + ...pp-pages-index-diy_form_detail.b197a485.js | 1 - ...p-pages-index-diy_form_result.a9fa0707.js} | 2 +- .../assets/app-pages-index-index.31c3f3b5.js | 1 - .../assets/app-pages-index-index.d30672cf.js | 1 + .../assets/app-pages-index-nosite.67d7b663.js | 1 - .../assets/app-pages-index-nosite.a2e162a8.js | 1 + .../assets/app-pages-index-tabbar.38d3a226.js | 1 - .../app-pages-member-account.70653d03.js | 1 + .../app-pages-member-account.d7f73887.js | 1 - .../app-pages-member-account_edit.81eb2939.js | 1 - .../app-pages-member-account_edit.975ba8cb.js | 1 + .../app-pages-member-address.88c4d43d.js | 1 - .../app-pages-member-address.b3d2ad43.js | 1 + .../app-pages-member-address_edit.59ff2cd1.js | 1 - .../app-pages-member-address_edit.b0f45691.js | 1 + ...pp-pages-member-apply_cash_out.026c0fda.js | 1 - ...pp-pages-member-apply_cash_out.76b43dc5.js | 1 + .../app-pages-member-balance.303940df.js | 1 + .../app-pages-member-balance.40f2495e.js | 1 - .../app-pages-member-cash_out.65ddb146.js | 1 + .../app-pages-member-cash_out.b6db4ac5.js | 1 - ...p-pages-member-cash_out_detail.4a5bf738.js | 1 + ...p-pages-member-cash_out_detail.6de89b3c.js | 1 - .../app-pages-member-commission.02b1f00d.js | 1 - .../app-pages-member-commission.c455a83e.js | 1 + .../app-pages-member-contact.220fe675.js | 1 + .../app-pages-member-contact.f3bd6ffb.js | 1 - ...-pages-member-detailed_account.3720f384.js | 1 - ...-pages-member-detailed_account.b69e01b4.js | 1 + .../assets/app-pages-member-index.656c892b.js | 1 - .../assets/app-pages-member-index.b5027401.js | 1 + .../assets/app-pages-member-level.93e211d0.js | 1 - .../assets/app-pages-member-level.f05850c1.js | 1 + .../app-pages-member-personal.271b665c.js | 1 + .../app-pages-member-personal.ffc81c6d.js | 1 - ...app-pages-member-personal_form.51f28bef.js | 1 + .../assets/app-pages-member-point.8f434efb.js | 1 + .../assets/app-pages-member-point.99482808.js | 1 - .../app-pages-member-point_detail.2ebba317.js | 1 - .../app-pages-member-point_detail.5989527f.js | 1 + .../app-pages-member-sign_in.e01b50fd.js | 1 + .../app-pages-member-sign_in.feab400f.js | 1 - .../assets/app-pages-pay-browser.138f4b10.js | 1 + .../assets/app-pages-pay-browser.3dec4863.js | 1 - .../assets/app-pages-pay-result.1c87c2a4.js | 1 + .../assets/app-pages-pay-result.5e274617.js | 1 - .../app-pages-setting-index.806c7ae9.js | 1 + .../app-pages-setting-index.e7e99fee.js | 1 - .../app-pages-verify-detail.aef28ef6.js | 1 + .../app-pages-verify-detail.b75f0d30.js | 1 - ....js => app-pages-verify-index.93678209.js} | 2 +- .../app-pages-verify-record.0d079b2d.js | 1 - .../app-pages-verify-record.71d65d5a.js | 1 + .../app-pages-verify-verify.d92ac5e6.js | 1 - .../app-pages-verify-verify.e021348a.js | 1 + ...app-pages-weapp-order_shipping.0a32d365.js | 1 - ...app-pages-weapp-order_shipping.d498f34b.js | 1 + .../app-pages-webview-index.2eb3a5b9.js | 1 - .../app-pages-webview-index.340db3bb.js | 1 + ...443b7e.css => apply_cash_out-83fd024f.css} | 2 +- ...ue_type_script_setup_true_lang.3d5a1ff1.js | 1 - ...ue_type_script_setup_true_lang.fcfc2513.js | 1 + ...2ddc5.css => cash_out_detail-c42f6ac3.css} | 2 +- .../public/wap/assets/diy_form-494b77eb.css | 1 - .../public/wap/assets/diy_form-bc63289b.css | 1 + .../public/wap/assets/diy_form.5542c398.js | 1 + .../public/wap/assets/diy_form.dd1f8c28.js | 1 - niucloud/public/wap/assets/index-04a0c64a.css | 1 + niucloud/public/wap/assets/index-08738f49.css | 1 - niucloud/public/wap/assets/index-20d2692d.css | 1 - niucloud/public/wap/assets/index-3e78e56f.css | 1 + niucloud/public/wap/assets/index-5804fc08.css | 1 + niucloud/public/wap/assets/index-58df6033.js | 27 ++ niucloud/public/wap/assets/index-5c500394.css | 1 + niucloud/public/wap/assets/index-b560dad3.css | 1 - ...{index-b3c50152.css => index-c0e0d57d.css} | 2 +- niucloud/public/wap/assets/index-c6ad3c68.js | 27 -- niucloud/public/wap/assets/index-da5f5776.css | 1 - niucloud/public/wap/assets/index.351aa2a5.js | 8 + niucloud/public/wap/assets/index.b73ea047.js | 8 - ...e_type_script_setup_true_lang.49f5d2fc.js} | 2 +- ...a3bbe716.js => mescroll-empty.b36c9fa7.js} | 2 +- ....18e0a8ef.js => mescroll-i18n.29e45df6.js} | 2 +- ...ue_type_script_setup_true_lang.23e89495.js | 1 + ...ue_type_script_setup_true_lang.5e6355a9.js | 1 - niucloud/public/wap/assets/money-618538b8.css | 1 + niucloud/public/wap/assets/money-a58606b0.css | 1 - .../{pay.6f744447.js => pay.5cf03fb2.js} | 2 +- .../public/wap/assets/personal-535c88a8.css | 1 + .../public/wap/assets/personal-756e3d6c.css | 1 - .../wap/assets/personal_form-9d607a6c.css | 1 + .../public/wap/assets/select-date.8bba10f7.js | 1 - .../public/wap/assets/select-date.e5e51336.js | 1 + niucloud/public/wap/assets/share-b35f5adb.css | 1 + niucloud/public/wap/assets/share-c25da6fb.css | 1 - ...n_in-acb5475a.css => sign_in-6c19c24c.css} | 2 +- ...ue_type_script_setup_true_lang.0fa2d328.js | 1 + ...ue_type_script_setup_true_lang.d50aa6f7.js | 1 - .../public/wap/assets/tabbar-688b62d8.css | 1 - .../public/wap/assets/top-tabbar.228a0fdd.js | 1 + .../public/wap/assets/top-tabbar.7ab178bb.js | 1 - ...bbar.ec9cfbdc.js => topTabbar.2f18307e.js} | 2 +- ...image.9096b10a.js => u--image.fedba3d6.js} | 2 +- .../wap/assets/u-action-sheet.3249b638.js | 1 + .../wap/assets/u-action-sheet.c827a4b8.js | 1 - ...vatar.a357715b.js => u-avatar.5524750d.js} | 2 +- ...5db441.js => u-checkbox-group.df63c744.js} | 2 +- .../wap/assets/u-datetime-picker-a8a5e758.css | 1 - .../wap/assets/u-datetime-picker.3b10fd68.js | 1 - ...{u-form.e563055f.js => u-form.e4c60902.js} | 2 +- ...{u-icon.0a0d2363.js => u-icon.0ae1125c.js} | 2 +- ...-input.8fc32358.js => u-input.8f97d28b.js} | 2 +- ...{u-line.233f5a79.js => u-line.0d9cc64c.js} | 2 +- ...29a896e4.js => u-loading-icon.ee5bd94f.js} | 2 +- ...-modal.282f517b.js => u-modal.58039b47.js} | 2 +- .../public/wap/assets/u-parse.1abba208.js | 1 - .../public/wap/assets/u-parse.5229b75e.js | 1 + .../public/wap/assets/u-popup-5c9ea98f.css | 1 - .../public/wap/assets/u-popup-740c5d05.css | 1 + .../public/wap/assets/u-popup.24d2d689.js | 1 + .../public/wap/assets/u-popup.463a41b9.js | 1 - .../wap/assets/u-safe-bottom-f61536ce.css | 1 - .../wap/assets/u-safe-bottom.58ab23d9.js | 1 - .../public/wap/assets/u-tabbar-109a0f08.css | 1 - .../public/wap/assets/u-tabbar.400d9315.js | 1 - ...n.1618e325.js => u-transition.20585ce2.js} | 2 +- .../public/wap/assets/u-upload.474ec092.js | 1 + .../public/wap/assets/u-upload.6e43b341.js | 1 - .../public/wap/assets/uni-popup.16a83edb.js | 1 + .../public/wap/assets/uni-popup.3d96ca24.js | 1 - niucloud/public/wap/assets/useDiy.a082f3a4.js | 1 + niucloud/public/wap/assets/useDiy.e868b31b.js | 1 - .../public/wap/assets/useDiyForm.bc2eef0f.js | 1 + ...ll.f2611dc5.js => useMescroll.eddfe106.js} | 2 +- ...{verify.4571c407.js => verify.e7571e95.js} | 2 +- niucloud/public/wap/index.html | 4 +- niucloud/public/web/200.html | 4 +- niucloud/public/web/404.html | 4 +- ...ment.4cace7d6.js => agreement.3bc3fb30.js} | 2 +- .../{auth.0310f461.js => auth.06aa4a8a.js} | 2 +- ...alance.dd46aab5.js => balance.b35ecb3a.js} | 2 +- .../{bind.2d22b007.js => bind.d233f297.js} | 2 +- ...{center.66fcdc4c.js => center.14b3d07f.js} | 2 +- .../{close.98274665.js => close.bd28b0e3.js} | 2 +- ...iner.b874448c.js => container.20caf0ab.js} | 2 +- ...ounce.c890efaf.js => debounce.30bd8664.js} | 2 +- ...efault.7c5ec702.js => default.285c701d.js} | 2 +- ...empty.a7961674.js => el-empty.415453aa.js} | 2 +- ...input.dc8de302.js => el-input.f84bdb48.js} | 2 +- ...ing.9b62bf9f.js => el-loading.520b7282.js} | 2 +- ...l-main.421c74e8.js => el-main.eb08ec9e.js} | 2 +- ...pper.36df3cb5.js => el-popper.49ef5783.js} | 2 +- ...lect.95aa3eaf.js => el-select.21d591ff.js} | 2 +- .../{entry.a7eeea30.js => entry.ac74755d.js} | 6 +- ...-404.37ae0d90.js => error-404.d146ebf0.js} | 2 +- ...-500.be45470b.js => error-500.8f7c9e78.js} | 2 +- ...eae7994.js => error-component.cbdba60e.js} | 4 +- niucloud/public/web/_nuxt/index.2fdfe942.js | 1 + .../{index.5df2b7ec.js => index.95b7fbc8.js} | 2 +- niucloud/public/web/_nuxt/index.bd7599e3.js | 1 - .../{index.1f4f5490.js => index.f9cd6f66.js} | 2 +- ....vue.250865c9.js => index.vue.8384b162.js} | 2 +- .../{login.19d2084b.js => login.f7857b07.js} | 2 +- ...{member.7491675c.js => member.432706d0.js} | 2 +- ...link.6d6db664.js => nuxt-link.13472e92.js} | 2 +- .../{point.d3c5bbec.js => point.702ec0fe.js} | 2 +- ...ister.f78776f2.js => register.547e1334.js} | 2 +- .../{vnode.d9875469.js => vnode.290de06f.js} | 2 +- niucloud/public/web/index.html | 4 +- 822 files changed, 3324 insertions(+), 1106 deletions(-) create mode 100644 niucloud/app/listener/system/ShowMarketingListener.php create mode 100644 niucloud/app/upgrade/v155/Upgrade.php create mode 100644 niucloud/app/upgrade/v155/upgrade.sql rename niucloud/public/admin/assets/{404-dddd8698.js => 404-4ea20bfc.js} (90%) delete mode 100644 niucloud/public/admin/assets/App-513018ee.js create mode 100644 niucloud/public/admin/assets/App-e76a4de4.js rename niucloud/public/admin/assets/{Verify-7c0933ac.js => Verify-84a5d087.js} (68%) rename niucloud/public/admin/assets/{VerifyPoints-9a93cadb.js => VerifyPoints-4e90120c.js} (62%) rename niucloud/public/admin/assets/{VerifySlide-cb9ff497.js => VerifySlide-1adcfaf7.js} (62%) rename niucloud/public/admin/assets/{access-18c7880b.js => access-68ddd4ed.js} (91%) rename niucloud/public/admin/assets/{access-9529db40.js => access-eb011b16.js} (89%) rename niucloud/public/admin/assets/{access-9519e9a5.js => access-f92517fe.js} (90%) rename niucloud/public/admin/assets/{account-be31da21.js => account-1a980b5f.js} (92%) rename niucloud/public/admin/assets/{add-member-6e5d766e.js => add-member-7835b01d.js} (66%) rename niucloud/public/admin/assets/{add-member.vue_vue_type_script_setup_true_lang-0621e8e6.js => add-member.vue_vue_type_script_setup_true_lang-7c5636c0.js} (90%) rename niucloud/public/admin/assets/{add-table-98480b28.js => add-table-9361ddc4.js} (81%) rename niucloud/public/admin/assets/{add-table.vue_vue_type_script_setup_true_lang-37f9ba5e.js => add-table.vue_vue_type_script_setup_true_lang-f99f2a93.js} (88%) rename niucloud/public/admin/assets/{add-theme-0a92957a.js => add-theme-11f90583.js} (68%) rename niucloud/public/admin/assets/{add-theme.vue_vue_type_script_setup_true_lang-318519cc.js => add-theme.vue_vue_type_script_setup_true_lang-99bb6249.js} (87%) rename niucloud/public/admin/assets/{adminlogin-c3c8ba87.js => adminlogin-2474e44e.js} (51%) rename niucloud/public/admin/assets/{adv-6400df2d.js => adv-3a4a4093.js} (59%) rename niucloud/public/admin/assets/{adv-edit-4c79c3ed.js => adv-edit-1c982547.js} (54%) rename niucloud/public/admin/assets/{adv-edit.vue_vue_type_style_index_0_lang-290d65e9.js => adv-edit.vue_vue_type_style_index_0_lang-8c175746.js} (86%) rename niucloud/public/admin/assets/{adv_position-ffa8f12a.js => adv_position-ac7ae05b.js} (88%) rename niucloud/public/admin/assets/{agreement-1965e3c2.js => agreement-0f301eed.js} (73%) delete mode 100644 niucloud/public/admin/assets/agreement_edit-155d2f03.js create mode 100644 niucloud/public/admin/assets/agreement_edit-333c655b.js delete mode 100644 niucloud/public/admin/assets/aliapp-b0553303.js create mode 100644 niucloud/public/admin/assets/aliapp-d54a887b.js create mode 100644 niucloud/public/admin/assets/app_default-ef62993a.js rename niucloud/public/admin/assets/{app_manage-e19912dc.js => app_manage-cdbb1d82.js} (89%) delete mode 100644 niucloud/public/admin/assets/attachment-07742802.js rename niucloud/public/admin/assets/{attachment-307ebd25.css => attachment-0ee1a416.css} (56%) create mode 100644 niucloud/public/admin/assets/attachment-153bb8c5.js rename niucloud/public/admin/assets/{attachment-942be520.js => attachment-d6e4df9f.js} (77%) create mode 100644 niucloud/public/admin/assets/auth.log-1ac2078a.js delete mode 100644 niucloud/public/admin/assets/auth.log-71585a97.js rename niucloud/public/admin/assets/{authorize-808f7ed5.js => authorize-5a6d8336.js} (97%) delete mode 100644 niucloud/public/admin/assets/backup_records-39d11bf4.js create mode 100644 niucloud/public/admin/assets/backup_records-4a19a30d.css delete mode 100644 niucloud/public/admin/assets/backup_records-4a7bc4d5.css create mode 100644 niucloud/public/admin/assets/backup_records-555fb285.js rename niucloud/public/admin/assets/{balance-7d4b02d1.js => balance-e6c3ecdc.js} (96%) create mode 100644 niucloud/public/admin/assets/benefits-discount-2a5d9b64.js delete mode 100644 niucloud/public/admin/assets/benefits-discount-4c3edaf5.js create mode 100644 niucloud/public/admin/assets/cash_out-4164faaa.css delete mode 100644 niucloud/public/admin/assets/cash_out-57d53511.css rename niucloud/public/admin/assets/{cash_out-734198c8.js => cash_out-65707cf3.js} (93%) rename niucloud/public/admin/assets/{cash_out-e6758bf2.js => cash_out-8fcf4bdf.js} (71%) create mode 100644 niucloud/public/admin/assets/cloud_compile-6bc999c4.js delete mode 100644 niucloud/public/admin/assets/cloud_compile-91abc8ec.js rename niucloud/public/admin/assets/{code-9d8b2523.js => code-bf34d0ac.js} (85%) rename niucloud/public/admin/assets/{commission-269b3499.js => commission-99c39450.js} (82%) rename niucloud/public/admin/assets/{config-ec186cb6.js => config-141950a2.js} (84%) delete mode 100644 niucloud/public/admin/assets/config-22175760.js rename niucloud/public/admin/assets/{config-7e480c88.js => config-5705818e.js} (58%) create mode 100644 niucloud/public/admin/assets/config-a21ba108.js rename niucloud/public/admin/assets/{config-759366c9.js => config-a9feafd3.js} (82%) rename niucloud/public/admin/assets/{config-79ef05a5.js => config-e6aeb7a5.js} (86%) rename niucloud/public/admin/assets/{copyright-59d893d4.js => copyright-2afd3e36.js} (88%) rename niucloud/public/admin/assets/{course-b7374adf.js => course-b80b9931.js} (93%) rename niucloud/public/admin/assets/{course-73e9c4bb.js => course-e8530e11.js} (93%) rename niucloud/public/admin/assets/{course-739d3de5.js => course-ec3ca394.js} (95%) rename niucloud/public/admin/assets/{cron-00e7be81.js => cron-49c3c702.js} (83%) rename niucloud/public/admin/assets/{cron-info-c7ff4e95.js => cron-info-a0848435.js} (80%) rename niucloud/public/admin/assets/{cron-info.vue_vue_type_script_setup_true_lang-d012ad3b.js => cron-info.vue_vue_type_script_setup_true_lang-18efef83.js} (90%) rename niucloud/public/admin/assets/{vue-web-terminal-2438a051.js => dark-83a8ed60.js} (93%) rename niucloud/public/admin/assets/{detail-form-image-fd41c9b2.js => detail-form-image-3db03365.js} (85%) rename niucloud/public/admin/assets/{detail-form-render-55c00335.js => detail-form-render-7c332561.js} (86%) rename niucloud/public/admin/assets/{detail-member-1ea6c8de.js => detail-member-782c8b57.js} (53%) delete mode 100644 niucloud/public/admin/assets/detail-member.vue_vue_type_style_index_0_lang-1445f617.js create mode 100644 niucloud/public/admin/assets/detail-member.vue_vue_type_style_index_0_lang-8151ede9.js rename niucloud/public/admin/assets/{detection-246cc612.js => detection-37685ea2.js} (93%) rename niucloud/public/admin/assets/{developer_token-12dd8c0e.js => developer_token-e0a5518d.js} (73%) rename niucloud/public/admin/assets/{dict-896816bc.js => dict-b701ea87.js} (89%) rename niucloud/public/admin/assets/{dict-8a2367a5.js => dict-c4280ace.js} (70%) rename niucloud/public/admin/assets/{dict.vue_vue_type_style_index_0_lang-235a1cec.js => dict.vue_vue_type_style_index_0_lang-4589d3ce.js} (75%) delete mode 100644 niucloud/public/admin/assets/diy-17e91366.js rename niucloud/public/admin/assets/{diy-9db2525d.js => diy-ba9878e3.js} (96%) create mode 100644 niucloud/public/admin/assets/diy-e412e4fe.js create mode 100644 niucloud/public/admin/assets/diy.edit-4c63a864.js delete mode 100644 niucloud/public/admin/assets/diy.edit-5e332d68.js delete mode 100644 niucloud/public/admin/assets/diy_form-85a10031.js create mode 100644 niucloud/public/admin/assets/diy_form-b86ec360.js rename niucloud/public/admin/assets/{diy_form.edit-62033e52.js => diy_form.edit-462b3d62.js} (98%) rename niucloud/public/admin/assets/{dict-1c99c58d.css => edit-1c99c58d.css} (100%) rename niucloud/public/admin/assets/{edit-6c0d597f.js => edit-2608b72c.js} (82%) create mode 100644 niucloud/public/admin/assets/edit-2c23c5c6.js rename niucloud/public/admin/assets/{edit-b6f95122.js => edit-4420abf8.js} (78%) delete mode 100644 niucloud/public/admin/assets/edit-5161c2c4.js rename niucloud/public/admin/assets/{edit-1cd1062f.js => edit-75e8d9bf.js} (61%) rename niucloud/public/admin/assets/{edit-active-cube-ea6531cb.js => edit-active-cube-e7b0d017.js} (89%) rename niucloud/public/admin/assets/{edit-associated-03b41d3e.js => edit-associated-7253668f.js} (75%) rename niucloud/public/admin/assets/{edit-associated.vue_vue_type_script_setup_true_async_true_lang-23a3b65e.js => edit-associated.vue_vue_type_script_setup_true_async_true_lang-822e59fc.js} (90%) rename niucloud/public/admin/assets/{edit-carousel-search-e1f48f71.js => edit-carousel-search-c0a45390.js} (89%) rename niucloud/public/admin/assets/{edit-10bbe461.js => edit-d0175321.js} (70%) rename niucloud/public/admin/assets/{edit-f5951c85.js => edit-d163aec9.js} (79%) rename niucloud/public/admin/assets/{edit-f829ae29.js => edit-dc134f7a.js} (51%) rename niucloud/public/admin/assets/{edit-draw-a83bdbe7.js => edit-draw-3bcfaf2a.js} (64%) delete mode 100644 niucloud/public/admin/assets/edit-float-btn-119f7914.js create mode 100644 niucloud/public/admin/assets/edit-float-btn-d4e1708c.js rename niucloud/public/admin/assets/{edit-form-address-eaa0bc59.js => edit-form-address-b2f59e0f.js} (57%) delete mode 100644 niucloud/public/admin/assets/edit-form-checkbox-2a0fc9bc.js create mode 100644 niucloud/public/admin/assets/edit-form-checkbox-3d302028.js rename niucloud/public/admin/assets/{edit-form-date-d4986b21.js => edit-form-date-c82a65dd.js} (84%) rename niucloud/public/admin/assets/{edit-form-date-scope-2a06f2ed.js => edit-form-date-scope-4a53ba95.js} (86%) rename niucloud/public/admin/assets/{edit-form-email-bd8ea8dd.js => edit-form-email-dd081a7a.js} (72%) rename niucloud/public/admin/assets/{edit-form-file-2d59f87e.js => edit-form-file-fe66bba6.js} (50%) rename niucloud/public/admin/assets/{edit-form-identity-134556cb.js => edit-form-identity-6391565d.js} (83%) rename niucloud/public/admin/assets/{edit-form-image-c4f7ee37.js => edit-form-image-48c9a455.js} (71%) rename niucloud/public/admin/assets/{edit-form-input-23bdf955.js => edit-form-input-df4d4363.js} (71%) rename niucloud/public/admin/assets/{edit-form-location-cc091f51.js => edit-form-location-c57b34b6.js} (75%) rename niucloud/public/admin/assets/{edit-form-mobile-fd16d52f.js => edit-form-mobile-31097b34.js} (83%) rename niucloud/public/admin/assets/{edit-form-number-3735a1cf.js => edit-form-number-39581975.js} (66%) delete mode 100644 niucloud/public/admin/assets/edit-form-radio-9305698d.js create mode 100644 niucloud/public/admin/assets/edit-form-radio-99514d85.js rename niucloud/public/admin/assets/{edit-form-submit-411cb58b.js => edit-form-submit-72f99bf6.js} (84%) rename niucloud/public/admin/assets/{edit-form-table-3caaa071.js => edit-form-table-ac8b1bf7.js} (85%) rename niucloud/public/admin/assets/{edit-form-textarea-7d7e4601.js => edit-form-textarea-e8bd8efc.js} (67%) rename niucloud/public/admin/assets/{edit-form-time-842be722.js => edit-form-time-53cbee0c.js} (81%) rename niucloud/public/admin/assets/{edit-form-time-scope-c0b487b9.js => edit-form-time-scope-b116a72e.js} (89%) rename niucloud/public/admin/assets/{edit-form-video-3b3c26ca.js => edit-form-video-e0677f78.js} (70%) rename niucloud/public/admin/assets/{edit-form-wechat-name-05d98f52.js => edit-form-wechat-name-1c905fea.js} (72%) rename niucloud/public/admin/assets/{edit-friendspay-message-3eac9b66.js => edit-friendspay-message-5984a00d.js} (66%) rename niucloud/public/admin/assets/{edit-friendspay-money-70dc588b.js => edit-friendspay-money-7f380914.js} (65%) rename niucloud/public/admin/assets/{edit-graphic-nav-974c27a5.js => edit-graphic-nav-8794ad38.js} (91%) rename niucloud/public/admin/assets/{edit-headimg-b3fbe428.js => edit-headimg-f0cb5189.js} (90%) rename niucloud/public/admin/assets/{edit-horz-blank-1743fabd.js => edit-horz-blank-d1298573.js} (66%) rename niucloud/public/admin/assets/{edit-horz-line-307c0d1f.js => edit-horz-line-1246d346.js} (85%) rename niucloud/public/admin/assets/{edit-hot-area-4082c593.js => edit-hot-area-a7807e51.js} (85%) rename niucloud/public/admin/assets/{edit-image-ads-ae7c80a5.js => edit-image-ads-87fdaeb4.js} (72%) rename niucloud/public/admin/assets/{edit-image-a06c5f45.js => edit-image-e91abe32.js} (67%) rename niucloud/public/admin/assets/{edit-label-1ebf8782.js => edit-label-289a073f.js} (66%) rename niucloud/public/admin/assets/{edit-label.vue_vue_type_script_setup_true_lang-8e98a16b.js => edit-label.vue_vue_type_script_setup_true_lang-be5fba4c.js} (76%) rename niucloud/public/admin/assets/{edit-member-353ee42c.js => edit-member-1b922747.js} (65%) rename niucloud/public/admin/assets/{edit-member-info-5aa25623.js => edit-member-info-9b8f36cf.js} (68%) rename niucloud/public/admin/assets/{edit-member-level-8b445534.js => edit-member-level-ba61ae29.js} (93%) create mode 100644 niucloud/public/admin/assets/edit-member.vue_vue_type_script_setup_true_lang-7e54db71.js delete mode 100644 niucloud/public/admin/assets/edit-member.vue_vue_type_script_setup_true_lang-f57e7a7c.js rename niucloud/public/admin/assets/{edit-menu-c24df583.js => edit-menu-598b8a0c.js} (66%) delete mode 100644 niucloud/public/admin/assets/edit-menu.vue_vue_type_script_setup_true_lang-87600218.js create mode 100644 niucloud/public/admin/assets/edit-menu.vue_vue_type_script_setup_true_lang-bbf234ed.js rename niucloud/public/admin/assets/{edit-nickname-b118de03.js => edit-nickname-632d8b0a.js} (87%) rename niucloud/public/admin/assets/{edit-notice-6bab6d03.js => edit-notice-2f1d219c.js} (89%) create mode 100644 niucloud/public/admin/assets/edit-page-200aaf74.js rename niucloud/public/admin/assets/{edit-page-7ed95b1e.js => edit-page-89ace8e9.js} (81%) delete mode 100644 niucloud/public/admin/assets/edit-page-cc8339f3.js rename niucloud/public/admin/assets/{edit-picture-show-94bf1989.js => edit-picture-show-85a8e95a.js} (95%) rename niucloud/public/admin/assets/{edit-qrcode-2a19f515.js => edit-qrcode-36d32acc.js} (64%) rename niucloud/public/admin/assets/{edit-rich-text-11f8f182.js => edit-rich-text-60ec5604.js} (76%) rename niucloud/public/admin/assets/{edit-role-78eb0258.js => edit-role-f0867f4e.js} (80%) create mode 100644 niucloud/public/admin/assets/edit-role.vue_vue_type_script_setup_true_async_true_lang-985247f9.js delete mode 100644 niucloud/public/admin/assets/edit-role.vue_vue_type_script_setup_true_async_true_lang-a8bb0b16.js rename niucloud/public/admin/assets/{edit-rubik-cube-930ca817.js => edit-rubik-cube-8ef6b591.js} (89%) rename niucloud/public/admin/assets/{edit-text-d2f3fbb4.js => edit-text-bd72e0fb.js} (94%) rename niucloud/public/admin/assets/{edit-text-69186b04.js => edit-text-efac261c.js} (89%) rename niucloud/public/admin/assets/{edit-theme-01e02d0b.js => edit-theme-64fed815.js} (68%) rename niucloud/public/admin/assets/{edit-theme.vue_vue_type_script_setup_true_lang-a645a339.js => edit-theme.vue_vue_type_script_setup_true_lang-742c68e4.js} (77%) rename niucloud/public/admin/assets/{edit-user-5e2e1f5d.js => edit-user-fafd36a5.js} (60%) rename niucloud/public/admin/assets/{edit-user.vue_vue_type_script_setup_true_lang-01cb2090.js => edit-user.vue_vue_type_script_setup_true_lang-d38e50d0.js} (86%) rename niucloud/public/admin/assets/{edit-verify-0dab8730.js => edit-verify-3e96cbb6.js} (82%) rename niucloud/public/admin/assets/{edit-verify.vue_vue_type_script_setup_true_async_true_lang-dd287230.js => edit-verify.vue_vue_type_script_setup_true_async_true_lang-3ba717cd.js} (88%) rename niucloud/public/admin/assets/{edit-view-type-31ab8b58.js => edit-view-type-5974a597.js} (72%) rename niucloud/public/admin/assets/{edit-view-type.vue_vue_type_script_setup_true_async_true_lang-da582668.js => edit-view-type.vue_vue_type_script_setup_true_async_true_lang-404bb72c.js} (90%) rename niucloud/public/admin/assets/{edit.vue_vue_type_style_index_0_lang-2b6c72a8.js => edit.vue_vue_type_style_index_0_lang-e44e7fc9.js} (93%) rename niucloud/public/admin/assets/{edit_personal-fe4369d3.js => edit_personal-f5aa6c96.js} (83%) rename niucloud/public/admin/assets/{export-8f5a57f3.js => export-ff0eec51.js} (77%) rename niucloud/public/admin/assets/{form-select-content-eca6d53b.js => form-select-content-cc844e5a.js} (85%) rename niucloud/public/admin/assets/{form-spread-popup-f6ed5761.js => form-spread-popup-7ecb169e.js} (65%) rename niucloud/public/admin/assets/{form-submit-popup-8706a55d.js => form-submit-popup-5fe93075.js} (97%) rename niucloud/public/admin/assets/{form-write-popup-71634658.js => form-write-popup-f333ad16.js} (69%) rename niucloud/public/admin/assets/{form-write-popup.vue_vue_type_style_index_0_lang-faceaabf.js => form-write-popup.vue_vue_type_style_index_0_lang-a02e5e5f.js} (83%) rename niucloud/public/admin/assets/{friendly-link-edit-cc86a716.js => friendly-link-edit-4dc2c6a0.js} (62%) rename niucloud/public/admin/assets/{friendly-link-edit.vue_vue_type_style_index_0_lang-09b2250c.js => friendly-link-edit.vue_vue_type_style_index_0_lang-0734a84d.js} (82%) rename niucloud/public/admin/assets/{friendly_link-bc9c7ae5.js => friendly_link-2d6918c8.js} (81%) rename niucloud/public/admin/assets/{gift-balance-6d487596.js => gift-balance-f3695181.js} (69%) rename niucloud/public/admin/assets/{gift-point-e9b49ca3.js => gift-point-de42d01e.js} (89%) rename niucloud/public/admin/assets/{growth-c17e39d7.js => growth-b3abd1fb.js} (92%) rename niucloud/public/admin/assets/{growth-rule-register-547f0891.js => growth-rule-register-acd43525.js} (56%) delete mode 100644 niucloud/public/admin/assets/growth_rule-19873b55.js create mode 100644 niucloud/public/admin/assets/growth_rule-7bb8cf2e.js create mode 100644 niucloud/public/admin/assets/index-06cf7cb8.js create mode 100644 niucloud/public/admin/assets/index-0dcbf74f.js delete mode 100644 niucloud/public/admin/assets/index-158186c7.js create mode 100644 niucloud/public/admin/assets/index-1752f4b7.js delete mode 100644 niucloud/public/admin/assets/index-1f52aff1.css rename niucloud/public/admin/assets/{index-375dc7ce.js => index-24bb50c1.js} (60%) rename niucloud/public/admin/assets/{index-64c763fa.js => index-29047b63.js} (57%) delete mode 100644 niucloud/public/admin/assets/index-2a19a473.js create mode 100644 niucloud/public/admin/assets/index-2f1eedd5.js rename niucloud/public/admin/assets/{index-f2b08d88.js => index-364de374.js} (89%) delete mode 100644 niucloud/public/admin/assets/index-3a3a07be.js rename niucloud/public/admin/assets/{index-def9af72.js => index-3e5186f6.js} (99%) delete mode 100644 niucloud/public/admin/assets/index-455f68a7.js rename niucloud/public/admin/assets/{index-b3926957.js => index-49c9b255.js} (56%) rename niucloud/public/admin/assets/{index-c42022e4.js => index-54e51196.js} (50%) delete mode 100644 niucloud/public/admin/assets/index-568a9c0f.js rename niucloud/public/admin/assets/{index-3ac417de.css => index-5795b1d5.css} (85%) delete mode 100644 niucloud/public/admin/assets/index-5a680c44.js rename niucloud/public/admin/assets/{index-0ad67b0e.js => index-606c6286.js} (75%) delete mode 100644 niucloud/public/admin/assets/index-627b9e4a.js rename niucloud/public/admin/assets/{index-fef3b0b8.js => index-6c83e205.js} (51%) delete mode 100644 niucloud/public/admin/assets/index-6f3b958f.js delete mode 100644 niucloud/public/admin/assets/index-76d8ad7e.js delete mode 100644 niucloud/public/admin/assets/index-7a3a4168.css rename niucloud/public/admin/assets/{index-325dfaac.js => index-7c108698.js} (50%) create mode 100644 niucloud/public/admin/assets/index-7f121e53.css delete mode 100644 niucloud/public/admin/assets/index-83c3ad49.js delete mode 100644 niucloud/public/admin/assets/index-84130c47.css rename niucloud/public/admin/assets/{index-f4e0ce84.js => index-86c7db3b.js} (50%) rename niucloud/public/admin/assets/{index-43235816.js => index-9b615147.js} (78%) create mode 100644 niucloud/public/admin/assets/index-a4ace02e.js delete mode 100644 niucloud/public/admin/assets/index-a796d0a1.js create mode 100644 niucloud/public/admin/assets/index-a7dbd031.js rename niucloud/public/admin/assets/{index-3a7858cb.js => index-aff9265a.js} (88%) create mode 100644 niucloud/public/admin/assets/index-b57321cf.js rename niucloud/public/admin/assets/{index-0343fd6e.js => index-b61a9a6f.js} (92%) rename niucloud/public/admin/assets/{index-3f6ca90a.js => index-b7d0aef4.js} (50%) create mode 100644 niucloud/public/admin/assets/index-b8e21b3f.js rename niucloud/public/admin/assets/{index-845c3eac.js => index-cba7bc25.js} (99%) delete mode 100644 niucloud/public/admin/assets/index-cc4a5c16.js create mode 100644 niucloud/public/admin/assets/index-d26bf7a9.js create mode 100644 niucloud/public/admin/assets/index-d3e6f02b.css rename niucloud/public/admin/assets/{index-bb45962d.js => index-d5e0e7ce.js} (51%) create mode 100644 niucloud/public/admin/assets/index-d6634cb6.css create mode 100644 niucloud/public/admin/assets/index-d948eae0.js create mode 100644 niucloud/public/admin/assets/index-d97ddbad.js create mode 100644 niucloud/public/admin/assets/index-d9c1384d.js delete mode 100644 niucloud/public/admin/assets/index-dbbdbe84.js rename niucloud/public/admin/assets/{index-7b16809d.js => index-dd34c985.js} (62%) create mode 100644 niucloud/public/admin/assets/index-de471a9b.js rename niucloud/public/admin/assets/{index-91585447.js => index-e1ac4e63.js} (60%) rename niucloud/public/admin/assets/{index-73278922.js => index-e2983ebd.js} (87%) rename niucloud/public/admin/assets/{index-e5242013.js => index-e940c5e1.js} (52%) create mode 100644 niucloud/public/admin/assets/index-ea035854.js delete mode 100644 niucloud/public/admin/assets/index-efcdf6ce.js rename niucloud/public/admin/assets/{index-e05985b6.js => index-f99f26c5.js} (89%) rename niucloud/public/admin/assets/{index.vue_vue_type_script_setup_true_lang-6019c80d.js => index.vue_vue_type_script_setup_true_lang-4749fc98.js} (66%) rename niucloud/public/admin/assets/{index.vue_vue_type_script_setup_true_lang-41313d1e.js => index.vue_vue_type_script_setup_true_lang-5c0ce90b.js} (86%) rename niucloud/public/admin/assets/{index.vue_vue_type_script_setup_true_lang-af8a6afb.js => index.vue_vue_type_script_setup_true_lang-6dd89d68.js} (59%) rename niucloud/public/admin/assets/{index.vue_vue_type_script_setup_true_lang-de519c71.js => index.vue_vue_type_script_setup_true_lang-72e25793.js} (65%) rename niucloud/public/admin/assets/{index.vue_vue_type_script_setup_true_lang-6bf0570d.js => index.vue_vue_type_script_setup_true_lang-9f643360.js} (90%) rename niucloud/public/admin/assets/{index.vue_vue_type_script_setup_true_lang-7d319548.js => index.vue_vue_type_script_setup_true_lang-b1bfcd32.js} (99%) rename niucloud/public/admin/assets/{index.vue_vue_type_script_setup_true_lang-1bf7c902.js => index.vue_vue_type_script_setup_true_lang-db003204.js} (60%) create mode 100644 niucloud/public/admin/assets/index.vue_vue_type_style_index_0_lang-1f18f008.js rename niucloud/public/admin/assets/{index.vue_vue_type_style_index_0_lang-108e1482.js => index.vue_vue_type_style_index_0_lang-4470b995.js} (75%) delete mode 100644 niucloud/public/admin/assets/index.vue_vue_type_style_index_0_lang-4584aedc.js rename niucloud/public/admin/assets/{index.vue_vue_type_style_index_0_lang-0aa9ed6b.js => index.vue_vue_type_style_index_0_lang-5728e7cf.js} (90%) create mode 100644 niucloud/public/admin/assets/index.vue_vue_type_style_index_0_lang-61ec4eeb.js delete mode 100644 niucloud/public/admin/assets/index.vue_vue_type_style_index_0_lang-6860038b.js create mode 100644 niucloud/public/admin/assets/index.vue_vue_type_style_index_0_lang-cdc3a85e.js rename niucloud/public/admin/assets/{index.vue_vue_type_style_index_0_lang-2cf9a8b2.js => index.vue_vue_type_style_index_0_lang-ec1fea3a.js} (77%) delete mode 100644 niucloud/public/admin/assets/index.vue_vue_type_style_index_0_lang-fa4e0735.js rename niucloud/public/admin/assets/{keyword_reply_edit-d54dfbb5.js => keyword_reply_edit-12b18b8d.js} (77%) rename niucloud/public/admin/assets/{label-ffe7473b.js => label-333137ac.js} (87%) rename niucloud/public/admin/assets/{layout-setting-9d0198ca.js => layout-setting-36ec9cf5.js} (91%) rename niucloud/public/admin/assets/{layout-setting-20d0c27a.js => layout-setting-89cf9be2.js} (91%) rename niucloud/public/admin/assets/{level-347787dc.js => level-c7f239eb.js} (92%) rename niucloud/public/admin/assets/{level_edit-53e59fee.js => level_edit-71cfa083.js} (82%) delete mode 100644 niucloud/public/admin/assets/list-06e45cf2.js rename niucloud/public/admin/assets/{list-fcbb0a3b.js => list-3ed583e8.js} (64%) rename niucloud/public/admin/assets/{list-f0365979.js => list-44cc2b15.js} (89%) create mode 100644 niucloud/public/admin/assets/list-5b3ef7be.js rename niucloud/public/admin/assets/{list-ceca54f6.js => list-c916c20e.js} (84%) rename niucloud/public/admin/assets/{list-35e1529d.js => list-fe3d6f63.js} (82%) delete mode 100644 niucloud/public/admin/assets/log-14d78f48.js create mode 100644 niucloud/public/admin/assets/log-9c8e6639.js delete mode 100644 niucloud/public/admin/assets/login-2eee3e1b.js create mode 100644 niucloud/public/admin/assets/login-41275bea.js rename niucloud/public/admin/assets/{map-74687cab.js => map-1687fc70.js} (82%) create mode 100644 niucloud/public/admin/assets/marketing-2a0a495b.css create mode 100644 niucloud/public/admin/assets/marketing-bd91818e.js delete mode 100644 niucloud/public/admin/assets/member-54a5604a.js create mode 100644 niucloud/public/admin/assets/member-688a285d.js rename niucloud/public/admin/assets/{member-85eebbae.js => member-83732911.js} (71%) create mode 100644 niucloud/public/admin/assets/member-8ba4505e.js create mode 100644 niucloud/public/admin/assets/member-a7a443ec.js rename niucloud/public/admin/assets/{member-balance-edit-9201df7c.js => member-balance-edit-f0d2092e.js} (76%) rename niucloud/public/admin/assets/{member-balance-edit.vue_vue_type_script_setup_true_lang-b64a618f.js => member-balance-edit.vue_vue_type_script_setup_true_lang-f8930d41.js} (73%) rename niucloud/public/admin/assets/{member-balance-info-10b242fb.js => member-balance-info-d42017b9.js} (82%) rename niucloud/public/admin/assets/{member-balance-info.vue_vue_type_script_setup_true_lang-6c6c11bc.js => member-balance-info.vue_vue_type_script_setup_true_lang-10227e48.js} (90%) create mode 100644 niucloud/public/admin/assets/member-benefits-1dca655a.js delete mode 100644 niucloud/public/admin/assets/member-benefits-5e936039.js delete mode 100644 niucloud/public/admin/assets/member-benefits.vue_vue_type_script_setup_true_lang-48442b45.js create mode 100644 niucloud/public/admin/assets/member-benefits.vue_vue_type_script_setup_true_lang-d8f2ea98.js rename niucloud/public/admin/assets/{member-commission-info-3068d4fe.js => member-commission-info-38953fe3.js} (82%) rename niucloud/public/admin/assets/{member-commission-info.vue_vue_type_script_setup_true_lang-3b76d8c3.js => member-commission-info.vue_vue_type_script_setup_true_lang-d8767ae5.js} (90%) delete mode 100644 niucloud/public/admin/assets/member-e2c57cc1.js delete mode 100644 niucloud/public/admin/assets/member-eb364a0b.js create mode 100644 niucloud/public/admin/assets/member-gift-ab2fba32.js delete mode 100644 niucloud/public/admin/assets/member-gift-f01c339b.js delete mode 100644 niucloud/public/admin/assets/member-gift.vue_vue_type_script_setup_true_lang-0129879c.js create mode 100644 niucloud/public/admin/assets/member-gift.vue_vue_type_script_setup_true_lang-68fa07d1.js rename niucloud/public/admin/assets/{member-money-info-457b4b68.js => member-money-info-8bf7c4ca.js} (89%) rename niucloud/public/admin/assets/{member-point-edit-14b52809.js => member-point-edit-144c05a2.js} (76%) create mode 100644 niucloud/public/admin/assets/member-point-edit.vue_vue_type_script_setup_true_lang-9bd62428.js delete mode 100644 niucloud/public/admin/assets/member-point-edit.vue_vue_type_script_setup_true_lang-d2420e12.js rename niucloud/public/admin/assets/{member-point-info-6e263ba6.js => member-point-info-1c2a8e78.js} (82%) rename niucloud/public/admin/assets/{member-point-info.vue_vue_type_script_setup_true_lang-f8ad39ae.js => member-point-info.vue_vue_type_script_setup_true_lang-3ec06dd9.js} (90%) create mode 100644 niucloud/public/admin/assets/member.member-8fdc51e9.js delete mode 100644 niucloud/public/admin/assets/member.member-9c7d2d43.js create mode 100644 niucloud/public/admin/assets/member.member_detail-e509facb.js delete mode 100644 niucloud/public/admin/assets/member.member_detail-e886a35c.js create mode 100644 niucloud/public/admin/assets/member_detail-13d2187e.js delete mode 100644 niucloud/public/admin/assets/member_detail-45612112.js create mode 100644 niucloud/public/admin/assets/member_detail-89d9f097.css delete mode 100644 niucloud/public/admin/assets/member_detail-b89e45de.css rename niucloud/public/admin/assets/{menu-0addcd33.js => menu-04ae38bb.js} (87%) rename niucloud/public/admin/assets/{menu-1bb71d5f.js => menu-05fe8cd7.js} (78%) rename niucloud/public/admin/assets/{menu-form-7ff9a1f9.js => menu-form-7fb0078c.js} (80%) rename niucloud/public/admin/assets/{menu-form.vue_vue_type_script_setup_true_lang-2aad6bbc.js => menu-form.vue_vue_type_script_setup_true_lang-48f38e26.js} (83%) delete mode 100644 niucloud/public/admin/assets/menu-item-07d6ab2c.js create mode 100644 niucloud/public/admin/assets/menu-item-2a33b930.js create mode 100644 niucloud/public/admin/assets/menu-item-47b58e97.js delete mode 100644 niucloud/public/admin/assets/menu-item-77968513.js rename niucloud/public/admin/assets/{menu-item.vue_vue_type_style_index_0_lang-f7258de5.js => menu-item.vue_vue_type_style_index_0_lang-056e5d63.js} (61%) delete mode 100644 niucloud/public/admin/assets/menu-item.vue_vue_type_style_index_0_lang-4e95fedf.js create mode 100644 niucloud/public/admin/assets/menu-item.vue_vue_type_style_index_0_lang-e0111271.js rename niucloud/public/admin/assets/{module-75300b78.js => module-f77f0a65.js} (87%) rename niucloud/public/admin/assets/{nav-b5cfd8b9.js => nav-bc1d29b8.js} (89%) rename niucloud/public/admin/assets/{nav-edit-5779847f.js => nav-edit-1866f8b0.js} (50%) rename niucloud/public/admin/assets/{nav-edit.vue_vue_type_style_index_0_lang-c2f035ba.js => nav-edit.vue_vue_type_style_index_0_lang-8c054f8c.js} (67%) rename niucloud/public/admin/assets/{news-card-2267e939.js => news-card-9c92072b.js} (51%) rename niucloud/public/admin/assets/{news-card.vue_vue_type_script_setup_true_lang-3f5ca148.js => news-card.vue_vue_type_script_setup_true_lang-86e42f8f.js} (82%) rename niucloud/public/admin/assets/{notice-dd7d3a4d.js => notice-ca52b9c8.js} (91%) rename niucloud/public/admin/assets/{notice-19cf93c4.js => notice-fe9f8a40.js} (97%) rename niucloud/public/admin/assets/{notice-records-info-0d8a5381.js => notice-records-info-438dce33.js} (80%) rename niucloud/public/admin/assets/{notice-records-info.vue_vue_type_script_setup_true_lang-15f9b1af.js => notice-records-info.vue_vue_type_script_setup_true_lang-ed3f481e.js} (87%) rename niucloud/public/admin/assets/{notice-sms-1ba0ead3.js => notice-sms-ad6414d9.js} (71%) rename niucloud/public/admin/assets/{notice-sms.vue_vue_type_script_setup_true_lang-dcdd3753.js => notice-sms.vue_vue_type_script_setup_true_lang-392b611e.js} (84%) rename niucloud/public/admin/assets/{notice-weapp-ea1473f5.js => notice-weapp-e97a4785.js} (75%) rename niucloud/public/admin/assets/{notice-weapp.vue_vue_type_script_setup_true_lang-8ecc3d38.js => notice-weapp.vue_vue_type_script_setup_true_lang-a727f35f.js} (84%) rename niucloud/public/admin/assets/{notice-wechat-ddaea889.js => notice-wechat-e25b7ec9.js} (75%) rename niucloud/public/admin/assets/{notice-wechat.vue_vue_type_script_setup_true_lang-ff95ebab.js => notice-wechat.vue_vue_type_script_setup_true_lang-c563cd7a.js} (59%) rename niucloud/public/admin/assets/{notice_records-eeb1e01d.js => notice_records-51f4d444.js} (89%) rename niucloud/public/admin/assets/{offlinepay-ad31e9dd.js => offlinepay-17aa7a24.js} (82%) rename niucloud/public/admin/assets/{pay-0e948cdb.js => pay-0201ce2a.js} (92%) delete mode 100644 niucloud/public/admin/assets/pay-5e0c1e3d.js create mode 100644 niucloud/public/admin/assets/pay-754de72f.js rename niucloud/public/admin/assets/{pay-alipay-222a45f8.js => pay-alipay-9729b59d.js} (92%) rename niucloud/public/admin/assets/{pay-friendspay-496202c6.js => pay-friendspay-b84762b6.js} (82%) rename niucloud/public/admin/assets/{pay-offlinepay-1078a7d6.js => pay-offlinepay-9be33707.js} (96%) rename niucloud/public/admin/assets/{pay-wechatpay-5f3e20e3.js => pay-wechatpay-d8cb05a4.js} (78%) create mode 100644 niucloud/public/admin/assets/pay_detail-404dc275.js delete mode 100644 niucloud/public/admin/assets/pay_detail-d0142901.js rename niucloud/public/admin/assets/{pay_refund-789a6b91.js => pay_refund-e7efbae0.js} (86%) rename niucloud/public/admin/assets/{personal-8fb45ebd.js => personal-7813a3f6.js} (93%) rename niucloud/public/admin/assets/{personal-5fd613a5.js => personal-966b71f6.js} (61%) rename niucloud/public/admin/assets/{point-f90ce00f.js => point-16b6eef2.js} (95%) rename niucloud/public/admin/assets/{point-rule-register-44d5e3a4.js => point-rule-register-4339d43d.js} (52%) create mode 100644 niucloud/public/admin/assets/point_rule-6ad1c7e0.js delete mode 100644 niucloud/public/admin/assets/point_rule-a175eb19.js rename niucloud/public/admin/assets/{poster-df482fa2.js => poster-436c7587.js} (97%) rename niucloud/public/admin/assets/{poster-5f51175a.js => poster-979d105b.js} (92%) rename niucloud/public/admin/assets/{preview-draw-afb1b4fc.js => preview-draw-5db49238.js} (80%) rename niucloud/public/admin/assets/{preview-dae7af73.js => preview-e2d5ec39.js} (59%) rename niucloud/public/admin/assets/{preview-friendspay-message-4dc416e2.js => preview-friendspay-message-430babbc.js} (87%) rename niucloud/public/admin/assets/{preview-friendspay-money-7cc62b12.js => preview-friendspay-money-fc9fff06.js} (87%) rename niucloud/public/admin/assets/{preview-headimg-06e60e28.js => preview-headimg-168bb01f.js} (96%) rename niucloud/public/admin/assets/{preview-image-dabc0ae4.js => preview-image-5ce8a53a.js} (81%) rename niucloud/public/admin/assets/{preview-nickname-756cd9b1.js => preview-nickname-a60259ea.js} (87%) rename niucloud/public/admin/assets/{preview-qrcode-f0a450bf.js => preview-qrcode-e54e4d9b.js} (78%) rename niucloud/public/admin/assets/{preview-text-a0db9206.js => preview-text-fd9ffa31.js} (87%) rename niucloud/public/admin/assets/{printer-8b3d4a3b.js => printer-a8efb34b.js} (95%) create mode 100644 niucloud/public/admin/assets/range-37ff0733.js delete mode 100644 niucloud/public/admin/assets/range-e90b089a.js rename niucloud/public/admin/assets/{records-f0b6500b.js => records-c56c9217.js} (65%) create mode 100644 niucloud/public/admin/assets/records.vue_vue_type_style_index_0_lang-3e338e6a.js delete mode 100644 niucloud/public/admin/assets/records.vue_vue_type_style_index_0_lang-ec4c6a04.js rename niucloud/public/admin/assets/{refund-detail-241780fb.js => refund-detail-92d4f714.js} (60%) create mode 100644 niucloud/public/admin/assets/refund-detail.vue_vue_type_style_index_0_lang-54c2f9a5.js delete mode 100644 niucloud/public/admin/assets/refund-detail.vue_vue_type_style_index_0_lang-a4604ef7.js rename niucloud/public/admin/assets/{refund_detail-85ebf2ce.js => refund_detail-d0c9cef9.js} (81%) rename niucloud/public/admin/assets/{reply-99380ac9.js => reply-1efe51f0.js} (83%) delete mode 100644 niucloud/public/admin/assets/reply-form-87ee7834.js create mode 100644 niucloud/public/admin/assets/reply-form-d3163808.js delete mode 100644 niucloud/public/admin/assets/role-3665f3b4.js create mode 100644 niucloud/public/admin/assets/role-a970c379.js rename niucloud/public/admin/assets/{route-9b719db1.js => route-5f22a1cd.js} (77%) rename niucloud/public/admin/assets/{schedule-e490684b.js => schedule-168dcd79.js} (69%) create mode 100644 niucloud/public/admin/assets/schedule_log-194407ee.js delete mode 100644 niucloud/public/admin/assets/schedule_log-38e4619c.js rename niucloud/public/admin/assets/{select-menu-item-22c482b5.js => select-menu-item-e8c6155f.js} (84%) rename niucloud/public/admin/assets/{select-wechat-media-6969882f.js => select-wechat-media-6aa61dca.js} (70%) rename niucloud/public/admin/assets/{select-wechat-media.vue_vue_type_script_setup_true_lang-5a137a9b.js => select-wechat-media.vue_vue_type_script_setup_true_lang-87ffff78.js} (71%) create mode 100644 niucloud/public/admin/assets/setting.member-6b40eced.js delete mode 100644 niucloud/public/admin/assets/setting.member-fdd021e7.js create mode 100644 niucloud/public/admin/assets/side-b48c3936.js create mode 100644 niucloud/public/admin/assets/side-c3f9b1e9.js delete mode 100644 niucloud/public/admin/assets/side-d69ec3a8.js delete mode 100644 niucloud/public/admin/assets/side-dded0cde.js delete mode 100644 niucloud/public/admin/assets/side.vue_vue_type_style_index_0_lang-7c7c1f53.js create mode 100644 niucloud/public/admin/assets/side.vue_vue_type_style_index_0_lang-86d7e9bc.js delete mode 100644 niucloud/public/admin/assets/side.vue_vue_type_style_index_0_lang-bb0b240d.js create mode 100644 niucloud/public/admin/assets/side.vue_vue_type_style_index_0_lang-bec1d3bc.js create mode 100644 niucloud/public/admin/assets/sign-continue-30d64fdf.css delete mode 100644 niucloud/public/admin/assets/sign-continue-551ac63b.js create mode 100644 niucloud/public/admin/assets/sign-continue-9a2704bc.js delete mode 100644 niucloud/public/admin/assets/sign-continue-c2bb25fd.css create mode 100644 niucloud/public/admin/assets/sign-day-806037d7.js delete mode 100644 niucloud/public/admin/assets/sign-day-bc539902.js create mode 100644 niucloud/public/admin/assets/sign_config-09c6013a.css delete mode 100644 niucloud/public/admin/assets/sign_config-a1b6d2c6.css rename niucloud/public/admin/assets/{sign_config-3d87f897.js => sign_config-b50b75b7.js} (94%) rename niucloud/public/admin/assets/{sign_list-9d66183e.js => sign_list-06634079.js} (96%) create mode 100644 niucloud/public/admin/assets/sms-1cb86965.js delete mode 100644 niucloud/public/admin/assets/sms-7102834f.js rename niucloud/public/admin/assets/{sms-ali-75365746.js => sms-ali-e098b74c.js} (92%) rename niucloud/public/admin/assets/{sms-niu-1b823d81.js => sms-niu-74060918.js} (92%) rename niucloud/public/admin/assets/{sms-records-info-2ce908d6.js => sms-records-info-ac10533c.js} (80%) rename niucloud/public/admin/assets/{sms-records-info.vue_vue_type_script_setup_true_lang-2ded98cb.js => sms-records-info.vue_vue_type_script_setup_true_lang-95c41dbf.js} (92%) rename niucloud/public/admin/assets/{sms-tencent-12a286c4.js => sms-tencent-5d776163.js} (93%) rename niucloud/public/admin/assets/{sms_niu-f6b9f284.js => sms_niu-4b07e1ac.js} (69%) rename niucloud/public/admin/assets/{sms_niu_login-20d3be1b.js => sms_niu_login-91dc39fa.js} (60%) create mode 100644 niucloud/public/admin/assets/sms_niu_login.vue_vue_type_script_setup_true_lang-3cb179cd.js delete mode 100644 niucloud/public/admin/assets/sms_niu_login.vue_vue_type_script_setup_true_lang-3cefd0a3.js rename niucloud/public/admin/assets/{sms_niu_pay_result-b7cf4af1.js => sms_niu_pay_result-6ca04bfc.js} (73%) rename niucloud/public/admin/assets/{sms_recharge-e81123bb.js => sms_recharge-7a8cc25d.js} (80%) rename niucloud/public/admin/assets/{sms_recharge-9cb343bc.css => sms_recharge-8aaa62ce.css} (50%) rename niucloud/public/admin/assets/{sms_recharge_record-79a1a10e.js => sms_recharge_record-5473d4ff.js} (82%) rename niucloud/public/admin/assets/{sms_recharge_record.vue_vue_type_script_setup_true_lang-8afecc34.js => sms_recharge_record.vue_vue_type_script_setup_true_lang-3fd0a97c.js} (86%) rename niucloud/public/admin/assets/{sms_records-59c02f51.js => sms_records-ec3b9ef9.js} (95%) rename niucloud/public/admin/assets/{sms_send-ebb1863e.js => sms_send-5d9feba6.js} (80%) rename niucloud/public/admin/assets/{sms_send.vue_vue_type_script_setup_true_lang-853c9b21.js => sms_send.vue_vue_type_script_setup_true_lang-30f1c3a3.js} (88%) rename niucloud/public/admin/assets/{sms_signature-af299086.js => sms_signature-78845595.js} (58%) rename niucloud/public/admin/assets/{sms_signature.vue_vue_type_script_setup_true_lang-30880f4b.js => sms_signature.vue_vue_type_script_setup_true_lang-91274e09.js} (77%) rename niucloud/public/admin/assets/{sms_template-e6e4aeba.js => sms_template-7bbb1b39.js} (85%) rename niucloud/public/admin/assets/{sms_template.vue_vue_type_script_setup_true_lang-9b9a1bd3.js => sms_template.vue_vue_type_script_setup_true_lang-a8e8a8f4.js} (81%) delete mode 100644 niucloud/public/admin/assets/storage-86fb1b4c.js create mode 100644 niucloud/public/admin/assets/storage-abde39ec.js rename niucloud/public/admin/assets/{storage-ali-91590055.js => storage-ali-5c065efd.js} (83%) rename niucloud/public/admin/assets/{storage-local-51dc36c9.js => storage-local-e210412d.js} (68%) delete mode 100644 niucloud/public/admin/assets/storage-qiniu-4446343e.js create mode 100644 niucloud/public/admin/assets/storage-qiniu-c5fe741b.js delete mode 100644 niucloud/public/admin/assets/storage-tencent-34c77286.js create mode 100644 niucloud/public/admin/assets/storage-tencent-35bf37a3.js delete mode 100644 niucloud/public/admin/assets/store-4e020d90.js delete mode 100644 niucloud/public/admin/assets/store-c1245c58.css create mode 100644 niucloud/public/admin/assets/store-d12d0113.js create mode 100644 niucloud/public/admin/assets/store-e510a652.css delete mode 100644 niucloud/public/admin/assets/switch-lang-07e55a44.js create mode 100644 niucloud/public/admin/assets/switch-lang-2c881054.js delete mode 100644 niucloud/public/admin/assets/switch-lang-402f2cf0.js create mode 100644 niucloud/public/admin/assets/switch-lang-b2c7ecd2.js delete mode 100644 niucloud/public/admin/assets/sys-5553c504.js create mode 100644 niucloud/public/admin/assets/sys-c0964254.js delete mode 100644 niucloud/public/admin/assets/system-980c7b11.js create mode 100644 niucloud/public/admin/assets/system-eb083e7f.js rename niucloud/public/admin/assets/{tabbar-26a76edb.js => tabbar-34d1e749.js} (92%) rename niucloud/public/admin/assets/{tabbar_edit-1cee05e6.js => tabbar_edit-51e7d2fa.js} (66%) rename niucloud/public/admin/assets/{tabs-159ad055.js => tabs-418cf5ed.js} (57%) rename niucloud/public/admin/assets/{tabs-9686334c.js => tabs-61f8ec3d.js} (57%) rename niucloud/public/admin/assets/{template-9ce61014.js => template-2bc9d0e9.js} (80%) create mode 100644 niucloud/public/admin/assets/template-976997a3.js delete mode 100644 niucloud/public/admin/assets/template-d26d89ce.js rename niucloud/public/admin/assets/{template_edit-ba84ee11.js => template_edit-244fcc03.js} (83%) rename niucloud/public/admin/assets/{template_list-b414be53.js => template_list-d1fca4ed.js} (75%) rename niucloud/public/admin/assets/{theme-list-f08ac484.js => theme-list-ee7ebefe.js} (70%) rename niucloud/public/admin/assets/{theme_style-ed9540c2.js => theme_style-18c8f058.js} (76%) rename niucloud/public/admin/assets/{tools-dd44aaeb.js => tools-d7b5f3fa.js} (95%) rename niucloud/public/admin/assets/{transfer-62b5ea6a.js => transfer-e59ba780.js} (79%) rename niucloud/public/admin/assets/{transfer_scene-5da77696.js => transfer_scene-c8f1308b.js} (79%) rename niucloud/public/admin/assets/{updatecache-c3d03348.css => updatecache-008ea5f2.css} (52%) rename niucloud/public/admin/assets/{updatecache-22a14ddb.js => updatecache-0a78513f.js} (73%) create mode 100644 niucloud/public/admin/assets/upgrade-12edd4c8.js rename niucloud/public/admin/assets/{upgrade-c7a67f66.js => upgrade-9f463b51.js} (94%) delete mode 100644 niucloud/public/admin/assets/upgrade-d31f0cc1.js create mode 100644 niucloud/public/admin/assets/upgrade_records-8d57f8c8.js delete mode 100644 niucloud/public/admin/assets/upgrade_records-afa55309.js rename niucloud/public/admin/assets/{upload-media-1e855067.js => upload-media-7086ccef.js} (67%) rename niucloud/public/admin/assets/{upload-media.vue_vue_type_script_setup_true_lang-6bb0165c.js => upload-media.vue_vue_type_script_setup_true_lang-b6f947ca.js} (84%) rename niucloud/public/admin/assets/{user-52f4bece.js => user-447cfff1.js} (90%) rename niucloud/public/admin/assets/{user-f69fc257.js => user-6f2af1d4.js} (89%) delete mode 100644 niucloud/public/admin/assets/user-info-2da95214.js rename niucloud/public/admin/assets/{user-info-ff709d6f.js => user-info-2f444684.js} (83%) delete mode 100644 niucloud/public/admin/assets/user-info-a664f617.css create mode 100644 niucloud/public/admin/assets/user-info-ed2c5fa0.js create mode 100644 niucloud/public/admin/assets/user-info-f705ad90.css rename niucloud/public/admin/assets/{user-log-detail-4e718a24.js => user-log-detail-d9a8d408.js} (60%) delete mode 100644 niucloud/public/admin/assets/user-log-detail.vue_vue_type_script_setup_true_lang-3947de51.js create mode 100644 niucloud/public/admin/assets/user-log-detail.vue_vue_type_script_setup_true_lang-cd57b777.js rename niucloud/public/admin/assets/{verifier-201c9c4c.js => verifier-90e069f6.js} (81%) rename niucloud/public/admin/assets/{verify-0306afa9.js => verify-6ac0e225.js} (82%) rename niucloud/public/admin/assets/{verify-a9a6aadc.js => verify-8a5b0052.js} (57%) rename niucloud/public/admin/assets/{verify-detail-d5ffd177.js => verify-detail-08581d66.js} (81%) create mode 100644 niucloud/public/admin/assets/verify-detail.vue_vue_type_style_index_0_lang-63dbad41.js delete mode 100644 niucloud/public/admin/assets/verify-detail.vue_vue_type_style_index_0_lang-7fa4077d.js delete mode 100644 niucloud/public/admin/assets/verify_detail-5b8cc1f0.js create mode 100644 niucloud/public/admin/assets/verify_detail-f5f681c9.js delete mode 100644 niucloud/public/admin/assets/weapp-4a0120a8.js create mode 100644 niucloud/public/admin/assets/weapp-6f1d4f67.js rename niucloud/public/admin/assets/{weapp-d1f4d633.js => weapp-a53675ed.js} (92%) rename niucloud/public/admin/assets/{web-3284d14b.js => web-c3b3614b.js} (88%) delete mode 100644 niucloud/public/admin/assets/web-link-7583711a.js create mode 100644 niucloud/public/admin/assets/web-link-7899b4d0.js rename niucloud/public/admin/assets/{web-link.vue_vue_type_style_index_0_lang-e7f33928.js => web-link.vue_vue_type_style_index_0_lang-a93c639f.js} (67%) rename niucloud/public/admin/assets/{wechat-fe9dadcf.js => wechat-73ae38fe.js} (75%) create mode 100644 niucloud/public/static/resource/images/diy_form/diy_form_member_info_preview.jpg create mode 100644 niucloud/public/static/resource/images/marketing/coupon.png create mode 100644 niucloud/public/static/resource/images/marketing/discount.png create mode 100644 niucloud/public/static/resource/images/marketing/exchange.png create mode 100644 niucloud/public/static/resource/images/marketing/goods_rank.png create mode 100644 niucloud/public/static/resource/images/marketing/manjian.png create mode 100644 niucloud/public/static/resource/images/marketing/newcomer.png create mode 100644 niucloud/public/static/resource/images/marketing/sign.png create mode 100644 niucloud/public/static/resource/images/marketing/verifier.png rename niucloud/public/wap/assets/{account-d1c92a6a.css => account-b364ea4c.css} (90%) delete mode 100644 niucloud/public/wap/assets/address-01097245.css create mode 100644 niucloud/public/wap/assets/address-317da341.css create mode 100644 niucloud/public/wap/assets/app-pages-auth-agreement.bbee0b90.js delete mode 100644 niucloud/public/wap/assets/app-pages-auth-agreement.ee39bb7a.js create mode 100644 niucloud/public/wap/assets/app-pages-auth-bind.182ec718.js delete mode 100644 niucloud/public/wap/assets/app-pages-auth-bind.e1fcbaab.js delete mode 100644 niucloud/public/wap/assets/app-pages-auth-index.b13c9677.js create mode 100644 niucloud/public/wap/assets/app-pages-auth-index.e85a2afe.js create mode 100644 niucloud/public/wap/assets/app-pages-auth-login.e7472f31.js delete mode 100644 niucloud/public/wap/assets/app-pages-auth-login.f1df58bb.js delete mode 100644 niucloud/public/wap/assets/app-pages-auth-register.3b122a44.js create mode 100644 niucloud/public/wap/assets/app-pages-auth-register.f88ef37f.js create mode 100644 niucloud/public/wap/assets/app-pages-auth-resetpwd.0368d411.js delete mode 100644 niucloud/public/wap/assets/app-pages-auth-resetpwd.fed796ed.js create mode 100644 niucloud/public/wap/assets/app-pages-friendspay-money.7f16d76b.js delete mode 100644 niucloud/public/wap/assets/app-pages-friendspay-money.badd2ae3.js create mode 100644 niucloud/public/wap/assets/app-pages-friendspay-share.753b597a.js delete mode 100644 niucloud/public/wap/assets/app-pages-friendspay-share.8f25f379.js delete mode 100644 niucloud/public/wap/assets/app-pages-index-close.64c4c7c2.js create mode 100644 niucloud/public/wap/assets/app-pages-index-close.8f3cd8a3.js delete mode 100644 niucloud/public/wap/assets/app-pages-index-diy.5cf4a6a9.js create mode 100644 niucloud/public/wap/assets/app-pages-index-diy.6a163be1.js create mode 100644 niucloud/public/wap/assets/app-pages-index-diy_form.2ebf8ab6.js delete mode 100644 niucloud/public/wap/assets/app-pages-index-diy_form.cd513d47.js create mode 100644 niucloud/public/wap/assets/app-pages-index-diy_form_detail.69e0a1cf.js delete mode 100644 niucloud/public/wap/assets/app-pages-index-diy_form_detail.b197a485.js rename niucloud/public/wap/assets/{app-pages-index-diy_form_result.519fd084.js => app-pages-index-diy_form_result.a9fa0707.js} (51%) delete mode 100644 niucloud/public/wap/assets/app-pages-index-index.31c3f3b5.js create mode 100644 niucloud/public/wap/assets/app-pages-index-index.d30672cf.js delete mode 100644 niucloud/public/wap/assets/app-pages-index-nosite.67d7b663.js create mode 100644 niucloud/public/wap/assets/app-pages-index-nosite.a2e162a8.js delete mode 100644 niucloud/public/wap/assets/app-pages-index-tabbar.38d3a226.js create mode 100644 niucloud/public/wap/assets/app-pages-member-account.70653d03.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-account.d7f73887.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-account_edit.81eb2939.js create mode 100644 niucloud/public/wap/assets/app-pages-member-account_edit.975ba8cb.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-address.88c4d43d.js create mode 100644 niucloud/public/wap/assets/app-pages-member-address.b3d2ad43.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-address_edit.59ff2cd1.js create mode 100644 niucloud/public/wap/assets/app-pages-member-address_edit.b0f45691.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-apply_cash_out.026c0fda.js create mode 100644 niucloud/public/wap/assets/app-pages-member-apply_cash_out.76b43dc5.js create mode 100644 niucloud/public/wap/assets/app-pages-member-balance.303940df.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-balance.40f2495e.js create mode 100644 niucloud/public/wap/assets/app-pages-member-cash_out.65ddb146.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-cash_out.b6db4ac5.js create mode 100644 niucloud/public/wap/assets/app-pages-member-cash_out_detail.4a5bf738.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-cash_out_detail.6de89b3c.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-commission.02b1f00d.js create mode 100644 niucloud/public/wap/assets/app-pages-member-commission.c455a83e.js create mode 100644 niucloud/public/wap/assets/app-pages-member-contact.220fe675.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-contact.f3bd6ffb.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-detailed_account.3720f384.js create mode 100644 niucloud/public/wap/assets/app-pages-member-detailed_account.b69e01b4.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-index.656c892b.js create mode 100644 niucloud/public/wap/assets/app-pages-member-index.b5027401.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-level.93e211d0.js create mode 100644 niucloud/public/wap/assets/app-pages-member-level.f05850c1.js create mode 100644 niucloud/public/wap/assets/app-pages-member-personal.271b665c.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-personal.ffc81c6d.js create mode 100644 niucloud/public/wap/assets/app-pages-member-personal_form.51f28bef.js create mode 100644 niucloud/public/wap/assets/app-pages-member-point.8f434efb.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-point.99482808.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-point_detail.2ebba317.js create mode 100644 niucloud/public/wap/assets/app-pages-member-point_detail.5989527f.js create mode 100644 niucloud/public/wap/assets/app-pages-member-sign_in.e01b50fd.js delete mode 100644 niucloud/public/wap/assets/app-pages-member-sign_in.feab400f.js create mode 100644 niucloud/public/wap/assets/app-pages-pay-browser.138f4b10.js delete mode 100644 niucloud/public/wap/assets/app-pages-pay-browser.3dec4863.js create mode 100644 niucloud/public/wap/assets/app-pages-pay-result.1c87c2a4.js delete mode 100644 niucloud/public/wap/assets/app-pages-pay-result.5e274617.js create mode 100644 niucloud/public/wap/assets/app-pages-setting-index.806c7ae9.js delete mode 100644 niucloud/public/wap/assets/app-pages-setting-index.e7e99fee.js create mode 100644 niucloud/public/wap/assets/app-pages-verify-detail.aef28ef6.js delete mode 100644 niucloud/public/wap/assets/app-pages-verify-detail.b75f0d30.js rename niucloud/public/wap/assets/{app-pages-verify-index.bd6905c9.js => app-pages-verify-index.93678209.js} (66%) delete mode 100644 niucloud/public/wap/assets/app-pages-verify-record.0d079b2d.js create mode 100644 niucloud/public/wap/assets/app-pages-verify-record.71d65d5a.js delete mode 100644 niucloud/public/wap/assets/app-pages-verify-verify.d92ac5e6.js create mode 100644 niucloud/public/wap/assets/app-pages-verify-verify.e021348a.js delete mode 100644 niucloud/public/wap/assets/app-pages-weapp-order_shipping.0a32d365.js create mode 100644 niucloud/public/wap/assets/app-pages-weapp-order_shipping.d498f34b.js delete mode 100644 niucloud/public/wap/assets/app-pages-webview-index.2eb3a5b9.js create mode 100644 niucloud/public/wap/assets/app-pages-webview-index.340db3bb.js rename niucloud/public/wap/assets/{apply_cash_out-05443b7e.css => apply_cash_out-83fd024f.css} (55%) delete mode 100644 niucloud/public/wap/assets/area-select.vue_vue_type_script_setup_true_lang.3d5a1ff1.js create mode 100644 niucloud/public/wap/assets/area-select.vue_vue_type_script_setup_true_lang.fcfc2513.js rename niucloud/public/wap/assets/{cash_out_detail-cbe2ddc5.css => cash_out_detail-c42f6ac3.css} (89%) delete mode 100644 niucloud/public/wap/assets/diy_form-494b77eb.css create mode 100644 niucloud/public/wap/assets/diy_form-bc63289b.css create mode 100644 niucloud/public/wap/assets/diy_form.5542c398.js delete mode 100644 niucloud/public/wap/assets/diy_form.dd1f8c28.js create mode 100644 niucloud/public/wap/assets/index-04a0c64a.css delete mode 100644 niucloud/public/wap/assets/index-08738f49.css delete mode 100644 niucloud/public/wap/assets/index-20d2692d.css create mode 100644 niucloud/public/wap/assets/index-3e78e56f.css create mode 100644 niucloud/public/wap/assets/index-5804fc08.css create mode 100644 niucloud/public/wap/assets/index-58df6033.js create mode 100644 niucloud/public/wap/assets/index-5c500394.css delete mode 100644 niucloud/public/wap/assets/index-b560dad3.css rename niucloud/public/wap/assets/{index-b3c50152.css => index-c0e0d57d.css} (63%) delete mode 100644 niucloud/public/wap/assets/index-c6ad3c68.js delete mode 100644 niucloud/public/wap/assets/index-da5f5776.css create mode 100644 niucloud/public/wap/assets/index.351aa2a5.js delete mode 100644 niucloud/public/wap/assets/index.b73ea047.js rename niucloud/public/wap/assets/{loading-page.vue_vue_type_script_setup_true_lang.c0eb459c.js => loading-page.vue_vue_type_script_setup_true_lang.49f5d2fc.js} (81%) rename niucloud/public/wap/assets/{mescroll-empty.a3bbe716.js => mescroll-empty.b36c9fa7.js} (86%) rename niucloud/public/wap/assets/{mescroll-i18n.18e0a8ef.js => mescroll-i18n.29e45df6.js} (92%) create mode 100644 niucloud/public/wap/assets/message.vue_vue_type_script_setup_true_lang.23e89495.js delete mode 100644 niucloud/public/wap/assets/message.vue_vue_type_script_setup_true_lang.5e6355a9.js create mode 100644 niucloud/public/wap/assets/money-618538b8.css delete mode 100644 niucloud/public/wap/assets/money-a58606b0.css rename niucloud/public/wap/assets/{pay.6f744447.js => pay.5cf03fb2.js} (68%) create mode 100644 niucloud/public/wap/assets/personal-535c88a8.css delete mode 100644 niucloud/public/wap/assets/personal-756e3d6c.css create mode 100644 niucloud/public/wap/assets/personal_form-9d607a6c.css delete mode 100644 niucloud/public/wap/assets/select-date.8bba10f7.js create mode 100644 niucloud/public/wap/assets/select-date.e5e51336.js create mode 100644 niucloud/public/wap/assets/share-b35f5adb.css delete mode 100644 niucloud/public/wap/assets/share-c25da6fb.css rename niucloud/public/wap/assets/{sign_in-acb5475a.css => sign_in-6c19c24c.css} (60%) create mode 100644 niucloud/public/wap/assets/sms-code.vue_vue_type_script_setup_true_lang.0fa2d328.js delete mode 100644 niucloud/public/wap/assets/sms-code.vue_vue_type_script_setup_true_lang.d50aa6f7.js delete mode 100644 niucloud/public/wap/assets/tabbar-688b62d8.css create mode 100644 niucloud/public/wap/assets/top-tabbar.228a0fdd.js delete mode 100644 niucloud/public/wap/assets/top-tabbar.7ab178bb.js rename niucloud/public/wap/assets/{topTabbar.ec9cfbdc.js => topTabbar.2f18307e.js} (89%) rename niucloud/public/wap/assets/{u--image.9096b10a.js => u--image.fedba3d6.js} (94%) create mode 100644 niucloud/public/wap/assets/u-action-sheet.3249b638.js delete mode 100644 niucloud/public/wap/assets/u-action-sheet.c827a4b8.js rename niucloud/public/wap/assets/{u-avatar.a357715b.js => u-avatar.5524750d.js} (89%) rename niucloud/public/wap/assets/{u-checkbox-group.2c5db441.js => u-checkbox-group.df63c744.js} (96%) delete mode 100644 niucloud/public/wap/assets/u-datetime-picker-a8a5e758.css delete mode 100644 niucloud/public/wap/assets/u-datetime-picker.3b10fd68.js rename niucloud/public/wap/assets/{u-form.e563055f.js => u-form.e4c60902.js} (91%) rename niucloud/public/wap/assets/{u-icon.0a0d2363.js => u-icon.0ae1125c.js} (97%) rename niucloud/public/wap/assets/{u-input.8fc32358.js => u-input.8f97d28b.js} (96%) rename niucloud/public/wap/assets/{u-line.233f5a79.js => u-line.0d9cc64c.js} (57%) rename niucloud/public/wap/assets/{u-loading-icon.29a896e4.js => u-loading-icon.ee5bd94f.js} (88%) rename niucloud/public/wap/assets/{u-modal.282f517b.js => u-modal.58039b47.js} (92%) delete mode 100644 niucloud/public/wap/assets/u-parse.1abba208.js create mode 100644 niucloud/public/wap/assets/u-parse.5229b75e.js delete mode 100644 niucloud/public/wap/assets/u-popup-5c9ea98f.css create mode 100644 niucloud/public/wap/assets/u-popup-740c5d05.css create mode 100644 niucloud/public/wap/assets/u-popup.24d2d689.js delete mode 100644 niucloud/public/wap/assets/u-popup.463a41b9.js delete mode 100644 niucloud/public/wap/assets/u-safe-bottom-f61536ce.css delete mode 100644 niucloud/public/wap/assets/u-safe-bottom.58ab23d9.js delete mode 100644 niucloud/public/wap/assets/u-tabbar-109a0f08.css delete mode 100644 niucloud/public/wap/assets/u-tabbar.400d9315.js rename niucloud/public/wap/assets/{u-transition.1618e325.js => u-transition.20585ce2.js} (88%) create mode 100644 niucloud/public/wap/assets/u-upload.474ec092.js delete mode 100644 niucloud/public/wap/assets/u-upload.6e43b341.js create mode 100644 niucloud/public/wap/assets/uni-popup.16a83edb.js delete mode 100644 niucloud/public/wap/assets/uni-popup.3d96ca24.js create mode 100644 niucloud/public/wap/assets/useDiy.a082f3a4.js delete mode 100644 niucloud/public/wap/assets/useDiy.e868b31b.js create mode 100644 niucloud/public/wap/assets/useDiyForm.bc2eef0f.js rename niucloud/public/wap/assets/{useMescroll.f2611dc5.js => useMescroll.eddfe106.js} (97%) rename niucloud/public/wap/assets/{verify.4571c407.js => verify.e7571e95.js} (82%) rename niucloud/public/web/_nuxt/{agreement.4cace7d6.js => agreement.3bc3fb30.js} (90%) rename niucloud/public/web/_nuxt/{auth.0310f461.js => auth.06aa4a8a.js} (70%) rename niucloud/public/web/_nuxt/{balance.dd46aab5.js => balance.b35ecb3a.js} (86%) rename niucloud/public/web/_nuxt/{bind.2d22b007.js => bind.d233f297.js} (85%) rename niucloud/public/web/_nuxt/{center.66fcdc4c.js => center.14b3d07f.js} (98%) rename niucloud/public/web/_nuxt/{close.98274665.js => close.bd28b0e3.js} (81%) rename niucloud/public/web/_nuxt/{container.b874448c.js => container.20caf0ab.js} (72%) rename niucloud/public/web/_nuxt/{debounce.c890efaf.js => debounce.30bd8664.js} (96%) rename niucloud/public/web/_nuxt/{default.7c5ec702.js => default.285c701d.js} (81%) rename niucloud/public/web/_nuxt/{el-empty.a7961674.js => el-empty.415453aa.js} (97%) rename niucloud/public/web/_nuxt/{el-input.dc8de302.js => el-input.f84bdb48.js} (99%) rename niucloud/public/web/_nuxt/{el-loading.9b62bf9f.js => el-loading.520b7282.js} (98%) rename niucloud/public/web/_nuxt/{el-main.421c74e8.js => el-main.eb08ec9e.js} (97%) rename niucloud/public/web/_nuxt/{el-popper.36df3cb5.js => el-popper.49ef5783.js} (99%) rename niucloud/public/web/_nuxt/{el-select.95aa3eaf.js => el-select.21d591ff.js} (99%) rename niucloud/public/web/_nuxt/{entry.a7eeea30.js => entry.ac74755d.js} (99%) rename niucloud/public/web/_nuxt/{error-404.37ae0d90.js => error-404.d146ebf0.js} (94%) rename niucloud/public/web/_nuxt/{error-500.be45470b.js => error-500.8f7c9e78.js} (96%) rename niucloud/public/web/_nuxt/{error-component.2eae7994.js => error-component.cbdba60e.js} (72%) create mode 100644 niucloud/public/web/_nuxt/index.2fdfe942.js rename niucloud/public/web/_nuxt/{index.5df2b7ec.js => index.95b7fbc8.js} (82%) delete mode 100644 niucloud/public/web/_nuxt/index.bd7599e3.js rename niucloud/public/web/_nuxt/{index.1f4f5490.js => index.f9cd6f66.js} (98%) rename niucloud/public/web/_nuxt/{index.vue.250865c9.js => index.vue.8384b162.js} (99%) rename niucloud/public/web/_nuxt/{login.19d2084b.js => login.f7857b07.js} (93%) rename niucloud/public/web/_nuxt/{member.7491675c.js => member.432706d0.js} (91%) rename niucloud/public/web/_nuxt/{nuxt-link.6d6db664.js => nuxt-link.13472e92.js} (98%) rename niucloud/public/web/_nuxt/{point.d3c5bbec.js => point.702ec0fe.js} (86%) rename niucloud/public/web/_nuxt/{register.f78776f2.js => register.547e1334.js} (94%) rename niucloud/public/web/_nuxt/{vnode.d9875469.js => vnode.290de06f.js} (88%) diff --git a/niucloud/app/adminapi/controller/addon/Addon.php b/niucloud/app/adminapi/controller/addon/Addon.php index e0fa743ee..25c3aa4e2 100644 --- a/niucloud/app/adminapi/controller/addon/Addon.php +++ b/niucloud/app/adminapi/controller/addon/Addon.php @@ -18,15 +18,28 @@ use core\base\BaseAdminController; use think\Response; +/** + * 插件管理 + * Class Addon + * @description 插件管理 + * @package app\adminapi\controller\addon + */ class Addon extends BaseAdminController { + /** + * 插件初始化 + * @description 插件初始化 + * @return Response + */ public function init() { return success((new CoreAddonService())->getInitList()); } + /** * 获取已下载插架 + * @description 获取已下载插架 */ public function getLocalAddonList() { @@ -35,6 +48,7 @@ class Addon extends BaseAdminController /** * 安装插件 + * @description 安装插件 * @param string $addon */ public function install($addon) @@ -44,6 +58,7 @@ class Addon extends BaseAdminController /** * 云安装插件 + * @description 云安装插件 * @param $addon * @return Response */ @@ -54,6 +69,7 @@ class Addon extends BaseAdminController /** * 获取安装任务 + * @description 获取安装任务 * @return Response */ public function getInstallTask() { @@ -62,6 +78,7 @@ class Addon extends BaseAdminController /** * 获取云安装日志 + * @description 获取云安装日志 * @param $addon * @return mixed */ @@ -71,6 +88,7 @@ class Addon extends BaseAdminController /** * 插件安装环境检测 + * @description 插件安装环境检测 * @param $addon * @return Response */ @@ -81,6 +99,7 @@ class Addon extends BaseAdminController /** * 取消安装 + * @description 取消安装 * @param $addon * @return mixed */ @@ -91,6 +110,7 @@ class Addon extends BaseAdminController /** * 卸载插件 + * @description 卸载插件 * @param string $addon */ public function uninstall($addon) @@ -101,6 +121,7 @@ class Addon extends BaseAdminController /** * 插件安装环境检测 + * @description 插件安装环境检测 * @param $addon * @return Response */ @@ -111,6 +132,7 @@ class Addon extends BaseAdminController /** * 插件列表 + * @description 插件列表 * @return Response */ public function lists() @@ -123,6 +145,7 @@ class Addon extends BaseAdminController /** * 插件详情 + * @description 插件详情 * @param int $id * @return Response */ @@ -133,6 +156,7 @@ class Addon extends BaseAdminController /** * 设置插件状态 + * @description 设置插件状态 * @param int $id * @param int $status * @return Response @@ -145,7 +169,8 @@ class Addon extends BaseAdminController /** * 下载插件 - * @param $app_key + * @description 下载插件 + * @param $addon * @return Response */ public function download($addon){ @@ -158,6 +183,7 @@ class Addon extends BaseAdminController /** * 查询已安装插件 + * @description 查询已安装插件 * @return Response */ public function getInstallList(){ @@ -166,6 +192,7 @@ class Addon extends BaseAdminController /** * 查询已安装有效应用 + * @description 查询已安装有效应用 */ public function getAddonList() { @@ -174,6 +201,7 @@ class Addon extends BaseAdminController /** * 插件类型 + * @description 插件类型 * @return Response */ public function getType(){ @@ -182,7 +210,8 @@ class Addon extends BaseAdminController /** * 更新插件 - * @param $app_key + * @description 更新插件 + * @param $addon * @return Response */ public function upgrade($addon = ''){ @@ -194,8 +223,14 @@ class Addon extends BaseAdminController return success(data:(new AddonService())->getShowAppTools()); } + public function showMarketing() + { + return success(( new AddonService() )->getShowMarketingTools()); + } + /** * 获取首页应用标签 + * @description 获取首页应用标签 */ public function getIndexAddonLabelList() { @@ -204,6 +239,7 @@ class Addon extends BaseAdminController /** * 获取首页应用 + * @description 获取首页应用 * @return Response */ public function getIndexAddonList() diff --git a/niucloud/app/adminapi/controller/addon/AddonDevelop.php b/niucloud/app/adminapi/controller/addon/AddonDevelop.php index 135828738..84c3a9113 100644 --- a/niucloud/app/adminapi/controller/addon/AddonDevelop.php +++ b/niucloud/app/adminapi/controller/addon/AddonDevelop.php @@ -16,11 +16,18 @@ use app\service\admin\addon\AddonDevelopService; use core\base\BaseAdminController; use think\Response; +/** + * 开发插件 + * Class AddonDevelop + * @description 开发插件 + * @package app\adminapi\controller\addon + */ class AddonDevelop extends BaseAdminController { /** * 开发插件列表 + * @description 开发插件列表 */ public function lists() { @@ -30,6 +37,12 @@ class AddonDevelop extends BaseAdminController return success(( new AddonDevelopService() )->getList($data[ 'search' ])); } + /** + * 开发插件详情 + * @description 开发插件详情 + * @param $key + * @return Response + */ public function info($key) { return success(( new AddonDevelopService() )->getInfo($key)); @@ -37,6 +50,7 @@ class AddonDevelop extends BaseAdminController /** * 开发插件新增 + * @description 开发插件新增 * @return Response */ public function add(string $key) @@ -60,6 +74,7 @@ class AddonDevelop extends BaseAdminController /** * 开发插件更新 + * @description 开发插件更新 * @param string $id * @return Response */ @@ -85,6 +100,7 @@ class AddonDevelop extends BaseAdminController /** * 删除开发插件 + * @description 删除开发插件 * @param $key * @return Response */ @@ -95,7 +111,8 @@ class AddonDevelop extends BaseAdminController } /** - *校验key是否被占用 + * 校验key是否被占用 + * @description 校验key是否被占用 * @param $key * @return void */ @@ -106,6 +123,7 @@ class AddonDevelop extends BaseAdminController /** * 打包 + * @description 打包 * @param $key * @return Response */ @@ -117,6 +135,7 @@ class AddonDevelop extends BaseAdminController /** * 下载 + * @description 下载 * @param $key * @return Response */ @@ -127,7 +146,8 @@ class AddonDevelop extends BaseAdminController } /** - * + * 插件key黑名单 + * @description 插件key黑名单 * @return Response */ public function keyBlackList() diff --git a/niucloud/app/adminapi/controller/addon/Backup.php b/niucloud/app/adminapi/controller/addon/Backup.php index f0b0183af..02592ae6b 100644 --- a/niucloud/app/adminapi/controller/addon/Backup.php +++ b/niucloud/app/adminapi/controller/addon/Backup.php @@ -15,11 +15,18 @@ use app\service\admin\upgrade\BackupRecordsService; use core\base\BaseAdminController; use think\Response; +/** + * 备份管理 + * Class Backup + * @description 备份管理 + * @package app\adminapi\controller\addon + */ class Backup extends BaseAdminController { /** * 获取升级记录分页列表 + * @description 获取升级记录分页列表 * @return Response */ public function getRecords() @@ -32,6 +39,7 @@ class Backup extends BaseAdminController /** * 修改备注 + * @description 修改备注 * @return Response */ public function modifyRemark() @@ -46,6 +54,7 @@ class Backup extends BaseAdminController /** * 恢复前检测文件是否存在 + * @description 恢复前检测文件是否存在 * @return Response */ public function checkDirExist() @@ -58,6 +67,7 @@ class Backup extends BaseAdminController /** * 检测目录权限 + * @description 检测目录权限 * @return Response */ public function checkPermission() @@ -67,6 +77,7 @@ class Backup extends BaseAdminController /** * 恢复备份 + * @description 恢复备份 * @return Response */ public function restoreBackup() @@ -81,6 +92,7 @@ class Backup extends BaseAdminController /** * 删除升级记录 + * @description 删除升级记录 * @return Response */ public function deleteRecords() @@ -94,6 +106,7 @@ class Backup extends BaseAdminController /** * 手动备份 + * @description 手动备份 * @return Response */ public function manualBackup() @@ -107,6 +120,7 @@ class Backup extends BaseAdminController /** * 获取正在进行的恢复任务 + * @description 获取正在进行的恢复任务 * @return Response */ public function getRestoreTask() @@ -116,6 +130,7 @@ class Backup extends BaseAdminController /** * 获取正在进行的备份任务 + * @description 获取正在进行的备份任务 * @return Response */ public function getBackupTask() diff --git a/niucloud/app/adminapi/controller/addon/Upgrade.php b/niucloud/app/adminapi/controller/addon/Upgrade.php index 290a2358d..4e44a14a6 100644 --- a/niucloud/app/adminapi/controller/addon/Upgrade.php +++ b/niucloud/app/adminapi/controller/addon/Upgrade.php @@ -16,11 +16,18 @@ use app\service\admin\upgrade\UpgradeService; use core\base\BaseAdminController; use think\Response; +/** + * 升级管理 + * Class Upgrade + * @description 升级管理 + * @package app\adminapi\controller\addon + */ class Upgrade extends BaseAdminController { /** * 更新插件 - * @param $app_key + * @description 更新插件 + * @param $addon * @return Response */ public function upgrade($addon = '') @@ -34,7 +41,7 @@ class Upgrade extends BaseAdminController /** * 执行升级 - * @param $app_key + * @description 执行升级 * @return Response */ public function execute() @@ -44,6 +51,7 @@ class Upgrade extends BaseAdminController /** * 获取升级内容 + * @description 获取升级内容 * @param $addon * @return Response */ @@ -54,6 +62,7 @@ class Upgrade extends BaseAdminController /** * 获取正在进行的升级任务 + * @description 获取正在进行的升级任务 * @return Response */ public function getUpgradeTask() @@ -63,6 +72,7 @@ class Upgrade extends BaseAdminController /** * 升级前环境检测 + * @description 升级前环境检测 * @param $addon * @return Response */ @@ -73,6 +83,7 @@ class Upgrade extends BaseAdminController /** * 清除 + * @description 清除升级任务 * @return Response */ public function clearUpgradeTask() @@ -80,12 +91,19 @@ class Upgrade extends BaseAdminController return success(data: ( new UpgradeService() )->clearUpgradeTask(0, 1)); } + /** + * 操作 + * @description 操作 + * @param $operate + * @return Response + */ public function operate($operate) { return success(( new UpgradeService() )->operate($operate)); } /** * 获取升级记录分页列表 + * @description 获取升级记录分页列表 * @return Response */ public function getRecords() @@ -96,6 +114,11 @@ class Upgrade extends BaseAdminController return success(( new UpgradeRecordsService() )->getPage($data)); } + /** + * 刪除升级记录 + * @description 刪除升级记录 + * @return Response + */ public function delRecords() { $data = $this->request->params([ [ 'ids', '' ], diff --git a/niucloud/app/adminapi/controller/aliapp/Config.php b/niucloud/app/adminapi/controller/aliapp/Config.php index 16ee7f2fe..4b47fc503 100644 --- a/niucloud/app/adminapi/controller/aliapp/Config.php +++ b/niucloud/app/adminapi/controller/aliapp/Config.php @@ -15,10 +15,17 @@ use app\service\admin\aliapp\AliappConfigService; use core\base\BaseAdminController; use think\Response; +/** + * 支付宝配置 + * Class Config + * @description 支付宝配置 + * @package app\adminapi\controller\aliapp + */ class Config extends BaseAdminController { /** * 获取支付宝配置信息 + * @description 获取支付宝配置信息 * @return Response */ public function get() @@ -28,6 +35,7 @@ class Config extends BaseAdminController /** * 设置支付宝配置信息 + * @description 设置支付宝配置信息 * @return Response */ public function set() @@ -49,6 +57,7 @@ class Config extends BaseAdminController /** * 静态资源 + * @description 静态资源 * @return Response */ public function static() diff --git a/niucloud/app/adminapi/controller/applet/SiteVersion.php b/niucloud/app/adminapi/controller/applet/SiteVersion.php index 54ea720ae..330977c7b 100644 --- a/niucloud/app/adminapi/controller/applet/SiteVersion.php +++ b/niucloud/app/adminapi/controller/applet/SiteVersion.php @@ -17,23 +17,25 @@ use think\Response; /** * 站点小程序版本升级下载控制器 + * @description 站点小程序版本升级下载 */ class SiteVersion extends BaseAdminController { /** * 列表 + * @description 列表 * @return Response */ public function lists() { $data = $this->request->params([ - ]); return success((new AppletVersionSiteService())->getPage($data)); } /** * 详情 + * @description 详情 * @param int $id * @return Response */ @@ -44,6 +46,7 @@ class SiteVersion extends BaseAdminController /** * 查询最后一个下载或升级的版本 + * @description 查询最后一个下载或升级的版本 * @param string $type * @return Response */ @@ -54,6 +57,7 @@ class SiteVersion extends BaseAdminController /** * 查看可升级的最高版本 + * @description 查看可升级的最高版本 * @param string $type * @return Response */ diff --git a/niucloud/app/adminapi/controller/applet/Version.php b/niucloud/app/adminapi/controller/applet/Version.php index 7b3ced198..2dcc20392 100644 --- a/niucloud/app/adminapi/controller/applet/Version.php +++ b/niucloud/app/adminapi/controller/applet/Version.php @@ -18,11 +18,13 @@ use think\Response; /** * 小程序版本管理控制器 + * @description 小程序版本管理 */ class Version extends BaseAdminController { /** * 列表 + * @description 列表 * @return Response */ public function lists() @@ -35,6 +37,7 @@ class Version extends BaseAdminController /** * 详情 + * @description 详情 * @param int $id * @return Response */ @@ -45,6 +48,7 @@ class Version extends BaseAdminController /** * 添加 + * @description 添加 * @return Response */ public function add() @@ -62,6 +66,7 @@ class Version extends BaseAdminController /** * 编辑 + * @description 编辑 * @param int $id * @return Response */ @@ -80,6 +85,7 @@ class Version extends BaseAdminController /** * 删除 + * @description 删除 * @param int $id * @return Response */ @@ -91,6 +97,7 @@ class Version extends BaseAdminController /** * 设置状态 + * @description 设置状态 * @param int $id * @param $status * @return Response @@ -103,6 +110,7 @@ class Version extends BaseAdminController /** * 小程序包上传 + * @description 小程序包上传 * @return Response * @throws Exception */ diff --git a/niucloud/app/adminapi/controller/applet/VersionDownload.php b/niucloud/app/adminapi/controller/applet/VersionDownload.php index a4204d042..4a415ff31 100644 --- a/niucloud/app/adminapi/controller/applet/VersionDownload.php +++ b/niucloud/app/adminapi/controller/applet/VersionDownload.php @@ -17,12 +17,14 @@ use think\response\File; /** * 小程序版本下载控制器 + * @description 小程序版本下载 */ class VersionDownload extends BaseAdminController { /** * 下载 + * @description 下载 * @param $id * @return File */ diff --git a/niucloud/app/adminapi/controller/auth/Auth.php b/niucloud/app/adminapi/controller/auth/Auth.php index 8f4748cea..1c2f7c591 100644 --- a/niucloud/app/adminapi/controller/auth/Auth.php +++ b/niucloud/app/adminapi/controller/auth/Auth.php @@ -16,11 +16,18 @@ use core\base\BaseAdminController; use think\Response; +/** + * 用户管理 + * Class Auth + * @description 用户管理 + * @package app\adminapi\controller\auth + */ class Auth extends BaseAdminController { /** * 登录用户菜单列表的接口 + * @description 登录用户菜单列表 */ public function authMenuList() { @@ -34,6 +41,7 @@ class Auth extends BaseAdminController /** * 获取登录用户信息 + * @description 获取登录用户信息 * @return Response */ public function get() @@ -43,6 +51,7 @@ class Auth extends BaseAdminController /** * 修改登录用户信息 + * @description 修改登录用户信息 * @param $field * @return Response */ @@ -59,6 +68,7 @@ class Auth extends BaseAdminController /** * 更新用户 + * @description 更新用户 */ public function edit() { diff --git a/niucloud/app/adminapi/controller/channel/H5.php b/niucloud/app/adminapi/controller/channel/H5.php index a91144db8..f928b720f 100644 --- a/niucloud/app/adminapi/controller/channel/H5.php +++ b/niucloud/app/adminapi/controller/channel/H5.php @@ -15,10 +15,16 @@ use app\service\admin\channel\H5Service; use core\base\BaseAdminController; use think\Response; +/** + * H5配置 + * Class H5 + * @package app\adminapi\controller\channel + */ class H5 extends BaseAdminController { /** * 获取H5配置信息 + * @description 获取H5配置信息 * @return Response */ public function get() @@ -28,6 +34,7 @@ class H5 extends BaseAdminController /** * 设置H5配置信息 + * @description 设置H5配置信息 * @return Response */ public function set() diff --git a/niucloud/app/adminapi/controller/channel/Pc.php b/niucloud/app/adminapi/controller/channel/Pc.php index 8a3c33c8c..76ec50614 100644 --- a/niucloud/app/adminapi/controller/channel/Pc.php +++ b/niucloud/app/adminapi/controller/channel/Pc.php @@ -15,10 +15,17 @@ use app\service\admin\channel\PcService; use core\base\BaseAdminController; use think\Response; +/** + * PC端配置 + * Class Pc + * @description PC端配置 + * @package app\adminapi\controller\channel + */ class Pc extends BaseAdminController { /** * 获取PC配置信息 + * @description 获取PC配置信息 * @return Response */ public function get() @@ -28,6 +35,7 @@ class Pc extends BaseAdminController /** * 设置PC配置信息 + * @description 设置PC配置信息 * @return Response */ public function set() diff --git a/niucloud/app/adminapi/controller/dict/Dict.php b/niucloud/app/adminapi/controller/dict/Dict.php index 5a07fd3e9..384e5822d 100644 --- a/niucloud/app/adminapi/controller/dict/Dict.php +++ b/niucloud/app/adminapi/controller/dict/Dict.php @@ -18,12 +18,14 @@ use app\service\admin\dict\DictService; /** * 数据字典控制器 * Class Dict + * @description 数据字典 * @package app\adminapi\controller\dict */ class Dict extends BaseAdminController { /** * 获取数据字典列表 + * @description 获取数据字典列表 * @return \think\Response */ public function lists(){ @@ -36,6 +38,7 @@ class Dict extends BaseAdminController /** * 数据字典详情 + * @description 数据字典详情 * @param int $id * @return \think\Response */ @@ -45,6 +48,7 @@ class Dict extends BaseAdminController /** * 添加数据字典 + * @description 添加数据字典 * @return \think\Response */ public function add(){ @@ -61,6 +65,7 @@ class Dict extends BaseAdminController /** * 数据字典编辑 + * @description 数据字典编辑 * @param $id 数据字典id * @return \think\Response */ @@ -77,6 +82,7 @@ class Dict extends BaseAdminController /** * 数据字典删除 + * @description 数据字典删除 * @param $id 数据字典id * @return \think\Response */ @@ -87,6 +93,7 @@ class Dict extends BaseAdminController /** * 添加数据字典内容 + * @description 添加数据字典内容 */ public function addDictData($id) { @@ -101,6 +108,7 @@ class Dict extends BaseAdminController /** * 获取全部数据字典 + * @description 获取全部数据字典 * @return \think\Response */ public function getAll(){ @@ -109,6 +117,7 @@ class Dict extends BaseAdminController /** * 数据字典详情 + * @description 数据字典详情 * @param key 数据字典关键字 * @return \think\Response */ diff --git a/niucloud/app/adminapi/controller/diy/Config.php b/niucloud/app/adminapi/controller/diy/Config.php index 7ca66bec1..2004c6015 100644 --- a/niucloud/app/adminapi/controller/diy/Config.php +++ b/niucloud/app/adminapi/controller/diy/Config.php @@ -19,12 +19,14 @@ use think\Response; /** * 自定义配置相关 * Class Config + * @description 自定义配置 * @package app\adminapi\controller\diy */ class Config extends BaseAdminController { /** * 获取底部导航列表 + * @description 获取底部导航列表 * @return Response */ public function getBottomList() @@ -34,6 +36,7 @@ class Config extends BaseAdminController /** * 获取底部导航 + * @description 获取底部导航 * @return Response */ public function getBottomConfig() @@ -46,6 +49,7 @@ class Config extends BaseAdminController /** * 设置底部导航 + * @description 设置底部导航 * @return Response */ public function setBottomConfig() diff --git a/niucloud/app/adminapi/controller/diy/Diy.php b/niucloud/app/adminapi/controller/diy/Diy.php index cefaf5545..2bdfcd0f6 100644 --- a/niucloud/app/adminapi/controller/diy/Diy.php +++ b/niucloud/app/adminapi/controller/diy/Diy.php @@ -24,12 +24,14 @@ use think\Response; /** * 自定义页面控制器 * Class DiyController + * @description 自定义页面 * @package app\adminapi\controller\diy */ class Diy extends BaseAdminController { /** - * @notes 获取自定义页面分页列表 + * 获取自定义页面分页列表 + * @description 获取自定义页面分页列表 * @return Response */ public function lists() @@ -44,7 +46,8 @@ class Diy extends BaseAdminController } /** - * @notes 获取自定义页面分页列表，轮播搜索组件用 + * 获取自定义页面分页列表，轮播搜索组件用 + * @description 获取自定义页面分页列表，轮播搜索组件用 * @return Response */ public function getPageByCarouselSearch() @@ -53,7 +56,8 @@ class Diy extends BaseAdminController } /** - * @notes 获取自定义页面列表 + * 获取自定义页面列表 + * @description 获取自定义页面列表 * @return Response * @throws DataNotFoundException * @throws DbException @@ -71,6 +75,7 @@ class Diy extends BaseAdminController /** * 自定义页面详情 + * @description 自定义页面详情 * @param int $id * @return Response */ @@ -81,6 +86,7 @@ class Diy extends BaseAdminController /** * 添加自定义页面 + * @description 添加自定义页面 * @return Response */ public function add() @@ -104,6 +110,7 @@ class Diy extends BaseAdminController /** * 自定义页面编辑 + * @description 自定义页面编辑 * @param $id * @return Response */ @@ -126,6 +133,7 @@ class Diy extends BaseAdminController /** * 自定义页面删除 + * @description 自定义页面删除 * @param int $id * @return Response */ @@ -137,6 +145,7 @@ class Diy extends BaseAdminController /** * 设为使用 + * @description 设为使用 * @param $id * @return Response * @throws Exception @@ -149,6 +158,7 @@ class Diy extends BaseAdminController /** * 获取页面初始化数据 + * @description 获取页面初始化数据 * @return Response */ public function getPageInit() @@ -166,6 +176,7 @@ class Diy extends BaseAdminController /** * 获取自定义链接列表 + * @description 获取自定义链接列表 */ public function getLink() { @@ -175,6 +186,7 @@ class Diy extends BaseAdminController /** * 获取页面模板 + * @description 获取页面模板 * @return Response */ public function getTemplate() @@ -192,6 +204,7 @@ class Diy extends BaseAdminController /** * 修改页面分享内容 + * @description 修改页面分享内容 * @param int $id * @return Response */ @@ -206,6 +219,7 @@ class Diy extends BaseAdminController /** * 获取装修页面列表 + * @description 获取装修页面列表 */ public function getDecoratePage() { @@ -217,6 +231,7 @@ class Diy extends BaseAdminController /** * 切换模板 + * @description 切换模板 */ public function changeTemplate() { @@ -234,6 +249,7 @@ class Diy extends BaseAdminController /** * 获取模板页面列表 + * @description 获取模板页面列表 * @return Response */ public function getTemplatePages() @@ -248,6 +264,7 @@ class Diy extends BaseAdminController /** * 获取模板页面（存在的应用插件列表） + * @description 获取模板页面（存在的应用插件列表） * @return Response */ public function getApps() @@ -257,6 +274,7 @@ class Diy extends BaseAdminController /** * 复制模版 + * @description 复制模版 * @return Response */ public function copy() @@ -270,6 +288,7 @@ class Diy extends BaseAdminController /** * 获取主题风格列表 + * @description 获取主题风格列表 * @return Response */ public function getDiyTheme() @@ -279,6 +298,7 @@ class Diy extends BaseAdminController /** * 设置主题风格 + * @description 设置主题风格 * @return Response */ public function setDiyTheme() @@ -296,6 +316,7 @@ class Diy extends BaseAdminController /** * 获取主题配色列表 + * @description 获取主题配色列表 * @return Response */ public function getDefaultThemeColor() @@ -308,6 +329,7 @@ class Diy extends BaseAdminController /** * 添加自定义主题配色 + * @description 添加自定义主题配色 * @return Response */ public function addDiyTheme() @@ -326,6 +348,7 @@ class Diy extends BaseAdminController /** * 编辑自定义主题配色 + * @description 编辑自定义主题配色 * @param $id * @return Response */ @@ -345,6 +368,7 @@ class Diy extends BaseAdminController /** * 删除自定义主题配色 + * @description 删除自定义主题配色 * @param $id * @return Response */ diff --git a/niucloud/app/adminapi/controller/diy/DiyForm.php b/niucloud/app/adminapi/controller/diy/DiyForm.php index 19565a394..4448f52d9 100644 --- a/niucloud/app/adminapi/controller/diy/DiyForm.php +++ b/niucloud/app/adminapi/controller/diy/DiyForm.php @@ -24,12 +24,14 @@ use think\Response; /** * 万能表单控制器 * Class DiyForm + * @description 万能表单 * @package app\adminapi\controller\diy */ class DiyForm extends BaseAdminController { /** - * @notes 获取万能表单分页列表 + * 获取万能表单分页列表 + * @description 获取万能表单分页列表 * @return Response */ public function pages() @@ -43,7 +45,8 @@ class DiyForm extends BaseAdminController } /** - * @notes 获取万能表单分页列表（用于弹框选择） + * 获取万能表单分页列表（用于弹框选择） + * @description 获取万能表单分页列表（用于弹框选择） * @return Response */ public function select() @@ -58,7 +61,8 @@ class DiyForm extends BaseAdminController } /** - * @notes 获取万能表单列表 + * 获取万能表单列表 + * @description 获取万能表单列表 * @return Response * @throws DataNotFoundException * @throws DbException @@ -77,6 +81,7 @@ class DiyForm extends BaseAdminController /** * 万能表单详情 + * @description 万能表单详情 * @param int $id * @return Response */ @@ -87,6 +92,7 @@ class DiyForm extends BaseAdminController /** * 添加万能表单 + * @description 添加万能表单 * @return Response */ public function add() @@ -105,6 +111,7 @@ class DiyForm extends BaseAdminController /** * 万能表单编辑 + * @description 万能表单编辑 * @param $id * @return Response */ @@ -124,6 +131,7 @@ class DiyForm extends BaseAdminController /** * 万能表单删除 + * @description 万能表单删除 * @return Response */ public function del() @@ -137,6 +145,7 @@ class DiyForm extends BaseAdminController /** * 获取万能表单初始化数据 + * @description 获取万能表单初始化数据 * @return Response * @throws DbException */ @@ -153,6 +162,7 @@ class DiyForm extends BaseAdminController /** * 获取万能表单模板 + * @description 获取万能表单模板 * @return Response */ public function getTemplate() @@ -167,6 +177,7 @@ class DiyForm extends BaseAdminController /** * 修改页面分享内容 + * @description 修改页面分享内容 * @return Response */ public function modifyShare() @@ -181,6 +192,7 @@ class DiyForm extends BaseAdminController /** * 获取模板页面（存在的应用插件列表） + * @description 获取模板页面（存在的应用插件列表） * @return Response */ public function getApps() @@ -189,7 +201,8 @@ class DiyForm extends BaseAdminController } /** - * 复制模版 todo 靠后 + * 复制万能表单 + * @description 复制万能表单 * @return Response */ public function copy() @@ -203,6 +216,7 @@ class DiyForm extends BaseAdminController /** * 获取模板页面（存在的应用插件列表） + * @description 获取模板页面（存在的应用插件列表） * @return Response */ public function getFormType() @@ -212,6 +226,7 @@ class DiyForm extends BaseAdminController /** * 修改状态 + * @description 修改状态 * @return \think\Response */ public function modifyStatus() @@ -226,6 +241,7 @@ class DiyForm extends BaseAdminController /** * 获取使用记录 + * @description 获取使用记录 * @return Response */ public function getRecordPages() @@ -240,6 +256,7 @@ class DiyForm extends BaseAdminController /** * 获取使用记录详情 + * @description 获取使用记录详情 * @param int $record_id * @return Response */ @@ -250,6 +267,7 @@ class DiyForm extends BaseAdminController /** * 使用记录删除 + * @description 使用记录删除 * @return Response */ public function delRecord() @@ -264,6 +282,7 @@ class DiyForm extends BaseAdminController /** * 获取万能表单字段记录 + * @description 获取万能表单字段记录 * @return Response */ public function getFieldsList() @@ -278,6 +297,7 @@ class DiyForm extends BaseAdminController /** * 获取表单填写配置 + * @description 获取表单填写配置 * @param $form_id int 所属万能表单id * @return Response */ @@ -288,6 +308,7 @@ class DiyForm extends BaseAdminController /** * 编辑表单填写配置 + * @description 编辑表单填写配置 * @return Response */ public function editWriteConfig() @@ -314,6 +335,7 @@ class DiyForm extends BaseAdminController /** * 获取表单提交成功 也配置 + * @description 获取表单提交成功页配置 * @param $form_id int 所属万能表单id * @return Response */ @@ -324,6 +346,7 @@ class DiyForm extends BaseAdminController /** * 编辑表单提交成功页配置 + * @description 编辑表单提交成功页配置 * @return Response */ public function editSubmitConfig() @@ -347,6 +370,7 @@ class DiyForm extends BaseAdminController /** * 获取万能表单填表人统计列表 + * @description 获取万能表单填表人统计列表 * @return Response */ public function memberStatPages() @@ -360,6 +384,7 @@ class DiyForm extends BaseAdminController /** * 获取万能表单字段统计列表 + * @description 获取万能表单字段统计列表 * @return Response */ public function fieldStatList() diff --git a/niucloud/app/adminapi/controller/diy/DiyRoute.php b/niucloud/app/adminapi/controller/diy/DiyRoute.php index 227fd6b24..6d3d50352 100644 --- a/niucloud/app/adminapi/controller/diy/DiyRoute.php +++ b/niucloud/app/adminapi/controller/diy/DiyRoute.php @@ -19,12 +19,14 @@ use think\Response; /** * 自定义路由表控制器 * Class DiyRouteController + * @description 自定义路由 * @package app\adminapi\controller\diy */ class DiyRoute extends BaseAdminController { /** - * @notes 获取自定义路由表列表 + * 获取自定义路由表列表 + * @description 获取自定义路由表列表 * @return Response */ public function lists() @@ -39,6 +41,7 @@ class DiyRoute extends BaseAdminController /** * 自定义路由表详情 + * @description 自定义路由表详情 * @param int $id * @return Response */ @@ -49,6 +52,7 @@ class DiyRoute extends BaseAdminController /** * 自定义路由表详情 + * @description 自定义路由表详情 * @param string $name * @return Response */ @@ -59,6 +63,7 @@ class DiyRoute extends BaseAdminController /** * 添加自定义路由表 + * @description 添加自定义路由表 * @return Response */ public function add() @@ -77,6 +82,7 @@ class DiyRoute extends BaseAdminController /** * 自定义路由表编辑 + * @description 自定义路由表编辑 * @param $id * @return Response */ @@ -96,6 +102,7 @@ class DiyRoute extends BaseAdminController /** * 自定义路由表删除 + * @description 自定义路由表删除 * @param int $id * @return Response */ @@ -107,6 +114,7 @@ class DiyRoute extends BaseAdminController /** * 修改页面分享内容 + * @description 修改页面分享内容 */ public function modifyShare() { @@ -125,6 +133,7 @@ class DiyRoute extends BaseAdminController /** * 获取模板页面（存在的应用插件列表） + * @description 获取模板页面（存在的应用插件列表） * @return Response */ public function getApps() diff --git a/niucloud/app/adminapi/controller/generator/Generator.php b/niucloud/app/adminapi/controller/generator/Generator.php index 12fbebdb7..eff1e91ba 100644 --- a/niucloud/app/adminapi/controller/generator/Generator.php +++ b/niucloud/app/adminapi/controller/generator/Generator.php @@ -22,12 +22,14 @@ use think\Response; /** * 代码生成-控制器 * Class Generate + * @description 代码生成器 * @package app\adminapi\controller\generate */ class Generator extends BaseController { /** * 代码生成器列表 + * @description 代码生成器列表 * @return Response */ public function lists() @@ -43,6 +45,7 @@ class Generator extends BaseController /** * 代码生成详情 + * @description 代码生成详情 * @param int $id * @return Response * @throws DataNotFoundException @@ -56,6 +59,7 @@ class Generator extends BaseController /** * 代码预览 + * @description 代码预览 * @param int $id * @return Response */ @@ -68,6 +72,7 @@ class Generator extends BaseController /** * 添加代码生成 + * @description 添加代码生成 * @return Response * @throws Exception */ @@ -83,6 +88,7 @@ class Generator extends BaseController /** * 代码生成编辑 + * @description 代码生成编辑 * @param $id * @return Response */ @@ -111,6 +117,7 @@ class Generator extends BaseController /** * 代码生成删除 + * @description 代码生成删除 * @param int $id * @return Response */ @@ -122,6 +129,7 @@ class Generator extends BaseController /** * 生成代码 + * @description 生成代码 * @return Response */ public function create() @@ -137,6 +145,7 @@ class Generator extends BaseController /** * 获取数据表列表 + * @description 获取数据表列表 * @return Response */ public function tableList() @@ -151,6 +160,7 @@ class Generator extends BaseController /** * 代码生成检测 + * @description 代码生成检测 */ public function checkFile() { @@ -163,6 +173,7 @@ class Generator extends BaseController /** * 获取表字段 + * @description 获取表字段 */ public function getTableColumn() { @@ -172,9 +183,9 @@ class Generator extends BaseController return success((new GenerateService())->getTableColumn($data)); } - /** * 获取全部模型 + * @description 获取全部模型 */ public function getModels() { @@ -186,6 +197,7 @@ class Generator extends BaseController /** * 根据模型获取表字段 + * @description 根据模型获取表字段 */ public function getModelTableColumn() { diff --git a/niucloud/app/adminapi/controller/login/Captcha.php b/niucloud/app/adminapi/controller/login/Captcha.php index f228f3cff..71bd4d068 100644 --- a/niucloud/app/adminapi/controller/login/Captcha.php +++ b/niucloud/app/adminapi/controller/login/Captcha.php @@ -15,12 +15,18 @@ use app\service\admin\captcha\CaptchaService; use core\base\BaseAdminController; use think\Response; +/** + * 验证码 + * Class Captcha + * @description 验证码 + * @package app\adminapi\controller\login + */ class Captcha extends BaseAdminController { - /** * 创建验证码 + * @description 创建验证码 * @return Response */ public function create() @@ -30,6 +36,7 @@ class Captcha extends BaseAdminController /** * 一次校验验证码 + * @description 一次校验验证码 * @return Response */ public function check() @@ -39,6 +46,7 @@ class Captcha extends BaseAdminController /** * 二次校验验证码 + * @description 二次校验验证码 * @return Response */ public function verification() diff --git a/niucloud/app/adminapi/controller/login/Config.php b/niucloud/app/adminapi/controller/login/Config.php index c6f48b2d8..9da5582e0 100644 --- a/niucloud/app/adminapi/controller/login/Config.php +++ b/niucloud/app/adminapi/controller/login/Config.php @@ -15,12 +15,18 @@ use app\service\admin\auth\ConfigService; use core\base\BaseAdminController; use think\Response; - +/** + * 登录设置 + * Class Config + * @description 登录设置 + * @package app\adminapi\controller\login + */ class Config extends BaseAdminController { /** * 获取登录设置 + * @description 获取登录设置 * @return Response */ public function getConfig() @@ -30,6 +36,7 @@ class Config extends BaseAdminController /** * 注册与登录设置 + * @description 注册与登录设置 * @return Response */ public function setConfig() diff --git a/niucloud/app/adminapi/controller/login/Login.php b/niucloud/app/adminapi/controller/login/Login.php index 879b695da..0e3034025 100644 --- a/niucloud/app/adminapi/controller/login/Login.php +++ b/niucloud/app/adminapi/controller/login/Login.php @@ -16,10 +16,18 @@ use app\service\admin\auth\LoginService; use core\base\BaseAdminController; use think\Response; +/** + * 登录 + * Class Login + * @description 登录 + * @package app\adminapi\controller\login + */ class Login extends BaseAdminController { + /** * 登录 + * @description 登录 * @return Response */ public function login() @@ -41,7 +49,8 @@ class Login extends BaseAdminController } /** - * 登出 + * 退出登录 + * @description 退出登录 * @return Response */ public function logout() @@ -50,9 +59,9 @@ class Login extends BaseAdminController return success('LOGOUT'); } - /** * 获取登录设置 + * @description 获取登录设置 * @return Response */ public function getConfig() diff --git a/niucloud/app/adminapi/controller/member/Account.php b/niucloud/app/adminapi/controller/member/Account.php index 6826e0fb4..32fd22da0 100644 --- a/niucloud/app/adminapi/controller/member/Account.php +++ b/niucloud/app/adminapi/controller/member/Account.php @@ -17,10 +17,17 @@ use app\service\admin\member\MemberService; use core\base\BaseAdminController; use think\Response; +/** + * 会员账户 + * Class Account + * @description 会员账户 + * @package app\adminapi\controller\member + */ class Account extends BaseAdminController { /** * 积分流水 + * @description 积分流水 * @return Response */ public function point() @@ -37,6 +44,7 @@ class Account extends BaseAdminController /** * 会员积分统计（用于会员积分统计窗口） + * @description 会员积分统计（用于会员积分统计窗口） */ public function sumPoint() { @@ -64,6 +72,7 @@ class Account extends BaseAdminController /** * 余额流水 + * @description 余额流水 * @return Response */ public function balance() @@ -80,6 +89,7 @@ class Account extends BaseAdminController /** * 可提现余额流水 + * @description 可提现余额流水 * @return Response */ public function money() @@ -96,6 +106,7 @@ class Account extends BaseAdminController /** * 查询成长值 + * @description 查询成长值 * @return Response */ public function growth() @@ -112,6 +123,7 @@ class Account extends BaseAdminController /** * 积分账户调整 + * @description 积分账户调整 */ public function adjustPoint() { @@ -126,6 +138,7 @@ class Account extends BaseAdminController /** * 余额账户调整 + * @description 余额账户调整 */ public function adjustBalance() { @@ -140,6 +153,7 @@ class Account extends BaseAdminController /** * 零钱调整 + * @description 零钱调整 * @return Response */ public function adjustMoney() @@ -155,6 +169,7 @@ class Account extends BaseAdminController /** * 会员佣金 + * @description 会员佣金 * @return Response */ public function commission() @@ -171,6 +186,7 @@ class Account extends BaseAdminController /** * 会员佣金统计（用于会员账户统计窗口） + * @description 会员佣金统计（用于会员账户统计窗口） */ public function sumCommission() { @@ -202,6 +218,7 @@ class Account extends BaseAdminController /** * 会员余额统计（用于会员账户统计窗口） + * @description 会员余额统计（用于会员账户统计窗口） */ public function sumBalance() { @@ -223,6 +240,7 @@ class Account extends BaseAdminController /** * 账户变化类型 + * @description 账户变化类型 * @param string $account_type * @return Response */ @@ -234,6 +252,7 @@ class Account extends BaseAdminController /** * 账户类型 + * @description 账户类型 */ public function accountType() { diff --git a/niucloud/app/adminapi/controller/member/Address.php b/niucloud/app/adminapi/controller/member/Address.php index b98079a7a..532d9b3d8 100644 --- a/niucloud/app/adminapi/controller/member/Address.php +++ b/niucloud/app/adminapi/controller/member/Address.php @@ -17,11 +17,13 @@ use core\base\BaseAdminController; /** * 会员收货地址控制器 + * @description 会员收货地址 */ class Address extends BaseAdminController { /** * 获取会员收货地址列表 + * @description 获取会员收货地址列表 * @return \think\Response */ public function lists(){ @@ -33,6 +35,7 @@ class Address extends BaseAdminController /** * 会员收货地址详情 + * @description 会员收货地址详情 * @param $id 会员收货地址id * @return \think\Response */ @@ -45,6 +48,7 @@ class Address extends BaseAdminController /** * 添加会员收货地址 + * @description 添加会员收货地址 * @return \think\Response */ public function add(){ @@ -68,6 +72,7 @@ class Address extends BaseAdminController /** * 会员收货地址编辑 + * @description 会员收货地址编辑 * @param $id 会员收货地址id * @return \think\Response */ diff --git a/niucloud/app/adminapi/controller/member/CashOut.php b/niucloud/app/adminapi/controller/member/CashOut.php index 778966bff..764ee64c4 100644 --- a/niucloud/app/adminapi/controller/member/CashOut.php +++ b/niucloud/app/adminapi/controller/member/CashOut.php @@ -17,10 +17,17 @@ use app\service\admin\member\MemberCashOutService; use core\base\BaseAdminController; use think\Response; +/** + * 提现 + * Class CashOut + * @description 提现 + * @package app\adminapi\controller\member + */ class CashOut extends BaseAdminController { /** * 提现列表 + * @description 提现列表 * @return Response */ public function lists() @@ -40,6 +47,7 @@ class CashOut extends BaseAdminController /** * 提现详情 + * @description 提现详情 * @param int $id * @return Response */ @@ -48,6 +56,13 @@ class CashOut extends BaseAdminController return success((new MemberCashOutService())->getInfo($id)); } + /** + * 提现申请 + * @description 提现申请 + * @param $id + * @param $action + * @return Response + */ public function audit($id, $action) { $data = $this->request->params([ @@ -59,6 +74,7 @@ class CashOut extends BaseAdminController /** * 转账方式 + * @description 转账方式 * @return Response */ public function getTransferType() @@ -68,6 +84,7 @@ class CashOut extends BaseAdminController /** * 转账方式 + * @description 转账方式 * @param $id * @return Response */ @@ -84,6 +101,7 @@ class CashOut extends BaseAdminController /** * 备注转账信息 + * @description 备注转账信息 * @param $id * @return Response */ @@ -97,6 +115,7 @@ class CashOut extends BaseAdminController } /** * 状态 + * @description 状态 * @return Response */ public function getStatusList() @@ -106,6 +125,7 @@ class CashOut extends BaseAdminController /** * 统计数据 + * @description 统计数据 */ public function stat() { @@ -114,6 +134,7 @@ class CashOut extends BaseAdminController /** * 校验数组是否 + * @description 校验数组是否 * @return void */ public function checkTransferStatus($id){ @@ -123,6 +144,7 @@ class CashOut extends BaseAdminController /** * 取消 + * @description 取消 * @param $id * @return void */ diff --git a/niucloud/app/adminapi/controller/member/Config.php b/niucloud/app/adminapi/controller/member/Config.php index fdd691a34..028cfe120 100644 --- a/niucloud/app/adminapi/controller/member/Config.php +++ b/niucloud/app/adminapi/controller/member/Config.php @@ -16,10 +16,17 @@ use app\service\admin\member\MemberService; use core\base\BaseAdminController; use think\Response; +/** + * 会员设置 + * Class Config + * @description 会员设置 + * @package app\adminapi\controller\member + */ class Config extends BaseAdminController { /** * 获取登录设置 + * @description 获取登录设置 * @return Response */ public function getLoginConfig() @@ -29,6 +36,7 @@ class Config extends BaseAdminController /** * 注册与登录设置 + * @description 设置注册与登录配置 * @return Response */ public function setLoginConfig() @@ -50,6 +58,7 @@ class Config extends BaseAdminController /** * 获取提现设置 + * @description 获取提现设置 * @return Response */ public function getCashOutConfig() @@ -59,6 +68,7 @@ class Config extends BaseAdminController /** * 提现设置 + * @description 设置提现设置 * @return Response */ public function setCashOutConfig() @@ -78,6 +88,7 @@ class Config extends BaseAdminController /** * 获取会员配置 + * @description 获取会员配置 * @return Response */ public function getMemberConfig() @@ -87,13 +98,15 @@ class Config extends BaseAdminController /** * 设置会员配置 + * @description 设置会员配置 * @return Response */ public function setMemberConfig() { $data = $this->request->params([ [ 'prefix', '' ], - [ 'length', 10 ] + [ 'length', 10 ], + [ 'form_id', '' ], ]); $this->validate($data, 'app\validate\member\MemberConfig.set'); ( new MemberConfigService() )->setMemberConfig($data); @@ -102,6 +115,7 @@ class Config extends BaseAdminController /** * 获取成长值规则配置 + * @description 获取成长值规则配置 * @return Response */ public function getGrowthRuleConfig() @@ -111,6 +125,7 @@ class Config extends BaseAdminController /** * 配置成长值规则 + * @description 配置成长值规则 * @return Response */ public function setGrowthRuleConfig() @@ -127,6 +142,7 @@ class Config extends BaseAdminController /** * 获取积分规则配置 + * @description 获取积分规则配置 * @return Response */ public function getPointRuleConfig() @@ -136,6 +152,7 @@ class Config extends BaseAdminController /** * 配置积分规则 + * @description 配置积分规则 * @return Response */ public function setPointRuleConfig() diff --git a/niucloud/app/adminapi/controller/member/Member.php b/niucloud/app/adminapi/controller/member/Member.php index 47767c97c..ae58480f9 100644 --- a/niucloud/app/adminapi/controller/member/Member.php +++ b/niucloud/app/adminapi/controller/member/Member.php @@ -21,10 +21,17 @@ use think\db\exception\DbException; use think\db\exception\ModelNotFoundException; use think\Response; +/** + * 会员管理 + * Class Member + * @description 会员管理 + * @package app\adminapi\controller\member + */ class Member extends BaseAdminController { /** * 会员列表 + * @description 会员列表 * @return Response */ public function lists() @@ -42,6 +49,7 @@ class Member extends BaseAdminController /** * 会员详情 + * @description 会员详情 * @param int $id * @return Response */ @@ -52,6 +60,7 @@ class Member extends BaseAdminController /** * 添加会员 + * @description 添加会员 * @return Response */ public function add() @@ -76,6 +85,7 @@ class Member extends BaseAdminController /** * 修改会员 + * @description 修改会员 * @param $member_id * @param $field * @return Response @@ -95,6 +105,7 @@ class Member extends BaseAdminController /** * 更新 + * @description 更新 * @return Response */ public function edit($member_id) @@ -112,6 +123,12 @@ class Member extends BaseAdminController return success('EDIT_SUCCESS'); } + /** + * 删除会员 + * @description 删除会员 + * @param $member_id + * @return Response + */ public function del($member_id) { $res = (new MemberService())->deleteMember($member_id); @@ -120,6 +137,7 @@ class Member extends BaseAdminController /** * 导出会员列表 + * @description 导出会员列表 * @return Response */ public function export() @@ -137,6 +155,7 @@ class Member extends BaseAdminController /** * 会员使用场景 + * @description 会员使用场景 * @return Response */ public function getMemberRegisterType() @@ -146,6 +165,7 @@ class Member extends BaseAdminController /** * 会员列表 + * @description 会员列表 * @return Response * @throws DataNotFoundException * @throws DbException @@ -162,6 +182,7 @@ class Member extends BaseAdminController /** * 获取会员注册渠道 + * @description 获取会员注册渠道 * @return Response */ public function getMemberRegisterChannelType() @@ -171,6 +192,7 @@ class Member extends BaseAdminController /** * 设置会员的状态 + * @description 设置会员的状态 * @param $status * @return Response */ @@ -187,6 +209,7 @@ class Member extends BaseAdminController /** * 获取状态枚举 + * @description 获取状态枚举 * @return Response */ public function getStatusList() @@ -196,6 +219,7 @@ class Member extends BaseAdminController /** * 获取会员编码 + * @description 获取会员编码 * @return Response */ public function getMemberNo() @@ -206,55 +230,85 @@ class Member extends BaseAdminController /** * 获取会员权益字典 + * @description 获取会员权益字典 * @return mixed */ - public function getMemberBenefitsDict() { + public function getMemberBenefitsDict() + { return success((new MemberService())->getMemberBenefitsDict()); } /** * 获取会员礼包字典 + * @description 获取会员礼包字典 * @return array|null */ - public function getMemberGiftDict() { + public function getMemberGiftDict() + { return success((new MemberService())->getMemberGiftDict()); } /** * 获取成长值规则字典 + * @description 获取成长值规则字典 * @return array|null */ - public function getGrowthRuleDict() { + public function getGrowthRuleDict() + { return success((new MemberService())->getGrowthRuleDict()); } /** * 获取积分规则字典 + * @description 获取积分规则字典 * @return array|null */ - public function getPointRuleDict() { + public function getPointRuleDict() + { return success((new MemberService())->getPointRuleDict()); } /** * 获取会员权益内容 + * @description 获取会员权益内容 * @return Response */ - public function getMemberBenefitsContent() { + public function getMemberBenefitsContent() + { $data = $this->request->params([ - [ 'benefits', [] ], + ['benefits', []], ]); return success((new MemberService())->getMemberBenefitsContent($data['benefits'])); } /** * 获取会员礼包内容 + * @description 获取会员礼包内容 * @return Response */ - public function getMemberGiftsContent() { + public function getMemberGiftsContent() + { $data = $this->request->params([ - [ 'gifts', [] ], + ['gifts', []], ]); return success((new MemberService())->getMemberGiftsContent($data['gifts'])); } + + /** + * 批量操作 + * @description 批量操作 + * @return Response + */ + public function batchModify() + { + $data = $this->request->params([ + ['is_all', 0], + ['where', []], + ['member_ids', []], + ['value', ''], + ['field', ''], + ]); + (new MemberService())->batchModify($data); + return success('MODIFY_SUCCESS'); + } } diff --git a/niucloud/app/adminapi/controller/member/MemberLabel.php b/niucloud/app/adminapi/controller/member/MemberLabel.php index 3f2a4153e..55f2e396f 100644 --- a/niucloud/app/adminapi/controller/member/MemberLabel.php +++ b/niucloud/app/adminapi/controller/member/MemberLabel.php @@ -18,10 +18,17 @@ use think\db\exception\DbException; use think\db\exception\ModelNotFoundException; use think\Response; +/** + * 会员标签 + * Class MemberLabel + * @description 会员标签 + * @package app\adminapi\controller\member + */ class MemberLabel extends BaseAdminController { /** * 会员标签列表 + * @description 会员标签列表 * @return Response */ public function lists() @@ -34,6 +41,7 @@ class MemberLabel extends BaseAdminController /** * 会员标签详情 + * @description 会员标签详情 * @param int $id * @return Response */ @@ -44,6 +52,7 @@ class MemberLabel extends BaseAdminController /** * 添加会员标签 + * @description 添加会员标签 * @return Response */ public function add() @@ -61,6 +70,7 @@ class MemberLabel extends BaseAdminController /** * 编辑会员标签 + * @description 编辑会员标签 */ public function edit($id) { @@ -76,6 +86,7 @@ class MemberLabel extends BaseAdminController /** * 会员标签删除 + * @description 会员标签删除 * @param int $id * @return Response */ @@ -87,6 +98,7 @@ class MemberLabel extends BaseAdminController /** * 获取标签 + * @description 获取标签 * @return Response * @throws DataNotFoundException * @throws DbException diff --git a/niucloud/app/adminapi/controller/member/MemberLevel.php b/niucloud/app/adminapi/controller/member/MemberLevel.php index 0cf0edbf7..6e01403c9 100644 --- a/niucloud/app/adminapi/controller/member/MemberLevel.php +++ b/niucloud/app/adminapi/controller/member/MemberLevel.php @@ -18,10 +18,17 @@ use think\db\exception\DbException; use think\db\exception\ModelNotFoundException; use think\Response; +/** + * 会员等级 + * Class MemberLevel + * @description 会员等级 + * @package app\adminapi\controller\member + */ class MemberLevel extends BaseAdminController { /** * 会员等级分页列表 + * @description 会员等级分页列表 * @return Response */ public function pages() @@ -34,6 +41,7 @@ class MemberLevel extends BaseAdminController /** * 会员等级详情 + * @description 会员等级详情 * @param int $id * @return Response */ @@ -44,6 +52,7 @@ class MemberLevel extends BaseAdminController /** * 添加会员等级 + * @description 添加会员等级 * @return Response */ public function add() @@ -62,6 +71,7 @@ class MemberLevel extends BaseAdminController /** * 编辑会员等级 + * @description 编辑会员等级 */ public function edit($id) { @@ -79,6 +89,7 @@ class MemberLevel extends BaseAdminController /** * 会员等级删除 + * @description 会员等级删除 * @param int $id * @return Response */ @@ -90,6 +101,7 @@ class MemberLevel extends BaseAdminController /** * 获取标签 + * @description 获取标签 * @return Response * @throws DataNotFoundException * @throws DbException diff --git a/niucloud/app/adminapi/controller/member/MemberSign.php b/niucloud/app/adminapi/controller/member/MemberSign.php index b7ee55bdf..e740c6018 100644 --- a/niucloud/app/adminapi/controller/member/MemberSign.php +++ b/niucloud/app/adminapi/controller/member/MemberSign.php @@ -15,10 +15,17 @@ use app\service\admin\member\MemberSignService; use core\base\BaseAdminController; use think\Response; +/** + * 会员签到 + * Class MemberSign + * @description 会员签到 + * @package app\adminapi\controller\member + */ class MemberSign extends BaseAdminController { /** * 会员签到记录 + * @description 会员签到记录 * @return Response */ public function lists() @@ -32,6 +39,7 @@ class MemberSign extends BaseAdminController /** * 会员签到详情 + * @description 会员签到详情 * @param int $sign_id * @return Response */ @@ -40,7 +48,9 @@ class MemberSign extends BaseAdminController return success(( new MemberSignService() )->getInfo($sign_id)); } - /**设置签到设置 + /** + * 设置签到设置 + * @description 设置签到设置 * @return Response */ public function setSign() @@ -58,6 +68,7 @@ class MemberSign extends BaseAdminController /** * 获取签到设置 + * @description 获取签到设置 * @return Response */ public function getSign() diff --git a/niucloud/app/adminapi/controller/niucloud/Cloud.php b/niucloud/app/adminapi/controller/niucloud/Cloud.php index 22a3861f3..30d0e0462 100644 --- a/niucloud/app/adminapi/controller/niucloud/Cloud.php +++ b/niucloud/app/adminapi/controller/niucloud/Cloud.php @@ -14,10 +14,17 @@ namespace app\adminapi\controller\niucloud; use app\service\core\niucloud\CoreCloudBuildService; use core\base\BaseAdminController; +/** + * 云编译 + * Class Cloud + * @description 云编译 + * @package app\adminapi\controller\niucloud + */ class Cloud extends BaseAdminController { /** * 云编译 + * @description 云编译 * @return \think\Response */ public function build() { @@ -34,6 +41,7 @@ class Cloud extends BaseAdminController /** * 获取云编译日志 + * @description 获取云编译日志 * @return \think\Response */ public function getBuildLog() { @@ -42,6 +50,7 @@ class Cloud extends BaseAdminController /** * 获取云编译任务 + * @description 获取云编译任务 * @return \think\Response */ public function getBuildTask() { @@ -50,6 +59,7 @@ class Cloud extends BaseAdminController /** * 清除云编译任务 + * @description 清除云编译任务 * @return \think\Response */ public function clearBuildTask() { @@ -58,6 +68,7 @@ class Cloud extends BaseAdminController /** * 编译前环境检测 + * @description 编译前环境检测 * @return \think\Response */ public function buildPreCheck() { diff --git a/niucloud/app/adminapi/controller/niucloud/Module.php b/niucloud/app/adminapi/controller/niucloud/Module.php index e856cf55e..723e57853 100644 --- a/niucloud/app/adminapi/controller/niucloud/Module.php +++ b/niucloud/app/adminapi/controller/niucloud/Module.php @@ -16,8 +16,20 @@ use app\service\core\niucloud\CoreAuthService; use core\base\BaseAdminController; use think\Response; +/** + * 模块 + * Class Module + * @description 模块 + * @package app\adminapi\controller\niucloud + */ class Module extends BaseAdminController { + /** + * 获取授权信息 + * @description 获取授权信息 + * @return Response + * @throws \GuzzleHttp\Exception\GuzzleException + */ public function authorize() { return success(( new CoreAuthService() )->getAuthInfo()); @@ -25,6 +37,7 @@ class Module extends BaseAdminController /** * 设置 授权信息 + * @description 设置 授权信息 */ public function setAuthorize() { @@ -38,6 +51,7 @@ class Module extends BaseAdminController /** * 获取 授权信息 + * @description 获取 授权信息 */ public function getAuthorize() { @@ -46,6 +60,7 @@ class Module extends BaseAdminController /** * 获取框架最新版本 + * @description 获取框架最新版本 * @return Response * @throws \GuzzleHttp\Exception\GuzzleException */ @@ -56,6 +71,7 @@ class Module extends BaseAdminController /** * 获取框架最新版本 + * @description 获取框架最新版本 * @return Response * @throws \GuzzleHttp\Exception\GuzzleException */ @@ -66,6 +82,7 @@ class Module extends BaseAdminController /** * 申请体验 + * @description 申请体验 * @return Response */ public function applyExperience() @@ -75,6 +92,7 @@ class Module extends BaseAdminController /** * 获取应用/插件的版本更新记录 + * @description 获取应用/插件的版本更新记录 * @return Response */ public function getAppVersionList() diff --git a/niucloud/app/adminapi/controller/notice/NiuSms.php b/niucloud/app/adminapi/controller/notice/NiuSms.php index e58c09167..e3f6c2a2e 100644 --- a/niucloud/app/adminapi/controller/notice/NiuSms.php +++ b/niucloud/app/adminapi/controller/notice/NiuSms.php @@ -15,10 +15,17 @@ use app\service\admin\notice\NiuSmsService; use core\base\BaseAdminController; use think\Response; +/** + * 牛云短信管理 + * Class NiuSms + * @description 牛云短信管理 + * @package app\adminapi\controller\notice + */ class NiuSms extends BaseAdminController { /** * 启用牛云短信 + * @description 启用牛云短信 * @return Response */ public function enable() @@ -30,9 +37,9 @@ class NiuSms extends BaseAdminController return success("SUCCESS"); } - /** * 获取基础信息 + * @description 获取基础信息 * @return Response */ public function getConfig() @@ -40,6 +47,11 @@ class NiuSms extends BaseAdminController return success((new NiuSmsService())->getConfig()); } + /** + * 获取短信套餐列表 + * @description 获取短信套餐列表 + * @return Response + */ public function getSmsPackageList() { $params = $this->request->params([ @@ -56,7 +68,11 @@ class NiuSms extends BaseAdminController return success($list); } - /*******牛云*******/ + /** + * 发送短信验证码 + * @description 发送短信验证码 + * @return Response + */ public function sendMobileCode() { $params = $this->request->params([ @@ -70,6 +86,7 @@ class NiuSms extends BaseAdminController /** * 获取图形验证码 + * @description 获取图形验证码 * @return Response */ public function captcha() @@ -80,6 +97,7 @@ class NiuSms extends BaseAdminController /** * 注册牛云短信子账号 + * @description 注册牛云短信子账号 * @return Response */ public function registerAccount() @@ -112,6 +130,7 @@ class NiuSms extends BaseAdminController /** * 登录牛云短信子账号 + * @description 登录牛云短信子账号 * @return Response */ public function loginAccount() @@ -126,6 +145,7 @@ class NiuSms extends BaseAdminController /** * 获取短信发送列表 + * @description 获取短信发送列表 * @param $username * @return Response */ @@ -142,6 +162,7 @@ class NiuSms extends BaseAdminController /** * 获取子账户信息 + * @description 获取子账户信息 * @param $username * @return Response */ @@ -153,6 +174,7 @@ class NiuSms extends BaseAdminController /** * 修改子账户信息 + * @description 修改子账户信息 * @param $username * @return Response */ @@ -171,6 +193,7 @@ class NiuSms extends BaseAdminController /** * 重置密码 + * @description 重置密码 * @param $username * @return Response */ @@ -187,6 +210,7 @@ class NiuSms extends BaseAdminController /** * 忘记密码 + * @description 忘记密码 * @param $username * @return Response */ @@ -203,6 +227,7 @@ class NiuSms extends BaseAdminController /** * 签名列表 + * @description 签名列表 * @param $username * @return Response */ @@ -214,6 +239,7 @@ class NiuSms extends BaseAdminController /** * 签名信息 + * @description 签名信息 * @param $username * @return Response */ @@ -224,6 +250,11 @@ class NiuSms extends BaseAdminController return success($data); } + /** + * 签名创建、报备需要的配置 + * @description 签名创建、报备需要的配置 + * @return Response + */ public function signCreateConfig() { return success((new NiuSmsService())->signCreateConfig()); @@ -231,6 +262,7 @@ class NiuSms extends BaseAdminController /** * 签名创建、报备 + * @description 签名创建、报备 * @param $username * @return Response */ @@ -254,6 +286,12 @@ class NiuSms extends BaseAdminController return success("SUCCESS"); } + /** + * 签名删除 + * @description 签名删除 + * @param $username + * @return Response + */ public function signDelete($username) { $params = $this->request->params([ @@ -265,6 +303,7 @@ class NiuSms extends BaseAdminController /** * 同步模版状态 + * @description 同步模版状态 * @param $sms_type * @param $username * @return Response @@ -277,6 +316,7 @@ class NiuSms extends BaseAdminController /** * 模版列表 + * @description 模版列表 * @param $sms_type * @param $username * @return Response @@ -289,6 +329,7 @@ class NiuSms extends BaseAdminController /** * 模版信息 + * @description 模版信息 * @param $sms_type * @param $username * @return Response @@ -302,6 +343,7 @@ class NiuSms extends BaseAdminController /** * 创建模版需要的配置 + * @description 创建模版需要的配置 * @return Response */ public function templateCreateConfig() @@ -311,6 +353,7 @@ class NiuSms extends BaseAdminController /** * 创建模版 + * @description 创建模版 * @param $sms_type * @param $username * @return Response @@ -329,6 +372,7 @@ class NiuSms extends BaseAdminController /** * 清除模版 + * @description 清除模版 * @param $username * @param $template_id * @return Response @@ -341,6 +385,7 @@ class NiuSms extends BaseAdminController /** * 创建订单 + * @description 创建订单 * @param $username * @return Response */ @@ -356,6 +401,7 @@ class NiuSms extends BaseAdminController /** * 订单计算 + * @description 订单计算 * @param $username * @return Response */ @@ -366,11 +412,11 @@ class NiuSms extends BaseAdminController ]); $data = (new NiuSmsService())->calculate($username, $params['package_id']); return success($data); - } /** * 获取支付信息 + * @description 获取支付信息 * @param $username * @return Response */ @@ -384,7 +430,8 @@ class NiuSms extends BaseAdminController } /** - * 充值、订单列表 + * 充值订单列表 + * @description 充值订单列表 * @param $username * @return Response */ @@ -402,6 +449,7 @@ class NiuSms extends BaseAdminController /** * 订单详情 + * @description 订单详情 * @param $username * @return Response */ @@ -416,6 +464,7 @@ class NiuSms extends BaseAdminController /** * 订单状态 + * @description 订单状态 * @param $username * @return Response */ diff --git a/niucloud/app/adminapi/controller/notice/Notice.php b/niucloud/app/adminapi/controller/notice/Notice.php index 514348925..c80f4cb3c 100644 --- a/niucloud/app/adminapi/controller/notice/Notice.php +++ b/niucloud/app/adminapi/controller/notice/Notice.php @@ -18,11 +18,18 @@ use core\base\BaseAdminController; use core\exception\AdminException; use think\Response; +/** + * 消息管理 + * Class Notice + * @description 消息管理 + * @package app\adminapi\controller\notice + */ class Notice extends BaseAdminController { /** * 消息列表 + * @description 消息列表 * @return Response */ public function lists() @@ -31,6 +38,12 @@ class Notice extends BaseAdminController return success($res); } + /** + * 消息详情 + * @description 消息详情 + * @param $key + * @return Response + */ public function info($key) { $res = (new NoticeService())->getInfo($key); @@ -39,6 +52,7 @@ class Notice extends BaseAdminController /** * 消息启动与关闭 + * @description 消息启动与关闭 * @return Response */ public function editStatus() @@ -54,6 +68,8 @@ class Notice extends BaseAdminController /** * 短信配置列表 + * @description 短信配置列表 + * @return Response */ public function smsList() { @@ -63,6 +79,7 @@ class Notice extends BaseAdminController /** * 短信配置详情 + * @description 短信配置详情 * @param $sms_type * @return Response */ @@ -74,6 +91,7 @@ class Notice extends BaseAdminController /** * 短信配置修改 + * @description 短信配置修改 * @return Response */ public function editSms($sms_type) @@ -96,6 +114,7 @@ class Notice extends BaseAdminController /** * 消息修改 + * @description 消息修改 * @return Response */ public function edit() diff --git a/niucloud/app/adminapi/controller/notice/NoticeLog.php b/niucloud/app/adminapi/controller/notice/NoticeLog.php index 8a8dcb182..9eb00a3b1 100644 --- a/niucloud/app/adminapi/controller/notice/NoticeLog.php +++ b/niucloud/app/adminapi/controller/notice/NoticeLog.php @@ -15,11 +15,18 @@ use app\service\admin\notice\NoticeLogService; use core\base\BaseAdminController; use think\Response; +/** + * 消息发送记录 + * Class NoticeLog + * @description 消息发送记录 + * @package app\adminapi\controller\notice + */ class NoticeLog extends BaseAdminController { /** * 消息发送记录列表 + * @description 消息发送记录列表 * @return Response */ public function lists() @@ -34,6 +41,12 @@ class NoticeLog extends BaseAdminController return success($res); } + /** + * 消息发送记录详情 + * @description 消息发送记录详情 + * @param $id + * @return Response + */ public function info($id) { $res = (new NoticeLogService())->getInfo($id); diff --git a/niucloud/app/adminapi/controller/notice/SmsLog.php b/niucloud/app/adminapi/controller/notice/SmsLog.php index 1216a9e14..44aa66dfb 100644 --- a/niucloud/app/adminapi/controller/notice/SmsLog.php +++ b/niucloud/app/adminapi/controller/notice/SmsLog.php @@ -15,11 +15,18 @@ use app\service\admin\notice\NoticeSmsLogService; use core\base\BaseAdminController; use think\Response; +/** + * 短信发送记录 + * Class SmsLog + * @description 短信发送记录 + * @package app\adminapi\controller\notice + */ class SmsLog extends BaseAdminController { /** * 短信发送记录列表 + * @description 短信发送记录列表 * @return Response */ public function lists() @@ -35,6 +42,12 @@ class SmsLog extends BaseAdminController return success($res); } + /** + * 短信发送记录详情 + * @description 短信发送记录详情 + * @param $id + * @return Response + */ public function info($id) { $res = (new NoticeSmsLogService())->getInfo($id); diff --git a/niucloud/app/adminapi/controller/pay/Pay.php b/niucloud/app/adminapi/controller/pay/Pay.php index dcfc750f8..eb14318fd 100644 --- a/niucloud/app/adminapi/controller/pay/Pay.php +++ b/niucloud/app/adminapi/controller/pay/Pay.php @@ -14,11 +14,17 @@ namespace app\adminapi\controller\pay; use app\service\admin\pay\PayService; use core\base\BaseAdminController; +/** + * 支付管理 + * Class Pay + * @description 支付管理 + * @package app\adminapi\controller\pay + */ class Pay extends BaseAdminController { /** * 待审核支付记录 - * @param array $where + * @description 待审核支付记录 * @return mixed */ public function audit(){ @@ -32,7 +38,8 @@ class Pay extends BaseAdminController /** * 查询详情 - * @param string $out_trade_no + * @description 查询详情 + * @param int $id * @return \think\Response */ public function detail(int $id){ @@ -41,6 +48,7 @@ class Pay extends BaseAdminController /** * 支付审核通过 + * @description 支付审核通过 * @param string $out_trade_no * @return \think\Response */ @@ -50,6 +58,7 @@ class Pay extends BaseAdminController /** * 审核拒绝 + * @description 审核拒绝 * @param string $out_trade_no */ public function refuse(string $out_trade_no){ @@ -59,11 +68,11 @@ class Pay extends BaseAdminController /** * 去支付 + * @description 去支付 * @return \think\Response */ public function pay() { - $data = $this->request->params([ ['type', ''], ['trade_type', ''],//业务类型 @@ -80,6 +89,7 @@ class Pay extends BaseAdminController /** * 支付信息 + * @description 支付信息 * @param $trade_type * @param $trade_id * @return \think\Response @@ -91,6 +101,7 @@ class Pay extends BaseAdminController /** * 找朋友帮忙付支付信息 + * @description 找朋友帮忙付支付信息 * @param $trade_type * @param $trade_id * @param $channel @@ -103,10 +114,11 @@ class Pay extends BaseAdminController /** * 支付方式列表 + * @description 支付方式列表 * @return \think\Response */ public function payTypeList() { return success(data:(new PayService())->getPayTypeList()); } -} +} \ No newline at end of file diff --git a/niucloud/app/adminapi/controller/pay/PayChannel.php b/niucloud/app/adminapi/controller/pay/PayChannel.php index 16f6be6f1..4bba8d522 100644 --- a/niucloud/app/adminapi/controller/pay/PayChannel.php +++ b/niucloud/app/adminapi/controller/pay/PayChannel.php @@ -19,11 +19,18 @@ use think\db\exception\DbException; use think\db\exception\ModelNotFoundException; use think\Response; +/** + * 支付渠道设置 + * Class PayChannel + * @description 支付渠道设置 + * @package app\adminapi\controller\pay + */ class PayChannel extends BaseAdminController { /** * 支付渠道设置 + * @description 支付渠道设置 * @return Response */ public function set($channel, $type) @@ -39,9 +46,9 @@ class PayChannel extends BaseAdminController return success('SET_SUCCESS'); } - /** * 支付渠道列表 + * @description 支付渠道列表 * @return Response */ public function lists() @@ -51,6 +58,7 @@ class PayChannel extends BaseAdminController /** * 通过渠道获取支付配置 + * @description 通过渠道获取支付配置 * @param $channel * @return Response * @throws DataNotFoundException @@ -62,9 +70,9 @@ class PayChannel extends BaseAdminController return success((new PayChannelService())->getListByChannel($channel)); } - /** * 支付设置 + * @description 支付设置 * @return Response */ public function setTransfer() @@ -81,6 +89,7 @@ class PayChannel extends BaseAdminController /** * 多渠道支付设置 + * @description 多渠道支付设置 * @return Response */ public function setAll() @@ -96,6 +105,7 @@ class PayChannel extends BaseAdminController /** * 获取全部支付方式 + * @description 获取全部支付方式 * @return Response */ public function getPayTypeList() { diff --git a/niucloud/app/adminapi/controller/pay/PayRefund.php b/niucloud/app/adminapi/controller/pay/PayRefund.php index e7fa2367c..fcf79f771 100644 --- a/niucloud/app/adminapi/controller/pay/PayRefund.php +++ b/niucloud/app/adminapi/controller/pay/PayRefund.php @@ -15,9 +15,17 @@ use app\dict\pay\RefundDict; use app\service\admin\pay\RefundService; use core\base\BaseAdminController; +/** + * 退款管理 + * Class PayRefund + * @description 退款管理 + * @package app\adminapi\controller\pay + */ class PayRefund extends BaseAdminController { /** + * 退款状态 + * @description 退款状态 * @return \think\Response */ public function getStatus() @@ -26,6 +34,7 @@ class PayRefund extends BaseAdminController } /** * 退款列表 + * @description 退款列表 * @return \think\Response */ public function pages() @@ -40,6 +49,7 @@ class PayRefund extends BaseAdminController /** * 退款详情 + * @description 退款详情 * @param $refund_no * @return \think\Response */ @@ -50,6 +60,7 @@ class PayRefund extends BaseAdminController /** * 获取退款方式 + * @description 获取退款方式 */ public function getRefundType() { @@ -58,6 +69,7 @@ class PayRefund extends BaseAdminController /** * 转账 + * @description 转账 * @return \think\Response */ public function transfer() diff --git a/niucloud/app/adminapi/controller/pay/Transfer.php b/niucloud/app/adminapi/controller/pay/Transfer.php index 24253b44a..6a2010596 100644 --- a/niucloud/app/adminapi/controller/pay/Transfer.php +++ b/niucloud/app/adminapi/controller/pay/Transfer.php @@ -11,15 +11,20 @@ namespace app\adminapi\controller\pay; -use app\dict\pay\TransferDict; -use app\service\admin\pay\PayService; use app\service\admin\pay\TransferService; use core\base\BaseAdminController; +/** + * 转账管理 + * Class Transfer + * @description 转账管理 + * @package app\adminapi\controller\pay + */ class Transfer extends BaseAdminController { /** * 转账方式 + * @description 转账方式 * @return \think\Response */ public function getWechatTransferScene(){ @@ -28,6 +33,7 @@ class Transfer extends BaseAdminController /** * 设置场景id + * @description 设置场景id * @param $scene * @return void */ @@ -40,6 +46,7 @@ class Transfer extends BaseAdminController /** * 设置业务转账场景配置 + * @description 设置业务转账场景配置 * @param $type * @return \think\Response */ @@ -51,4 +58,4 @@ class Transfer extends BaseAdminController ]); return success(data:(new TransferService())->setTradeScene($type, $data)); } -} +} \ No newline at end of file diff --git a/niucloud/app/adminapi/controller/poster/Poster.php b/niucloud/app/adminapi/controller/poster/Poster.php index afa218e77..009c63588 100644 --- a/niucloud/app/adminapi/controller/poster/Poster.php +++ b/niucloud/app/adminapi/controller/poster/Poster.php @@ -15,12 +15,15 @@ use core\base\BaseAdminController; /** * 海报 + * @description 海报 + * @package app\adminapi\controller\poster */ class Poster extends BaseAdminController { /** * 获取海报 + * @description 获取海报 * @return \think\Response */ public function poster() diff --git a/niucloud/app/adminapi/controller/sys/Agreement.php b/niucloud/app/adminapi/controller/sys/Agreement.php index e8deae591..87e53d3db 100644 --- a/niucloud/app/adminapi/controller/sys/Agreement.php +++ b/niucloud/app/adminapi/controller/sys/Agreement.php @@ -24,6 +24,7 @@ class Agreement extends BaseAdminController { /** * 协议列表 + * @description 协议列表 * @return Response */ public function lists() @@ -34,6 +35,7 @@ class Agreement extends BaseAdminController /** * 协议内容 + * @description 协议内容 * @param string $key * @return Response */ @@ -45,6 +47,7 @@ class Agreement extends BaseAdminController /** * 协议更新 + * @description 协议更新 * @param string $key * @return Response */ @@ -59,5 +62,4 @@ class Agreement extends BaseAdminController return success('EDIT_SUCCESS'); } - } diff --git a/niucloud/app/adminapi/controller/sys/App.php b/niucloud/app/adminapi/controller/sys/App.php index 393a1fffa..4cfd9a4bd 100644 --- a/niucloud/app/adminapi/controller/sys/App.php +++ b/niucloud/app/adminapi/controller/sys/App.php @@ -22,6 +22,7 @@ class App extends BaseAdminController { /** * 获取应用链接列表 + * @description 获取应用链接列表 * @return Response */ public function getAppList() @@ -29,5 +30,4 @@ class App extends BaseAdminController return success((new AppService())->getAppList()); } - } diff --git a/niucloud/app/adminapi/controller/sys/Area.php b/niucloud/app/adminapi/controller/sys/Area.php index 71f3d510b..49b8d9841 100644 --- a/niucloud/app/adminapi/controller/sys/Area.php +++ b/niucloud/app/adminapi/controller/sys/Area.php @@ -15,10 +15,17 @@ use app\service\admin\sys\AreaService; use core\base\BaseAdminController; use think\Response; +/** + * 地区管理 + * Class Area + * @description 地区管理 + * @package app\adminapi\controller\sys + */ class Area extends BaseAdminController { /** - * 拖过pid获取子项列表 + * 根据pid获取子项列表 + * @description 根据pid获取子项列表 * @param int $pid * @return Response */ @@ -29,6 +36,7 @@ class Area extends BaseAdminController /** * 获取层级列表 + * @description 获取层级列表 * @param int $level * @return Response */ @@ -38,6 +46,8 @@ class Area extends BaseAdminController } /** + * 获取地址信息 + * @description 获取地址信息 * @return Response */ public function addressInfo() @@ -49,6 +59,8 @@ class Area extends BaseAdminController } /** + * 获取地址信息 + * @description 获取地址信息 * @return Response */ public function contraryAddress() @@ -60,7 +72,8 @@ class Area extends BaseAdminController } /** - * + * 根据code获取地址信息 + * @description 根据code获取地址信息 * @return void */ public function areaByAreaCode(string $code) { diff --git a/niucloud/app/adminapi/controller/sys/Attachment.php b/niucloud/app/adminapi/controller/sys/Attachment.php index 3958e83f9..bb699256a 100644 --- a/niucloud/app/adminapi/controller/sys/Attachment.php +++ b/niucloud/app/adminapi/controller/sys/Attachment.php @@ -16,11 +16,18 @@ use app\service\admin\sys\AttachmentService; use core\base\BaseAdminController; use think\Response; +/** + * 附件管理 + * Class Attachment + * @description 附件管理 + * @package app\adminapi\controller\sys + */ class Attachment extends BaseAdminController { /** * 附件列表 + * @description 附件列表 */ public function lists() { @@ -36,6 +43,7 @@ class Attachment extends BaseAdminController /** * 删除附件 + * @description 删除附件 * @param $att_id * @return Response */ @@ -46,6 +54,7 @@ class Attachment extends BaseAdminController /** * 批量删除 + * @description 批量删除 * @return Response */ public function batchDel() @@ -59,6 +68,7 @@ class Attachment extends BaseAdminController /** * 新增附件分组 + * @description 新增附件分组 * @return Response */ public function addCategory() @@ -74,6 +84,7 @@ class Attachment extends BaseAdminController /** * 附件分组列表 + * @description 附件分组列表 */ public function categoryLists() { @@ -86,6 +97,7 @@ class Attachment extends BaseAdminController /** * 更新附件分组 + * @description 更新附件分组 * @return Response */ public function editCategory($id) @@ -100,6 +112,7 @@ class Attachment extends BaseAdminController /** * 删除附件组 + * @description 删除附件组 * @param $id * @return Response */ @@ -111,6 +124,7 @@ class Attachment extends BaseAdminController /** * 移动图片分组 + * @description 移动图片分组 * @return Response */ public function moveCategory($att_id) @@ -124,6 +138,7 @@ class Attachment extends BaseAdminController /** * 批量移动图片分组 + * @description 批量移动图片分组 * @return Response */ public function batchMoveCategory() diff --git a/niucloud/app/adminapi/controller/sys/Channel.php b/niucloud/app/adminapi/controller/sys/Channel.php index 5dd319c03..baab0c3f9 100644 --- a/niucloud/app/adminapi/controller/sys/Channel.php +++ b/niucloud/app/adminapi/controller/sys/Channel.php @@ -15,11 +15,17 @@ use app\dict\common\ChannelDict; use core\base\BaseAdminController; use think\Response; +/** + * 渠道管理 + * Class Channel + * @description 渠道管理 + */ class Channel extends BaseAdminController { /** * 获取渠道列表 + * @description 获取渠道列表 * @return Response */ public function getChannelType() diff --git a/niucloud/app/adminapi/controller/sys/Common.php b/niucloud/app/adminapi/controller/sys/Common.php index 12570a989..5a3456b79 100644 --- a/niucloud/app/adminapi/controller/sys/Common.php +++ b/niucloud/app/adminapi/controller/sys/Common.php @@ -17,11 +17,15 @@ use think\Response; /** * 公共数据字典 + * Class Common + * @description 公共数据字典 + * @package app\adminapi\controller\sys */ class Common extends BaseAdminController { /** * 月份 + * @description 月份 * @return Response */ public function getMonth() @@ -31,6 +35,7 @@ class Common extends BaseAdminController /** * 星期 + * @description 星期 * @return Response */ public function getWeek() @@ -38,5 +43,4 @@ class Common extends BaseAdminController return success((new DateDict())->getWeek()); } - } diff --git a/niucloud/app/adminapi/controller/sys/Config.php b/niucloud/app/adminapi/controller/sys/Config.php index 639aa9867..2c8fbf5d8 100644 --- a/niucloud/app/adminapi/controller/sys/Config.php +++ b/niucloud/app/adminapi/controller/sys/Config.php @@ -15,10 +15,17 @@ use app\service\admin\sys\ConfigService; use core\base\BaseAdminController; use think\Response; +/** + * 配置管理 + * Class Config + * @description 配置管理 + * @package app\adminapi\controller\sys + */ class Config extends BaseAdminController { /** * 获取网站设置 + * @description 获取网站设置 * @return Response */ public function getWebsite() @@ -28,6 +35,7 @@ class Config extends BaseAdminController /** * 网站设置 + * @description 网站设置 * @return Response */ public function setWebsite() @@ -65,6 +73,7 @@ class Config extends BaseAdminController /** * 获取版权信息 + * @description 获取版权信息 * @return Response */ public function getCopyright() @@ -72,7 +81,9 @@ class Config extends BaseAdminController return success(( new ConfigService() )->getCopyright()); } - /**设置版权信息 + /** + * 设置版权信息 + * @description 设置版权信息 * @return Response */ public function setCopyright() @@ -93,6 +104,7 @@ class Config extends BaseAdminController /** * 场景域名 + * @description 场景域名 * @return Response */ public function getSceneDomain() @@ -102,6 +114,7 @@ class Config extends BaseAdminController /** * 获取服务信息 + * @description 获取服务信息 * @return Response */ public function getServiceInfo() @@ -109,7 +122,9 @@ class Config extends BaseAdminController return success(( new ConfigService() )->getService()); } - /**设置版权信息 + /** + * 设置地图信息 + * @description 设置地图信息 * @return Response */ public function setMap() @@ -125,6 +140,7 @@ class Config extends BaseAdminController /** * 获取地图设置 + * @description 获取地图设置 * @return Response */ public function getMap() @@ -146,6 +162,7 @@ class Config extends BaseAdminController /** * 获取开发者key + * @description 获取开发者key * @return Response */ public function getDeveloperToken() @@ -155,6 +172,7 @@ class Config extends BaseAdminController /** * 设置开发者key + * @description 设置开发者key * @return Response */ public function setDeveloperToken() diff --git a/niucloud/app/adminapi/controller/sys/Export.php b/niucloud/app/adminapi/controller/sys/Export.php index a25caf326..04e7877a0 100644 --- a/niucloud/app/adminapi/controller/sys/Export.php +++ b/niucloud/app/adminapi/controller/sys/Export.php @@ -16,11 +16,18 @@ use app\service\admin\sys\ExportService; use core\base\BaseAdminController; use think\Response; +/** + * 报表导出 + * Class Export + * @description 报表导出 + * @package app\adminapi\controller\sys + */ class Export extends BaseAdminController { /** * 报表导出列表 + * @description 报表导出列表 * @return Response */ public function lists() @@ -36,6 +43,7 @@ class Export extends BaseAdminController /** * 报表导出 + * @description 报表导出 * @param string $type * @return Response */ @@ -46,6 +54,7 @@ class Export extends BaseAdminController /** * 检查导出数据源是否为空 + * @description 检查导出数据源是否为空 * @param string $type * @return Response */ @@ -57,6 +66,7 @@ class Export extends BaseAdminController /** * 报表删除 + * @description 报表删除 * @param $id * @return Response */ @@ -68,6 +78,7 @@ class Export extends BaseAdminController /** * 获取导出状态列表 + * @description 获取导出状态列表 * @param string $type */ public function getExportStatus() @@ -77,6 +88,7 @@ class Export extends BaseAdminController /** * 获取导出数据类型列表 + * @description 获取导出数据类型列表 * @return Response */ public function getExportDataType(){ diff --git a/niucloud/app/adminapi/controller/sys/Menu.php b/niucloud/app/adminapi/controller/sys/Menu.php index 32a0e2f21..56b6540a9 100644 --- a/niucloud/app/adminapi/controller/sys/Menu.php +++ b/niucloud/app/adminapi/controller/sys/Menu.php @@ -19,83 +19,93 @@ use app\service\admin\sys\MenuService; use core\base\BaseAdminController; use think\Response; +/** + * 菜单管理 + * Class Menu + * @description 菜单管理 + * @package app\adminapi\controller\sys + */ class Menu extends BaseAdminController { /** - * 菜单列表 + * 菜单列表(todo 限制只有平台端可以访问) + * @description 菜单列表 * @return Response */ public function lists() { - return success((new MenuService())->getAllMenuList('all', 1)); + return success(( new MenuService() )->getAllMenuList('all', 1)); } /** * 菜单信息 + * @description 菜单信息 * @param $menu_key * @return Response */ public function info($menu_key) { - return success((new MenuService())->get($menu_key)); + return success(( new MenuService() )->get($menu_key)); } /** * 新增菜单接口 + * @description 新增菜单 * @return Response */ public function add() { $data = $this->request->params([ - ['menu_name', ''], - ['menu_type', 0], - ['menu_key', ''], - ['parent_key', ''], - ['icon', ''], - ['api_url', ''], - ['view_path', ''], - ['router_path', ''], - ['methods', ''], - ['sort', 0], - ['status', MenuDict::ON], - ['is_show', 0], - ['addon', ''], - ['menu_short_name',''] + [ 'menu_name', '' ], + [ 'menu_type', 0 ], + [ 'menu_key', '' ], + [ 'parent_key', '' ], + [ 'icon', '' ], + [ 'api_url', '' ], + [ 'view_path', '' ], + [ 'router_path', '' ], + [ 'methods', '' ], + [ 'sort', 0 ], + [ 'status', MenuDict::ON ], + [ 'is_show', 0 ], + [ 'addon', '' ], + [ 'menu_short_name', '' ] ]); $this->validate($data, 'app\validate\sys\Menu.add'); - (new MenuService())->add($data); + ( new MenuService() )->add($data); return success('ADD_SUCCESS'); } /** * 菜单或接口更新 + * @description 菜单或接口更新 */ public function edit($menu_key) { $data = $this->request->params([ - ['menu_name', ''], - ['parent_key', ''], - ['menu_type', 0], - ['icon', ''], - ['api_url', ''], - ['router_path', ''], - ['view_path', ''], - ['methods', ''], - ['sort', 0], - ['status', MenuDict::ON], - ['is_show', 0], - ['addon', ''], - ['menu_short_name',''] + [ 'menu_name', '' ], + [ 'parent_key', '' ], + [ 'menu_type', 0 ], + [ 'icon', '' ], + [ 'api_url', '' ], + [ 'router_path', '' ], + [ 'view_path', '' ], + [ 'methods', '' ], + [ 'sort', 0 ], + [ 'status', MenuDict::ON ], + [ 'is_show', 0 ], + [ 'addon', '' ], + [ 'menu_short_name', '' ] ]); $this->validate($data, 'app\validate\sys\Menu.edit'); - (new MenuService())->edit($menu_key, $data); + ( new MenuService() )->edit($menu_key, $data); return success('EDIT_SUCCESS'); } - /** * 获取菜单类型静态资源 + * @description 获取菜单类型静态资源 * @return Response */ public function getMenuType() @@ -105,6 +115,7 @@ class Menu extends BaseAdminController /** * 获取请求方式 + * @description 获取请求方式 * @return Response */ public function getMethodType() @@ -114,46 +125,53 @@ class Menu extends BaseAdminController /** * 删除菜单 + * @description 删除菜单 * @param $menu_key * @return Response */ public function del($menu_key) { - (new MenuService())->del($menu_key); + ( new MenuService() )->del($menu_key); return success('DELETE_SUCCESS'); } + /** + * 刷新菜单 + * @description 刷新菜单 + * @return Response + */ public function refreshMenu() { - (new InstallSystemService())->install(); + ( new InstallSystemService() )->install(); return success('SUCCESS'); } /** * 查询菜单信息 + * @description 查询菜单信息 */ public function getSystem() { - $data = $this->request->params([ - ['status', 'all'], - ]); - return success( (new MenuService())->getSystemMenu($data['status'], 1)); + return success(( new MenuService() )->getSystemMenu('all', 1)); } /** * 查询应用权限信息 + * @description 查询应用权限信息 */ public function getAddonMenu($app_key) { - return success( (new MenuService())->getAddonMenu($app_key,'all', 1)); + return success(( new MenuService() )->getAddonMenu($app_key, 'all', 1)); } /** * 查询菜单类型为目录的菜单 + * @description 查询菜单类型为目录的菜单 * @param $addon * @return Response */ - public function getMenuByTypeDir($addon = 'system') { - return success( (new MenuService())->getMenuByTypeDir($addon)); + public function getMenuByTypeDir($addon = 'system') + { + return success(( new MenuService() )->getMenuByTypeDir($addon)); } } diff --git a/niucloud/app/adminapi/controller/sys/Poster.php b/niucloud/app/adminapi/controller/sys/Poster.php index 2cfa760a0..2c23c8130 100644 --- a/niucloud/app/adminapi/controller/sys/Poster.php +++ b/niucloud/app/adminapi/controller/sys/Poster.php @@ -18,6 +18,7 @@ use core\base\BaseAdminController; /** * 自定义海报 * Class Poster + * @description 自定义海报 * @package app\adminapi\controller\sys */ class Poster extends BaseAdminController @@ -25,6 +26,7 @@ class Poster extends BaseAdminController /** * 获取自定义海报分页列表 + * @description 获取自定义海报分页列表 * @return \think\Response */ public function pages() @@ -38,6 +40,7 @@ class Poster extends BaseAdminController /** * 获取自定义海报分页列表 + * @description 获取自定义海报分页列表 * @return \think\Response */ public function lists() @@ -51,6 +54,7 @@ class Poster extends BaseAdminController /** * 自定义海报详情 + * @description 自定义海报详情 * @param int $id * @return \think\Response */ @@ -61,6 +65,7 @@ class Poster extends BaseAdminController /** * 添加自定义海报 + * @description 添加自定义海报 * @return \think\Response */ public function add() @@ -80,6 +85,7 @@ class Poster extends BaseAdminController /** * 自定义海报编辑 + * @description 自定义海报编辑 * @param int $id 自定义海报id * @return \think\Response */ @@ -100,6 +106,7 @@ class Poster extends BaseAdminController /** * 自定义海报删除 + * @description 自定义海报删除 * @param int $id 自定义海报id * @return \think\Response */ @@ -111,6 +118,7 @@ class Poster extends BaseAdminController /** * 修改自定义海报状态 + * @description 修改自定义海报状态 * @return \think\Response */ public function modifyStatus() @@ -125,6 +133,7 @@ class Poster extends BaseAdminController /** * 将自定义海报修改为默认海报 + * @description 将自定义海报修改为默认海报 * @return \think\Response */ public function modifyDefault() @@ -138,6 +147,7 @@ class Poster extends BaseAdminController /** * 获取自定义海报类型 + * @description 获取自定义海报类型 * @return \think\Response */ public function type() @@ -150,6 +160,7 @@ class Poster extends BaseAdminController /** * 获取自定义海报模版 + * @description 获取自定义海报模版 * @return \think\Response */ public function template() @@ -163,6 +174,7 @@ class Poster extends BaseAdminController /** * 获取自定义海报初始化数据 + * @description 获取自定义海报初始化数据 * @return \think\Response * @throws \think\db\exception\DbException */ @@ -178,6 +190,7 @@ class Poster extends BaseAdminController /** * 获取自定义海报预览 + * @description 获取自定义海报预览 * @return array|\think\Response */ public function preview() diff --git a/niucloud/app/adminapi/controller/sys/Printer.php b/niucloud/app/adminapi/controller/sys/Printer.php index 878b2c5f6..2ee8f23d8 100644 --- a/niucloud/app/adminapi/controller/sys/Printer.php +++ b/niucloud/app/adminapi/controller/sys/Printer.php @@ -19,6 +19,7 @@ use core\base\BaseAdminController; /** * 小票打印机控制器 * Class Printer + * @description 小票打印机 * @package app\adminapi\controller\sys */ class Printer extends BaseAdminController @@ -26,6 +27,7 @@ class Printer extends BaseAdminController /** * 获取小票打印机分页列表 + * @description 获取小票打印机分页列表 * @return \think\Response */ public function pages() @@ -38,6 +40,7 @@ class Printer extends BaseAdminController /** * 获取小票打印机列表 + * @description 获取小票打印机列表 * @return \think\Response */ public function lists() @@ -50,6 +53,7 @@ class Printer extends BaseAdminController /** * 小票打印机详情 + * @description 小票打印机详情 * @param int $id * @return \think\Response */ @@ -60,6 +64,7 @@ class Printer extends BaseAdminController /** * 添加小票打印机 + * @description 添加小票打印机 * @return \think\Response */ public function add() @@ -84,6 +89,7 @@ class Printer extends BaseAdminController /** * 小票打印机编辑 + * @description 小票打印机编辑 * @param $id 小票打印机id * @return \think\Response */ @@ -109,6 +115,7 @@ class Printer extends BaseAdminController /** * 修改小票打印机状态 + * @description 修改小票打印机状态 * @return \think\Response */ public function modifyStatus() @@ -123,6 +130,7 @@ class Printer extends BaseAdminController /** * 小票打印机删除 + * @description 小票打印机删除 * @param $id 小票打印机id * @return \think\Response */ @@ -134,6 +142,7 @@ class Printer extends BaseAdminController /** * 获取小票打印模板分页列表 + * @description 获取小票打印模板分页列表 * @return \think\Response */ public function templatePageLists() @@ -147,6 +156,7 @@ class Printer extends BaseAdminController /** * 获取小票打印模板列表 + * @description 获取小票打印模板列表 * @return \think\Response * @throws \think\db\exception\DbException */ @@ -161,6 +171,7 @@ class Printer extends BaseAdminController /** * 小票打印模板详情 + * @description 小票打印模板详情 * @param int $id * @return \think\Response */ @@ -171,6 +182,7 @@ class Printer extends BaseAdminController /** * 添加小票打印模板 + * @description 添加小票打印模板 * @return \think\Response */ public function templateAdd() @@ -187,6 +199,7 @@ class Printer extends BaseAdminController /** * 小票打印模板编辑 + * @description 小票打印模板编辑 * @param $id 小票打印模板id * @return \think\Response */ @@ -204,6 +217,7 @@ class Printer extends BaseAdminController /** * 小票打印模板删除 + * @description 小票打印模板删除 * @param $id 小票打印模板id * @return \think\Response */ @@ -215,6 +229,7 @@ class Printer extends BaseAdminController /** * 获取小票打印模板类型 + * @description 获取小票打印模板类型 * @return array|\think\Response */ public function getType() @@ -224,6 +239,7 @@ class Printer extends BaseAdminController /** * 获取小票打印机设备品牌 + * @description 获取小票打印机设备品牌 * @return array|\think\Response */ public function getBrand() @@ -236,6 +252,7 @@ class Printer extends BaseAdminController /** * 测试打印 + * @description 测试打印 * @param int $id * @return \think\Response */ @@ -247,6 +264,7 @@ class Printer extends BaseAdminController /** * 刷新打印机token + * @description 刷新打印机token * @param int $id * @return \think\Response */ @@ -258,6 +276,7 @@ class Printer extends BaseAdminController /** * 打印小票内容 + * @description 打印小票内容 * @return \think\Response */ public function printTicket() diff --git a/niucloud/app/adminapi/controller/sys/Role.php b/niucloud/app/adminapi/controller/sys/Role.php index 11b66c29a..34f1ff712 100644 --- a/niucloud/app/adminapi/controller/sys/Role.php +++ b/niucloud/app/adminapi/controller/sys/Role.php @@ -17,8 +17,19 @@ use core\base\BaseAdminController; use think\db\exception\DbException; use think\Response; +/** + * 用户组管理 + * Class Role + * @description 用户组管理 + * @package app\adminapi\controller\sys + */ class Role extends BaseAdminController { + /** + * 用户组列表 + * @description 用户组列表 + * @return Response + */ public function lists() { $data = $this->request->params([ @@ -31,6 +42,7 @@ class Role extends BaseAdminController /** * 用户组详情 + * @description 用户组详情 * @param $role_id * @return Response */ @@ -41,6 +53,7 @@ class Role extends BaseAdminController /** * 获取全部权限 + * @description 获取全部权限 * @return Response */ public function all() @@ -50,6 +63,7 @@ class Role extends BaseAdminController /** * 新增用户组 + * @description 新增用户组 * @return Response */ public function add() @@ -64,9 +78,9 @@ class Role extends BaseAdminController return success('ADD_SUCCESS'); } - /** * 更新用户组 + * @description 更新用户组 */ public function edit($role_id) { @@ -80,9 +94,9 @@ class Role extends BaseAdminController return success('EDIT_SUCCESS'); } - /** * 删除单个用户组 + * @description 删除单个用户组 * @param $role_id * @return Response * @throws DbException @@ -95,15 +109,17 @@ class Role extends BaseAdminController /** * 设置角色状态 + * @description 设置角色状态 * @param $role_id * @return Response */ - public function setStatus($role_id) + public function modifyStatus($role_id) { $data = $this->request->params([ ['status', RoleStatusDict::ON], ]); - (new RoleService())->setStatus($role_id, $data['status']); + (new RoleService())->modifyStatus($role_id, $data['status']); return success('DELETE_SUCCESS'); } + } diff --git a/niucloud/app/adminapi/controller/sys/Schedule.php b/niucloud/app/adminapi/controller/sys/Schedule.php index ac4228725..c5df84def 100644 --- a/niucloud/app/adminapi/controller/sys/Schedule.php +++ b/niucloud/app/adminapi/controller/sys/Schedule.php @@ -18,11 +18,14 @@ use think\Response; /** * 自动任务 + * @description 自动任务 + * @package app\adminapi\controller\sys */ class Schedule extends BaseAdminController { /** * 任务列表 + * @description 任务列表 * @return Response */ public function lists() @@ -32,11 +35,11 @@ class Schedule extends BaseAdminController ['status', 'all'], ]); return success(data: (new ScheduleService())->getPage($data)); - } /** * 计划任务模板 + * @description 计划任务模板 * @return Response */ public function template() @@ -46,6 +49,7 @@ class Schedule extends BaseAdminController /** * 获取任务模式 + * @description 获取任务模式 * @return Response */ public function getType() @@ -55,6 +59,7 @@ class Schedule extends BaseAdminController /** * 详情 + * @description 详情 * @param int $id * @return Response */ @@ -65,6 +70,7 @@ class Schedule extends BaseAdminController /** * 添加 + * @description 添加 * @return Response */ public function add() @@ -81,6 +87,7 @@ class Schedule extends BaseAdminController /** * 编辑 + * @description 编辑 * @param int $id * @return Response */ @@ -97,6 +104,7 @@ class Schedule extends BaseAdminController /** * 启用或关闭 + * @description 启用或关闭 * @param int $id * @return Response */ @@ -111,6 +119,7 @@ class Schedule extends BaseAdminController /** * 删除 + * @description 删除 * @param int $id * @return Response */ @@ -122,6 +131,7 @@ class Schedule extends BaseAdminController /** * 时间间隔类型 + * @description 时间间隔类型 * @return Response */ public function getDateType() @@ -131,6 +141,7 @@ class Schedule extends BaseAdminController /** * 执行一次任务 + * @description 执行一次任务 * @param int $id * @return Response */ diff --git a/niucloud/app/adminapi/controller/sys/ScheduleLog.php b/niucloud/app/adminapi/controller/sys/ScheduleLog.php index 17dee1eb9..35b018743 100644 --- a/niucloud/app/adminapi/controller/sys/ScheduleLog.php +++ b/niucloud/app/adminapi/controller/sys/ScheduleLog.php @@ -17,11 +17,13 @@ use think\Response; /** * 计划任务执行记录 + * @description 计划任务执行记录 */ class ScheduleLog extends BaseAdminController { /** * 任务执行记录列表 + * @description 任务执行记录列表 * @return Response */ public function lists() @@ -38,6 +40,7 @@ class ScheduleLog extends BaseAdminController /** * 删除计划任务执行记录 + * @description 删除计划任务执行记录 * @return Response */ public function del() @@ -51,6 +54,7 @@ class ScheduleLog extends BaseAdminController /** * 清空计划任务执行记录 + * @description 清空计划任务执行记录 * @return Response */ public function clear() diff --git a/niucloud/app/adminapi/controller/sys/System.php b/niucloud/app/adminapi/controller/sys/System.php index 98a895964..2adfb8492 100644 --- a/niucloud/app/adminapi/controller/sys/System.php +++ b/niucloud/app/adminapi/controller/sys/System.php @@ -18,12 +18,14 @@ use think\Response; /** * 系统信息查询 * Class System + * @description 系统信息查询 * @package app\adminapi\controller\sys */ class System extends BaseAdminController { /** * 获取当前系统信息 + * @description 获取当前系统信息 * @return Response */ public function info() @@ -33,6 +35,7 @@ class System extends BaseAdminController /** * 获取当前url配置 + * @description 获取当前url配置 * @return Response */ public function url() @@ -42,6 +45,7 @@ class System extends BaseAdminController /** * 获取系统环境配置 + * @description 获取系统环境配置 * @return Response */ public function getSystemInfo() @@ -51,6 +55,7 @@ class System extends BaseAdminController /** * 清理表缓存 + * @description 清理表缓存 */ public function schemaCache() { @@ -59,6 +64,7 @@ class System extends BaseAdminController /** * 清理缓存 + * @description 清理缓存 */ public function clearCache() { @@ -67,6 +73,7 @@ class System extends BaseAdminController /** * 校验消息队列是否正常运行 + * @description 校验消息队列是否正常运行 * @return Response */ public function checkJob() @@ -76,6 +83,7 @@ class System extends BaseAdminController /** * 校验计划任务是否正常运行 + * @description 校验计划任务是否正常运行 * @return Response */ public function checkSchedule() @@ -85,6 +93,7 @@ class System extends BaseAdminController /** * 环境变量查询 + * @description 环境变量查询 * @return Response */ public function getEnvInfo() @@ -94,6 +103,7 @@ class System extends BaseAdminController /** * 获取推广二维码 + * @description 获取推广二维码 * @return Response */ public function getSpreadQrcode() diff --git a/niucloud/app/adminapi/controller/sys/Ueditor.php b/niucloud/app/adminapi/controller/sys/Ueditor.php index 24f278de8..910dc3d1f 100644 --- a/niucloud/app/adminapi/controller/sys/Ueditor.php +++ b/niucloud/app/adminapi/controller/sys/Ueditor.php @@ -16,6 +16,7 @@ use core\base\BaseAdminController; use think\Response; /** + * Ueditor */ class Ueditor extends BaseAdminController { diff --git a/niucloud/app/adminapi/controller/upload/Storage.php b/niucloud/app/adminapi/controller/upload/Storage.php index 254b5d076..5c00d4404 100644 --- a/niucloud/app/adminapi/controller/upload/Storage.php +++ b/niucloud/app/adminapi/controller/upload/Storage.php @@ -17,11 +17,18 @@ use core\base\BaseAdminController; use core\exception\AdminException; use think\Response; +/** + * 存储管理 + * Class Storage + * @description 存储管理 + * @package app\adminapi\controller\upload + */ class Storage extends BaseAdminController { /** * 云存储配置列表 + * @description 云存储配置列表 */ public function storageList() { @@ -31,6 +38,7 @@ class Storage extends BaseAdminController /** * 存储配置详情 + * @description 存储配置详情 * @param $storage_type 存储驱动类型 * @return Response */ @@ -42,6 +50,7 @@ class Storage extends BaseAdminController /** * 存储设置修改 + * @description 存储设置修改 * @return Response */ public function editStorage($storage_type) diff --git a/niucloud/app/adminapi/controller/upload/Upload.php b/niucloud/app/adminapi/controller/upload/Upload.php index 01d72d26f..e390e800b 100644 --- a/niucloud/app/adminapi/controller/upload/Upload.php +++ b/niucloud/app/adminapi/controller/upload/Upload.php @@ -16,10 +16,17 @@ use app\service\admin\upload\UploadService; use core\base\BaseAdminController; use think\Response; +/** + * 上传管理 + * Class Upload + * @description 上传管理 + * @package app\adminapi\controller\upload + */ class Upload extends BaseAdminController { /** * 图片上传 + * @description 图片上传 * @return Response */ public function image() @@ -36,6 +43,7 @@ class Upload extends BaseAdminController /** * 视频上传 + * @description 视频上传 * @return Response */ public function video() @@ -50,6 +58,7 @@ class Upload extends BaseAdminController /** * 文件上传(默认不上云) + * @description 文件上传 * @return Response */ public function document($type) @@ -63,6 +72,7 @@ class Upload extends BaseAdminController /** * 上传配置 + * @description 上传配置 * @return Response */ public function setUploadConfig() @@ -81,6 +91,7 @@ class Upload extends BaseAdminController /** * 获取上传配置 + * @description 获取上传配置 * @return Response */ public function getUploadConfig() diff --git a/niucloud/app/adminapi/controller/user/User.php b/niucloud/app/adminapi/controller/user/User.php index bc54ad73d..a671b31a9 100644 --- a/niucloud/app/adminapi/controller/user/User.php +++ b/niucloud/app/adminapi/controller/user/User.php @@ -19,10 +19,16 @@ use think\Response; /** * 站点用户接口 + * @description 站点用户 * Class User */ class User extends BaseAdminController { + /** + * 用户列表 + * @description 用户列表 + * @return Response + */ public function lists() { $data = $this->request->params([ @@ -50,6 +56,11 @@ class User extends BaseAdminController return success((new UserService())->getInfo($uid)); } + /** + * 获取全部用户 + * @description 获取全部用户 + * @return Response + */ public function getUserAll() { $data = $this->request->params([ @@ -63,6 +74,7 @@ class User extends BaseAdminController /** * 新增用户 + * @description 新增用户 * @return Response * @throws Exception */ @@ -81,9 +93,9 @@ class User extends BaseAdminController return success('ADD_SUCCESS', ['uid' => $uid]); } - /** * 更新用户 + * @description 更新用户 */ public function edit($uid) { @@ -100,6 +112,7 @@ class User extends BaseAdminController /** * 更新字段 + * @description 更新字段 * @param $uid * @param $field * @return Response @@ -118,6 +131,7 @@ class User extends BaseAdminController /** * 删除单个用户 + * @description 删除单个用户 * @param $uid * @return Response */ @@ -129,6 +143,7 @@ class User extends BaseAdminController /** * 锁定用户 + * @description 锁定用户 */ public function lock($uid) { @@ -138,6 +153,7 @@ class User extends BaseAdminController /** * 解锁用户 + * @description 解锁用户 */ public function unlock($uid) { @@ -145,5 +161,4 @@ class User extends BaseAdminController return success('MODIFY_SUCCESS'); } - } diff --git a/niucloud/app/adminapi/controller/verify/Verifier.php b/niucloud/app/adminapi/controller/verify/Verifier.php index e76e15340..bfa4c5ad2 100644 --- a/niucloud/app/adminapi/controller/verify/Verifier.php +++ b/niucloud/app/adminapi/controller/verify/Verifier.php @@ -16,10 +16,17 @@ use app\service\admin\verify\VerifierService; use core\base\BaseAdminController; use think\Response; +/** + * 核销人员 + * Class Verifier + * @description 核销人员 + * @package app\adminapi\controller\verify + */ class Verifier extends BaseAdminController { /** * 核销人员列表 + * @description 核销人员列表 * @return Response */ public function lists() @@ -29,6 +36,7 @@ class Verifier extends BaseAdminController /** * 核销人员列表 + * @description 核销人员列表 * @return Response */ public function select() @@ -38,7 +46,8 @@ class Verifier extends BaseAdminController /** * 获取核销员信息 - * @param int $order_id + * @description 获取核销员信息 + * @param int $id * @return Response */ public function detail($id) @@ -48,7 +57,7 @@ class Verifier extends BaseAdminController /** * 添加核销员 - * @param int $order_id + * @description 添加核销员 * @return Response */ public function add() @@ -62,7 +71,8 @@ class Verifier extends BaseAdminController /** * 添加核销员 - * @param int $order_id + * @description 添加核销员 + * @param int $id * @return Response */ public function edit($id) @@ -76,6 +86,7 @@ class Verifier extends BaseAdminController /** * 删除核销员 + * @description 删除核销员 */ public function del(int $id) { @@ -84,6 +95,7 @@ class Verifier extends BaseAdminController /** * 获取核销类型 + * @description 获取核销类型 * @return Response */ public function getVerifyType() diff --git a/niucloud/app/adminapi/controller/verify/Verify.php b/niucloud/app/adminapi/controller/verify/Verify.php index 14b666e31..2a14c2120 100644 --- a/niucloud/app/adminapi/controller/verify/Verify.php +++ b/niucloud/app/adminapi/controller/verify/Verify.php @@ -15,10 +15,17 @@ use app\service\admin\verify\VerifyService; use core\base\BaseAdminController; use think\Response; +/** + * 核销记录 + * Class Verify + * @description 核销记录 + * @package app\adminapi\controller\verify + */ class Verify extends BaseAdminController { /** * 核销记录列表 + * @description 核销记录列表 * @return Response */ public function lists() @@ -35,6 +42,7 @@ class Verify extends BaseAdminController /** * 核销信息 + * @description 核销信息 * @param int $order_id * @return Response */ diff --git a/niucloud/app/adminapi/controller/weapp/Config.php b/niucloud/app/adminapi/controller/weapp/Config.php index b78c8cca0..58e32bf72 100644 --- a/niucloud/app/adminapi/controller/weapp/Config.php +++ b/niucloud/app/adminapi/controller/weapp/Config.php @@ -15,10 +15,17 @@ use app\service\admin\weapp\WeappConfigService; use core\base\BaseAdminController; use think\Response; +/** + * 微信小程序配置 + * Class Config + * @description 微信小程序配置 + * @package app\adminapi\controller\weapp + */ class Config extends BaseAdminController { /** * 获取微信小程序配置信息 + * @description 获取微信小程序配置信息 * @return Response */ public function get() @@ -28,6 +35,7 @@ class Config extends BaseAdminController /** * 设置微信小程序配置信息 + * @description 设置微信小程序配置信息 * @return Response */ public function set() diff --git a/niucloud/app/adminapi/controller/weapp/Delivery.php b/niucloud/app/adminapi/controller/weapp/Delivery.php index 6b37f0b82..b29ececac 100644 --- a/niucloud/app/adminapi/controller/weapp/Delivery.php +++ b/niucloud/app/adminapi/controller/weapp/Delivery.php @@ -16,12 +16,14 @@ use core\base\BaseAdminController; /** * 小程序发货信息管理服务 + * @description 小程序发货信息管理服务 */ class Delivery extends BaseAdminController { /** * 查询小程序是否已开通发货信息管理服务 + * @description 查询小程序是否已开通发货信息管理服务 * @return bool * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException */ diff --git a/niucloud/app/adminapi/controller/weapp/Template.php b/niucloud/app/adminapi/controller/weapp/Template.php index e8d842d5e..05e7612f7 100644 --- a/niucloud/app/adminapi/controller/weapp/Template.php +++ b/niucloud/app/adminapi/controller/weapp/Template.php @@ -17,12 +17,14 @@ use think\Response; /** * 微信小程序订阅消息 + * @description 微信小程序订阅消息 */ class Template extends BaseAdminController { /** * 订阅消息 + * @description 订阅消息 * @return Response */ public function lists() @@ -31,9 +33,9 @@ class Template extends BaseAdminController return success($wechat_template_service->getList()); } - /** - * 菜单信息 + * 同步微信公众号消息模板 + * @description 同步微信公众号消息模板 * @return Response */ public function sync() diff --git a/niucloud/app/adminapi/controller/weapp/Version.php b/niucloud/app/adminapi/controller/weapp/Version.php index e64af8988..4475ddac9 100644 --- a/niucloud/app/adminapi/controller/weapp/Version.php +++ b/niucloud/app/adminapi/controller/weapp/Version.php @@ -17,11 +17,13 @@ use think\Response; /** * 小程序版本管理控制器 + * @description 小程序版本管理 */ class Version extends BaseAdminController { /** * 列表 + * @description 列表 * @return Response */ public function lists() @@ -34,6 +36,7 @@ class Version extends BaseAdminController /** * 详情 + * @description 详情 * @param int $id * @return Response */ @@ -44,6 +47,7 @@ class Version extends BaseAdminController /** * 添加 + * @description 添加 * @return Response */ public function add() @@ -56,7 +60,7 @@ class Version extends BaseAdminController /** * 获取预览码 - * @param int $id + * @description 获取预览码 * @return Response */ public function preview() @@ -66,6 +70,7 @@ class Version extends BaseAdminController /** * 删除 + * @description 删除 * @param int $id * @return Response */ diff --git a/niucloud/app/adminapi/controller/wechat/Config.php b/niucloud/app/adminapi/controller/wechat/Config.php index 2d4137050..1bda65b81 100644 --- a/niucloud/app/adminapi/controller/wechat/Config.php +++ b/niucloud/app/adminapi/controller/wechat/Config.php @@ -19,6 +19,7 @@ class Config extends BaseAdminController { /** * 获取微信配置信息 + * @description 获取微信配置信息 * @return Response */ public function get() @@ -28,6 +29,7 @@ class Config extends BaseAdminController /** * 设置微信配置信息 + * @description 设置微信配置信息 * @return Response */ public function set() @@ -49,6 +51,7 @@ class Config extends BaseAdminController /** * 获取微信静态资源 + * @description 获取微信静态资源 * @return Response */ public function static() diff --git a/niucloud/app/adminapi/controller/wechat/Media.php b/niucloud/app/adminapi/controller/wechat/Media.php index 9ca7ea111..3dd06df38 100644 --- a/niucloud/app/adminapi/controller/wechat/Media.php +++ b/niucloud/app/adminapi/controller/wechat/Media.php @@ -29,6 +29,7 @@ class Media extends BaseAdminController /** * 上传图片素材 + * @description 上传图片素材 * @return \think\Response * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface @@ -42,6 +43,7 @@ class Media extends BaseAdminController /** * 上传视频素材 + * @description 上传视频素材 * @return \think\Response * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface @@ -55,6 +57,7 @@ class Media extends BaseAdminController /** * 同步草稿箱 + * @description 同步草稿箱 * @return \think\Response * @throws \EasyWeChat\Kernel\Exceptions\InvalidArgumentException * @throws \Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface diff --git a/niucloud/app/adminapi/controller/wechat/Menu.php b/niucloud/app/adminapi/controller/wechat/Menu.php index ce5444f9a..734f56cde 100644 --- a/niucloud/app/adminapi/controller/wechat/Menu.php +++ b/niucloud/app/adminapi/controller/wechat/Menu.php @@ -24,7 +24,8 @@ class Menu extends BaseAdminController { /** - * 菜单信息 + * 获取微信菜单 + * @description 获取微信菜单 * @return Response */ public function info() @@ -34,7 +35,8 @@ class Menu extends BaseAdminController } /** - * 设置菜单 + * 更新微信菜单 + * @description 更新微信菜单 * @return Response * @throws InvalidConfigException * @throws GuzzleException diff --git a/niucloud/app/adminapi/controller/wechat/Reply.php b/niucloud/app/adminapi/controller/wechat/Reply.php index 08767c7f7..c1df60e48 100644 --- a/niucloud/app/adminapi/controller/wechat/Reply.php +++ b/niucloud/app/adminapi/controller/wechat/Reply.php @@ -23,6 +23,7 @@ class Reply extends BaseAdminController /** * 关键词回复 + * @description 关键词回复 * @return Response */ public function keyword($id) @@ -43,6 +44,7 @@ class Reply extends BaseAdminController /** * 新增关键词回复 + * @description 新增关键词回复 * @return Response */ public function addKeyword() @@ -62,6 +64,7 @@ class Reply extends BaseAdminController /** * 更新关键词回复 + * @description 更新关键词回复 * @return Response */ public function editKeyword($id) @@ -81,6 +84,7 @@ class Reply extends BaseAdminController /** * 删除关键字回复 + * @description 删除关键字回复 * @return Response */ public function delKeyword($id) @@ -92,6 +96,7 @@ class Reply extends BaseAdminController /** * 获取默认回复 + * @description 获取默认回复 * @return Response */ public function default() @@ -102,6 +107,7 @@ class Reply extends BaseAdminController /** * 更新默认回复 + * @description 更新默认回复 * @return Response */ public function editDefault() @@ -116,6 +122,7 @@ class Reply extends BaseAdminController /** * 获取关注回复 + * @description 获取关注回复 * @return Response */ public function subscribe() @@ -126,6 +133,7 @@ class Reply extends BaseAdminController /** * 更新关注回复 + * @description 更新关注回复 * @return Response */ public function editSubscribe() diff --git a/niucloud/app/adminapi/controller/wechat/Template.php b/niucloud/app/adminapi/controller/wechat/Template.php index 76519ea0b..ecd0ac612 100644 --- a/niucloud/app/adminapi/controller/wechat/Template.php +++ b/niucloud/app/adminapi/controller/wechat/Template.php @@ -22,7 +22,8 @@ class Template extends BaseAdminController { /** - * 菜单信息 + * 同步微信公众号消息模板 + * @description 同步微信公众号消息模板 * @return Response */ public function sync() @@ -36,6 +37,7 @@ class Template extends BaseAdminController /** * 模板消息 + * @description 获取模板消息 * @return Response */ public function lists() diff --git a/niucloud/app/adminapi/middleware/AdminLog.php b/niucloud/app/adminapi/middleware/AdminLog.php index efaf8536e..ab691335d 100644 --- a/niucloud/app/adminapi/middleware/AdminLog.php +++ b/niucloud/app/adminapi/middleware/AdminLog.php @@ -15,6 +15,7 @@ namespace app\adminapi\middleware; use app\Request; use app\service\admin\user\UserLogService; use Closure; +use ReflectionClass; /** * admin用户操作日志 @@ -27,18 +28,63 @@ class AdminLog { //写入日志 if ($request->method() != 'GET') { + $path = $request->rule()->getRoute(); + if(strstr($path,'@')){ + $arr = explode('@', $path); + $controller = $arr[0] ?? ""; + $action = $arr[1] ?? ""; + }else{ + //暂时只有APP目录下使用这样的路由定义 + list($controllerStr, $action) = explode('/', $path, 2); + list($module, $controller) = explode('.', $controllerStr, 2); + // 拼接完整类名（根据 TP 命名空间规则调整） + $controllerClass = "app\\adminapi\\controller\\{$module}\\{$controller}"; + $controller = $controllerClass; + } + + $operation = $this->extractDescFromAnnotation($controller, $action); $data = [ 'uid' => $request->uid(), 'username' => $request->username(), 'url' => $request->url(), 'params' => $request->param(), 'ip' => $request->ip(), - 'type' => $request->method() - + 'type' => $request->method(), + 'operation' => $operation, ]; (new UserLogService())->add($data); } return $next($request); } + + private function extractDescFromAnnotation($controllerClass, $actionMethod) + { + try { + if (!class_exists($controllerClass)) { + return ''; + } + + $reflection = new ReflectionClass($controllerClass); + $controller_comment = $reflection->getDocComment(); + $controller_desc = ''; + if (preg_match('/@description\s+(.+)/', $controller_comment, $matches)) { + $controller_desc = $matches[1]; + } + if (!$reflection->hasMethod($actionMethod)) { + return ''; + } + + $method = $reflection->getMethod($actionMethod); + $docComment = $method->getDocComment(); + + if (preg_match('/@description\s+(.+)/', $docComment, $matches)) { + return (empty($controller_desc) ? "" : $controller_desc.'-').$matches[1]; + } + + return ''; + } catch (\Exception $e) { + return ''; + } + } } diff --git a/niucloud/app/adminapi/route/addon.php b/niucloud/app/adminapi/route/addon.php index cca92a7e2..62f3645c7 100644 --- a/niucloud/app/adminapi/route/addon.php +++ b/niucloud/app/adminapi/route/addon.php @@ -91,4 +91,6 @@ Route::group(function () { Route::get('addon/list/install', 'addon.Addon/getInstallList'); // 获取应用列表 Route::get('addon/list/showapp', 'addon.Addon/showApp'); + // 获取营销列表 + Route::get('showMarketing', 'addon.Addon/showMarketing'); }); diff --git a/niucloud/app/adminapi/route/member.php b/niucloud/app/adminapi/route/member.php index 906d786ec..fded33f96 100644 --- a/niucloud/app/adminapi/route/member.php +++ b/niucloud/app/adminapi/route/member.php @@ -36,6 +36,7 @@ Route::group('member', function() { Route::get('member/export', 'member.Member/export'); Route::put('member/modify/:member_id/:field', 'member.Member/modify'); + Route::post('member/batch_modify', 'member.Member/batchModify'); //会员注册方式 Route::get('registertype', 'member.Member/getMemberRegisterType'); //会员注册渠道 diff --git a/niucloud/app/adminapi/route/sys.php b/niucloud/app/adminapi/route/sys.php index df585c9b2..b36eda280 100644 --- a/niucloud/app/adminapi/route/sys.php +++ b/niucloud/app/adminapi/route/sys.php @@ -37,8 +37,8 @@ Route::group('sys', function() { Route::put('role/:role_id', 'sys.Role/edit'); //删除用户组 Route::delete('role/:role_id', 'sys.Role/del'); - //设置用户组状态 - Route::put('role/status/:role_id', 'sys.Role/setStatus'); + // 修改用户组状态 + Route::put('role/status', 'sys.Role/modifyStatus'); /***************************************************** 菜单 ****************************************************/ //菜单新增 Route::post('menu', 'sys.Menu/add'); diff --git a/niucloud/app/api/controller/diy/DiyForm.php b/niucloud/app/api/controller/diy/DiyForm.php index a97f84f92..02113f16b 100644 --- a/niucloud/app/api/controller/diy/DiyForm.php +++ b/niucloud/app/api/controller/diy/DiyForm.php @@ -43,6 +43,20 @@ class DiyForm extends BaseApiController return success('SUCCESS', ( new DiyFormService() )->addRecord($data)); } + /** + * 编辑填表记录 + * @return Response + */ + public function editRecord() + { + $data = $this->request->params([ + [ 'record_id', '' ], + [ 'value', [] ], + [ 'relate_id', '' ], + ]); + return success('SUCCESS', ( new DiyFormService() )->editRecord($data)); + } + /** * 获取表单填写结果信息 * @return Response @@ -66,4 +80,13 @@ class DiyForm extends BaseApiController ]); return success('SUCCESS', ( new DiyFormService() )->getFormRecordInfo($data)); } + + /** + * 获取个人资料表单填写记录 + * @return Response + */ + public function getMemberInfoRecord() + { + return success('SUCCESS', ( new DiyFormService() )->getMemberInfoFormRecordInfo()); + } } diff --git a/niucloud/app/api/controller/sys/Config.php b/niucloud/app/api/controller/sys/Config.php index a0811d3ed..a0e8abb5d 100644 --- a/niucloud/app/api/controller/sys/Config.php +++ b/niucloud/app/api/controller/sys/Config.php @@ -89,11 +89,21 @@ class Config extends BaseApiController $res[ 'member_level' ] = ( new MemberLevelService() )->getList(); $res[ 'login_config' ] = ( new MemberConfigService() )->getLoginConfig($data[ 'url' ]); $res[ 'theme_list' ] = ( new DiyService() )->getDiyTheme(); - - // 查询是否已经存在该小程序用户, 如果存在则小程序端快捷登录时不再弹出授权弹框 + $openid_field = match ( $this->request->getChannel() ) { + 'wechat' => 'wx_openid', + 'weapp' => 'weapp_openid', + default => '' + }; + // 根据来源查询是否已经存在用户, 如果存在则快捷登录时不再弹出授权弹框 + // 根据来源查询是否绑定手机号, 如果绑定并且开启强制绑定则快捷登录时不再弹出绑定手机弹窗 $res[ 'member_exist' ] = 0; + $res[ 'member_mobile_exist' ] = 0; if (!empty($data[ 'openid' ])) { - $res[ 'member_exist' ] = ( new MemberService() )->getCount([ [ 'weapp_openid', '=', $data[ 'openid' ] ] ]) > 0 ? 1 : 0; + if (!empty($openid_field)){ + $res[ 'member_exist' ] = ( new MemberService() )->getCount([ [ $openid_field, '=', $data[ 'openid' ] ] ]) > 0 ? 1 : 0; + + $res[ 'member_mobile_exist' ] = ( new MemberService() )->getCount([ [ $openid_field, '=', $data[ 'openid' ] ], [ 'mobile', '<>', '' ] ]) > 0 ? 1 : 0; + } } ( new MemberService() )->initMemberData(); @@ -101,4 +111,31 @@ class Config extends BaseApiController event('initWap'); return success($res); } + + /** + * 获取用户是否绑定手机 + * @return Response + */ + public function getMemberMobileExist() + { + $data = $this->request->params([ + [ 'openid', '' ] + ]); + + $openid_field = match ( $this->request->getChannel() ) { + 'wechat' => 'wx_openid', + 'weapp' => 'weapp_openid', + default => '' + }; + + // 根据来源查询是否绑定手机号, 如果绑定并且开启强制绑定则快捷登录时不再弹出绑定手机弹窗 + $res[ 'member_mobile_exist' ] = 0; + if (!empty($data[ 'openid' ])) { + if (!empty($openid_field)) { + $res['member_mobile_exist'] = (new MemberService())->getCount([ [ $openid_field, '=', $data['openid'] ], ['mobile', '<>', ''] ]) > 0 ? 1 : 0; + } + } + + return success($res); + } } diff --git a/niucloud/app/api/controller/wechat/Wechat.php b/niucloud/app/api/controller/wechat/Wechat.php index ad69883e4..be21d5dc5 100644 --- a/niucloud/app/api/controller/wechat/Wechat.php +++ b/niucloud/app/api/controller/wechat/Wechat.php @@ -11,6 +11,7 @@ namespace app\api\controller\wechat; +use app\service\api\login\LoginService; use app\service\api\wechat\WechatConfigService; use app\service\api\wechat\WechatAuthService; use core\base\BaseController; @@ -96,6 +97,10 @@ class Wechat extends BaseController $this->validate($data, [ 'mobile' => 'mobile' ]); + + // 校验手机验证码（电脑端扫码） + ( new LoginService() )->checkMobileCode($data[ 'mobile' ]); + $wechat_auth_service = new WechatAuthService(); return success($wechat_auth_service->register($data[ 'openid' ], $data[ 'mobile' ], wx_unionid: $data[ 'unionid' ])); } diff --git a/niucloud/app/api/route/dispatch/BindDispatch.php b/niucloud/app/api/route/dispatch/BindDispatch.php index f3b8ba26e..3e138852a 100644 --- a/niucloud/app/api/route/dispatch/BindDispatch.php +++ b/niucloud/app/api/route/dispatch/BindDispatch.php @@ -24,6 +24,7 @@ class BindDispatch extends Controller } switch ($channel) { + case MemberLoginTypeDict::PC: case MemberLoginTypeDict::WECHAT: $controller = 'wechat.Wechat'; $action = 'register'; diff --git a/niucloud/app/api/route/diy.php b/niucloud/app/api/route/diy.php index 5b02a4397..0cf3e23e1 100644 --- a/niucloud/app/api/route/diy.php +++ b/niucloud/app/api/route/diy.php @@ -42,12 +42,18 @@ Route::group('diy', function() { // 提交填表记录 Route::post('form/record', 'diy.DiyForm/addRecord'); + // 修改填表记录 + Route::put('form/record', 'diy.DiyForm/editRecord'); + // 获取表单填写结果信息 Route::get('form/result', 'diy.DiyForm/getResult'); // 获取填表记录 Route::get('form/record', 'diy.DiyForm/getRecord'); + // 获取个人资料表单填写记录 + Route::get('form/member_record', 'diy.DiyForm/getMemberInfoRecord'); + })->middleware(ApiLog::class) ->middleware(ApiCheckToken::class, true); diff --git a/niucloud/app/api/route/file.php b/niucloud/app/api/route/file.php index c1799e292..f0d969dc4 100644 --- a/niucloud/app/api/route/file.php +++ b/niucloud/app/api/route/file.php @@ -21,12 +21,7 @@ use think\facade\Route; Route::group('file', function() { /***************************************************** 会员管理 ****************************************************/ - //上传图片 - Route::post('image', 'upload.Upload/image'); - //上传视频 - Route::post('video', 'upload.Upload/video'); - //拉取图片 - Route::post('image/fetch', 'upload.Upload/imageFetch'); + })->middleware(ApiChannel::class) ->middleware(ApiCheckToken::class, true) @@ -36,7 +31,12 @@ Route::group('file', function() { * 会员个人信息管理 */ Route::group('file', function() { - + //上传图片 + Route::post('image', 'upload.Upload/image'); + //上传视频 + Route::post('video', 'upload.Upload/video'); + //拉取图片 + Route::post('image/fetch', 'upload.Upload/imageFetch'); //base64图片 Route::post('image/base64', 'upload.Upload/imageBase64'); diff --git a/niucloud/app/api/route/route.php b/niucloud/app/api/route/route.php index 2b371fd48..016232e15 100644 --- a/niucloud/app/api/route/route.php +++ b/niucloud/app/api/route/route.php @@ -108,6 +108,8 @@ Route::group(function() { // 获取初始化数据信息 Route::get('init', 'sys.Config/init'); + // 获取公众号用户是否绑定手机 + Route::get('member_mobile_exist', 'sys.Config/getMemberMobileExist'); /***************************************************** 地区管理 ****************************************************/ //通过pid获取列表 diff --git a/niucloud/app/common.php b/niucloud/app/common.php index 900432b8d..bf61d56d8 100644 --- a/niucloud/app/common.php +++ b/niucloud/app/common.php @@ -936,8 +936,8 @@ function poster($id, $type, array $param = [], string $channel = '', bool $is_th /** * 是否是url链接 - * @param unknown $string - * @return boolean + * @param $string + * @return bool */ function is_url($string) { diff --git a/niucloud/app/dict/common/CommonActiveDict.php b/niucloud/app/dict/common/CommonActiveDict.php index ce94d1a34..8a83c3887 100644 --- a/niucloud/app/dict/common/CommonActiveDict.php +++ b/niucloud/app/dict/common/CommonActiveDict.php @@ -19,40 +19,58 @@ namespace app\dict\common; */ class CommonActiveDict { - const IMPULSE_BUY = 'impulse_buy'; - const GIFTCARD = 'gift_card'; + const IMPULSE_BUY = 'impulse_buy';//顺手买 顺 + const GIFTCARD = 'gift_card';//礼品卡 礼 - const DISCOUNT = 'discount';// 限时折扣 - const EXCHANGE = 'exchange';// 积分商城 - const MANJIANSONG = 'manjiansong'; // 满减送 - const NEWCOMER_DISCOUNT = 'newcomer_discount'; // 新人专享 + const DISCOUNT = 'discount';// 限时折扣 折 + const EXCHANGE = 'exchange';// 积分商城 积 + const MANJIANSONG = 'manjiansong'; // 满减送 满减 + const NEWCOMER_DISCOUNT = 'newcomer_discount'; // 新人专享 新 + const PINTUAN = 'pintuan'; // 新人专享 新 + const SECKILL = 'seckill'; // 秒杀 秒 - public static function getActiveShort($active) + public static function getActiveShort($active = '') { $data = [ self::IMPULSE_BUY => [ - 'name' => get_lang('common_active_short.impulse_buy'), - 'bg_color' => "#FFAE42" + 'name' => get_lang('common_active_short.impulse_buy_short'), + 'active_name' => get_lang('common_active_short.impulse_buy_name'), + 'bg_color' => "#FF7700" ], self::GIFTCARD => [ - 'name' => get_lang('common_active_short.gift_card'), - 'bg_color' => '#FF0000' + 'name' => get_lang('common_active_short.gift_card_short'), + 'active_name' => get_lang('common_active_short.gift_card_name'), + 'bg_color' => '#F00000' ], self::DISCOUNT => [ - 'name' => get_lang('common_active_short.discount'), - 'bg_color' => '#38B0DE' + 'name' => get_lang('common_active_short.discount_short'), + 'active_name' => get_lang('common_active_short.discount_name'), + 'bg_color' => '#FFA322' ], self::EXCHANGE => [ - 'name' => get_lang('common_active_short.exchange'), - 'bg_color' => '#00FFFF' + 'name' => get_lang('common_active_short.exchange_short'), + 'active_name' => get_lang('common_active_short.exchange_name'), + 'bg_color' => '#00C441' ], self::MANJIANSONG => [ - 'name' => get_lang('common_active_short.manjiansong'), - 'bg_color' => '#00FF00' + 'name' => get_lang('common_active_short.manjiansong_short'), + 'active_name' => get_lang('common_active_short.manjiansong_name'), + 'bg_color' => '#249DE9' ], self::NEWCOMER_DISCOUNT => [ - 'name' => get_lang('common_active_short.newcomer_discount'), - 'bg_color' => '#70DB93' + 'name' => get_lang('common_active_short.newcomer_discount_short'), + 'active_name' => get_lang('common_active_short.newcomer_discount_name'), + 'bg_color' => '#BB27FF' + ], + self::SECKILL => [ + 'name' => get_lang('common_active_short.seckill_short'), + 'active_name' => get_lang('common_active_short.seckill_name'), + 'bg_color' => '#F606CA' + ], + self::PINTUAN => [ + 'name' => get_lang('common_active_short.pintuan_short'), + 'active_name' => get_lang('common_active_short.pintuan_name'), + 'bg_color' => '#FF1C77' ], ]; return !empty($active) ? $data[$active] : $data; diff --git a/niucloud/app/dict/diy/PagesDict.php b/niucloud/app/dict/diy/PagesDict.php index 8ee143481..36956108e 100644 --- a/niucloud/app/dict/diy/PagesDict.php +++ b/niucloud/app/dict/diy/PagesDict.php @@ -189,7 +189,7 @@ class PagesDict 'imgUrl' => "", 'imgWidth' => '', 'imgHeight' => '', - 'count' => -1, + 'count' => 'once', 'show' => 0, 'link' => [ 'name' => "" @@ -261,7 +261,7 @@ class PagesDict 'imgUrl' => "", 'imgWidth' => '', 'imgHeight' => '', - 'count' => -1, + 'count' => 'once', 'show' => 0, 'link' => [ 'name' => "" @@ -726,7 +726,7 @@ class PagesDict 'imgUrl' => "", 'imgWidth' => '', 'imgHeight' => '', - 'count' => -1, + 'count' => 'once', 'show' => 0, 'link' => [ 'name' => "" diff --git a/niucloud/app/dict/diy_form/TemplateDict.php b/niucloud/app/dict/diy_form/TemplateDict.php index f294ed29e..4bf54bb15 100644 --- a/niucloud/app/dict/diy_form/TemplateDict.php +++ b/niucloud/app/dict/diy_form/TemplateDict.php @@ -82,7 +82,7 @@ class TemplateDict "imgUrl" => "", "imgWidth" => "", "imgHeight" => "", - "count" => -1, + "count" => 'once', "show" => 0, "link" => [ "name" => "" @@ -683,6 +683,392 @@ class TemplateDict ], ], + "DIY_FORM_MEMBER_INFO" => [ + 'member_info_form_data' => [ // 页面标识 + "title" => "个人资料", // 页面名称 + 'cover' => '', // 页面封面图 + 'preview' => '', // 页面预览图 + 'desc' => '适用于会员个人资料字段补充收集', // 页面描述 + 'containField' => '共7个字段，包含7个字段：姓名、身份证号、邮箱、职业、爱好、身份证人像面、身份证国徽面', // 包含字段 + // 页面数据源 + "data" => [ + "global" => [ + "title" => "个人资料", + "completeLayout" => "style-1", + "completeAlign" => "left", + "borderControl" => true, + "pageStartBgColor" => "rgba(255, 255, 255, 1)", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "bgUrl" => "", + "bgHeightScale" => 100, + "imgWidth" => "", + "imgHeight" => "", + "topStatusBar" => [ + "isShow" => true, + "bgColor" => "#ffffff", + "rollBgColor" => "#ffffff", + "style" => "style-1", + "styleName" => "风格1", + "textColor" => "#333333", + "rollTextColor" => "#333333", + "textAlign" => "center", + "inputPlaceholder" => "请输入搜索关键词", + "imgUrl" => "", + "link" => [ + "name" => "" + ] + ], + "bottomTabBarSwitch" => true, + "popWindow" => [ + "imgUrl" => "", + "imgWidth" => "", + "imgHeight" => "", + "count" => -1, + "show" => 0, + "link" => [ + "name" => "" + ] + ], + "template" => [ + "textColor" => "#303133", + "pageStartBgColor" => "", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 0, + "bottom" => 0, + "both" => 0 + ], + "isHidden" => false + ] + ], + "value" => [ + [ + "path" => "edit-form-input", + "uses" => 0, + "position" => "", + "componentType" => "diy_form", + "id" => "46wkksoz5ew0", + "componentName" => "FormInput", + "componentTitle" => "单行文本", + "ignore" => [ + "componentBgUrl" + ], + "field" => [ + "name" => "姓名", + "remark" => [ + "text" => "", + "color" => "#999999", + "fontSize" => 14 + ], + "required" => true, + "unique" => false, + "autofill" => false, + "privacyProtection" => false, + "cache" => true, + "default" => "", + "value" => "" + ], + "placeholder" => "请输入姓名", + "fontSize" => 14, + "fontWeight" => "bold", + "textColor" => "#303133", + "pageStartBgColor" => "#FFFFFF", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 15, + "bottom" => 10, + "both" => 25 + ], + "isHidden" => false, + "pageStyle" => "background-color:#FFFFFF;padding-top:30rpx;padding-bottom:20rpx;padding-right:34rpx;padding-left:34rpx;" + ], + [ + "path" => "edit-form-identity", + "uses" => 1, + "componentType" => "diy_form", + "id" => "4hy63cm1lj80", + "componentName" => "FormIdentity", + "componentTitle" => "身份证号", + "ignore" => [ + "componentBgUrl" + ], + "field" => [ + "name" => "身份证号", + "remark" => [ + "text" => "", + "color" => "#999999", + "fontSize" => 14 + ], + "required" => false, + "unique" => true, + "autofill" => false, + "privacyProtection" => false, + 'cache' => true, + "default" => "", + "value" => "" + ], + "placeholder" => "请输入身份证号", + "fontSize" => 14, + "fontWeight" => "bold", + "textColor" => "#303133", + "pageStartBgColor" => "#FFFFFF", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 5, + "bottom" => 10, + "both" => 25 + ], + "isHidden" => false, + "pageStyle" => "background-color:#FFFFFF;padding-top:10rpx;padding-bottom:20rpx;padding-right:34rpx;padding-left:34rpx;" + ], + [ + "path" => "edit-form-email", + "uses" => 0, + "componentType" => "diy_form", + "id" => "13f2w3r9h9vg", + "componentName" => "FormEmail", + "componentTitle" => "邮箱", + "ignore" => [ + "componentBgUrl" + ], + "field" => [ + "name" => "邮箱", + "remark" => [ + "text" => "", + "color" => "#999999", + "fontSize" => 14 + ], + "required" => false, + "unique" => false, + "autofill" => false, + "privacyProtection" => false, + 'cache' => true, + "default" => "", + "value" => "" + ], + "placeholder" => "请输入邮箱", + "fontSize" => 14, + "fontWeight" => "bold", + "textColor" => "#303133", + "pageStartBgColor" => "#FFFFFF", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 5, + "bottom" => 10, + "both" => 25 + ], + "isHidden" => false, + "pageStyle" => "background-color:#FFFFFF;padding-top:10rpx;padding-bottom:20rpx;padding-right:34rpx;padding-left:34rpx;" + ], + [ + "path" => "edit-form-checkbox", + "uses" => 0, + "convert" => [], + "componentType" => "diy_form", + "id" => "4jcvmb2asve0", + "componentName" => "FormCheckbox", + "componentTitle" => "多选项", + "ignore" => [ + "componentBgUrl" + ], + "field" => [ + "name" => "职业", + "remark" => [ + "text" => "", + "color" => "#999999", + "fontSize" => 14 + ], + "required" => true, + "unique" => false, + "autofill" => false, + "privacyProtection" => false, + 'cache' => true, + "default" => [], + "value" => [] + ], + "fontSize" => 14, + "fontWeight" => "bold", + "style" => "style-3", + "options" => [ + [ + "id" => "incszbphksdt", + "text" => "选项1" + ], + [ + "id" => "dzcjgipwkffx", + "text" => "选项2" + ] + ], + "selectableNum" => [ + "min" => 0, + "max" => 0 + ], + "textColor" => "#303133", + "pageStartBgColor" => "#FFFFFF", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 5, + "bottom" => 10, + "both" => 25 + ], + "isHidden" => false, + ], + [ + "path" => "edit-form-textarea", + "uses" => 0, + "componentType" => "diy_form", + "id" => "64a0gh89tz40", + "componentName" => "FormTextarea", + "componentTitle" => "多行文本", + "ignore" => [ + "componentBgUrl" + ], + "field" => [ + "name" => "爱好", + "remark" => [ + "text" => "", + "color" => "#999999", + "fontSize" => 14 + ], + "required" => false, + "unique" => false, + "autofill" => false, + "privacyProtection" => false, + 'cache' => true, + "default" => "", + "value" => "" + ], + "placeholder" => "请输入特长优点", + "fontSize" => 14, + "fontWeight" => "bold", + "rowCount" => 4, + "textColor" => "#303133", + "pageStartBgColor" => "#FFFFFF", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 0, + "bottomElementRounded" => 0, + "margin" => [ + "top" => 5, + "bottom" => 10, + "both" => 25 + ], + "isHidden" => false, + "pageStyle" => "background-color:#FFFFFF;padding-top:10rpx;padding-bottom:20rpx;padding-right:34rpx;padding-left:34rpx;" + ], + [ + "path" => "edit-form-submit", + "uses" => 1, + "position" => "bottom_fixed", + "componentType" => "diy_form", + "id" => "38b02iygfzc0", + "componentName" => "FormSubmit", + "componentTitle" => "表单提交", + "ignore" => [ + "componentBgUrl" + ], + "btnPosition" => "follow_content", + "submitBtn" => [ + "text" => "提交", + "color" => "#ffffff", + "bgColor" => "#409EFF" + ], + "resetBtn" => [ + "control" => true, + "text" => "重置", + "color" => "", + "bgColor" => "" + ], + "textColor" => "#303133", + "pageStartBgColor" => "", + "pageEndBgColor" => "", + "pageGradientAngle" => "to bottom", + "componentBgUrl" => "", + "componentBgAlpha" => 2, + "componentStartBgColor" => "", + "componentEndBgColor" => "", + "componentGradientAngle" => "to bottom", + "topRounded" => 0, + "bottomRounded" => 0, + "elementBgColor" => "", + "topElementRounded" => 50, + "bottomElementRounded" => 50, + "margin" => [ + "top" => 5, + "bottom" => 5, + "both" => 25 + ], + "isHidden" => false, + "pageStyle" => "padding-top:10rpx;padding-bottom:10rpx;padding-right:20rpx;padding-left:20rpx;" + ] + ] + ] + ], + ], // todo 靠后完善 // 'SIGN_REGISTRATION' => [ // 'active_sign_up' => [ // 页面标识 diff --git a/niucloud/app/dict/diy_form/TypeDict.php b/niucloud/app/dict/diy_form/TypeDict.php index 90e9d3544..175d77aac 100644 --- a/niucloud/app/dict/diy_form/TypeDict.php +++ b/niucloud/app/dict/diy_form/TypeDict.php @@ -11,6 +11,7 @@ namespace app\dict\diy_form; +use app\dict\sys\AppTypeDict; use core\dict\DictLoader; /** @@ -34,6 +35,15 @@ class TypeDict 'sort' => 10001, 'addon' => '' ], + //个人资料 + 'DIY_FORM_MEMBER_INFO' => [ + 'title' => get_lang('dict_diy_form.type_diy_form_member_info'), + 'preview' => 'static/resource/images/diy_form/diy_form_member_info_preview.jpg', // 预览图 + 'sort' => 10002, + 'addon' => '', + 'app_type' => [AppTypeDict::ADMIN], + "show_submit" => true, // 是否显示表单提交组件 + ], //签到报名登记 todo 靠后完善 // 'SIGN_REGISTRATION' => [ // 'title' => get_lang('dict_diy_form.type_sign_registration'), diff --git a/niucloud/app/dict/member/MemberLoginTypeDict.php b/niucloud/app/dict/member/MemberLoginTypeDict.php index 1bf6b2019..e98d9039a 100644 --- a/niucloud/app/dict/member/MemberLoginTypeDict.php +++ b/niucloud/app/dict/member/MemberLoginTypeDict.php @@ -27,13 +27,16 @@ class MemberLoginTypeDict //微信小程序授权登录 public const WEAPP = 'weapp'; + // PC登录 + public const PC = 'pc'; + public static function getType($type = '') { $data = [ self::USERNAME => get_lang('dict_member.login_username'),//用户名密码登录 self::MOBILE => get_lang('dict_member.login_mobile'),//手机号验证码登录, self::WECHAT => get_lang('dict_member.login_wechat'),//'微信公众号授权登录', - self::WEAPP => get_lang('dict_member.login_weapp'),//'微信小程序授权登录', + self::PC => get_lang('dict_member.login_pc'),//'微信小程序授权登录', ]; if (empty($type)) { return $data; diff --git a/niucloud/app/dict/menu/admin.php b/niucloud/app/dict/menu/admin.php index adc420de9..06e7bb4ac 100644 --- a/niucloud/app/dict/menu/admin.php +++ b/niucloud/app/dict/menu/admin.php @@ -6,7 +6,7 @@ return [ 'menu_short_name' => '装修', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'element Brush', + 'icon' => 'iconfont iconzhuangxiu3', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -19,6 +19,7 @@ return [ 'menu_name' => '编辑', 'menu_key' => 'diy_tabbar_edit', 'menu_short_name' => '编辑', + 'parent_select_key' => 'diy_bottom', 'menu_type' => '1', 'icon' => '', 'api_url' => 'diy/bottom/edit', @@ -279,6 +280,7 @@ return [ 'menu_name' => '海报装修', 'menu_key' => 'poster_decorate', 'menu_short_name' => '海报装修', + 'parent_select_key' => 'poster_management', 'menu_type' => '1', 'icon' => '', 'api_url' => 'poster/', @@ -543,7 +545,7 @@ return [ 'menu_short_name' => '会员', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'iconfont iconjiaoseyonghu', + 'icon' => 'iconfont iconhuiyuan', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -614,6 +616,7 @@ return [ 'menu_name' => '会员详情', 'menu_key' => 'member_info', 'menu_short_name' => '会员详情', + 'parent_select_key' => 'member_list', 'menu_type' => '1', 'icon' => '', 'api_url' => 'member/member/', @@ -956,7 +959,7 @@ return [ 'menu_short_name' => '财务', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'element Box', + 'icon' => 'iconfont iconcaiwu1', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -1071,6 +1074,7 @@ return [ 'menu_name' => '退款详情', 'menu_key' => 'member_refund_detail', 'menu_short_name' => '退款详情', + 'parent_select_key' => 'member_refund_list', 'menu_type' => '1', 'icon' => 'iconfont iconhuiyuantixian', 'api_url' => 'pay/refund/', @@ -1089,7 +1093,7 @@ return [ 'menu_short_name' => '营销', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'iconfont iconyingxiao', + 'icon' => 'iconfont iconyingxiao2', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -1099,167 +1103,181 @@ return [ 'is_show' => '1', 'children' => [ [ - 'menu_name' => '核销管理', - 'menu_key' => 'verify', - 'menu_short_name' => '核销管理', + 'menu_name' => '营销列表', + 'menu_key' => 'marketing_list', + 'menu_short_name' => '营销列表', + 'menu_type' => '1', + 'icon' => 'iconfont iconmanage-apply', + 'api_url' => 'marketing/list', + 'router_path' => 'app/marketing', + 'view_path' => 'app/marketing', + 'methods' => 'get', + 'sort' => '50', + 'status' => '1', + 'is_show' => '1', + ], + ], + ], + [ + 'menu_name' => '核销管理', + 'menu_key' => 'verify', + 'menu_short_name' => '核销管理', + 'menu_type' => '0', + 'icon' => '', + 'api_url' => '', + 'router_path' => '', + 'view_path' => '', + 'methods' => 'get', + 'sort' => '48', + 'status' => '1', + 'is_show' => '0', + 'children' => [ + [ + 'menu_name' => '核销员', + 'menu_key' => 'verifier_list', + 'menu_short_name' => '核销员', 'menu_type' => '1', 'icon' => '', - 'api_url' => '', - 'router_path' => '', - 'view_path' => '', + 'api_url' => 'verify/verifier', + 'router_path' => 'marketing/verifier', + 'view_path' => 'marketing/verifier', 'methods' => 'get', 'sort' => '48', 'status' => '1', 'is_show' => '1', 'children' => [ [ - 'menu_name' => '核销员', - 'menu_key' => 'verifier_list', - 'menu_short_name' => '核销员', - 'menu_type' => '1', + 'menu_name' => '添加核销员', + 'menu_key' => 'add_verifier', + 'menu_short_name' => '添加核销员', + 'menu_type' => '2', 'icon' => '', 'api_url' => 'verify/verifier', - 'router_path' => 'marketing/verifier', - 'view_path' => 'marketing/verifier', - 'methods' => 'get', - 'sort' => '48', - 'status' => '1', - 'is_show' => '1', - 'children' => [ - [ - 'menu_name' => '添加核销员', - 'menu_key' => 'add_verifier', - 'menu_short_name' => '添加核销员', - 'menu_type' => '2', - 'icon' => '', - 'api_url' => 'verify/verifier', - 'router_path' => '', - 'view_path' => '', - 'methods' => 'post', - 'sort' => '100', - 'status' => '1', - 'is_show' => '1', - ], - [ - 'menu_name' => '编辑核销员', - 'menu_key' => 'edit_verifier', - 'menu_short_name' => '编辑核销员', - 'menu_type' => '2', - 'icon' => '', - 'api_url' => 'verify/verifier/', - 'router_path' => '', - 'view_path' => '', - 'methods' => 'post', - 'sort' => '100', - 'status' => '1', - 'is_show' => '1', - ], - [ - 'menu_name' => '删除核销员', - 'menu_key' => 'delete_verifier', - 'menu_short_name' => '删除核销员', - 'menu_type' => '2', - 'icon' => '', - 'api_url' => 'verify/verifier/', - 'router_path' => '', - 'view_path' => '', - 'methods' => 'delete', - 'sort' => '100', - 'status' => '1', - 'is_show' => '1', - ] - ] - ], - [ - 'menu_name' => '核销记录', - 'menu_key' => 'verify_list', - 'menu_short_name' => '核销记录', - 'menu_type' => '1', - 'icon' => '', - 'api_url' => 'verify/verify/record', - 'router_path' => 'marketing/verify', - 'view_path' => 'marketing/verify', - 'methods' => 'get', - 'sort' => '48', + 'router_path' => '', + 'view_path' => '', + 'methods' => 'post', + 'sort' => '100', 'status' => '1', 'is_show' => '1', ], [ - 'menu_name' => '核销详情', - 'menu_key' => 'verify_detail', - 'menu_short_name' => '核销详情', - 'menu_type' => '1', + 'menu_name' => '编辑核销员', + 'menu_key' => 'edit_verifier', + 'menu_short_name' => '编辑核销员', + 'menu_type' => '2', 'icon' => '', - 'api_url' => 'verify/verify/', - 'router_path' => 'marketing/verify/detail', - 'view_path' => 'marketing/verify_detail', - 'methods' => 'get', - 'sort' => '48', + 'api_url' => 'verify/verifier/', + 'router_path' => '', + 'view_path' => '', + 'methods' => 'post', + 'sort' => '100', 'status' => '1', - 'is_show' => '0', + 'is_show' => '1', + ], + [ + 'menu_name' => '删除核销员', + 'menu_key' => 'delete_verifier', + 'menu_short_name' => '删除核销员', + 'menu_type' => '2', + 'icon' => '', + 'api_url' => 'verify/verifier/', + 'router_path' => '', + 'view_path' => '', + 'methods' => 'delete', + 'sort' => '100', + 'status' => '1', + 'is_show' => '1', ] - ], + ] ], [ - 'menu_name' => '签到管理', - 'menu_key' => 'sign', - 'menu_short_name' => '签到管理', + 'menu_name' => '核销记录', + 'menu_key' => 'verify_list', + 'menu_short_name' => '核销记录', + 'menu_type' => '1', + 'icon' => '', + 'api_url' => 'verify/verify/record', + 'router_path' => 'marketing/verify', + 'view_path' => 'marketing/verify', + 'methods' => 'get', + 'sort' => '48', + 'status' => '1', + 'is_show' => '1', + ], + [ + 'menu_name' => '核销详情', + 'menu_key' => 'verify_detail', + 'menu_short_name' => '核销详情', + 'menu_type' => '1', + 'icon' => '', + 'api_url' => 'verify/verify/', + 'router_path' => 'marketing/verify/detail', + 'view_path' => 'marketing/verify_detail', + 'methods' => 'get', + 'sort' => '48', + 'status' => '1', + 'is_show' => '0', + ] + ], + ], + [ + 'menu_name' => '签到管理', + 'menu_key' => 'sign', + 'menu_short_name' => '签到管理', + 'menu_type' => '0', + 'icon' => 'element FolderChecked', + 'api_url' => '', + 'router_path' => '', + 'view_path' => '', + 'methods' => 'get', + 'sort' => '30', + 'status' => '1', + 'is_show' => '0', + 'children' => [ + [ + 'menu_name' => '签到设置', + 'menu_key' => 'sign_set', + 'menu_short_name' => '签到设置', 'menu_type' => '1', 'icon' => 'element FolderChecked', - 'api_url' => '', - 'router_path' => '', - 'view_path' => '', + 'api_url' => 'member/sign/config', + 'router_path' => 'marketing/sign/config', + 'view_path' => 'marketing/sign_config', 'methods' => 'get', 'sort' => '30', 'status' => '1', 'is_show' => '1', 'children' => [ [ - 'menu_name' => '签到设置', - 'menu_key' => 'sign_set', - 'menu_short_name' => '签到设置', - 'menu_type' => '1', - 'icon' => 'element FolderChecked', + 'menu_name' => '保存', + 'menu_key' => 'save_sign_set', + 'menu_short_name' => '保存', + 'menu_type' => '2', + 'icon' => '', 'api_url' => 'member/sign/config', - 'router_path' => 'marketing/sign/config', - 'view_path' => 'marketing/sign_config', - 'methods' => 'get', - 'sort' => '30', - 'status' => '1', - 'is_show' => '1', - 'children' => [ - [ - 'menu_name' => '保存', - 'menu_key' => 'save_sign_set', - 'menu_short_name' => '保存', - 'menu_type' => '2', - 'icon' => '', - 'api_url' => 'member/sign/config', - 'router_path' => '', - 'view_path' => '', - 'methods' => 'put', - 'sort' => '100', - 'status' => '1', - 'is_show' => '1', - ] - ] - ], - [ - 'menu_name' => '签到记录', - 'menu_key' => 'sign_list', - 'menu_short_name' => '签到记录', - 'menu_type' => '1', - 'icon' => 'element FolderChecked', - 'api_url' => 'member/sign', - 'router_path' => 'marketing/sign', - 'view_path' => 'marketing/sign_list', - 'methods' => 'get', - 'sort' => '30', + 'router_path' => '', + 'view_path' => '', + 'methods' => 'put', + 'sort' => '100', 'status' => '1', 'is_show' => '1', ] - ], + ] ], + [ + 'menu_name' => '签到记录', + 'menu_key' => 'sign_list', + 'menu_short_name' => '签到记录', + 'menu_type' => '1', + 'icon' => 'element FolderChecked', + 'api_url' => 'member/sign', + 'router_path' => 'marketing/sign', + 'view_path' => 'marketing/sign_list', + 'methods' => 'get', + 'sort' => '30', + 'status' => '1', + 'is_show' => '1', + ] ], ], [ @@ -1268,7 +1286,7 @@ return [ 'menu_short_name' => '应用', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'iconfont iconmanage-apply', + 'icon' => 'iconfont iconyingyong21', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -1299,7 +1317,7 @@ return [ 'menu_short_name' => '渠道', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'element DataBoard', + 'icon' => 'iconfont iconqudao', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -1772,7 +1790,7 @@ return [ 'menu_short_name' => '权限', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'element Lock', + 'icon' => 'iconfont iconquanxian', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -1961,7 +1979,7 @@ return [ 'menu_short_name' => '设置', 'parent_key' => '', 'menu_type' => '0', - 'icon' => 'element Setting', + 'icon' => 'iconfont iconshezhi3', 'api_url' => '', 'router_path' => '', 'view_path' => '', @@ -2635,6 +2653,7 @@ return [ 'menu_name' => '页面装修', 'menu_key' => 'decorate', 'menu_short_name' => '页面装修', + 'parent_select_key' => 'diy', 'parent_key' => '', 'menu_type' => '0', 'icon' => '', @@ -2855,6 +2874,7 @@ return [ 'menu_name' => '添加打印机', 'menu_key' => 'printer_add', 'menu_short_name' => '添加打印机', + 'parent_select_key' => 'printer_management_list', 'menu_type' => '1', 'icon' => '', 'api_url' => 'printer', @@ -2868,7 +2888,8 @@ return [ [ 'menu_name' => '编辑打印机', 'menu_key' => 'printer_edit', - 'menu_short_name' => '添加打印机', + 'menu_short_name' => '编辑打印机', + 'parent_select_key' => 'printer_management_list', 'menu_type' => '1', 'icon' => '', 'api_url' => 'printer/', @@ -2913,6 +2934,7 @@ return [ 'menu_name' => '添加打印模板', 'menu_key' => 'printer_template_add', 'menu_short_name' => '添加打印模板', + 'parent_select_key' => 'printer_template_management', 'menu_type' => '1', 'icon' => '', 'api_url' => 'printer/template', @@ -2927,6 +2949,7 @@ return [ 'menu_name' => '编辑打印模板', 'menu_key' => 'printer_template_edit', 'menu_short_name' => '编辑打印模板', + 'parent_select_key' => 'printer_template_management', 'menu_type' => '1', 'icon' => '', 'api_url' => 'printer/template/', diff --git a/niucloud/app/dict/pay/PayDict.php b/niucloud/app/dict/pay/PayDict.php index eed6bf77d..bc21152e3 100644 --- a/niucloud/app/dict/pay/PayDict.php +++ b/niucloud/app/dict/pay/PayDict.php @@ -44,7 +44,7 @@ class PayDict public const STATUS_FINISH = '2';//已支付 public const STATUS_AUDIT = '3';//待审核 - public const STATUS_CANCLE = '-1';//已取消 + public const STATUS_CANCEL = '-1';//已取消 public const MEMBER = 'member'; public const USER = 'user'; @@ -112,7 +112,7 @@ class PayDict self::STATUS_WAIT => get_lang('dict_pay.status_wait'), self::STATUS_ING => get_lang('dict_pay.status_ing'), self::STATUS_FINISH => get_lang('dict_pay.status_finish'), - self::STATUS_CANCLE => get_lang('dict_pay.status_cancle'), + self::STATUS_CANCEL => get_lang('dict_pay.status_cancel'), self::STATUS_AUDIT => get_lang('dict_pay.status_audit') ]; } diff --git a/niucloud/app/dict/sys/ConfigKeyDict.php b/niucloud/app/dict/sys/ConfigKeyDict.php index 25be49339..ac187ab81 100644 --- a/niucloud/app/dict/sys/ConfigKeyDict.php +++ b/niucloud/app/dict/sys/ConfigKeyDict.php @@ -39,4 +39,5 @@ class ConfigKeyDict public const WECHAT_TRANSFER_SCENE_CONFIG = 'WECHAT_TRANSFER_SCENE_CONFIG';//微信转账场景配置 public const SMS = 'SMS';//短信配置 + public const SHOP_THIRD_PARTY_DELIVERY_CONFIG = 'SHOP_THREE_PARTY_DELIVERY_CONFIG';//短信配置 } diff --git a/niucloud/app/event.php b/niucloud/app/event.php index 30b862b0d..4401ba86a 100644 --- a/niucloud/app/event.php +++ b/niucloud/app/event.php @@ -106,6 +106,9 @@ $system_event = [ 'ShowApp' => [ 'app\listener\system\ShowAppListener' ], + 'ShowMarketing' => [ + 'app\listener\system\ShowMarketingListener' + ], //获取微信转账场景配置 'GetWechatTransferTradeScene' => [ 'app\listener\transfer\TransferCashOutListener' diff --git a/niucloud/app/install/source/database.sql b/niucloud/app/install/source/database.sql index 6e0fe5650..5358c55b7 100644 --- a/niucloud/app/install/source/database.sql +++ b/niucloud/app/install/source/database.sql @@ -194,7 +194,7 @@ CREATE TABLE `diy_page` ( `title` varchar(255) NOT NULL DEFAULT '' COMMENT '页面标题（用于前台展示）', `name` varchar(255) NOT NULL DEFAULT '' COMMENT '页面标识', `type` varchar(255) NOT NULL DEFAULT '' COMMENT '页面模板', - `template` varchar(255) NOT NULL DEFAULT '' COMMENT '模板名称', + `template` varchar(255) NOT NULL DEFAULT '' COMMENT '页面模板名称', `mode` varchar(255) NOT NULL DEFAULT 'diy' COMMENT '页面展示模式，diy：自定义，fixed：固定', `value` longtext COMMENT '页面数据，json格式', `is_default` int(11) NOT NULL DEFAULT 0 COMMENT '是否默认页面，1：是，0：否', @@ -727,7 +727,7 @@ CREATE TABLE `sys_backup_records` ( `id` INT NOT NULL AUTO_INCREMENT COMMENT '主键id', `version` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '备份版本号', `backup_key` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '备份标识', - `content` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '备份内容', + `content` TEXT DEFAULT NULL COMMENT '备份内容', `status` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '状态', `fail_reason` LONGTEXT DEFAULT NULL COMMENT '失败原因', `remark` VARCHAR(500) NOT NULL DEFAULT '' COMMENT '备注', @@ -847,6 +847,7 @@ CREATE TABLE `sys_menu` ( `addon` varchar(255) NOT NULL DEFAULT '' COMMENT '所属插件', `source` varchar(255) NOT NULL DEFAULT 'system' COMMENT '菜单来源 system 系统文件 create 新建菜单 generator 代码生成器', `menu_attr` varchar(50) NOT NULL DEFAULT '' COMMENT '菜单属性 common 公共 system 系统', + `parent_select_key` VARCHAR(255) NOT NULL DEFAULT '' COMMENT '上级key', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '菜单表' ROW_FORMAT = Dynamic; @@ -1046,8 +1047,9 @@ CREATE TABLE `sys_user_log` ( `id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT COMMENT '管理员操作记录ID', `ip` varchar(50) NOT NULL DEFAULT '' COMMENT '登录IP', `uid` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '管理员id', - `username` varchar(64) NOT NULL DEFAULT '' COMMENT '管理员姓名', - `url` varchar(128) NOT NULL DEFAULT '' COMMENT '链接', + `username` varchar(255) NOT NULL DEFAULT '' COMMENT '管理员姓名', + `operation` varchar(255) NOT NULL DEFAULT '' COMMENT '操作描述', + `url` varchar(255) NOT NULL DEFAULT '' COMMENT '链接', `params` longtext DEFAULT NULL COMMENT '参数', `type` varchar(32) NOT NULL DEFAULT '' COMMENT '请求方式', `create_time` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '操作时间', diff --git a/niucloud/app/lang/zh-cn/dict.php b/niucloud/app/lang/zh-cn/dict.php index 037cfcc09..096eda108 100644 --- a/niucloud/app/lang/zh-cn/dict.php +++ b/niucloud/app/lang/zh-cn/dict.php @@ -76,25 +76,25 @@ return [ 'var_balance' => '会员余额', 'var_point' => '会员积分', ], - 'dict_sms_api'=>[ - 'template_status_again_report'=>'需重新报备', - 'template_status_need_edit'=>'需修改报备参数', - 'template_status_not_report'=>'未报备', - 'template_status_wait'=>'待审核', - 'template_status_pass'=>'审核通过', - 'template_status_refuse'=>'审核不通过', + 'dict_sms_api' => [ + 'template_status_again_report' => '需重新报备', + 'template_status_need_edit' => '需修改报备参数', + 'template_status_not_report' => '未报备', + 'template_status_wait' => '待审核', + 'template_status_pass' => '审核通过', + 'template_status_refuse' => '审核不通过', //验证码-1 行业通知-2 营销推广-3 - 'template_type_verify_code'=>'验证码', - 'template_type_industry_notice'=>'行业通知', - 'template_type_sem'=>'营销推广', + 'template_type_verify_code' => '验证码', + 'template_type_industry_notice' => '行业通知', + 'template_type_sem' => '营销推广', - 'sign_audit_status_wait'=>'待审核', - 'sign_audit_status_pass'=>'审核通过', - 'sign_audit_status_refuse'=>'审核不通过', + 'sign_audit_status_wait' => '待审核', + 'sign_audit_status_pass' => '审核通过', + 'sign_audit_status_refuse' => '审核不通过', - 'balance_add'=>'充值', - 'balance_reduce'=>'扣减' + 'balance_add' => '充值', + 'balance_reduce' => '扣减' ], //上传附件相关 @@ -131,6 +131,7 @@ return [ 'login_mobile' => '手机验证码登录', 'login_wechat' => '微信公众号授权登录', 'login_weapp' => '微信小程序授权登录', + 'login_pc' => '电脑端微信授权登录', 'account_point_adjust' => '账户调整', 'account_point_member_register' => '会员注册', 'account_point_level_upgrade' => '升级礼包', @@ -203,7 +204,7 @@ return [ 'status_wait' => '待支付', 'status_ing' => '支付中', 'status_finish' => '已支付', - 'status_cancle' => '已取消', + 'status_cancel' => '已取消', 'status_audit' => '待审核', 'pay' => '收款', 'refund' => '退款', @@ -290,6 +291,7 @@ return [ 'dict_diy_form' => [ 'component_type_form' => '表单组件', 'type_diy_form' => '自定义表单', + 'type_diy_form_member_info' => '个人资料', 'type_sign_registration' => '签到报名登记', 'type_leave_message_suggestion' => '留言建议', 'type_write_off_voucher' => '核销凭证', @@ -449,12 +451,22 @@ return [ 'complete' => '完成', 'fail' => '失败' ], - 'common_active_short'=>[ - 'impulse_buy'=>'顺', - 'gift_card'=>'礼', - 'discount'=>'折', - 'exchange'=>'积', - 'manjiansong'=>'满减', - 'newcomer_discount'=>'新', + 'common_active_short' => [ + 'impulse_buy_short' => '顺', + 'impulse_buy_name' => '顺手买', + 'gift_card_short' => '礼', + 'gift_card_name' => '礼品卡', + 'discount_short' => '折', + 'discount_name' => '限时折扣', + 'exchange_short' => '积', + 'exchange_name' => '积分商城', + 'manjiansong_short' => '满减', + 'manjiansong_name' => '满减送', + 'newcomer_discount_short' => '新', + 'newcomer_discount_name' => '新人专享', + 'pintuan_short' => '拼', + 'pintuan_name' => '拼团', + 'seckill_short' => '秒', + 'seckill_name' => '秒杀', ] ]; diff --git a/niucloud/app/listener/poster/FriendspayPoster.php b/niucloud/app/listener/poster/FriendspayPoster.php index d1cf05c5e..ce08a90eb 100644 --- a/niucloud/app/listener/poster/FriendspayPoster.php +++ b/niucloud/app/listener/poster/FriendspayPoster.php @@ -56,7 +56,7 @@ class FriendspayPoster $pay_info = ( new Pay() )->field('money')->where([ [ 'trade_id', '=', $trade_id ], [ 'trade_type', '=', $trade_type ], - [ 'status', '<>', PayDict::STATUS_CANCLE ],///不查询已取消的单据 + [ 'status', '<>', PayDict::STATUS_CANCEL ],///不查询已取消的单据 ])->findOrEmpty()->toArray(); if (empty($pay_info)) return []; diff --git a/niucloud/app/listener/system/ShowMarketingListener.php b/niucloud/app/listener/system/ShowMarketingListener.php new file mode 100644 index 000000000..16a6cdc0b --- /dev/null +++ b/niucloud/app/listener/system/ShowMarketingListener.php @@ -0,0 +1,54 @@ + [ + + ], + // 工具 + 'tool' => [ + + ], + // 营销 + 'marketing' => [ + [ + 'title' => '核销管理', + 'desc' => '管理核销员及核销记录', + 'icon' => 'static/resource/images/marketing/verifier.png', + 'key' => 'verify', + 'url' => '/marketing/verifier', + ], + [ + 'title' => '签到管理', + 'desc' => '客户每日签到发放奖励', + 'icon' => 'static/resource/images/marketing/sign.png', + 'key' => 'sign', + 'url' => '/marketing/sign/config', + ], + ] + ]; + } +} diff --git a/niucloud/app/model/sys/SysExport.php b/niucloud/app/model/sys/SysExport.php index 2b1ee10a7..074266885 100644 --- a/niucloud/app/model/sys/SysExport.php +++ b/niucloud/app/model/sys/SysExport.php @@ -17,7 +17,7 @@ use think\db\Query; /** * 导出报表模型 - * Class SysUserLog + * Class SysExport * @package app\model\sys */ class SysExport extends BaseModel diff --git a/niucloud/app/service/admin/addon/AddonService.php b/niucloud/app/service/admin/addon/AddonService.php index bee510851..b85ca44ac 100644 --- a/niucloud/app/service/admin/addon/AddonService.php +++ b/niucloud/app/service/admin/addon/AddonService.php @@ -29,14 +29,17 @@ use think\db\exception\DbException; class AddonService extends BaseAdminService { public static $cache_tag_name = 'addon_cache'; + public function __construct() { parent::__construct(); $this->model = new Addon(); } - public function getList(){ - return (new CoreAddonService())->getLocalAddonList(); + + public function getList() + { + return ( new CoreAddonService() )->getLocalAddonList(); } /** @@ -45,7 +48,7 @@ class AddonService extends BaseAdminService */ public function getLocalAddonList() { - return (new CoreAddonService())->getLocalAddonList(); + return ( new CoreAddonService() )->getLocalAddonList(); } /** @@ -107,7 +110,8 @@ class AddonService extends BaseAdminService * @param string $addon * @return void */ - public function uninstallCheck(string $addon) { + public function uninstallCheck(string $addon) + { return ( new CoreAddonInstallService($addon) )->uninstallCheck(); } @@ -128,7 +132,7 @@ class AddonService extends BaseAdminService */ public function getPage(array $where = []) { - return (new CoreAddonService())->getPage($where); + return ( new CoreAddonService() )->getPage($where); } /** @@ -138,7 +142,7 @@ class AddonService extends BaseAdminService */ public function getInfo(int $id) { - return (new CoreAddonService())->getInfo($id); + return ( new CoreAddonService() )->getInfo($id); } /** @@ -146,8 +150,9 @@ class AddonService extends BaseAdminService * @param int $id * @param int $status */ - public function setStatus(int $id, int $status){ - return (new CoreAddonService())->setStatus($id, $status); + public function setStatus(int $id, int $status) + { + return ( new CoreAddonService() )->setStatus($id, $status); } /** @@ -155,9 +160,10 @@ class AddonService extends BaseAdminService * @param string $app_key * @return true */ - public function download(string $app_key, string $version){ + public function download(string $app_key, string $version) + { if (empty($version)) throw new CommonException('ADDON_DOWNLOAD_VERSION_EMPTY'); - return (new CoreAddonDownloadService())->download($app_key, $version); + return ( new CoreAddonDownloadService() )->download($app_key, $version); } @@ -165,8 +171,9 @@ class AddonService extends BaseAdminService * 查询已安装应用 * @return array */ - public function getInstallList(){ - return (new CoreAddonService())->getInstallAddonList(); + public function getInstallList() + { + return ( new CoreAddonService() )->getInstallAddonList(); } /** @@ -177,15 +184,16 @@ class AddonService extends BaseAdminService * @throws \think\db\exception\DataNotFoundException * @throws \think\db\exception\ModelNotFoundException */ - public function getAddonListByKeys($keys){ + public function getAddonListByKeys($keys) + { sort($keys); - $cache_name = 'addon_list'.implode('_', $keys); + $cache_name = 'addon_list' . implode('_', $keys); return cache_remember( $cache_name, function () use ($keys) { $where = [ - ['key', 'in', $keys], - ['status', '=', AddonDict::ON] + [ 'key', 'in', $keys ], + [ 'status', '=', AddonDict::ON ] ]; return $this->model->where($where)->field('title, icon, key, desc, status, cover')->select()->toArray(); @@ -244,7 +252,7 @@ class AddonService extends BaseAdminService } - $addons = $this->model->where([['status', '=', AddonDict::ON]])->append(['status_name'])->column('title, icon, key, desc, status, type, support_app', 'key'); + $addons = $this->model->where([ [ 'status', '=', AddonDict::ON ] ])->append([ 'status_name' ])->column('title, icon, key, desc, status, type, support_app', 'key'); if (!empty($addons)) { foreach ($addons as $k => $v) { if (!in_array($v[ 'key' ], $keys) && $v[ 'type' ] == AddonDict::ADDON && $v[ 'status' ] == AddonDict::ON) { @@ -260,4 +268,38 @@ class AddonService extends BaseAdminService return $list; } + + /** + * 查询营销列表 + * @return array + */ + public function getShowMarketingTools() + { + $list = [ + 'marketing' => [ + 'title' => '营销活动', + 'list' => [] + ] + ]; + + $apps = event('ShowMarketing'); + + $keys = []; + foreach ($apps as $v) { + foreach ($v as $ck => $cv) { + if (!empty($cv)) { + foreach ($cv as $addon_k => $addon_v) { + if (in_array($addon_v[ 'key' ], $keys)) { + continue; + } + $list[ $ck ][ 'list' ][] = $addon_v; + $keys[] = $addon_v[ 'key' ]; + } + } + + } + } + + return $list; + } } diff --git a/niucloud/app/service/admin/auth/LoginService.php b/niucloud/app/service/admin/auth/LoginService.php index b8f302547..f8010d9cb 100644 --- a/niucloud/app/service/admin/auth/LoginService.php +++ b/niucloud/app/service/admin/auth/LoginService.php @@ -14,6 +14,7 @@ namespace app\service\admin\auth; use app\dict\sys\AppTypeDict; use app\model\sys\SysUser; use app\service\admin\captcha\CaptchaService; +use app\service\admin\sys\RoleService; use app\service\admin\user\UserService; use app\service\core\sys\CoreConfigService; use core\base\BaseAdminService; @@ -45,10 +46,10 @@ class LoginService extends BaseAdminService */ public function login(string $username, string $password) { - $config = (new ConfigService())->getConfig(); - $is_captcha = $config['is_captcha']; - if($is_captcha == 1){ - (new CaptchaService())->verification(); + $config = ( new ConfigService() )->getConfig(); + $is_captcha = $config[ 'is_captcha' ]; + if ($is_captcha == 1) { + ( new CaptchaService() )->verification(); } $user_service = new UserService(); @@ -60,6 +61,23 @@ class LoginService extends BaseAdminService throw new AuthException('USER_LOCK'); } + if(!$userinfo->is_admin) { + $role_service = new RoleService(); + $userrole = $role_service->getUserRoles($userinfo->role_ids); + + if (!empty($userrole)) { + $role_count = 0; + foreach ($userrole as $k => $v) { + if ($v[ 'status' ] == 0) { + $role_count++; + } + } + if ($role_count == count($userrole)) { + throw new AuthException('USER_LOCK'); + } + } + } + //修改用户登录信息 $userinfo->last_time = time(); $userinfo->last_ip = app('request')->ip(); @@ -70,8 +88,8 @@ class LoginService extends BaseAdminService //查询权限以及菜单 $data = [ - 'token' => $token_info['token'], - 'expires_time' => $token_info['params']['exp'], + 'token' => $token_info[ 'token' ], + 'expires_time' => $token_info[ 'params' ][ 'exp' ], 'userinfo' => [ 'uid' => $userinfo->uid, 'username' => $userinfo->username, @@ -80,8 +98,8 @@ class LoginService extends BaseAdminService ]; // 获取站点布局 - $layout_config = (new CoreConfigService())->getConfig('SITE_LAYOUT'); - $data['layout'] = empty($layout_config) ? 'default' : $layout_config['value']['key']; + $layout_config = ( new CoreConfigService() )->getConfig('SITE_LAYOUT'); + $data[ 'layout' ] = empty($layout_config) ? 'default' : $layout_config[ 'value' ][ 'key' ]; return $data; } @@ -103,7 +121,7 @@ class LoginService extends BaseAdminService public function createToken(SysUser $userinfo) { $expire_time = env('system.admin_token_expire_time') ?? 3600; - return TokenAuth::createToken($userinfo->uid, AppTypeDict::ADMIN, ['uid' => $userinfo->uid, 'username' => $userinfo->username], $expire_time); + return TokenAuth::createToken($userinfo->uid, AppTypeDict::ADMIN, [ 'uid' => $userinfo->uid, 'username' => $userinfo->username ], $expire_time); } /** @@ -131,7 +149,7 @@ class LoginService extends BaseAdminService //暴力操作,截停所有异常覆盖为token失效 try { $token_info = TokenAuth::parseToken($token, AppTypeDict::ADMIN); - } catch ( Throwable $e ) { + } catch (Throwable $e) { throw new AuthException('LOGIN_EXPIRE', 401); } diff --git a/niucloud/app/service/admin/install/InstallSystemService.php b/niucloud/app/service/admin/install/InstallSystemService.php index 092677081..30cd34261 100644 --- a/niucloud/app/service/admin/install/InstallSystemService.php +++ b/niucloud/app/service/admin/install/InstallSystemService.php @@ -96,7 +96,8 @@ class InstallSystemService extends BaseAdminService 'sort' => $value[ 'sort' ] ?? '', 'status' => 1, 'is_show' => $value[ 'is_show' ] ?? 1, - 'menu_attr' => $value['menu_attr'] ?? '' + 'menu_attr' => $value['menu_attr'] ?? '', + 'parent_select_key' => $value['parent_select_key'] ?? '' ]; $refer = $value; if (isset($refer[ 'children' ])) { diff --git a/niucloud/app/service/admin/member/MemberService.php b/niucloud/app/service/admin/member/MemberService.php index cfdabc691..0942872d0 100644 --- a/niucloud/app/service/admin/member/MemberService.php +++ b/niucloud/app/service/admin/member/MemberService.php @@ -65,7 +65,7 @@ class MemberService extends BaseAdminService public function getList(array $where = []) { $field = 'member_id, nickname, headimg'; - $temp_where[] = []; + $temp_where = []; if (!empty($where[ 'member_ids' ])) { $temp_where[] = [ 'member_id', 'in', implode(',', $where[ 'member_ids' ]) ]; } @@ -79,7 +79,7 @@ class MemberService extends BaseAdminService */ public function getInfo(int $member_id) { - $field = 'member_id,member_no, username, mobile, password, register_channel, register_type, nickname, headimg, member_level, member_label, wx_openid, weapp_openid, wx_unionid, ali_openid, douyin_openid, login_ip, login_type, login_channel, login_count, login_time, create_time, last_visit_time, last_consum_time, sex, status, birthday, point, point_get, balance, balance_get, growth, growth_get, is_member, member_time, is_del, province_id, city_id, district_id, address, location, delete_time, money, money_get, commission, commission_get, commission_cash_outing'; + $field = 'member_id,member_no, id_card,remark,username, mobile, password, register_channel, register_type, nickname, headimg, member_level, member_label, wx_openid, weapp_openid, wx_unionid, ali_openid, douyin_openid, login_ip, login_type, login_channel, login_count, login_time, create_time, last_visit_time, last_consum_time, sex, status, birthday, point, point_get, balance, balance_get, growth, growth_get, is_member, member_time, is_del, province_id, city_id, district_id, address, location, delete_time, money, money_get, commission, commission_get, commission_cash_outing'; return $this->makeUp($this->model->where([ [ 'member_id', '=', $member_id ] ])->field($field)->with('member_level_name_bind')->append([ 'register_channel_name', 'register_type_name', 'sex_name', 'login_channel_name', 'login_type_name', 'status_name' ])->findOrEmpty()->toArray()); } @@ -155,6 +155,16 @@ class MemberService extends BaseAdminService return ( new CoreMemberService() )->modify($member_id, $field, $data); } + /** + * 批量修改字段 + * @param $data + * @return Member + */ + public function batchModify($data) + { + return ( new CoreMemberService() )->batchModify($data); + } + /** * 组合整理数据 * @param $data diff --git a/niucloud/app/service/admin/notice/NiuSmsService.php b/niucloud/app/service/admin/notice/NiuSmsService.php index 36f30b5a9..c2c5623f3 100644 --- a/niucloud/app/service/admin/notice/NiuSmsService.php +++ b/niucloud/app/service/admin/notice/NiuSmsService.php @@ -418,8 +418,11 @@ class NiuSmsService extends BaseAdminService public function checkTemplateAudit($template_key, $template_id) { $config = $this->niu_service->getNiuLoginConfig(true); + if (empty($config)) { + throw new AdminException('SMS_TYPE_NOT_OPEN'); + } //当前使用短信功能提供商非牛云短信无需校验模版ID是否正常 - if ($config['default'] != SmsDict::NIUSMS) { + if (isset($config['default']) && $config['default'] != SmsDict::NIUSMS) { return true; } $config = $config[SmsDict::NIUSMS]; diff --git a/niucloud/app/service/admin/sys/MenuService.php b/niucloud/app/service/admin/sys/MenuService.php index 7c4fd0365..5e65e0106 100644 --- a/niucloud/app/service/admin/sys/MenuService.php +++ b/niucloud/app/service/admin/sys/MenuService.php @@ -36,6 +36,7 @@ class MenuService extends BaseAdminService public function __construct() { parent::__construct(); + $this->model = new SysMenu(); } /** @@ -47,8 +48,9 @@ class MenuService extends BaseAdminService { $menu = $this->find($data[ 'menu_key' ]); if (!$menu->isEmpty()) throw new AdminException('validate_menu.exit_menu_key');//创建失败 + $data[ 'source' ] = MenuDict::CREATE; - $res = ( new SysMenu() )->create($data); + $res = $this->model->create($data); if (!$res) throw new AdminException('ADD_FAIL');//创建失败 Cache::tag(self::$cache_tag_name)->clear(); @@ -69,7 +71,7 @@ class MenuService extends BaseAdminService ); //校验菜单是否可以修改 - $res = ( new SysMenu() )->update($data, $where); + $res = $this->model->update($data, $where); Cache::tag(self::$cache_tag_name)->clear(); return $res; } @@ -81,7 +83,7 @@ class MenuService extends BaseAdminService */ public function get(string $menu_key) { - return ( new SysMenu() )->where([ [ 'menu_key', '=', $menu_key ] ])->findOrEmpty()->toArray(); + return $this->model->where([ [ 'menu_key', '=', $menu_key ] ])->findOrEmpty()->toArray(); } /** @@ -93,7 +95,7 @@ class MenuService extends BaseAdminService $where = array( [ 'menu_key', '=', $menu_key ] ); - $menu = ( new SysMenu() )->where($where)->findOrEmpty(); + $menu = $this->model->where($where)->findOrEmpty(); return $menu; } @@ -107,7 +109,7 @@ class MenuService extends BaseAdminService { //查询是否有下级菜单或按钮 $menu = $this->find($menu_key); - if (( new SysMenu() )->where([ [ 'parent_key', '=', $menu_key ] ])->count() > 0) + if ($this->model->where([ [ 'parent_key', '=', $menu_key ] ])->count() > 0) throw new AdminException('MENU_NOT_ALLOW_DELETE'); $res = $menu->delete(); @@ -119,6 +121,7 @@ class MenuService extends BaseAdminService * 通过菜单menu_key获取 * @param array $menu_keys * @param int $is_tree + * @param $addon 用于检测插件筛选 * @return mixed * @throws DataNotFoundException * @throws DbException @@ -164,7 +167,7 @@ class MenuService extends BaseAdminService if (!empty($app_type)) { $where[] = [ 'app_type', '=', $app_type ]; } - return ( new SysMenu() )->where($where)->order('sort', 'desc')->select()->toArray(); + return $this->model->where($where)->order('sort', 'desc')->select()->toArray(); }, self::$cache_tag_name ); @@ -196,6 +199,7 @@ class MenuService extends BaseAdminService if ($status != 'all') { $where[] = [ 'status', '=', $status ]; } + // 排除菜单 $delete_menu_addon = []; $addon_loader = new DictLoader("Menu"); @@ -209,7 +213,7 @@ class MenuService extends BaseAdminService $where[] = [ 'menu_key', 'not in', $delete_intersect ]; } } - return ( new SysMenu() )->where($where)->order('sort desc')->select()->toArray(); + return $this->model->where($where)->order('sort desc')->select()->toArray(); }, self::$cache_tag_name ); @@ -221,9 +225,81 @@ class MenuService extends BaseAdminService $v[ 'menu_name' ] = $lang_menu_name; } } - return $is_tree ? $this->menuToTree($menu_list, 'menu_key', 'parent_key', 'children', 'auth', '', $is_button) : $menu_list; + } + /** + * 根据parent_select_key字段重新整理上下级关系 + * @param array $menus + * @return mixed + * @throws DataNotFoundException + * @throws DbException + * @throws ModelNotFoundException + */ + public function moveChildrenToParent(array &$menus) { + $menuKeyMap = []; + //处理整个菜单结构，建立menu_key映射 + $flattenMenus = function (&$list) use (&$flattenMenus, &$menuKeyMap) { + foreach ($list as &$item) { + if (!empty($item[ 'menu_key' ])) { + $menuKeyMap[$item[ 'menu_key' ]] = &$item; + } + if (isset($item[ 'children' ]) && is_array($item[ 'children' ])) { + $flattenMenus($item[ 'children' ]); + } + } + }; + $flattenMenus($menus); + + //重新分配parent_select_key子项 + $moveList = []; + $collectMoves = function (&$list, $parentList = null) use (&$collectMoves, &$moveList) { + foreach ($list as $i => &$item) { + if (!empty($item[ 'parent_select_key' ])) { + $moveList[] = [ + 'item' => &$item, + 'parent_list' => &$list, + 'index' => $i, + 'target_key' => $item['parent_select_key'], + ]; + } + if (isset($item[ 'children' ]) && is_array($item[ 'children' ])) { + $collectMoves($item[ 'children' ], $item); + } + } + }; + $collectMoves($menus); + + //迁移 + foreach ($moveList as $move) { + $item = $move[ 'item' ]; + $targetKey = $move[ 'target_key' ]; + $index = $move[ 'index' ]; + $parentList = &$move[ 'parent_list' ]; + // 从当前children列表中移除 + unset($parentList[ $index ]); + + // 将其添加到目标key的children + if (isset($menuKeyMap[ $targetKey ])) { + if (!isset($menuKeyMap[ $targetKey ][ 'children' ]) || !is_array($menuKeyMap[ $targetKey ][ 'children' ])) { + $menuKeyMap[ $targetKey ][ 'children' ] = []; + } + $menuKeyMap[ $targetKey ][ 'children' ][] = $item; + } + } + + //清理index，避免因unset导致的乱序 + $reIndex = function (&$list) use (&$reIndex) { + $list = array_values($list); + foreach ($list as $key=> &$item) { + if (isset($item[ 'children' ]) && is_array($item[ 'children' ])) { + $reIndex($item[ 'children' ]); + } + } + + }; + $reIndex($menus); + return $menus; } @@ -235,7 +311,7 @@ class MenuService extends BaseAdminService public function getApiListByMenuKeys(array $menu_keys) { sort($menu_keys); - $cache_name = 'api' . md5(implode('_', $menu_keys)); + $cache_name = 'api' . md5(implode("_", $menu_keys)); return cache_remember( $cache_name, function() use ($menu_keys) { @@ -261,7 +337,7 @@ class MenuService extends BaseAdminService public function getButtonListBuMenuKeys(array $menu_keys) { sort($menu_keys); - $cache_name = 'button' . md5(implode('_', $menu_keys)); + $cache_name = 'button' . md5(implode("_", $menu_keys)); return cache_remember( $cache_name, function() use ($menu_keys) { @@ -269,7 +345,7 @@ class MenuService extends BaseAdminService [ 'menu_key', 'in', $menu_keys ], [ 'menu_type', '=', MenuTypeDict::BUTTON ] ]; - return ( new SysMenu() )->where($where)->order('sort', 'desc')->column('menu_key'); + return $this->model->where($where)->order('sort', 'desc')->column('menu_key'); }, self::$cache_tag_name ); @@ -292,7 +368,7 @@ class MenuService extends BaseAdminService if ($status != 'all') { $where[] = [ 'status', '=', $status ]; } - $menu_list = ( new SysMenu() )->where($where)->order('sort', 'desc')->column('methods, api_url'); + $menu_list = $this->model->where($where)->order('sort', 'desc')->column('methods, api_url'); $auth_menu_list = []; foreach ($menu_list as $v) { $auth_menu_list[ $v[ 'methods' ] ][] = $v[ 'api_url' ]; @@ -314,12 +390,11 @@ class MenuService extends BaseAdminService return cache_remember( $cache_name, function() use ($status) { - $where = [ - ]; + $where = []; if ($status != 'all') { $where[] = [ 'status', '=', $status ]; } - return ( new SysMenu() )->where($where)->order('sort desc')->column('menu_key'); + return $this->model->where($where)->order('sort desc')->column('menu_key'); }, self::$cache_tag_name ); @@ -341,7 +416,7 @@ class MenuService extends BaseAdminService if ($status != 'all') { $where[] = [ 'status', '=', $status ]; } - return ( new SysMenu() )->where($where)->order('sort', 'desc')->column('menu_key'); + return $this->model->where($where)->order('sort', 'desc')->column('menu_key'); }, self::$cache_tag_name ); @@ -395,7 +470,7 @@ class MenuService extends BaseAdminService */ public function getFullRouterPath($menu_key) { - $menu = ( new SysMenu() )->where([ [ 'menu_key', '=', $menu_key ] ])->findOrEmpty($menu_key); + $menu = $this->model->where([ [ 'menu_key', '=', $menu_key ] ])->findOrEmpty($menu_key); if ($menu->isEmpty()) return ''; $parents = []; $this->getParentDirectory($menu, $parents); @@ -418,7 +493,7 @@ class MenuService extends BaseAdminService public function getParentDirectory(SysMenu $menu, &$parents) { if (!$menu->isEmpty() && !empty($menu[ 'parent_key' ])) { - $parent_menu = ( new SysMenu() )->where([ [ 'menu_key', '=', $menu[ 'parent_key' ] ] ])->findOrEmpty(); + $parent_menu = $this->model->where([ [ 'menu_key', '=', $menu[ 'parent_key' ] ] ])->findOrEmpty(); if (!empty($parent_menu)) { if (!empty($parent_menu[ 'router_path' ])) $parents[] = $parent_menu[ 'router_path' ]; $this->getParentDirectory($parent_menu, $parents); @@ -427,6 +502,116 @@ class MenuService extends BaseAdminService } + /** + * 获取系统菜单(站点权限api极限) + * @param string $app_type + * @param string $addons + * @return mixed|string + */ + public function getApiListBySystem(string $app_type = '', array $addons = []) + { + sort($addons); + $cache_name = 'system_menu_api_' . $app_type . implode("_", $addons); + return cache_remember( + $cache_name, + function() use ($app_type, $addons) { + $addons[] = ''; + $where = [ + [ 'addon', 'in', $addons ] + ]; + if (!empty($app_type)) { + $where[] = [ 'app_type', '=', $app_type ]; + } + $menu_list = ( new SysMenu() )->where($where)->order('sort', 'desc')->column('api_url,methods'); + foreach ($menu_list as $v) { + $auth_menu_list[ $v[ 'methods' ] ][] = $v[ 'api_url' ]; + } + return $auth_menu_list ?? []; + }, + self::$cache_tag_name + ); + } + + /** + * 站点所拥有的菜单极限 + * @param string $app_type + * @param array $addons + * @param int $is_tree + * @return array|mixed|string + * @throws DataNotFoundException + * @throws DbException + * @throws ModelNotFoundException + */ + public function getMenuListBySystem(string $app_type, array $addons, int $is_tree = 0, int $is_button = 1, $status = 'all') + { + sort($addons); + $cache_name = 'menu' . md5(implode("_", $addons)) . $is_tree . $status; + $menu_list = cache_remember( + $cache_name, + function() use ($addons, $app_type, $is_tree, $status) { + $where = [ + [ 'addon', 'in', $addons ] + ]; + if (!empty($app_type)) { + $where[] = [ 'app_type', '=', $app_type ]; + } + if ($status != 'all') $where[] = [ 'status', '=', $status ]; + // 排除插件中delete的菜单 + $delete_menu_addon = []; + $addon_loader = new DictLoader("Menu"); + foreach ($addons as $addon) { + $delete_menu = $addon_loader->load([ "addon" => $addon, "app_type" => $app_type ])[ 'delete' ] ?? []; + if (!empty($delete_menu) && is_array($delete_menu)) $delete_menu_addon[] = $delete_menu; + } + if (!empty($delete_menu_addon)) { + $delete_intersect = array_intersect(...$delete_menu_addon); + if (!empty($delete_intersect)) { + $where[] = [ 'menu_key', 'not in', $delete_intersect ]; + } + } + return $this->model->where($where)->order('sort', 'desc')->select()->toArray(); + }, + self::$cache_tag_name + ); + + foreach ($menu_list as &$v) { + $lang_menu_key = "dict_menu_" . $v[ 'app_type' ] . '.' . $v[ 'menu_key' ]; + $lang_menu_name = get_lang("dict_menu_" . $v[ 'app_type' ] . '.' . $v[ 'menu_key' ]); + //语言已定义 + if ($lang_menu_key != $lang_menu_name) { + $v[ 'menu_name' ] = $lang_menu_name; + } + } + return $is_tree ? $this->menuToTree($menu_list, 'menu_key', 'parent_key', 'children', 'auth', '', $is_button) : $menu_list; + + } + + /** + * 通过站点的应用配置获取所有的keys + * @param string $app_type + * @param array $addons + * @return mixed|string + */ + public function getMenuKeysBySystem(string $app_type, array $addons) + { + sort($addons); + $cache_name = 'menu_keys_' . $app_type . implode("_", $addons); + return cache_remember( + $cache_name, + function() use ($app_type, $addons) { + $addons[] = ''; + $where = [ + [ 'addon', 'in', $addons ] + ]; + if (!empty($app_type)) { + $where[] = [ 'app_type', '=', $app_type ]; + } + return ( new SysMenu() )->where($where)->order('sort', 'desc')->column('menu_key'); + }, + self::$cache_tag_name + ); + } + public function getSystemMenu($status = 'all', $is_tree = 0, $is_button = 0) { @@ -449,7 +634,8 @@ class MenuService extends BaseAdminService $v[ 'menu_name' ] = $lang_menu_name; } } - return $is_tree ? $this->menuToTree($menu_list, 'menu_key', 'parent_key', 'children', 'auth', '', $is_button) : $menu_list; + $all_menu_list = $is_tree ? $this->menuToTree($menu_list, 'menu_key', 'parent_key', 'children', 'auth', '', $is_button) : $menu_list; + return $this->moveChildrenToParent($all_menu_list); } public function getAddonMenu($app_key, $status = 'all', $is_tree = 0, $is_button = 0) diff --git a/niucloud/app/service/admin/sys/RoleService.php b/niucloud/app/service/admin/sys/RoleService.php index 8474b4930..bd81ea6eb 100644 --- a/niucloud/app/service/admin/sys/RoleService.php +++ b/niucloud/app/service/admin/sys/RoleService.php @@ -29,6 +29,7 @@ use think\facade\Cache; class RoleService extends BaseAdminService { public static $cache_tag_name = 'role_cache'; + public function __construct() { parent::__construct(); @@ -43,20 +44,22 @@ class RoleService extends BaseAdminService public function getPage(array $data) { $where = []; - if(isset($data['role_name']) && $data['role_name'] !== '') { - $where[] = ['role_name', 'like', "%".$this->model->handelSpecialCharacter($data['role_name'])."%"]; + if (isset($data[ 'role_name' ]) && $data[ 'role_name' ] !== '') { + $where[] = [ 'role_name', 'like', "%" . $this->model->handelSpecialCharacter($data[ 'role_name' ]) . "%" ]; } $field = 'role_id,role_name,status,create_time'; - $search_model = $this->model->where($where)->field($field)->order('create_time desc')->append(['status_name']); + $search_model = $this->model->where($where)->field($field)->order('create_time desc')->append([ 'status_name' ]); return $this->pageQuery($search_model); } + /** * 获取权限信息 * @param int $role_id * @return array */ - public function getInfo(int $role_id){ - return $this->model->append(['status_name'])->findOrEmpty($role_id)->toArray(); + public function getInfo(int $role_id) + { + return $this->model->append([ 'status_name' ])->findOrEmpty($role_id)->toArray(); } /** @@ -69,7 +72,7 @@ class RoleService extends BaseAdminService public function getAll() { $where = array( - ['status', '=', 1] + [ 'status', '=', 1 ] ); return $this->model->where($where)->field('role_id,role_name,status,create_time')->select()->toArray(); } @@ -79,8 +82,9 @@ class RoleService extends BaseAdminService * @param array $data * @return true */ - public function add(array $data){ - $data['create_time'] = time(); + public function add(array $data) + { + $data[ 'create_time' ] = time(); $this->model->save($data); Cache::tag(self::$cache_tag_name)->clear(); return true; @@ -92,11 +96,12 @@ class RoleService extends BaseAdminService * @param array $data * @return true */ - public function edit(int $role_id, array $data){ + public function edit(int $role_id, array $data) + { $where = array( - ['role_id', '=', $role_id], + [ 'role_id', '=', $role_id ], ); - $data['update_time'] = time(); + $data[ 'update_time' ] = time(); $this->model->update($data, $where); Cache::tag(self::$cache_tag_name)->clear(); return true; @@ -108,9 +113,10 @@ class RoleService extends BaseAdminService * @param int $role_id * @return mixed */ - public function find(int $role_id){ + public function find(int $role_id) + { $where = array( - ['role_id', '=', $role_id], + [ 'role_id', '=', $role_id ], ); $role = $this->model->where($where)->findOrEmpty(); if ($role->isEmpty()) @@ -124,9 +130,10 @@ class RoleService extends BaseAdminService * @return mixed * @throws DbException */ - public function del(int $role_id){ + public function del(int $role_id) + { $role = $this->find($role_id); - if(SysUser::where([['role_ids', 'like',['%"'.$role_id.'"%']]])->count() > 0) + if (SysUser::where([ [ 'role_ids', 'like', [ '%"' . $role_id . '"%' ] ] ])->count() > 0) throw new AdminException('USER_ROLE_NOT_ALLOW_DELETE'); $res = $role->delete(); Cache::tag(self::$cache_tag_name)->clear(); @@ -138,14 +145,15 @@ class RoleService extends BaseAdminService * 获取角色id为健名,角色名为键值的数据 * @return mixed|string */ - public function getColumn(){ + public function getColumn() + { $cache_name = 'role_column'; return cache_remember( $cache_name, - function() { + function () { return $this->model->column('role_name', 'role_id'); }, - [MenuService::$cache_tag_name, self::$cache_tag_name] + [ RoleService::$cache_tag_name, self::$cache_tag_name ] ); } @@ -157,26 +165,27 @@ class RoleService extends BaseAdminService * @throws DbException * @throws ModelNotFoundException */ - public function getMenuKeysByRoleIds(array $role_ids){ + public function getMenuKeysByRoleIds(array $role_ids) + { sort($role_ids); - $cache_name = 'user_role_menu_keys_'.md5(implode('_', $role_ids)); + $cache_name = 'user_role_menu_keys_' . md5(implode('_', $role_ids)); return cache_remember( $cache_name, - function() use($role_ids) { - $rules = $this->model->where([['role_id', 'IN', $role_ids], ['status', '=', RoleStatusDict::ON]])->field('rules')->select()->toArray(); - if(!empty($rules)){ + function () use ($role_ids) { + $rules = $this->model->where([ [ 'role_id', 'IN', $role_ids ], [ 'status', '=', RoleStatusDict::ON ] ])->field('rules')->select()->toArray(); + if (!empty($rules)) { $temp = []; - foreach($rules as $v){ - $temp = array_merge($temp, $v['rules']); + foreach ($rules as $v) { + $temp = array_merge($temp, $v[ 'rules' ]); } $temp = array_unique($temp); - if(empty($temp)) return []; + if (empty($temp)) return []; return $temp; } return []; }, - [MenuService::$cache_tag_name, self::$cache_tag_name] + [ RoleService::$cache_tag_name, self::$cache_tag_name ] ); } @@ -190,36 +199,56 @@ class RoleService extends BaseAdminService * @throws DbException * @throws ModelNotFoundException */ - public function getAddonKeysByRoleIds(array $role_ids){ + public function getAddonKeysByRoleIds(array $role_ids) + { sort($role_ids); - $cache_name = 'user_role_addon_keys_'.md5(implode('_', $role_ids)); + $cache_name = 'user_role_addon_keys_' . md5(implode('_', $role_ids)); return cache_remember( $cache_name, - function() use($role_ids) { - $rules = $this->model->where([['role_id', 'IN', $role_ids], ['status', '=', RoleStatusDict::ON]])->field('addon_keys')->select()->toArray(); - if(!empty($rules)){ + function () use ($role_ids) { + $rules = $this->model->where([ [ 'role_id', 'IN', $role_ids ], [ 'status', '=', RoleStatusDict::ON ] ])->field('addon_keys')->select()->toArray(); + if (!empty($rules)) { $temp = []; - foreach($rules as $v){ - $temp = array_merge($temp, $v['addon_keys']); + foreach ($rules as $v) { + $temp = array_merge($temp, $v[ 'addon_keys' ]); } $temp = array_unique($temp); - if(empty($temp)) return []; + if (empty($temp)) return []; return $temp; } return []; }, - [MenuService::$cache_tag_name, self::$cache_tag_name] + [ RoleService::$cache_tag_name, self::$cache_tag_name ] ); } + /** + * 用户权限信息 + * @return mixed + */ + public function getUserRoles($role_ids) + { + $cache_name = 'user_roles_' . md5(implode('_', $role_ids));; + return cache_remember( + $cache_name, + function () use ($role_ids) { + $where = array( + [ 'role_id', 'in', $role_ids ] + ); + return $this->model->where($where)->select()->toArray(); + }, + [ RoleService::$cache_tag_name, self::$cache_tag_name ] + ); + } + /** * 角色状态修改 */ - public function setStatus(int $id, int $status) + public function modifyStatus(int $id, int $status) { - $this->model->where([['role_id', '=', $id]])->update(['status' => $status]); + $this->model->where([ [ 'role_id', '=', $id ] ])->update([ 'status' => $status ]); return true; } } diff --git a/niucloud/app/service/admin/upgrade/BackupRecordsService.php b/niucloud/app/service/admin/upgrade/BackupRecordsService.php index 523990da3..25a00a7db 100644 --- a/niucloud/app/service/admin/upgrade/BackupRecordsService.php +++ b/niucloud/app/service/admin/upgrade/BackupRecordsService.php @@ -176,6 +176,7 @@ class BackupRecordsService extends BaseAdminService public function checkPermission() { $niucloud_dir = $this->root_path . 'niucloud' . DIRECTORY_SEPARATOR; + $upgrade_dir = $this->root_path . 'upgrade' . DIRECTORY_SEPARATOR; $admin_dir = $this->root_path . 'admin' . DIRECTORY_SEPARATOR; $web_dir = $this->root_path . 'web' . DIRECTORY_SEPARATOR; $wap_dir = $this->root_path . 'uni-app' . DIRECTORY_SEPARATOR; @@ -195,11 +196,13 @@ class BackupRecordsService extends BaseAdminService ]; $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $niucloud_dir), 'status' => is_readable($niucloud_dir) ]; + $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $upgrade_dir), 'status' => is_readable($upgrade_dir) ]; $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $admin_dir), 'status' => is_readable($admin_dir) ]; $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $web_dir), 'status' => is_readable($web_dir) ]; $data[ 'dir' ][ 'is_readable' ][] = [ 'dir' => str_replace(project_path(), '', $wap_dir), 'status' => is_readable($wap_dir) ]; $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $niucloud_dir), 'status' => is_write($niucloud_dir) ]; + $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $upgrade_dir), 'status' => is_write($upgrade_dir) ]; $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $admin_dir), 'status' => is_write($admin_dir) ]; $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $web_dir), 'status' => is_write($web_dir) ]; $data[ 'dir' ][ 'is_write' ][] = [ 'dir' => str_replace(project_path(), '', $wap_dir), 'status' => is_write($wap_dir) ]; diff --git a/niucloud/app/service/admin/user/UserLogService.php b/niucloud/app/service/admin/user/UserLogService.php index c72956991..31892049b 100644 --- a/niucloud/app/service/admin/user/UserLogService.php +++ b/niucloud/app/service/admin/user/UserLogService.php @@ -37,7 +37,7 @@ class UserLogService extends BaseAdminService */ public function getPage(array $where) { - $field = 'id, ip, uid, username, url, params, type, create_time'; + $field = 'id, ip, uid, username, operation, url, params, type, create_time'; $order = 'create_time desc'; $search_model = $this->model->withSearch(['username', 'create_time', 'uid', 'ip', 'type', 'url'], $where)->field($field)->order($order); return $this->pageQuery($search_model); @@ -52,7 +52,7 @@ class UserLogService extends BaseAdminService $where = array( ['id', '=', $id], ); - $field = 'id, ip, uid, username, url, params, type, create_time'; + $field = 'id, ip, uid, username, operation, url, params, type, create_time'; return $this->model->where($where)->field($field)->findOrEmpty()->toArray(); } diff --git a/niucloud/app/service/api/diy/DiyService.php b/niucloud/app/service/api/diy/DiyService.php index 8fd6353a4..c5275b3e1 100644 --- a/niucloud/app/service/api/diy/DiyService.php +++ b/niucloud/app/service/api/diy/DiyService.php @@ -69,6 +69,7 @@ class DiyService extends BaseApiService $field = 'id,title,name,type,template, mode,value,is_default,share,visit_count'; $info = $this->model->field($field)->where($condition)->findOrEmpty()->toArray(); + if (empty($info)) { // 查询默认页面数据 if (!empty($params[ 'name' ])) { @@ -170,9 +171,11 @@ class DiyService extends BaseApiService continue; } $addon_theme = array_values(array_filter(event('ThemeColor', [ 'key' => $value[ 'key' ] ])))[ 0 ] ?? []; - $data[ $value[ 'key' ] ][ 'title' ] = $theme_data[ $value[ 'key' ] ][ 'title' ] ?? ( !empty($addon_theme) ? $addon_theme[ 'theme_color' ][ 0 ][ 'title' ] : '' ); - $data[ $value[ 'key' ] ][ 'theme' ] = $theme_data[ $value[ 'key' ] ][ 'theme' ] ?? ( !empty($addon_theme) ? $addon_theme[ 'theme_color' ][ 0 ][ 'theme' ] : '' ); - $data[ $value[ 'key' ] ][ 'new_theme' ] = $theme_data[ $value[ 'key' ] ][ 'new_theme' ] ?? ''; + if (!empty($addon_theme) && !empty($addon_theme[ 'theme_color' ])) { + $data[ $value[ 'key' ] ][ 'title' ] = $theme_data[ $value[ 'key' ] ][ 'title' ] ?? $addon_theme[ 'theme_color' ][ 0 ][ 'title' ]; + $data[ $value[ 'key' ] ][ 'theme' ] = $theme_data[ $value[ 'key' ] ][ 'theme' ] ?? $addon_theme[ 'theme_color' ][ 0 ][ 'theme' ]; + $data[ $value[ 'key' ] ][ 'new_theme' ] = $theme_data[ $value[ 'key' ] ][ 'new_theme' ] ?? ''; + } } if (count($apps) > 1) {// 应用数量大于1时，展示系统主题色设置，只有一个应用时，不展示系统主题色设置 $data = array_merge($app_theme, $data); diff --git a/niucloud/app/service/api/diy_form/DiyFormService.php b/niucloud/app/service/api/diy_form/DiyFormService.php index f52bedbb0..071e74a82 100644 --- a/niucloud/app/service/api/diy_form/DiyFormService.php +++ b/niucloud/app/service/api/diy_form/DiyFormService.php @@ -18,6 +18,7 @@ use app\model\member\Member; use app\model\member\MemberLabel; use app\model\member\MemberLevel; use app\service\core\diy_form\CoreDiyFormRecordsService; +use app\service\core\member\CoreMemberConfigService; use core\base\BaseApiService; use core\exception\ApiException; @@ -280,6 +281,45 @@ class DiyFormService extends BaseApiService return ( new CoreDiyFormRecordsService() )->add($data); } + /** + * 编辑填表记录 + * @param array $data + * @return array + */ + public function editRecord(array $data = []) + { + $diy_form_records_model = new DiyFormRecords(); + $records_info = $diy_form_records_model->field('form_id')->where([['record_id', '=', $data['record_id']], ['member_id', '=', $this->member_id]])->findOrEmpty()->toArray(); + if (empty($records_info)) throw new ApiException('DIY_FORM_RECORDS_NOT_EXIST'); + + $data[ 'form_id' ] = $records_info[ 'form_id' ]; + $data[ 'member_id' ] = $this->member_id; + + $info = $this->model->field('status')->where([ [ 'form_id', '=', $records_info[ 'form_id' ] ] ])->findOrEmpty()->toArray(); + if (empty($info)) throw new ApiException('DIY_FORM_NOT_EXIST'); + if ($info[ 'status' ] == 0) throw new ApiException('DIY_FORM_NOT_OPEN'); + + $core_diy_form_records_service = new CoreDiyFormRecordsService(); + $write_config = ( new DiyFormWriteConfig() )->where([ + [ 'form_id', '=', $records_info[ 'form_id' ] ] + ])->findOrEmpty()->toArray(); + if (!empty($write_config)) { + if ($error_msg = $this->checkMemberCanJoinOrNot($this->member_id, $write_config)) { + throw new ApiException($error_msg[ 'desc' ]); + } + if ($error_msg = $this->checkFormWriteTime($write_config)) { + throw new ApiException($error_msg[ 'desc' ]); + } + if ($error_msg = $this->checkFormWriteLimitNum($records_info[ 'form_id' ], $write_config)) { + throw new ApiException($error_msg[ 'desc' ]); + } + if ($error_msg = $this->checkMemberWriteLimitNum($this->member_id, $records_info[ 'form_id' ], $write_config)) { + throw new ApiException($error_msg[ 'desc' ]); + } + } + return $core_diy_form_records_service->edit($data); + } + /** * 获取表单填写结果信息 * @param array $params @@ -312,4 +352,43 @@ class DiyFormService extends BaseApiService return $info; } + /** + * 获取个人资料表单填写记录 + * @param array $params + * @return mixed + */ + public function getMemberInfoFormRecordInfo() + { + $info = []; + $config = (new CoreMemberConfigService())->getMemberConfig(); + if (!empty($config['form_id'])) { + $diy_form_records_model = new DiyFormRecords(); + $field = 'record_id,form_id,create_time'; + $records_info = $diy_form_records_model->field($field)->where([['form_id', '=', $config['form_id']], ['member_id', '=', $this->member_id]])->with([ + // 关联填写字段列表 + 'recordsFieldList' => function($query) { + $query->field('id, form_id, form_field_id, record_id, field_key, field_type, field_name, field_value, field_required, field_unique, privacy_protection, update_num, update_time')->append([ 'handle_field_value', 'render_value' ]); + } + ])->order('create_time desc')->findOrEmpty()->toArray(); + + $form_info = $this->model->where([['form_id', '=', $config['form_id']], ['status', '=', 1]])->field('form_id,type') + ->with(['formField' => function($query) { + $query->field('form_id,field_id as form_field_id,field_key,field_type,field_name,field_default as field_value,field_required,field_unique,privacy_protection'); + }])->append([ 'type_name' ])->findOrEmpty()->toArray(); + + if (!empty($form_info)) { + if (!empty($records_info)) { + $records_info['recordsFieldList'] = array_column($records_info['recordsFieldList'], null, 'field_key'); + foreach ($form_info['formField'] as $k => &$v) { + if (!empty($records_info['recordsFieldList'][$v['field_key']])) { + $v['field_value'] = $records_info['recordsFieldList'][$v['field_key']]['field_value']; + } + } + } + $info = $form_info; + } + } + return $info; + } + } diff --git a/niucloud/app/service/api/login/LoginService.php b/niucloud/app/service/api/login/LoginService.php index 5eec1692a..90958ba45 100644 --- a/niucloud/app/service/api/login/LoginService.php +++ b/niucloud/app/service/api/login/LoginService.php @@ -111,6 +111,54 @@ class LoginService extends BaseApiService $is_bind_mobile = $config[ 'is_bind_mobile' ]; if ($is_mobile != 1 && $is_bind_mobile != 1) throw new AuthException('MOBILE_LOGIN_UNOPENED'); $member_service = new MemberService(); + + if (!empty($params['openid'])) { + $mobile = $params[ 'mobile' ]; + $openid = $params[ 'openid' ]; +; + $openid_field = match ( $this->channel ) { + 'wechat' => 'wx_openid', + 'weapp' => 'weapp_openid', + default => '' + }; + + $openid_member_info = $member_service->findMemberInfo([ $openid_field => $openid ]); + $mobile_member_info = $member_service->findMemberInfo([ 'mobile' => $mobile ]); + + //openid 账号已存在 + if (!$openid_member_info->isEmpty()) { + // 手机号也存在 + if (!$mobile_member_info->isEmpty()) { + // 如果不是同一个人 抛异常 + if ($openid_member_info['member_id'] != $mobile_member_info['member_id']) { + throw new AuthException('MOBILE_IS_EXIST'); // 手机号已被其他账号绑定 + } + // 是同一个用户，直接登录 + return $this->login($mobile_member_info, MemberLoginTypeDict::MOBILE); + } + + // 手机号不存在，给 openid 账号绑定手机号 + $openid_member_info->mobile = $mobile; + $openid_member_info->save(); + return $this->login($openid_member_info, MemberLoginTypeDict::MOBILE); + } + + //openid 账号不存在 + if (!$mobile_member_info->isEmpty()) { + // 手机号已存在，不能注册，避免重复 + throw new AuthException('MOBILE_IS_EXIST'); + } + + //都不存在，执行注册 + $data = [ + 'mobile' => $mobile, + 'nickname' => $params['nickname'] ?? '', + 'headimg' => $params['headimg'] ?? '', + $openid_field => $openid + ]; + return (new RegisterService())->register($mobile, $data, MemberRegisterTypeDict::MOBILE, false); + } + $member_info = $member_service->findMemberInfo([ 'mobile' => $params[ 'mobile' ] ]); if ($member_info->isEmpty()) { //开启强制绑定手机号，登录会自动注册并绑定手机号 diff --git a/niucloud/app/service/api/member/MemberService.php b/niucloud/app/service/api/member/MemberService.php index d31581ce0..900e1ae0b 100644 --- a/niucloud/app/service/api/member/MemberService.php +++ b/niucloud/app/service/api/member/MemberService.php @@ -11,7 +11,9 @@ namespace app\service\api\member; +use app\model\diy_form\DiyFormRecords; use app\model\member\Member; +use app\service\core\member\CoreMemberConfigService; use app\service\core\member\CoreMemberService; use core\base\BaseApiService; use core\exception\ApiException; @@ -59,7 +61,20 @@ class MemberService extends BaseApiService public function getInfo() { $field = 'member_id, username, member_no, mobile, register_channel, nickname, headimg, member_level, member_label, login_ip, login_type, login_time, create_time, last_visit_time, last_consum_time, sex, status, birthday, point, balance, growth, is_member, member_time, is_del, province_id, city_id, district_id, address, location, money, money_get, wx_openid, weapp_openid, commission, commission_get, commission_cash_outing'; - return $this->model->where([['member_id', '=', $this->member_id]])->with(['member_level_name_bind'])->field($field)->append(['sex_name'])->findOrEmpty()->toArray(); + $member_info = $this->model->where([['member_id', '=', $this->member_id]])->with(['member_level_name_bind'])->field($field)->append(['sex_name'])->findOrEmpty()->toArray(); + if (!empty($member_info)) { + $config = (new CoreMemberConfigService())->getMemberConfig(); + $member_info['form_id'] = $config['form_id']; + $member_info['form_record_id'] = ''; + if (!empty($member_info['form_id'])) { + $diy_form_records_model = new DiyFormRecords(); + $form_records = $diy_form_records_model->field('record_id')->where([['form_id', '=', $member_info['form_id']], ['member_id', '=', $member_info['member_id']]])->order('create_time desc')->findOrEmpty()->toArray(); + if (!empty($form_records)) { + $member_info['form_record_id'] = $form_records['record_id']; + } + } + } + return $member_info; } /** diff --git a/niucloud/app/service/core/addon/CoreAddonDevelopBuildService.php b/niucloud/app/service/core/addon/CoreAddonDevelopBuildService.php index aa3ee400b..8beca8019 100644 --- a/niucloud/app/service/core/addon/CoreAddonDevelopBuildService.php +++ b/niucloud/app/service/core/addon/CoreAddonDevelopBuildService.php @@ -88,7 +88,7 @@ class CoreAddonDevelopBuildService extends BaseCoreService */ public function menu(string $app_type) { $where = [ ['app_type', '=', $app_type], ['addon', '=', $this->addon] ]; - $field = 'menu_name,menu_key,menu_short_name,parent_key,menu_type,icon,api_url,router_path,view_path,methods,sort,status,is_show'; + $field = 'menu_name,menu_key,menu_short_name,parent_select_key,parent_key,menu_type,icon,api_url,router_path,view_path,methods,sort,status,is_show'; $menu = (new SysMenu())->where($where)->field($field)->order('sort', 'desc')->select()->toArray(); if (!empty($menu)) { $menu = $this->menuToTree($menu, 'menu_key', 'parent_key', 'children'); diff --git a/niucloud/app/service/core/addon/CoreAddonService.php b/niucloud/app/service/core/addon/CoreAddonService.php index 0a8cede91..cec0b4eb4 100644 --- a/niucloud/app/service/core/addon/CoreAddonService.php +++ b/niucloud/app/service/core/addon/CoreAddonService.php @@ -68,7 +68,7 @@ class CoreAddonService extends CoreAddonBaseService $list[$v['app']['app_key']] = $data; } $online_app_list = array_column($list, 'key'); - } catch ( Throwable $e ) { + } catch (Throwable $e) { $error = $e->getMessage(); } $files = get_files_by_dir($this->addon_path); @@ -82,7 +82,7 @@ class CoreAddonService extends CoreAddonBaseService $data['install_info'] = $install_addon_list[$key] ?? []; $data['is_download'] = true; $data['is_local'] = in_array($data['key'], $online_app_list) ? false : true; - $data['version'] = isset($list[ $data['key'] ]) ? $list[ $data['key'] ]['version'] : $data['version']; + $data['version'] = isset($list[$data['key']]) ? $list[$data['key']]['version'] : $data['version']; $list[$key] = $data; } } @@ -219,7 +219,8 @@ class CoreAddonService extends CoreAddonBaseService * 查询已安装的有效的应用 * @return array */ - public function getInstallAddonList(){ + public function getInstallAddonList() + { $addon_list = $this->model->where([['status', '=', AddonDict::ON]])->append(['status_name'])->column('title, icon, key, desc, status, type, support_app', 'key'); if (!empty($addon_list)) { foreach ($addon_list as &$data) { @@ -290,13 +291,31 @@ class CoreAddonService extends CoreAddonBaseService $data['cover'] = is_file($data['cover']) ? image_to_base64($data['cover']) : ''; $data['type_name'] = empty($data['type']) ? '' : AddonDict::getType()[$data['type']] ?? ''; } - if(isset($data['support_app']) && !empty($data['support_app'])) - { + if (isset($data['support_app']) && !empty($data['support_app'])) { $data['support_type'] = 2; - }else{ + } else { $data['support_type'] = 1; } return $data; } + /** + * 获取首页应用标签 + * @return array + */ + public function getIndexAddonLabelList() + { + return (new CoreModuleService())->getIndexModuleLabelList()['data'] ?? []; + } + + /** + * 获取首页应用 + * @param int $label_id + * @return array + */ + public function getIndexAddonList($label_id) + { + return (new CoreModuleService())->getIndexModuleList($label_id)['data'] ?? []; + } + } diff --git a/niucloud/app/service/core/addon/WapTrait.php b/niucloud/app/service/core/addon/WapTrait.php index 96db5254c..fbe03180d 100644 --- a/niucloud/app/service/core/addon/WapTrait.php +++ b/niucloud/app/service/core/addon/WapTrait.php @@ -33,6 +33,7 @@ trait WapTrait $content = "