Skip to content

朱继来 / 后台订单管理

Go to a project
Commit 2f50e719 by PRY5YKGJ82EZEPX\Administrator
Options

Merge branch 'hcy_pcb_20181221-r' into development

parents 8ed2a30a ad518aa0
Inline Side-by-side
Showing with 30 additions and 825 deletions
.gitignore
Homestead.yaml
Homestead.json
.env
/.idea
.idea/Order.iml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
.idea/blade.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BladeInjectionConfiguration" escapedTextEnd="!!}" escapedTextStart="{!!" />
</project>
\ No newline at end of file
.idea/copyright/profiles_settings.xml deleted 100644 → 0
<component name="CopyrightManager">
<settings default="" />
</component>
\ No newline at end of file
.idea/misc.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<OptionsSetting value="true" id="添加" />
<OptionsSetting value="true" id="移除" />
<OptionsSetting value="true" id="签出" />
<OptionsSetting value="true" id="更新" />
<OptionsSetting value="true" id="状态" />
<OptionsSetting value="true" id="编辑" />
<ConfirmationsSetting value="0" id="添加" />
<ConfirmationsSetting value="0" id="移除" />
</component>
</project>
\ No newline at end of file
.idea/modules.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/Order.iml" filepath="$PROJECT_DIR$/.idea/Order.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/vcs.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
.idea/workspace.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="BookmarkManager">
<bookmark url="file://$PROJECT_DIR$/public/js/AuthPaymentDays.js" line="7" />
</component>
<component name="ChangeListManager">
<list default="true" id="4b4c9130-b911-40a1-ad7c-6495f4778010" name="默认的" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php" afterPath="$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/js/PcbOrderList.js" afterPath="$PROJECT_DIR$/public/js/PcbOrderList.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php" afterPath="$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php" />
</list>
<ignored path="Order.iws" />
<ignored path=".idea/workspace.xml" />
<ignored path=".idea/dataSources.local.xml" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="CreatePatchCommitExecutor">
<option name="PATCH_PATH" value="" />
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FavoritesManager">
<favorites_list name="Order" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="PcbOrderList.blade.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="419">
<caret line="93" column="48" selection-start-line="93" selection-start-column="48" selection-end-line="93" selection-end-column="48" />
<folding>
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#button#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PcbOrderList.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/js/PcbOrderList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="473">
<caret line="203" column="41" selection-start-line="203" selection-start-column="41" selection-end-line="203" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ApiController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="62" column="55" selection-start-line="62" selection-start-column="55" selection-end-line="62" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="PcbPublicModel.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="508">
<caret line="72" column="39" selection-start-line="72" selection-start-column="38" selection-end-line="72" selection-end-column="48" />
<folding>
<element signature="e#33#64#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="JavaScript File" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/app/Http/Controllers/PaymentDaysController.php" />
<option value="$PROJECT_DIR$/config/perm.php" />
<option value="$PROJECT_DIR$/app/Http/routes.php" />
<option value="$PROJECT_DIR$/resources/views/PaymentDays.blade.php" />
<option value="$PROJECT_DIR$/config/app.php" />
<option value="$PROJECT_DIR$/composer.json" />
<option value="$USER_HOME$/AppData/Local/Temp/scp20036/public/js/FootStone/UploadMonopolyFile.js" />
<option value="$PROJECT_DIR$/resources/views/layouts/header.blade.php" />
<option value="$USER_HOME$/AppData/Local/Temp/scp42319/public/js/FootStone/UploadMonopolyFile.js" />
<option value="$PROJECT_DIR$/public/js/AuthPaymentDays.js" />
<option value="$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php" />
<option value="$PROJECT_DIR$/app/Model/PaymentDaysModel.php" />
<option value="$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php" />
<option value="$PROJECT_DIR$/public/js/PaymentDaysList.js" />
<option value="$PROJECT_DIR$/public/index.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/PermController.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/OrderController.php" />
<option value="$PROJECT_DIR$/app/Model/Pcb/AbnormalModel.php" />
<option value="$PROJECT_DIR$/app/Map/PcbMap.php" />
<option value="$PROJECT_DIR$/.env" />
<option value="$PROJECT_DIR$/config/database.php" />
<option value="$PROJECT_DIR$/app/Map/PcbOrderMap.php" />
<option value="$PROJECT_DIR$/public/js/common.min.js" />
<option value="$PROJECT_DIR$/app/Map/PcbOrderInvoiceMap.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/RegionController.php" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbActionLogModel.php" />
<option value="$PROJECT_DIR$/config/website.php" />
<option value="$PROJECT_DIR$/public/js/PcbOrderDetail.js" />
<option value="$PROJECT_DIR$/app/Map/PcbOrderShippingMap.php" />
<option value="$PROJECT_DIR$/config/params.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/ApiController.php" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbServerModel.php" />
<option value="$PROJECT_DIR$/public/js/PcbPurchaseList.js" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.php" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbOrderModel.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb.blade.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseDetail.blade.php" />
<option value="$PROJECT_DIR$/app/Http/Function.php" />
<option value="$PROJECT_DIR$/app/Http/Controllers/WebController.php" />
<option value="$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php" />
<option value="$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php" />
<option value="$PROJECT_DIR$/public/js/PcbOrderList.js" />
</list>
</option>
</component>
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<gulpfiles>
<GulpfileState>
<gulpfile-path>$PROJECT_DIR$/gulpfile.js</gulpfile-path>
</GulpfileState>
</gulpfiles>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpServers">
<servers />
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1936" />
<option name="height" value="1056" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkout" />
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<OptionsSetting value="true" id="添加" />
<OptionsSetting value="true" id="移除" />
<OptionsSetting value="true" id="签出" />
<OptionsSetting value="true" id="更新" />
<OptionsSetting value="true" id="状态" />
<OptionsSetting value="true" id="编辑" />
<OptionsSetting value="true" id="检出" />
<ConfirmationsSetting value="1" id="添加" />
<ConfirmationsSetting value="0" id="移除" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
<manualOrder />
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="ProjectPane">
<subPane />
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../ichuntapi" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\WWW\Order\resources\views\Pcb" />
<recent name="D:\WWW\Order\public\js" />
<recent name="D:\WWW\Order\app\Model\Pcb" />
<recent name="D:\WWW\Order\app\Map" />
<recent name="D:\WWW\Order\resources\views" />
</key>
</component>
<component name="RunManager">
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
<method />
</configuration>
<configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
<method />
</configuration>
<configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
<TestRunner />
<method />
</configuration>
<configuration default="true" type="PhpBehatConfigurationType" factoryName="Behat">
<BehatRunner />
<method />
</configuration>
<configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
<method />
</configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<node-interpreter>project</node-interpreter>
<node-options />
<gulpfile />
<tasks />
<arguments />
<envs />
<method />
</configuration>
<configuration default="true" type="js.build_tools.npm" factoryName="npm">
<command value="run-script" />
<scripts />
<node-interpreter value="project" />
<envs />
<method />
</configuration>
<configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
<node-interpreter>project</node-interpreter>
<node-options />
<working-directory />
<pass-parent-env>true</pass-parent-env>
<envs />
<ui />
<extra-mocha-options />
<test-kind>DIRECTORY</test-kind>
<test-directory />
<recursive>false</recursive>
<method />
</configuration>
</component>
<component name="ShelveChangesManager" show_recycled="false">
<option name="remove_strategy" value="false" />
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="4b4c9130-b911-40a1-ad7c-6495f4778010" name="默认的" comment="" />
<created>1539065019417</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1539065019417</updated>
<workItem from="1539065020769" duration="33480000" />
<workItem from="1539167536899" duration="1228000" />
<workItem from="1539327663189" duration="3659000" />
<workItem from="1539332944482" duration="2229000" />
<workItem from="1545360823838" duration="125000" />
<workItem from="1545360991555" duration="74146000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="119927000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.12447917" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25581396" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="调试" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="运行" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="版本控制" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="调试" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="11" side_tool="true" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="运行" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Gulp" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12447917" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="版本控制" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25581396" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout-to-restore>
</component>
<component name="UnknownFeatures">
<option featureType="com.intellij.fileTypeFactory" implementationName="*.env" />
</component>
<component name="Vcs.Log.UiProperties">
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
</option>
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
<collection />
</option>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="3" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/resources/views/selfOrder/content.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="534">
<caret line="75" column="75" selection-start-line="75" selection-start-column="75" selection-end-line="75" selection-end-column="75" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/detail/content.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="201">
<caret line="41" column="24" selection-start-line="41" selection-start-column="24" selection-end-line="41" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PcbOrderList.blade.php" />
<entry file="file://$PROJECT_DIR$/resources/views/PcbOrderList.blade.php" />
<entry file="file://$PROJECT_DIR$/public/js/PaymentDaysList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="35" column="75" selection-start-line="35" selection-start-column="68" selection-end-line="35" selection-end-column="75" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/erpOrder.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/PaymentDaysList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="19" column="5" selection-start-line="19" selection-start-column="5" selection-end-line="26" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/OrderModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="546">
<caret line="22" column="9" selection-start-line="22" selection-start-column="9" selection-end-line="22" selection-end-column="9" />
<folding>
<element signature="e#28#67#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/self_order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3772">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/common.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="29650">
<caret line="1711" column="11" selection-start-line="1711" selection-start-column="11" selection-end-line="1711" selection-end-column="11" />
<folding>
<marker date="1543561946067" expanded="true" signature="12273:12285" ph="..." />
<marker date="1543561946067" expanded="true" signature="17513:17552" ph="..." />
<marker date="1543561946067" expanded="true" signature="17697:17715" ph="..." />
<marker date="1543561946067" expanded="true" signature="17808:17826" ph="..." />
<marker date="1543561946067" expanded="true" signature="32564:32582" ph="..." />
<marker date="1543561946067" expanded="true" signature="34284:34302" ph="..." />
<marker date="1543561946067" expanded="true" signature="34784:34799" ph="..." />
<marker date="1543561946067" expanded="true" signature="60241:60253" ph="..." />
<marker date="1543561946067" expanded="true" signature="62020:62038" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/prompt.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-525">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/detail/changeOrder.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="124" column="33" selection-start-line="124" selection-start-column="33" selection-end-line="124" selection-end-column="33" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/routes.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284">
<caret line="40" column="90" selection-start-line="40" selection-start-column="79" selection-end-line="40" selection-end-column="90" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/storage/framework/views/7dad30cea302b2f460ccfd9da370b3a492cfd439.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="34" column="24" selection-start-line="34" selection-start-column="24" selection-end-line="34" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/lib/phpstorm.jar!/resources/html5-schema/html5/tables.rnc">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="305">
<caret line="217" column="16" selection-start-line="217" selection-start-column="16" selection-end-line="217" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Map/PcbOrderInvoiceMap.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="14" selection-start-line="1" selection-start-column="14" selection-end-line="1" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/PaymentDaysModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="925">
<caret line="40" column="17" selection-start-line="40" selection-start-column="12" selection-end-line="40" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/UserMainModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/RegionController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1100">
<caret line="45" column="58" selection-start-line="45" selection-start-column="58" selection-end-line="45" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.env">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="18" column="14" selection-start-line="17" selection-start-column="0" selection-end-line="22" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/OrderCountController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-675">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/Controller.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/PcbOrderDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="767">
<caret line="53" column="0" selection-start-line="30" selection-start-column="0" selection-end-line="53" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/storage/framework/views/4baec658f0868ab7a322746690eb8ebcd097a3ff.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="569">
<caret line="106" column="23" selection-start-line="106" selection-start-column="23" selection-end-line="106" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/OrderController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="509">
<caret line="1217" column="66" selection-start-line="1217" selection-start-column="51" selection-end-line="1217" selection-end-column="66" />
<folding>
<element signature="e#39#67#0#PHP" expanded="true" />
<marker date="1545370203471" expanded="true" signature="14178:14278" ph="SELECT * FRO... department" />
<marker date="1545370203471" expanded="true" signature="14219:14277" ph="SELECT depar... department" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/queue.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/app.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1800">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/common.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="157" column="22" selection-start-line="157" selection-start-column="9" selection-end-line="157" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbServerModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="583">
<caret line="25" column="19" selection-start-line="25" selection-start-column="15" selection-end-line="25" selection-end-column="19" />
<folding>
<element signature="e#33#45#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="32" column="56" selection-start-line="32" selection-start-column="56" selection-end-line="32" selection-end-column="56" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/PcbPurchaseList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="417">
<caret line="28" column="40" selection-start-line="28" selection-start-column="25" selection-end-line="28" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="27" column="40" selection-start-line="27" selection-start-column="34" selection-end-line="27" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="367">
<caret line="27" column="40" selection-start-line="27" selection-start-column="34" selection-end-line="27" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/PaymentDays/AuthPaymentDays.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="14" column="81" selection-start-line="14" selection-start-column="81" selection-end-line="14" selection-end-column="81" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbPurchaseDetail.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2584">
<caret line="173" column="68" selection-start-line="173" selection-start-column="57" selection-end-line="173" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderDetail.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3466">
<caret line="144" column="29" selection-start-line="144" selection-start-column="29" selection-end-line="144" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Function.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="619">
<caret line="211" column="19" selection-start-line="211" selection-start-column="15" selection-end-line="211" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/database.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="508">
<caret line="98" column="35" selection-start-line="98" selection-start-column="35" selection-end-line="98" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Map/PcbOrderShippingMap.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/layouts/header.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="30" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/WebController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="28" selection-start-line="6" selection-start-column="28" selection-end-line="6" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Map/PcbOrderMap.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="1" column="17" selection-start-line="1" selection-start-column="17" selection-end-line="1" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbActionLogModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/website.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="17" column="15" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/config/params.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="37" selection-start-line="2" selection-start-column="5" selection-end-line="13" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbPurchaseModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="20" selection-start-line="4" selection-start-column="20" selection-end-line="4" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Http/Controllers/ApiController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="62" column="55" selection-start-line="62" selection-start-column="55" selection-end-line="62" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbOrderModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1775">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding>
<element signature="e#33#57#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/Model/Pcb/PcbPublicModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="508">
<caret line="72" column="39" selection-start-line="72" selection-start-column="38" selection-end-line="72" selection-end-column="48" />
<folding>
<element signature="e#33#64#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/resources/views/Pcb/PcbOrderList.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="419">
<caret line="93" column="48" selection-start-line="93" selection-start-column="48" selection-end-line="93" selection-end-column="48" />
<folding>
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#form#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#select#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#button#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/js/PcbOrderList.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="473">
<caret line="203" column="41" selection-start-line="203" selection-start-column="41" selection-end-line="203" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
app/Http/Controllers/WebController.php
......@@ -6,6 +6,7 @@ use App\Map\PcbOrderInvoiceMap;
use App\Map\PcbOrderMap;
use App\Map\PcbOrderShippingMap;
use App\Model\PaymentDaysModel;
use App\Model\Pcb\PcbPublicModel;
use Illuminate\Http\Request;
use App\Http\Requests;
......@@ -121,7 +122,8 @@ class WebController extends Controller
$purchase['finish_time'] = $purchase['finish_time'] > 0 ? date('Y-m-d H:i:s',$purchase['finish_time']) : "";
}
//拼接基本信息
$orderBase['order_pay_type'] = PcbOrderMap::$order_pay_type[$orderBase['order_pay_type']];
$PcbPublicModel = new PcbPublicModel();
$orderBase['order_pay_type'] = $PcbPublicModel->getPay($order_id);
$orderBase['order_type'] = PcbOrderMap::$order_type[$orderBase['order_type']];
$orderBase['status_name'] = PcbOrderMap::$status[$orderBase['status']];
$orderBase['create_time'] = $orderBase['create_time'] > 0 ? date('Y-m-d H:i:s',$orderBase['create_time']) : "";
......
app/Http/Function.php
......@@ -337,6 +337,12 @@ function export_csv($data = [], $header_data = [], $file_name = '')
fclose($fp);exit;
}
/*
*所有变量转字符串
*/
function changeToStr($str){
return sprintf("'%s'", $str);
}
/*
* 取二维数组某一列的值生成以逗号分隔的字符串,如：$data = ['0'=>['uid'=>'1313','name'=>121]，'1'=>['uid'=>'1414','name'=>121]]
转换后变为：arrayTostr($data,'uid') =》1313，1414
* @param array $data 要取值的数组
......
app/Model/Pcb/PcbOrderModel.php
......@@ -72,6 +72,8 @@ class PcbOrderModel extends Model
return [];
}
$PcbPurchaseModel = new PcbPurchaseModel();
$PcbPublicModel = new PcbPublicModel();
$con = DB::connection("pcb");
foreach ($data as $k=>&$v){
//查询采购
$puchase = $PcbPurchaseModel->where("order_id",$v['order_id'])->first();
......@@ -85,8 +87,8 @@ class PcbOrderModel extends Model
$v['purchase_amount'] = $puchase['purchase_amount'] > 0 ? $puchase['purchase_amount'] : "";
$v['purchase_sn'] = $puchase['purchase_sn'];
}
$v['order_pay_type'] = PcbOrderMap::$order_pay_type[$v['order_pay_type']];
//查询支付
$v['order_pay_type'] = $PcbPublicModel->getPay($v['order_id']);
$v['order_type'] = PcbOrderMap::$order_type[$v['order_type']];
$v['status_name'] = PcbOrderMap::$status[$v['status']];
$v['create_time'] = date('Y-m-d H:i:s',$v['create_time']);
......
app/Model/Pcb/PcbPublicModel.php
......@@ -2,6 +2,7 @@
namespace App\Model\Pcb;
use App\Map\PcbOrderMap;
use League\Flysystem\Exception;
use Request;
use DB;
......@@ -84,5 +85,19 @@ class PcbPublicModel
return [10002, '失败'.$e->getMessage()];
}
}
/*
* 查询支付方式
*/
public function getPay($order_id){
$payLog = DB::connection("pcb")->table("pay_log")->where(['is_paid'=>1,'order_id'=>$order_id])->get();
$payName = "";
if ($payLog){
$payLog = objectToArray($payLog);
$payName = arrayToCommaStr($payLog,'pay_name',2);
}
return $payName;
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment