郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 bec7a154749fd41edbdec12b27b393fd6b4e397d 2 个父辈 59298ff0 61279e1f
1 个管道 的构建 通过 耗费 13 秒

Merge branch 'master' of http://114.215.101.231:8099/guosheng/areial 

# Conflicts:
#	.idea/workspace.xml
内嵌 并排对比
正在显示 3 个修改的文件 包含 255 行增加 和 37 行删除
... ... @@ -4,9 +4,13 @@
<bookmark url="file://$PROJECT_DIR$/application/admin/view/video/add.html" line="31" />
</component>
<component name="ChangeListManager">
<<<<<<< HEAD
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list>
=======
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="" />
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
... ... @@ -14,7 +18,9 @@
<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">
<<<<<<< HEAD
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
... ... @@ -28,6 +34,15 @@
<element signature="e#3370#3660#0#PHP" expanded="false" />
<element signature="e#3666#3988#0#PHP" expanded="false" />
<element signature="e#3993#4280#0#PHP" expanded="false" />
=======
<leaf>
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382">
<caret line="2439" column="0" lean-forward="true" selection-start-line="2439" selection-start-column="0" selection-end-line="2439" selection-end-column="0" />
<folding>
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
<element signature="e#4287#4721#0#PHP" expanded="false" />
<element signature="e#4726#5084#0#PHP" expanded="false" />
<element signature="e#5090#5497#0#PHP" expanded="false" />
... ... @@ -97,7 +112,10 @@
<element signature="e#72731#73330#0#PHP" expanded="false" />
<element signature="e#73335#74262#0#PHP" expanded="false" />
<element signature="e#74268#74982#0#PHP" expanded="false" />
<<<<<<< HEAD
<element signature="e#74361#74430#0#PHP" expanded="false" />
=======
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
<element signature="e#74988#75415#0#PHP" expanded="false" />
<element signature="e#75420#75889#0#PHP" expanded="false" />
<element signature="e#75896#77101#0#PHP" expanded="false" />
... ... @@ -112,6 +130,7 @@
</provider>
</entry>
</file>
<<<<<<< HEAD
<file leaf-file-name="Pic.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -132,6 +151,8 @@
</provider>
</entry>
</file>
=======
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -245,9 +266,15 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<<<<<<< HEAD
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="18" />
<option name="y" value="97" />
=======
<component name="ProjectFrameBounds">
<option name="x" value="-154" />
<option name="y" value="9" />
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
<option name="width" value="1747" />
<option name="height" value="1013" />
</component>
... ... @@ -268,6 +295,7 @@
<panes>
<pane id="ProjectPane">
<subPane>
<<<<<<< HEAD
<expand>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -332,10 +360,76 @@
</path>
</expand>
<select />
=======
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="application" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="application" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="api" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="areial" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="application" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="api" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="controller" />
<option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
</PATH_ELEMENT>
</PATH>
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -371,6 +465,69 @@
</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>
... ... @@ -504,6 +661,7 @@
<workItem from="1590137451444" duration="1533000" />
<workItem from="1590141410628" duration="1864000" />
<workItem from="1590193431145" duration="1982000" />
<<<<<<< HEAD
<workItem from="1590217205221" duration="13528000" />
<workItem from="1590394675945" duration="22000" />
<workItem from="1590462128047" duration="1254000" />
... ... @@ -515,6 +673,10 @@
<workItem from="1591236438354" duration="772000" />
<workItem from="1591779728435" duration="654000" />
<workItem from="1591835396934" duration="599000" />
=======
<workItem from="1590217205221" duration="12032000" />
<workItem from="1590280044844" duration="101000" />
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -758,7 +920,11 @@
<servers />
</component>
<component name="TimeTrackingManager">
<<<<<<< HEAD
<option name="totallyTimeSpent" value="698537000" />
=======
<option name="totallyTimeSpent" value="693097000" />
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -770,26 +936,35 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<<<<<<< HEAD
<frame x="18" y="97" width="1747" height="1013" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16597511" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
=======
<frame x="-154" y="9" width="1747" height="1010" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14997037" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" 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="-1" 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.32876712" sideWeight="0.5" order="0" 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="0" 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="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="5" 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="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="-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.449711" sideWeight="0.5" order="2" 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="0" 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="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="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="3" 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="1" 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="8" 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="5" 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="3" side_tool="false" content_ui="combo" />
<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="4" 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="2" 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="6" 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.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
... ... @@ -812,7 +987,7 @@
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
<option name="processedProjectFiles" value="true" />
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
... ... @@ -861,13 +1036,7 @@
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/助通短信平台账号/PHP_G_DEMO.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1050">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/助通短信平台账号/PHP_G_DEMO.php" />
<entry file="file://$PROJECT_DIR$/application/nsms/nsms.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
... ... @@ -875,13 +1044,7 @@
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/助通短信平台账号/php_Nsms_demo.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
<caret line="73" column="58" lean-forward="true" selection-start-line="73" selection-start-column="58" selection-end-line="73" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/助通短信平台账号/php_Nsms_demo.php" />
<entry file="file://$PROJECT_DIR$/application/index/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5721">
... ... @@ -917,11 +1080,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20200224/FnP4bjIl2npbQgozzDqWFF8jSgyX.jpg">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20200224/FnP4bjIl2npbQgozzDqWFF8jSgyX.jpg" />
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_5.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
... ... @@ -950,11 +1109,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20200331/Fo7_AuWQX97fjnNLJNARJ4dtjv-E.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/uploads/20200331/Fo7_AuWQX97fjnNLJNARJ4dtjv-E.png" />
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775">
... ... @@ -962,13 +1117,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Words.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1125">
<caret line="46" column="4" lean-forward="false" selection-start-line="46" selection-start-column="4" selection-end-line="54" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Words.php" />
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
... ... @@ -1019,6 +1168,17 @@
</state>
</provider>
</entry>
<<<<<<< HEAD
=======
<entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="169" column="33" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="327" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/src/Kernel/Support/Helpers.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-375">
... ... @@ -1056,8 +1216,13 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="-118">
<caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
=======
<state relative-caret-position="205">
<caret line="250" column="9" lean-forward="true" selection-start-line="250" selection-start-column="9" selection-end-line="250" selection-end-column="9" />
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
</state>
</provider>
</entry>
... ... @@ -1068,6 +1233,16 @@
</state>
</provider>
</entry>
<<<<<<< HEAD
=======
<entry file="file://$PROJECT_DIR$/application/admin/model/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
</state>
</provider>
</entry>
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
<entry file="file://$PROJECT_DIR$/application/admin/view/user/user/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
... ... @@ -1082,10 +1257,26 @@
</state>
</provider>
</entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="51" lean-forward="true" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" />
=======
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="51" column="54" lean-forward="false" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/OrderDetail.php" />
<entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html" />
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="26" column="24" lean-forward="false" selection-start-line="26" selection-start-column="24" selection-end-line="26" selection-end-column="41" />
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
</state>
</provider>
</entry>
... ... @@ -1096,6 +1287,17 @@
</state>
</provider>
</entry>
<<<<<<< HEAD
=======
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="24" column="21" lean-forward="true" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order_detail.js" />
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/zip/zip.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
... ... @@ -1107,6 +1309,10 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="20" column="58" lean-forward="false" selection-start-line="20" selection-start-column="54" selection-end-line="20" selection-end-column="58" />
<<<<<<< HEAD
=======
<folding />
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
</state>
</provider>
</entry>
... ... @@ -1114,6 +1320,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="325" column="8" lean-forward="true" selection-start-line="325" selection-start-column="8" selection-end-line="325" selection-end-column="8" />
<<<<<<< HEAD
</state>
</provider>
</entry>
... ... @@ -1156,13 +1363,20 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="25">
<caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
=======
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<<<<<<< HEAD
<state relative-caret-position="525">
<caret line="29" column="7" lean-forward="false" selection-start-line="29" selection-start-column="7" selection-end-line="29" selection-end-column="7" />
=======
<state relative-caret-position="382">
<caret line="2439" column="0" lean-forward="true" selection-start-line="2439" selection-start-column="0" selection-end-line="2439" selection-end-column="0" />
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
<folding>
<element signature="e#589#1327#0#PHP" expanded="false" />
<element signature="e#1332#2995#0#PHP" expanded="false" />
... ... @@ -1253,6 +1467,7 @@
</state>
</provider>
</entry>
<<<<<<< HEAD
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6800">
... ... @@ -1269,5 +1484,7 @@
</state>
</provider>
</entry>
=======
>>>>>>> 61279e1f89038758efb77a9cfadbca0d88df1e05
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -157,7 +157,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[eight_price]', ['2800'=>__('2800'), '1'=>__('3800'),'2'=>__('4800')],'-1')}
{:build_radios('row[eight_price]', ['2800'=>__('2800'), '3800'=>__('3800'),'4800'=>__('4800')],'-1')}
</div>
</div>
<!--<div class="form-group">-->
... ...
... ... @@ -2452,7 +2452,8 @@ class User extends Api
*/
public function change()
{
$this->success('success',['type'=>0]);
$this->success('success',['type'=>1]);
}
... ...