yangsai
/
shangmenanmo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

111

Browse Source
main
wangmingchuan321@qq.com 3 months ago
parent 671645d150
commit 6830bc23d0
9 changed files with 7008 additions and 6246 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      .idea/misc.xml
  2. 2
      .idea/modules.xml
  3. 414
      .idea/workspace.xml
  4. 8
      .idea/wzsmam.njrzwl.cn.iml
  5. 700
      app/massage/controller/Index.php
  6. 5
      app/massage/model/Commission.php
  7. 7
      app/massage/model/Order.php
  8. 12107
      后端UI/package-lock.json
  9. 5
      后端UI/package.json

6
.idea/misc.xml
Unescape View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="SvnConfiguration">
<configuration />
</component>
</project>

2
.idea/modules.xml
Unescape View File

@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/wzsmam.njrzwl.cn.iml" filepath="$PROJECT_DIR$/.idea/wzsmam.njrzwl.cn.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/shangmenanmo_php.iml" filepath="$PROJECT_DIR$/.idea/shangmenanmo_php.iml" />
</modules>
</component>
</project>

414
.idea/workspace.xml
Unescape View File

@ -1,343 +1,113 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c90fa749-3469-49e4-a8d2-1a9551e562be" name="Default" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<list default="true" id="dcec0f90-23d8-48c0-a5fe-7676efef12d5" name="变更" comment="">
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/wzsmam.njrzwl.cn.iml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/massage/model/Commission.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/massage/model/Commission.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/massage/model/Order.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/massage/model/Order.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/后端UI/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/后端UI/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/后端UI/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/后端UI/package.json" afterDir="false" />
</list>
<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="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="index.0400e26a.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/h5/static/js/index.0400e26a.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296">
<caret line="0" column="102052" lean-forward="false" selection-start-line="0" selection-start-column="102052" selection-end-line="0" selection-end-column="102052" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.f8db9304.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/h5/static/js/index.f8db9304.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="277">
<caret line="0" column="292605" lean-forward="true" selection-start-line="0" selection-start-column="292605" selection-end-line="0" selection-end-column="292605" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.f8db9304.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/h6/static/js/index.f8db9304.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296">
<caret line="0" column="292635" lean-forward="false" selection-start-line="0" selection-start-column="292635" selection-end-line="0" selection-end-column="292635" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.e6fcaff6.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/h5/static/js/index.e6fcaff6.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<caret line="0" column="301251" lean-forward="false" selection-start-line="0" selection-start-column="301251" selection-end-line="0" selection-end-column="301251" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="protocol.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/protocol.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="703">
<caret line="37" column="0" lean-forward="true" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CouponRecord.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/massage/model/CouponRecord.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3629">
<caret line="213" column="5" lean-forward="true" selection-start-line="213" selection-start-column="5" selection-end-line="213" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>C:\Users\Administrator\Downloads</find>
<find>https://wzsmam.njrenzhou.com/</find>
<find>longbing_massages_city</find>
<find>youhui</find>
<find>youhu</find>
<find>yo</find>
<find>you</find>
<find>you'hui</find>
<find>you'hui'qu</find>
<find>you'hui'quan</find>
<find>优惠券</find>
</findStrings>
<dirStrings>
<dir>C:\Users\Administrator\Downloads\wzsmam.njrzwl.cn_HiGGY\wzsmam.njrzwl.cn</dir>
</dirStrings>
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/h5/static/js/index.0400e26a.js" />
<option value="$PROJECT_DIR$/public/h5/static/js/index.f8db9304.js" />
<option value="$PROJECT_DIR$/public/h6/static/js/index.f8db9304.js" />
<option value="$PROJECT_DIR$/public/h5/static/js/index.e6fcaff6.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>
<sorting>DEFINITION_ORDER</sorting>
</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="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
<showMembers />
<showModules />
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
<manualOrder />
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="wzsmam.njrzwl.cn" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="wzsmam.njrzwl.cn" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="wzsmam.njrzwl.cn" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="wzsmam.njrzwl.cn" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="public" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
</panes>
<component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
<execution />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="MarkdownSettingsMigration">
<option name="stateVersion" value="1" />
</component>
<component name="PhpWorkspaceProjectConfiguration">
<include_path>
<path value="$PROJECT_DIR$/vendor/ramsey/uuid" />
<path value="$PROJECT_DIR$/vendor/ralouphie/mimey" />
<path value="$PROJECT_DIR$/vendor/ralouphie/getallheaders" />
<path value="$PROJECT_DIR$/vendor/psr/cache" />
<path value="$PROJECT_DIR$/vendor/psr/log" />
<path value="$PROJECT_DIR$/vendor/psr/container" />
<path value="$PROJECT_DIR$/vendor/paragonie/random_compat" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php72" />
<path value="$PROJECT_DIR$/vendor/symfony/yaml" />
<path value="$PROJECT_DIR$/vendor/symfony/var-dumper" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-normalizer" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-mbstring" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-ctype" />
<path value="$PROJECT_DIR$/vendor/psr/simple-cache" />
<path value="$PROJECT_DIR$/vendor/psr/http-message" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-intl-idn" />
<path value="$PROJECT_DIR$/vendor/symfony/polyfill-php80" />
<path value="$PROJECT_DIR$/vendor/mtdowling/jmespath.php" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/tea-utils" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/tea-rpc-utils" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/sdk" />
<path value="$PROJECT_DIR$/vendor/adbario/php-dot-notation" />
<path value="$PROJECT_DIR$/vendor/lizhichao/one-sm" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/openapi-util" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/endpoint-util" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/tea-oss-utils" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/client" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/tea-xml" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/tea" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/darabonba-openapi" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/credentials" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/gateway-spi" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/dyvmsapi-20170525" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/dyplsapi-20170525" />
<path value="$PROJECT_DIR$/vendor/alibabacloud/tea-fileform" />
<path value="$PROJECT_DIR$/vendor/alipaysdk/easysdk" />
<path value="$PROJECT_DIR$/vendor/league/flysystem" />
<path value="$PROJECT_DIR$/vendor/composer" />
<path value="$PROJECT_DIR$/vendor/league/flysystem-cached-adapter" />
<path value="$PROJECT_DIR$/vendor/topthink/think-view" />
<path value="$PROJECT_DIR$/vendor/clagiordano/weblibs-configmanager" />
<path value="$PROJECT_DIR$/vendor/antchain/twc" />
<path value="$PROJECT_DIR$/vendor/topthink/think-orm" />
<path value="$PROJECT_DIR$/vendor/antchain/antchain-util" />
<path value="$PROJECT_DIR$/vendor/topthink/think-multi-app" />
<path value="$PROJECT_DIR$/vendor/topthink/think-helper" />
<path value="$PROJECT_DIR$/vendor/tp5er/tp5-databackup" />
<path value="$PROJECT_DIR$/vendor/topthink/framework" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/promises" />
<path value="$PROJECT_DIR$/vendor/topthink/think-template" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/psr7" />
<path value="$PROJECT_DIR$/vendor/topthink/think-trace" />
<path value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle" />
</include_path>
</component>
<component name="ProjectId" id="2nHpB5xZWcls8KiMNJuRfMfTJer" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="settings.editor.selected.configurable" value="configurable.group.language" />
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="vue.rearranger.settings.migration" value="true" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager">
<configuration default="true" type="CodeceptionConfigurationType" factoryName="Codeception">
<PhpTestRunnerSettings />
<method />
</configuration>
<configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
<node-interpreter value="project" />
<working-dir value="" />
<envs />
<scope-kind value="ALL" />
<method />
</configuration>
<configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
<config-file value="" />
<node-interpreter value="project" />
<envs />
<method />
</configuration>
<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="PhpSpecConfigurationType" factoryName="PHPSpec">
<PhpTestRunnerSettings />
<method />
</configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
<method />
</configuration>
<configuration default="true" type="js.build_tools.npm" factoryName="npm">
<command value="run" />
<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="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="c90fa749-3469-49e4-a8d2-1a9551e562be" name="Default" comment="" />
<created>1728369661453</created>
<task active="true" id="Default" summary="默认任务">
<changelist id="dcec0f90-23d8-48c0-a5fe-7676efef12d5" name="变更" comment="" />
<created>1728639716315</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1728369661453</updated>
<workItem from="1728369662592" duration="3111000" />
<updated>1728639716315</updated>
<workItem from="1728639717558" duration="4751000" />
<workItem from="1728695105787" duration="15091000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="3111000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="0" />
<layout>
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" 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="-1" 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="-1" 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.33" sideWeight="0.5" order="1" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" 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="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="-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" />
<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="-1" 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="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="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="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" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="processedProjectFiles" value="true" />
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/h5/static/js/index.0400e26a.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296">
<caret line="0" column="102052" lean-forward="false" selection-start-line="0" selection-start-column="102052" selection-end-line="0" selection-end-column="102052" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/h5/static/js/index.f8db9304.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="277">
<caret line="0" column="292605" lean-forward="true" selection-start-line="0" selection-start-column="292605" selection-end-line="0" selection-end-column="292605" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/h6/static/js/index.f8db9304.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="296">
<caret line="0" column="292635" lean-forward="false" selection-start-line="0" selection-start-column="292635" selection-end-line="0" selection-end-column="292635" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/h5/static/js/index.e6fcaff6.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="239">
<caret line="0" column="301251" lean-forward="false" selection-start-line="0" selection-start-column="301251" selection-end-line="0" selection-end-column="301251" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/protocol.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="703">
<caret line="37" column="0" lean-forward="true" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/massage/model/CouponRecord.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3629">
<caret line="213" column="5" lean-forward="true" selection-start-line="213" selection-start-column="5" selection-end-line="213" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<option name="version" value="3" />
</component>
</project>

