From 7147c8e14810035f4e68347e859baaf234d4f6be Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 19 Mar 2026 12:19:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TUICallKit-Vue3/App.vue | 11 +- TUICallKit-Vue3/TUIKit/pages/chat/chat.vue | 107 ++++- TUICallKit-Vue3/pages.json | 6 +- TUICallKit-Vue3/pages/Card/contact.vue | 4 +- TUICallKit-Vue3/pages/Card/edit_card.vue | 115 ++---- TUICallKit-Vue3/pages/order/monad/monad.vue | 224 ++++++++-- TUICallKit-Vue3/static/zs.jpg | Bin 0 -> 91773 bytes admin/src/api/order.ts | 20 + .../src/components/tcm-prescription/index.vue | 30 +- admin/src/views/order/index.vue | 385 ++++++++++++++++-- admin/src/views/tcm/appointment/list.vue | 10 +- .../diagnosis/components/CaseRecordList.vue | 4 +- admin/src/views/tcm/diagnosis/edit.vue | 73 +--- admin/src/views/tcm/diagnosis/index.vue | 6 +- ps/管理密码.txt | 23 +- .../controller/order/OrderController.php | 128 +++++- .../order/WechatNotifyController.php | 24 +- .../app/adminapi/lists/order/OrderLists.php | 16 + .../app/adminapi/logic/order/OrderLogic.php | 212 ++++++++++ .../app/adminapi/logic/tcm/DiagnosisLogic.php | 2 +- .../adminapi/validate/order/OrderValidate.php | 7 +- .../common/command/SyncWechatWorkBills.php | 71 ++++ .../wechat/WechatWorkExternalPayService.php | 124 ++++++ server/config/console.php | 2 + server/config/pay.php | 14 + server/config/project.php | 3 + .../2026_03_18_add_order_trade_no.php | 16 + ...026_03_18_add_order_wechat_payee_payer.php | 20 + .../2026_03_18_allow_order_patient_null.php | 17 + .../add_order_wechat_payee_payer.sql | 5 + .../{403-D0WH6BSm.js => 403-B-NjERrA.js} | 2 +- .../{404-D3npB2vj.js => 404-BZ3pLLt6.js} | 2 +- ...gobJAz-.js => BloodRecordList-BKkYZBfl.js} | 2 +- ...D8ZnJgZv.js => CaseRecordList-ZnHRK7LY.js} | 2 +- ...BA0LeRwd.js => account-adjust-jCLJVSI_.js} | 2 +- ...e_type_script_setup_true_lang-SQUTYfT-.js} | 2 +- .../{add-yHI8NGwi.js => add-DEYnPGRd.js} | 2 +- ...dd-nav-ByiCC8th.js => add-nav-BPIXt30X.js} | 2 +- ...e_type_script_setup_true_lang-BO9Rpsnx.js} | 2 +- .../{admin-LudvpDlJ.js => admin-CFEVrA4m.js} | 2 +- ...nt-DwC-4ixM.js => appointment-CeqsIS7h.js} | 2 +- ...rticle-B3cChs-W.js => article-DIaZSPkV.js} | 2 +- .../{attr-C-1ggcMy.js => attr-4sY-AoS9.js} | 2 +- .../{attr-D_aINBiA.js => attr-ALZFQ-pX.js} | 2 +- .../{attr-Du19Tqk8.js => attr-B7cUovah.js} | 2 +- .../{attr-DtyqbmX3.js => attr-BHKBcTbt.js} | 2 +- .../{attr-B_I9AkSB.js => attr-Bkd7gOLr.js} | 2 +- .../{attr-F9S8tcgH.js => attr-BoYdfvU7.js} | 2 +- .../{attr-C0fjujj0.js => attr-ImpioGJ-.js} | 2 +- .../{attr-C9ks4B_Y.js => attr-ZwK3LDeF.js} | 2 +- .../{attr-DSQbsA7p.js => attr-bqO2GOIn.js} | 2 +- .../admin/assets/attr-setting-BBEd9qDX.js | 1 + .../admin/assets/attr-setting-C6eSiUrz.js | 1 - ...e_type_script_setup_true_lang-t_0RYA2y.js} | 2 +- ...e_type_script_setup_true_lang-BGR7XIT3.js} | 2 +- ...e_type_script_setup_true_lang-BwUrALDH.js} | 2 +- ...e_type_script_setup_true_lang-C8hyJxU4.js} | 2 +- ...e_type_script_setup_true_lang-CCFcqAN9.js} | 2 +- ...e_type_script_setup_true_lang-Cj-AdCVa.js} | 2 +- ...e_type_script_setup_true_lang-Co6XAfj-.js} | 2 +- ...e_type_script_setup_true_lang-DC15wQyg.js} | 2 +- .../{auth-D2hw0oKm.js => auth-DtFfTBWW.js} | 2 +- ...e_type_script_setup_true_lang-DKag64IP.js} | 2 +- ...yFyxtzn.js => balance_details-CTxjKrcV.js} | 2 +- .../{cache-BoTVDBM1.js => cache-BeMcsfgs.js} | 2 +- .../{code-BK92Epys.js => code-CsTgZe46.js} | 2 +- ...w-CpFeu6ld.js => code-preview-DOk-a9oN.js} | 2 +- ...e_type_script_setup_true_lang-BznSs603.js} | 2 +- ...{config-BjVo9LEl.js => config-B2QSsw6U.js} | 2 +- ...sumer-CRfl8IXb.js => consumer-CRwCXIIy.js} | 2 +- ...ontent-Day_-VJJ.js => content-3b3z_rKH.js} | 2 +- ...ontent-3U6qh0qk.js => content-BOpg3OuT.js} | 2 +- ...ontent-DGv57Zxs.js => content-BPyIPbmq.js} | 2 +- ...ontent-BVqX3zpw.js => content-BdLjXZus.js} | 2 +- ...ontent-e0li-4AG.js => content-C62o2pLM.js} | 2 +- ...ontent-BsuvUNAY.js => content-CLn3MHa2.js} | 2 +- ...ontent-jukA7jWK.js => content-CPxg9EJp.js} | 2 +- ...ontent-Dr1ss8cu.js => content-CX7lUgUf.js} | 2 +- ...ontent-R2FAyNC7.js => content-DglgXF07.js} | 2 +- ...ontent-Bw6_yHDk.js => content-DlqKqa7C.js} | 2 +- ...ontent-DbreNKti.js => content-DyemOu16.js} | 2 +- ...ontent-8UwO0oHv.js => content-Qh3sI8Df.js} | 2 +- ...ontent-DJwOTrQU.js => content-kp7CgxfA.js} | 2 +- ...e_type_script_setup_true_lang-BiFWz2WM.js} | 2 +- ...e_type_script_setup_true_lang-CUtmI3Qy.js} | 2 +- ...e_type_script_setup_true_lang-DPNx49gf.js} | 2 +- ...e_type_script_setup_true_lang-DZ01aBHw.js} | 2 +- ...e_type_script_setup_true_lang-DiXk-X0r.js} | 2 +- ...ble-DT8frQgF.js => data-table-C-WccVU4.js} | 2 +- ...e_type_script_setup_true_lang-Bhit-Y6R.js} | 2 +- ...ion-CP2tbaix.js => decoration-DCmkka88.js} | 2 +- ...1IgAIr74.js => decoration-img-D91Nd-ts.js} | 2 +- ...-VkwNg5FD.js => default_reply-BjeDsc4J.js} | 2 +- ...ent-CEoergYz.js => department-DjQu8mEQ.js} | 2 +- ...{detail-CqfUPpBb.js => detail-ClqvKHHV.js} | 2 +- ...{detail-DvnjWdKm.js => detail-DfKjFMRO.js} | 2 +- ...e_type_script_setup_true_lang-Ca9g3xUA.js} | 2 +- .../{dict-CnIqMrc3.js => dict-Dd9NRscl.js} | 2 +- ...{doctor-Cqf6kNwd.js => doctor-DazyH8xe.js} | 2 +- .../{edit-D8GioLt_.js => edit-B2y1U1F0.js} | 2 +- .../{edit-C2xt-HB7.js => edit-B43raeH9.js} | 2 +- .../{edit-DNzytf8J.js => edit-BB6HK_v8.js} | 2 +- .../{edit-faNpgM6v.js => edit-BCemvJXh.js} | 2 +- .../{edit-Dk5GZkrg.js => edit-BPGCtgV1.js} | 2 +- .../{edit-5l99YkxD.js => edit-BTc-jwwa.js} | 2 +- .../{edit-thCii_0x.js => edit-BXX8N9Yt.js} | 2 +- .../{edit-Cm1v4VK4.js => edit-BglGr_sY.js} | 2 +- .../{edit-BKWVlOdW.js => edit-Bja0sU2O.js} | 2 +- .../{edit-DB_fCgRM.js => edit-BklaF1nc.js} | 2 +- .../{edit-CbFXzVG4.js => edit-C6I6EKPE.js} | 2 +- .../{edit-DWYqkJcs.js => edit-CIR1irfP.js} | 2 +- .../{edit-CoN2wz9z.js => edit-CausSqK9.js} | 2 +- .../{edit-C4DgrXWl.js => edit-Cdw_PVj6.js} | 2 +- .../{edit-BxNiXZiB.js => edit-CuTaWl-v.js} | 2 +- .../{edit-BlC5bHPZ.js => edit-DKA1hhSu.js} | 2 +- .../{edit-W8eXuPdE.js => edit-DkPAlzI3.js} | 2 +- .../{edit-DnR4n2nb.js => edit-T6oIpCfM.js} | 2 +- .../{edit-Do2209h1.js => edit-qhnyzqgg.js} | 2 +- ...e_type_script_setup_true_lang-BA5iM1Gc.js} | 2 +- ...e_type_script_setup_true_lang-BJBngVHG.js} | 2 +- ...e_type_script_setup_true_lang-Bq-tyqp2.js} | 2 +- ...e_type_script_setup_true_lang-CfG1XG4J.js} | 2 +- ...e_type_script_setup_true_lang-ChxlvA22.js} | 2 +- ...e_type_script_setup_true_lang-DVGNCqb7.js} | 2 +- ...e_type_script_setup_true_lang-Dsq_xGgQ.js} | 2 +- ...e_type_script_setup_true_lang-ZIvTJn49.js} | 2 +- ...e_type_script_setup_true_lang-npYdxIjB.js} | 2 +- ...e_type_script_setup_true_lang-qLBLNz7p.js} | 2 +- ...e_name_articleColumnEdit_lang-ly_2mBjw.js} | 2 +- ...nt-spxpcuNq.js => environment-DPisuiw7.js} | 2 +- .../{error-CfyvjVFR.js => error-Ca7g0yF5.js} | 2 +- .../{fans-B_5jWEjL.js => fans-Vs4ytoPW.js} | 2 +- .../{file-DOon29Q2.js => file-iCEiT0HD.js} | 2 +- ...{filing-CnOuKbf3.js => filing-BHQIRhO4.js} | 2 +- ...inance-CqVYEFHO.js => finance-DncpPy6f.js} | 2 +- ...y-CQJKu4BN.js => follow_reply-ErcK4jxk.js} | 2 +- .../assets/{h5-6L0KosNj.js => h5-BAbcc5qD.js} | 2 +- .../assets/{h5-CwEUAjR7.js => h5-VOAXzViq.js} | 2 +- .../{icon-DEyTfEo8.js => icon-nRmwohUW.js} | 2 +- .../{index-B6TucgqJ.js => index--VIN1k7u.js} | 2 +- .../{index-DEQe-UnT.js => index-BAubk_wL.js} | 2 +- .../{index-Cx_lABnw.js => index-BKxbHXJ8.js} | 2 +- server/public/admin/assets/index-BNrzv8cF.css | 1 + .../{index-CXA-bNfK.js => index-Bf7oH1tS.js} | 2 +- server/public/admin/assets/index-BfHzgXZ3.css | 1 - .../{index-Dvmv_GEz.js => index-Bi8ZuWNg.js} | 2 +- .../{index-D_oLC6eS.js => index-BmaYk8Bn.js} | 2 +- .../{index-DZnC4hgT.js => index-BndEHBWt.js} | 2 +- .../{index-Gw_3yz2v.js => index-C12ADgbD.js} | 2 +- .../{index-DXy0HmZJ.js => index-C5WD9Qji.js} | 2 +- .../{index-B8NipZ1b.js => index-C5s_LN6o.js} | 2 +- .../{index-CKiCysXM.js => index-C7Gumua2.js} | 2 +- .../{index-K5XYyAwJ.js => index-CKXnPZ-R.js} | 2 +- server/public/admin/assets/index-CPNyzHoP.js | 1 - .../{index-r6gvMSbY.js => index-CWjIxPVg.js} | 2 +- .../{index-DwUNfBqL.js => index-CcUcGwR5.js} | 2 +- .../{index-CmMlywtA.js => index-Cic1LWAA.js} | 2 +- .../{index-Etg6lXFM.js => index-Cm83Dsqu.js} | 2 +- .../{index-BU_dsraE.js => index-CqxFJjWA.js} | 2 +- .../{index-GmQk8S_Q.js => index-Ctf_JX2o.js} | 2 +- .../{index-DIQcmtoy.js => index-DHTwt3XI.js} | 2 +- .../{index-CXTuV9qP.js => index-DLGvSY_a.js} | 2 +- .../{index-DEc2DVeg.js => index-DVKAVAQJ.js} | 2 +- .../{index-DHLLYwHc.js => index-DWgAU1z5.js} | 2 +- .../{index-uCEUeqPU.js => index-D_m7ga9B.js} | 2 +- .../{index-l_uFPjGb.js => index-De0zVwLT.js} | 2 +- .../{index-D_UrxyFA.js => index-DjBNstTw.js} | 2 +- .../{index-7f7heJQi.js => index-DlMC5Iah.js} | 2 +- server/public/admin/assets/index-Dwoju_1a.js | 1 + .../{index-SXe-Gaiw.js => index-Pu55kePU.js} | 2 +- .../{index-CSVOMdFR.js => index-ULnY6lSw.js} | 2 +- .../{index-CEQHPbUM.js => index-_HeSPmLP.js} | 4 +- .../{index-rYEzGpDJ.js => index-ciB2RLDK.js} | 2 +- .../{index-nGWlQlsy.js => index-kLQvabyt.js} | 2 +- .../{index-nEELoYrr.js => index-pfMHenGL.js} | 2 +- .../{index-CKtRzGPH.js => index-soWVpNtZ.js} | 2 +- ...e_type_script_setup_true_lang-DE3zchpg.js} | 2 +- ...e_vue_type_style_index_0_lang-Cmz7wdm7.js} | 2 +- ...ex_h5-DdNxMg5F.js => index_h5-OWqaff54.js} | 2 +- ...on-CMN1DEf7.js => information-Cdiy8TLA.js} | 2 +- ...ournal-DWehvNb1.js => journal-4_TYeauf.js} | 2 +- ...-BCthS6Nm.js => keyword_reply-DSVTVNsR.js} | 2 +- .../{link-DrZeJvlE.js => link-JIIRFW7n.js} | 2 +- .../{list-B5qsYan4.js => list-VH2Rstdl.js} | 2 +- .../{login-BOHYl7Aa.js => login-DaPkLaMl.js} | 2 +- ...4zEKPl9-.js => login_register-Dv5kKgHe.js} | 2 +- .../{menu-BnYcqYXQ.js => menu-BfMz5aGJ.js} | 2 +- .../{menu-B3rJBbSb.js => menu-CvFttI-F.js} | 2 +- .../{menu-BBXu4PFa.js => menu-Dwc54CsN.js} | 2 +- ...u-set-Bf0HhhUp.js => menu-set-DnRgUgSd.js} | 2 +- ...e_type_script_setup_true_lang-D_YFWIFe.js} | 2 +- ...essage-ChJr1mEM.js => message-Cl6eDY_i.js} | 2 +- ...e-epm4iaBP.js => mobile-style-B8nLiIYc.js} | 2 +- ...e_type_script_setup_true_lang-B74Cav_p.js} | 2 +- ...a-attr-C5r_JB30.js => oa-attr-CjJnRGO_.js} | 2 +- ...m-B1b9Tpc-.js => oa-menu-form-Cce6R9Dx.js} | 2 +- ...ZPu0l.js => oa-menu-form-edit-BHj9uMnD.js} | 2 +- ...e_type_script_setup_true_lang-B_jqxhS9.js} | 2 +- ...e_type_script_setup_true_lang-DEkd0D4M.js} | 2 +- ...phone-DtCcnbzO.js => oa-phone-CJWupXfE.js} | 2 +- ...g-FfmFPOGq.js => open_setting-CUf5S4P3.js} | 2 +- server/public/admin/assets/order-Ce7NKeGP.js | 1 - server/public/admin/assets/order-DWIZYCwY.js | 1 + ...rflow-Z-Kza-FM.js => overflow-ouIk4loi.js} | 2 +- ...l-D_UQxpXJ.js => patient-call-IJr7Hts7.js} | 2 +- .../{pay-CrD25yaw.js => pay-C5W8Ozhc.js} | 2 +- .../assets/{pc-DG4Rbu-L.js => pc-keyPSAIQ.js} | 2 +- ...ils-Cj7U3HDf.js => pc_details-6jvdfbxm.js} | 2 +- ...{picker-MOfswJ5q.js => picker-Bo66eC5A.js} | 2 +- ...{picker-CYt6oNKF.js => picker-CZdl8TOk.js} | 2 +- ...e_type_script_setup_true_lang-BgCI1ryf.js} | 2 +- .../{post-vT-foE0S.js => post-CsmubPWE.js} | 2 +- ...QOO.js => prescription-drawer-BV-xbctI.js} | 2 +- ...review-B3KMNDvP.js => preview-DVDp7mDw.js} | 2 +- ...-pc-C9cUT_GO.js => preview-pc-CrOogL8t.js} | 2 +- ...tocol-CRwo3VTh.js => protocol-i8wIsKZL.js} | 2 +- ...StKMnIR.js => recharge_record-CF953O09.js} | 2 +- ...log-DNYwAJX3.js => refund-log-XjotX3KB.js} | 2 +- ...e_type_script_setup_true_lang-DtTxu41Z.js} | 2 +- ...-DM27aUtf.js => refund_record-p0bZGi2D.js} | 2 +- ...-CwsZQwhC.js => relations-add-dtnX2jzA.js} | 2 +- ...e_type_script_setup_true_lang-BKejQYLa.js} | 2 +- ...text-C93QbVHQ.js => rich_text-Y_P3YUmX.js} | 2 +- .../{role--sV937A1.js => role-Dcb-Zt9c.js} | 2 +- ...{roster-CdhmY_e9.js => roster-BXhRH1aG.js} | 2 +- ...etting-DkvfG2yB.js => setting-BS0vh2z5.js} | 2 +- .../{setup-DXVRr0gk.js => setup-Dq1wrMbj.js} | 2 +- ...ics-B9IDv-Zc.js => statistics-HzXrJmvw.js} | 2 +- .../{style-DKpkRoQk.js => style-BZRV_DQN.js} | 2 +- ...{tabbar-BPg8zuXy.js => tabbar-CryLiNR9.js} | 2 +- .../{tcm-DnkxvU8R.js => tcm-SmjkhU9m.js} | 2 +- ...r-CmLFg20k.js => theme-picker-DiSjZAdk.js} | 2 +- ...{upload-BfvQ_G5z.js => upload-BtMAXvqv.js} | 2 +- ...BRXuZoi6.js => useDictOptions-DRs4kdTo.js} | 2 +- ...nuOa-E3kf59Nw.js => useMenuOa-CJLna9fq.js} | 2 +- .../{user-B960aqRO.js => user-DkS3fpSA.js} | 2 +- .../{weapp-Djj_b1HH.js => weapp-DxDF7dJg.js} | 2 +- .../{weapp-CcSdnjzt.js => weapp-LZ_TIOZs.js} | 2 +- ...ebsite-DnCRI4Gd.js => website-CM3CN6QA.js} | 2 +- .../{wx_oa-Bno-7Pul.js => wx_oa-BaKk34Dy.js} | 2 +- server/public/admin/index.html | 2 +- server/route/app.php | 4 + server/server.zip | Bin 68919278 -> 69539964 bytes 243 files changed, 1662 insertions(+), 437 deletions(-) create mode 100644 TUICallKit-Vue3/static/zs.jpg create mode 100644 server/app/common/command/SyncWechatWorkBills.php create mode 100644 server/app/common/service/wechat/WechatWorkExternalPayService.php create mode 100644 server/database/migrations/2026_03_18_add_order_trade_no.php create mode 100644 server/database/migrations/2026_03_18_add_order_wechat_payee_payer.php create mode 100644 server/database/migrations/2026_03_18_allow_order_patient_null.php create mode 100644 server/database/migrations/add_order_wechat_payee_payer.sql rename server/public/admin/assets/{403-D0WH6BSm.js => 403-B-NjERrA.js} (92%) rename server/public/admin/assets/{404-D3npB2vj.js => 404-BZ3pLLt6.js} (91%) rename server/public/admin/assets/{BloodRecordList-CgobJAz-.js => BloodRecordList-BKkYZBfl.js} (97%) rename server/public/admin/assets/{CaseRecordList-D8ZnJgZv.js => CaseRecordList-ZnHRK7LY.js} (91%) rename server/public/admin/assets/{account-adjust-BA0LeRwd.js => account-adjust-jCLJVSI_.js} (91%) rename server/public/admin/assets/{account-adjust.vue_vue_type_script_setup_true_lang-DI9_-3Un.js => account-adjust.vue_vue_type_script_setup_true_lang-SQUTYfT-.js} (94%) rename server/public/admin/assets/{add-yHI8NGwi.js => add-DEYnPGRd.js} (98%) rename server/public/admin/assets/{add-nav-ByiCC8th.js => add-nav-BPIXt30X.js} (76%) rename server/public/admin/assets/{add-nav.vue_vue_type_script_setup_true_lang-By9mxj-t.js => add-nav.vue_vue_type_script_setup_true_lang-BO9Rpsnx.js} (93%) rename server/public/admin/assets/{admin-LudvpDlJ.js => admin-CFEVrA4m.js} (84%) rename server/public/admin/assets/{appointment-DwC-4ixM.js => appointment-CeqsIS7h.js} (97%) rename server/public/admin/assets/{article-B3cChs-W.js => article-DIaZSPkV.js} (93%) rename server/public/admin/assets/{attr-C-1ggcMy.js => attr-4sY-AoS9.js} (73%) rename server/public/admin/assets/{attr-D_aINBiA.js => attr-ALZFQ-pX.js} (76%) rename server/public/admin/assets/{attr-Du19Tqk8.js => attr-B7cUovah.js} (80%) rename server/public/admin/assets/{attr-DtyqbmX3.js => attr-BHKBcTbt.js} (73%) rename server/public/admin/assets/{attr-B_I9AkSB.js => attr-Bkd7gOLr.js} (74%) rename server/public/admin/assets/{attr-F9S8tcgH.js => attr-BoYdfvU7.js} (75%) rename server/public/admin/assets/{attr-C0fjujj0.js => attr-ImpioGJ-.js} (74%) rename server/public/admin/assets/{attr-C9ks4B_Y.js => attr-ZwK3LDeF.js} (92%) rename server/public/admin/assets/{attr-DSQbsA7p.js => attr-bqO2GOIn.js} (74%) create mode 100644 server/public/admin/assets/attr-setting-BBEd9qDX.js delete mode 100644 server/public/admin/assets/attr-setting-C6eSiUrz.js rename server/public/admin/assets/{attr-setting.vue_vue_type_script_setup_true_lang-BiFia1C_.js => attr-setting.vue_vue_type_script_setup_true_lang-t_0RYA2y.js} (94%) rename server/public/admin/assets/{attr.vue_vue_type_script_setup_true_lang-B6sqwB6Y.js => attr.vue_vue_type_script_setup_true_lang-BGR7XIT3.js} (93%) rename server/public/admin/assets/{attr.vue_vue_type_script_setup_true_lang-BR3iUk5L.js => attr.vue_vue_type_script_setup_true_lang-BwUrALDH.js} (96%) rename server/public/admin/assets/{attr.vue_vue_type_script_setup_true_lang-D8NrKIwB.js => attr.vue_vue_type_script_setup_true_lang-C8hyJxU4.js} (96%) rename server/public/admin/assets/{attr.vue_vue_type_script_setup_true_lang-CZlinQVl.js => attr.vue_vue_type_script_setup_true_lang-CCFcqAN9.js} (93%) rename server/public/admin/assets/{attr.vue_vue_type_script_setup_true_lang-B8_52s7h.js => attr.vue_vue_type_script_setup_true_lang-Cj-AdCVa.js} (97%) rename server/public/admin/assets/{attr.vue_vue_type_script_setup_true_lang-Cigvn11T.js => attr.vue_vue_type_script_setup_true_lang-Co6XAfj-.js} (97%) rename server/public/admin/assets/{attr.vue_vue_type_script_setup_true_lang-BfBosxxM.js => attr.vue_vue_type_script_setup_true_lang-DC15wQyg.js} (96%) rename server/public/admin/assets/{auth-D2hw0oKm.js => auth-DtFfTBWW.js} (74%) rename server/public/admin/assets/{auth.vue_vue_type_script_setup_true_lang-CGFdlawL.js => auth.vue_vue_type_script_setup_true_lang-DKag64IP.js} (92%) rename server/public/admin/assets/{balance_details-DyFyxtzn.js => balance_details-CTxjKrcV.js} (97%) rename server/public/admin/assets/{cache-BoTVDBM1.js => cache-BeMcsfgs.js} (97%) rename server/public/admin/assets/{code-BK92Epys.js => code-CsTgZe46.js} (92%) rename server/public/admin/assets/{code-preview-CpFeu6ld.js => code-preview-DOk-a9oN.js} (90%) rename server/public/admin/assets/{code-preview.vue_vue_type_script_setup_true_lang-Bi0qcB4H.js => code-preview.vue_vue_type_script_setup_true_lang-BznSs603.js} (95%) rename server/public/admin/assets/{config-BjVo9LEl.js => config-B2QSsw6U.js} (94%) rename server/public/admin/assets/{consumer-CRfl8IXb.js => consumer-CRwCXIIy.js} (81%) rename server/public/admin/assets/{content-Day_-VJJ.js => content-3b3z_rKH.js} (96%) rename server/public/admin/assets/{content-3U6qh0qk.js => content-BOpg3OuT.js} (91%) rename server/public/admin/assets/{content-DGv57Zxs.js => content-BPyIPbmq.js} (95%) rename server/public/admin/assets/{content-BVqX3zpw.js => content-BdLjXZus.js} (95%) rename server/public/admin/assets/{content-e0li-4AG.js => content-C62o2pLM.js} (95%) rename server/public/admin/assets/{content-BsuvUNAY.js => content-CLn3MHa2.js} (91%) rename server/public/admin/assets/{content-jukA7jWK.js => content-CPxg9EJp.js} (91%) rename server/public/admin/assets/{content-Dr1ss8cu.js => content-CX7lUgUf.js} (76%) rename server/public/admin/assets/{content-R2FAyNC7.js => content-DglgXF07.js} (91%) rename server/public/admin/assets/{content-Bw6_yHDk.js => content-DlqKqa7C.js} (95%) rename server/public/admin/assets/{content-DbreNKti.js => content-DyemOu16.js} (93%) rename server/public/admin/assets/{content-8UwO0oHv.js => content-Qh3sI8Df.js} (95%) rename server/public/admin/assets/{content-DJwOTrQU.js => content-kp7CgxfA.js} (96%) rename server/public/admin/assets/{content.vue_vue_type_script_setup_true_lang-BGhxBqa0.js => content.vue_vue_type_script_setup_true_lang-BiFWz2WM.js} (90%) rename server/public/admin/assets/{content.vue_vue_type_script_setup_true_lang-Y-WJYm8z.js => content.vue_vue_type_script_setup_true_lang-CUtmI3Qy.js} (91%) rename server/public/admin/assets/{content.vue_vue_type_script_setup_true_lang-Ce3Ds6bi.js => content.vue_vue_type_script_setup_true_lang-DPNx49gf.js} (91%) rename server/public/admin/assets/{content.vue_vue_type_script_setup_true_lang-DqFhgCMz.js => content.vue_vue_type_script_setup_true_lang-DZ01aBHw.js} (93%) rename server/public/admin/assets/{content.vue_vue_type_script_setup_true_lang-BUGDX-nj.js => content.vue_vue_type_script_setup_true_lang-DiXk-X0r.js} (89%) rename server/public/admin/assets/{data-table-DT8frQgF.js => data-table-C-WccVU4.js} (83%) rename server/public/admin/assets/{data-table.vue_vue_type_script_setup_true_lang-BjYRrGuy.js => data-table.vue_vue_type_script_setup_true_lang-Bhit-Y6R.js} (92%) rename server/public/admin/assets/{decoration-CP2tbaix.js => decoration-DCmkka88.js} (87%) rename server/public/admin/assets/{decoration-img-1IgAIr74.js => decoration-img-D91Nd-ts.js} (96%) rename server/public/admin/assets/{default_reply-VkwNg5FD.js => default_reply-BjeDsc4J.js} (93%) rename server/public/admin/assets/{department-CEoergYz.js => department-DjQu8mEQ.js} (85%) rename server/public/admin/assets/{detail-CqfUPpBb.js => detail-ClqvKHHV.js} (94%) rename server/public/admin/assets/{detail-DvnjWdKm.js => detail-DfKjFMRO.js} (88%) rename server/public/admin/assets/{detail.vue_vue_type_script_setup_true_lang-DGJMgJF3.js => detail.vue_vue_type_script_setup_true_lang-Ca9g3xUA.js} (96%) rename server/public/admin/assets/{dict-CnIqMrc3.js => dict-Dd9NRscl.js} (92%) rename server/public/admin/assets/{doctor-Cqf6kNwd.js => doctor-DazyH8xe.js} (91%) rename server/public/admin/assets/{edit-D8GioLt_.js => edit-B2y1U1F0.js} (98%) rename server/public/admin/assets/{edit-C2xt-HB7.js => edit-B43raeH9.js} (94%) rename server/public/admin/assets/{edit-DNzytf8J.js => edit-BB6HK_v8.js} (79%) rename server/public/admin/assets/{edit-faNpgM6v.js => edit-BCemvJXh.js} (95%) rename server/public/admin/assets/{edit-Dk5GZkrg.js => edit-BPGCtgV1.js} (69%) rename server/public/admin/assets/{edit-5l99YkxD.js => edit-BTc-jwwa.js} (97%) rename server/public/admin/assets/{edit-thCii_0x.js => edit-BXX8N9Yt.js} (79%) rename server/public/admin/assets/{edit-Cm1v4VK4.js => edit-BglGr_sY.js} (81%) rename server/public/admin/assets/{edit-BKWVlOdW.js => edit-Bja0sU2O.js} (91%) rename server/public/admin/assets/{edit-DB_fCgRM.js => edit-BklaF1nc.js} (79%) rename server/public/admin/assets/{edit-CbFXzVG4.js => edit-C6I6EKPE.js} (97%) rename server/public/admin/assets/{edit-DWYqkJcs.js => edit-CIR1irfP.js} (95%) rename server/public/admin/assets/{edit-CoN2wz9z.js => edit-CausSqK9.js} (79%) rename server/public/admin/assets/{edit-C4DgrXWl.js => edit-Cdw_PVj6.js} (79%) rename server/public/admin/assets/{edit-BxNiXZiB.js => edit-CuTaWl-v.js} (96%) rename server/public/admin/assets/{edit-BlC5bHPZ.js => edit-DKA1hhSu.js} (78%) rename server/public/admin/assets/{edit-W8eXuPdE.js => edit-DkPAlzI3.js} (79%) rename server/public/admin/assets/{edit-DnR4n2nb.js => edit-T6oIpCfM.js} (76%) rename server/public/admin/assets/{edit-Do2209h1.js => edit-qhnyzqgg.js} (87%) rename server/public/admin/assets/{edit.vue_vue_type_script_setup_true_lang-nlMtbLqt.js => edit.vue_vue_type_script_setup_true_lang-BA5iM1Gc.js} (93%) rename server/public/admin/assets/{edit.vue_vue_type_script_setup_true_lang-C693ECZ2.js => edit.vue_vue_type_script_setup_true_lang-BJBngVHG.js} (94%) rename server/public/admin/assets/{edit.vue_vue_type_script_setup_true_lang-BW3ZWA6I.js => edit.vue_vue_type_script_setup_true_lang-Bq-tyqp2.js} (96%) rename server/public/admin/assets/{edit.vue_vue_type_script_setup_true_lang-NEziGKai.js => edit.vue_vue_type_script_setup_true_lang-CfG1XG4J.js} (95%) rename server/public/admin/assets/{edit.vue_vue_type_script_setup_true_lang-CmiWZ2ap.js => edit.vue_vue_type_script_setup_true_lang-ChxlvA22.js} (95%) rename server/public/admin/assets/{edit.vue_vue_type_script_setup_true_lang-DzlNP7oD.js => edit.vue_vue_type_script_setup_true_lang-DVGNCqb7.js} (92%) rename server/public/admin/assets/{edit.vue_vue_type_script_setup_true_lang-BoetkNvN.js => edit.vue_vue_type_script_setup_true_lang-Dsq_xGgQ.js} (95%) rename server/public/admin/assets/{edit.vue_vue_type_script_setup_true_lang-DYeQuRsO.js => edit.vue_vue_type_script_setup_true_lang-ZIvTJn49.js} (96%) rename server/public/admin/assets/{edit.vue_vue_type_script_setup_true_lang-BaiM4JNG.js => edit.vue_vue_type_script_setup_true_lang-npYdxIjB.js} (98%) rename server/public/admin/assets/{edit.vue_vue_type_script_setup_true_lang-anDeUNxe.js => edit.vue_vue_type_script_setup_true_lang-qLBLNz7p.js} (96%) rename server/public/admin/assets/{edit.vue_vue_type_script_setup_true_name_articleColumnEdit_lang-Djuw-I0B.js => edit.vue_vue_type_script_setup_true_name_articleColumnEdit_lang-ly_2mBjw.js} (93%) rename server/public/admin/assets/{environment-spxpcuNq.js => environment-DPisuiw7.js} (97%) rename server/public/admin/assets/{error-CfyvjVFR.js => error-Ca7g0yF5.js} (97%) rename server/public/admin/assets/{fans-B_5jWEjL.js => fans-Vs4ytoPW.js} (89%) rename server/public/admin/assets/{file-DOon29Q2.js => file-iCEiT0HD.js} (90%) rename server/public/admin/assets/{filing-CnOuKbf3.js => filing-BHQIRhO4.js} (94%) rename server/public/admin/assets/{finance-CqVYEFHO.js => finance-DncpPy6f.js} (90%) rename server/public/admin/assets/{follow_reply-CQJKu4BN.js => follow_reply-ErcK4jxk.js} (93%) rename server/public/admin/assets/{h5-6L0KosNj.js => h5-BAbcc5qD.js} (96%) rename server/public/admin/assets/{h5-CwEUAjR7.js => h5-VOAXzViq.js} (99%) rename server/public/admin/assets/{icon-DEyTfEo8.js => icon-nRmwohUW.js} (96%) rename server/public/admin/assets/{index-B6TucgqJ.js => index--VIN1k7u.js} (97%) rename server/public/admin/assets/{index-DEQe-UnT.js => index-BAubk_wL.js} (99%) rename server/public/admin/assets/{index-Cx_lABnw.js => index-BKxbHXJ8.js} (99%) create mode 100644 server/public/admin/assets/index-BNrzv8cF.css rename server/public/admin/assets/{index-CXA-bNfK.js => index-Bf7oH1tS.js} (94%) delete mode 100644 server/public/admin/assets/index-BfHzgXZ3.css rename server/public/admin/assets/{index-Dvmv_GEz.js => index-Bi8ZuWNg.js} (97%) rename server/public/admin/assets/{index-D_oLC6eS.js => index-BmaYk8Bn.js} (95%) rename server/public/admin/assets/{index-DZnC4hgT.js => index-BndEHBWt.js} (93%) rename server/public/admin/assets/{index-Gw_3yz2v.js => index-C12ADgbD.js} (86%) rename server/public/admin/assets/{index-DXy0HmZJ.js => index-C5WD9Qji.js} (96%) rename server/public/admin/assets/{index-B8NipZ1b.js => index-C5s_LN6o.js} (88%) rename server/public/admin/assets/{index-CKiCysXM.js => index-C7Gumua2.js} (89%) rename server/public/admin/assets/{index-K5XYyAwJ.js => index-CKXnPZ-R.js} (90%) delete mode 100644 server/public/admin/assets/index-CPNyzHoP.js rename server/public/admin/assets/{index-r6gvMSbY.js => index-CWjIxPVg.js} (92%) rename server/public/admin/assets/{index-DwUNfBqL.js => index-CcUcGwR5.js} (98%) rename server/public/admin/assets/{index-CmMlywtA.js => index-Cic1LWAA.js} (94%) rename server/public/admin/assets/{index-Etg6lXFM.js => index-Cm83Dsqu.js} (91%) rename server/public/admin/assets/{index-BU_dsraE.js => index-CqxFJjWA.js} (96%) rename server/public/admin/assets/{index-GmQk8S_Q.js => index-Ctf_JX2o.js} (97%) rename server/public/admin/assets/{index-DIQcmtoy.js => index-DHTwt3XI.js} (91%) rename server/public/admin/assets/{index-CXTuV9qP.js => index-DLGvSY_a.js} (87%) rename server/public/admin/assets/{index-DEc2DVeg.js => index-DVKAVAQJ.js} (95%) rename server/public/admin/assets/{index-DHLLYwHc.js => index-DWgAU1z5.js} (93%) rename server/public/admin/assets/{index-uCEUeqPU.js => index-D_m7ga9B.js} (95%) rename server/public/admin/assets/{index-l_uFPjGb.js => index-De0zVwLT.js} (95%) rename server/public/admin/assets/{index-D_UrxyFA.js => index-DjBNstTw.js} (94%) rename server/public/admin/assets/{index-7f7heJQi.js => index-DlMC5Iah.js} (95%) create mode 100644 server/public/admin/assets/index-Dwoju_1a.js rename server/public/admin/assets/{index-SXe-Gaiw.js => index-Pu55kePU.js} (74%) rename server/public/admin/assets/{index-CSVOMdFR.js => index-ULnY6lSw.js} (94%) rename server/public/admin/assets/{index-CEQHPbUM.js => index-_HeSPmLP.js} (93%) rename server/public/admin/assets/{index-rYEzGpDJ.js => index-ciB2RLDK.js} (98%) rename server/public/admin/assets/{index-nGWlQlsy.js => index-kLQvabyt.js} (86%) rename server/public/admin/assets/{index-nEELoYrr.js => index-pfMHenGL.js} (93%) rename server/public/admin/assets/{index-CKtRzGPH.js => index-soWVpNtZ.js} (70%) rename server/public/admin/assets/{index.vue_vue_type_script_setup_true_lang-CYJz_nKH.js => index.vue_vue_type_script_setup_true_lang-DE3zchpg.js} (96%) rename server/public/admin/assets/{index.vue_vue_type_style_index_0_lang-i4rvJlDm.js => index.vue_vue_type_style_index_0_lang-Cmz7wdm7.js} (96%) rename server/public/admin/assets/{index_h5-DdNxMg5F.js => index_h5-OWqaff54.js} (95%) rename server/public/admin/assets/{information-CMN1DEf7.js => information-Cdiy8TLA.js} (95%) rename server/public/admin/assets/{journal-DWehvNb1.js => journal-4_TYeauf.js} (96%) rename server/public/admin/assets/{keyword_reply-BCthS6Nm.js => keyword_reply-DSVTVNsR.js} (94%) rename server/public/admin/assets/{link-DrZeJvlE.js => link-JIIRFW7n.js} (86%) rename server/public/admin/assets/{list-B5qsYan4.js => list-VH2Rstdl.js} (97%) rename server/public/admin/assets/{login-BOHYl7Aa.js => login-DaPkLaMl.js} (99%) rename server/public/admin/assets/{login_register-4zEKPl9-.js => login_register-Dv5kKgHe.js} (96%) rename server/public/admin/assets/{menu-BnYcqYXQ.js => menu-BfMz5aGJ.js} (96%) rename server/public/admin/assets/{menu-B3rJBbSb.js => menu-CvFttI-F.js} (86%) rename server/public/admin/assets/{menu-BBXu4PFa.js => menu-Dwc54CsN.js} (79%) rename server/public/admin/assets/{menu-set-Bf0HhhUp.js => menu-set-DnRgUgSd.js} (80%) rename server/public/admin/assets/{menu-set.vue_vue_type_script_setup_true_lang-CC5XEGzo.js => menu-set.vue_vue_type_script_setup_true_lang-D_YFWIFe.js} (94%) rename server/public/admin/assets/{message-ChJr1mEM.js => message-Cl6eDY_i.js} (87%) rename server/public/admin/assets/{mobile-style-epm4iaBP.js => mobile-style-B8nLiIYc.js} (91%) rename server/public/admin/assets/{mobile-style.vue_vue_type_script_setup_true_lang-DvTKajKv.js => mobile-style.vue_vue_type_script_setup_true_lang-B74Cav_p.js} (98%) rename server/public/admin/assets/{oa-attr-C5r_JB30.js => oa-attr-CjJnRGO_.js} (86%) rename server/public/admin/assets/{oa-menu-form-B1b9Tpc-.js => oa-menu-form-Cce6R9Dx.js} (86%) rename server/public/admin/assets/{oa-menu-form-edit-B3TZPu0l.js => oa-menu-form-edit-BHj9uMnD.js} (83%) rename server/public/admin/assets/{oa-menu-form-edit.vue_vue_type_script_setup_true_lang-BP2A5CoE.js => oa-menu-form-edit.vue_vue_type_script_setup_true_lang-B_jqxhS9.js} (90%) rename server/public/admin/assets/{oa-menu-form.vue_vue_type_script_setup_true_lang-ChjlT_5u.js => oa-menu-form.vue_vue_type_script_setup_true_lang-DEkd0D4M.js} (97%) rename server/public/admin/assets/{oa-phone-DtCcnbzO.js => oa-phone-CJWupXfE.js} (95%) rename server/public/admin/assets/{open_setting-FfmFPOGq.js => open_setting-CUf5S4P3.js} (96%) delete mode 100644 server/public/admin/assets/order-Ce7NKeGP.js create mode 100644 server/public/admin/assets/order-DWIZYCwY.js rename server/public/admin/assets/{overflow-Z-Kza-FM.js => overflow-ouIk4loi.js} (96%) rename server/public/admin/assets/{patient-call-D_UQxpXJ.js => patient-call-IJr7Hts7.js} (98%) rename server/public/admin/assets/{pay-CrD25yaw.js => pay-C5W8Ozhc.js} (85%) rename server/public/admin/assets/{pc-DG4Rbu-L.js => pc-keyPSAIQ.js} (94%) rename server/public/admin/assets/{pc_details-Cj7U3HDf.js => pc_details-6jvdfbxm.js} (66%) rename server/public/admin/assets/{picker-MOfswJ5q.js => picker-Bo66eC5A.js} (97%) rename server/public/admin/assets/{picker-CYt6oNKF.js => picker-CZdl8TOk.js} (95%) rename server/public/admin/assets/{picker.vue_vue_type_script_setup_true_lang-B6ZXGpPs.js => picker.vue_vue_type_script_setup_true_lang-BgCI1ryf.js} (98%) rename server/public/admin/assets/{post-vT-foE0S.js => post-CsmubPWE.js} (86%) rename server/public/admin/assets/{prescription-drawer-8sfa2QOO.js => prescription-drawer-BV-xbctI.js} (98%) rename server/public/admin/assets/{preview-B3KMNDvP.js => preview-DVDp7mDw.js} (72%) rename server/public/admin/assets/{preview-pc-C9cUT_GO.js => preview-pc-CrOogL8t.js} (65%) rename server/public/admin/assets/{protocol-CRwo3VTh.js => protocol-i8wIsKZL.js} (88%) rename server/public/admin/assets/{recharge_record-BStKMnIR.js => recharge_record-CF953O09.js} (95%) rename server/public/admin/assets/{refund-log-DNYwAJX3.js => refund-log-XjotX3KB.js} (91%) rename server/public/admin/assets/{refund-log.vue_vue_type_script_setup_true_lang-Bw1Ul-K0.js => refund-log.vue_vue_type_script_setup_true_lang-DtTxu41Z.js} (96%) rename server/public/admin/assets/{refund_record-DM27aUtf.js => refund_record-p0bZGi2D.js} (95%) rename server/public/admin/assets/{relations-add-CwsZQwhC.js => relations-add-dtnX2jzA.js} (87%) rename server/public/admin/assets/{relations-add.vue_vue_type_script_setup_true_lang-Do5vjTVU.js => relations-add.vue_vue_type_script_setup_true_lang-BKejQYLa.js} (93%) rename server/public/admin/assets/{rich_text-C93QbVHQ.js => rich_text-Y_P3YUmX.js} (85%) rename server/public/admin/assets/{role--sV937A1.js => role-Dcb-Zt9c.js} (83%) rename server/public/admin/assets/{roster-CdhmY_e9.js => roster-BXhRH1aG.js} (98%) rename server/public/admin/assets/{setting-DkvfG2yB.js => setting-BS0vh2z5.js} (95%) rename server/public/admin/assets/{setup-DXVRr0gk.js => setup-Dq1wrMbj.js} (89%) rename server/public/admin/assets/{statistics-B9IDv-Zc.js => statistics-HzXrJmvw.js} (93%) rename server/public/admin/assets/{style-DKpkRoQk.js => style-BZRV_DQN.js} (88%) rename server/public/admin/assets/{tabbar-BPg8zuXy.js => tabbar-CryLiNR9.js} (82%) rename server/public/admin/assets/{tcm-DnkxvU8R.js => tcm-SmjkhU9m.js} (97%) rename server/public/admin/assets/{theme-picker-CmLFg20k.js => theme-picker-DiSjZAdk.js} (97%) rename server/public/admin/assets/{upload-BfvQ_G5z.js => upload-BtMAXvqv.js} (95%) rename server/public/admin/assets/{useDictOptions-BRXuZoi6.js => useDictOptions-DRs4kdTo.js} (84%) rename server/public/admin/assets/{useMenuOa-E3kf59Nw.js => useMenuOa-CJLna9fq.js} (92%) rename server/public/admin/assets/{user-B960aqRO.js => user-DkS3fpSA.js} (82%) rename server/public/admin/assets/{weapp-Djj_b1HH.js => weapp-DxDF7dJg.js} (94%) rename server/public/admin/assets/{weapp-CcSdnjzt.js => weapp-LZ_TIOZs.js} (68%) rename server/public/admin/assets/{website-DnCRI4Gd.js => website-CM3CN6QA.js} (91%) rename server/public/admin/assets/{wx_oa-Bno-7Pul.js => wx_oa-BaKk34Dy.js} (93%) diff --git a/TUICallKit-Vue3/App.vue b/TUICallKit-Vue3/App.vue index 9ca60616..7e93b46a 100644 --- a/TUICallKit-Vue3/App.vue +++ b/TUICallKit-Vue3/App.vue @@ -92,16 +92,17 @@ const video =async (data)=>{ const { userSig, SDKAppID } = GenerateTestUserSig.genTestUserSig({ userID:userId, }); - console.log('获取签名成功:',userSig); - getApp().globalData.userID = userId.value; + + getApp().globalData.userID = userId; getApp().globalData.userSig = userSig; getApp().globalData.SDKAppID = SDKAppID; - - await uni.CallManager.init({ + const cc={ sdkAppID: SDKAppID, // 替换为用户自己的 sdkAppID userID: userId, // 替换为用户自己的 userID userSig: userSig, // 替换为用户自己的 userSig globalCallPagePath: "TUICallKit/src/Components/TUICallKit", // 替换为步骤一里注册的全局监听页面 - }); + } + uni.setStorageSync('CallManager', userId) + await uni.CallManager.init(cc); } \ No newline at end of file diff --git a/TUICallKit-Vue3/TUIKit/pages/chat/chat.vue b/TUICallKit-Vue3/TUIKit/pages/chat/chat.vue index c0c7c76f..40deeeb0 100644 --- a/TUICallKit-Vue3/TUIKit/pages/chat/chat.vue +++ b/TUICallKit-Vue3/TUIKit/pages/chat/chat.vue @@ -1,5 +1,9 @@ @@ -58,7 +58,7 @@ const getCases = async () => { const data = await prescriptionListByDiagnosis({ diagnosis_id: props.diagnosisId }) caseList.value = Array.isArray(data) ? data : [] } catch (error) { - console.error('获取病例记录失败:', error) + console.error('获取病历记录失败:', error) caseList.value = [] } finally { loading.value = false diff --git a/admin/src/views/tcm/diagnosis/edit.vue b/admin/src/views/tcm/diagnosis/edit.vue index 9f70903b..0be0f1fd 100644 --- a/admin/src/views/tcm/diagnosis/edit.vue +++ b/admin/src/views/tcm/diagnosis/edit.vue @@ -11,7 +11,7 @@ > - + - + - + - + @@ -194,45 +194,11 @@ - - - - - - - + - - - - - - - + @@ -246,7 +212,7 @@ - + - + - + 糖尿病 高血压 @@ -573,8 +539,8 @@ /> - - + +
@@ -610,18 +576,18 @@
- +
- +
- +