8
.idea/wzsmam.njrzwl.cn.iml
Unescape View File

@ -1,8 +0,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>

700
app/massage/controller/Index.php
View File

File diff suppressed because it is too large Load Diff

5
app/massage/model/Commission.php
Unescape View File

@ -3,6 +3,7 @@ namespace app\massage\model;
use app\BaseModel;
use think\facade\Db;
use think\facade\Log;
class Commission extends BaseModel
{
@ -1549,7 +1550,7 @@ class Commission extends BaseModel
//技师佣金
$order['coach_cash'] = round($balance*$order['true_service_price']/100,2);
$order['coach_cash'] = $order['coach_cash']>$cash?$cash:$order['coach_cash'];
// $order['coach_cash'] = $order['coach_cash']>$cash?$cash:$order['coach_cash'];
$order['surplus_cash'] = $cash - $order['coach_cash'];
@ -2379,4 +2380,4 @@ class Commission extends BaseModel
}
}

7
app/massage/model/Order.php
Unescape View File

@ -177,7 +177,7 @@ class Order extends BaseModel
->where(function ($query) use ($mapor){
$query->whereOr($mapor);
})
->group('a.id')
->order('a.id desc')
->paginate($page)
@ -195,7 +195,7 @@ class Order extends BaseModel
}
}
return $data;
}
@ -695,6 +695,7 @@ class Order extends BaseModel
}
//计算佣金
$order = $comm_model->cashDataCustom($order);
//转单时候线下技师需要把佣金给到加盟商
if(empty($order['coach_id'])&&!empty($order['admin_id'])){
@ -2002,4 +2003,4 @@ class Order extends BaseModel
}
}

12107
后端UI/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

5
后端UI/package.json
Unescape View File

@ -22,6 +22,7 @@
"fundebug-vue": "0.0.1",
"moment": "^2.24.0",
"qiniu-js": "^3.3.1",
"sass": "^1.79.4",
"vue": "^2.5.2",
"vue-clipboard2": "^0.3.1",
"vue-i18n": "^8.12.0",
@ -45,10 +46,10 @@
"css-loader": "^3.2.0",
"echarts": "^4.3.0",
"eslint": "^4.19.1",
"eslint-config-standard": "^10.2.1",
"eslint-friendly-formatter": "^4.0.1",
"eslint-loader": "^2.0.0",
"eslint-plugin-html": "^4.0.3",
"eslint-config-standard": "^10.2.1",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-node": "^5.2.0",
"eslint-plugin-promise": "^3.4.0",
@ -60,7 +61,7 @@
"html-webpack-plugin": "^2.30.1",
"moment": "^2.24.0",
"node-notifier": "^5.1.2",
"node-sass": "^4.12.0",
"node-sass": "^4.14.1",
"nprogress": "^0.2.0",
"optimize-css-assets-webpack-plugin": "^3.2.0",
"ora": "^1.2.0",

Write Preview
Loading…
Cancel
Save