郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 5bcf69b6a5d0f986bcb674fd85faa7ca7bb15884 1 个父辈 0ccc754e
1 个管道 的构建 失败 耗费 1 秒

修改订单中联系人电话

内嵌 并排对比
正在显示 2 个修改的文件 包含 37 行增加 和 99 行删除
... ... @@ -2,9 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/order/fapiao.html" afterPath="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -15,86 +13,12 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<file leaf-file-name="fapiao.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294">
<caret line="1972" column="31" lean-forward="true" selection-start-line="1972" selection-start-column="31" selection-end-line="1972" selection-end-column="31" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#1266#2890#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4571#0#PHP" expanded="false" />
<element signature="e#4577#4984#0#PHP" expanded="false" />
<element signature="e#4989#5332#0#PHP" expanded="false" />
<element signature="e#5338#5751#0#PHP" expanded="false" />
<element signature="e#5756#6073#0#PHP" expanded="false" />
<element signature="e#6079#6916#0#PHP" expanded="false" />
<element signature="e#6921#9116#0#PHP" expanded="false" />
<element signature="e#9122#9802#0#PHP" expanded="false" />
<element signature="e#9807#10715#0#PHP" expanded="false" />
<element signature="e#10721#11510#0#PHP" expanded="false" />
<element signature="e#11515#12863#0#PHP" expanded="false" />
<element signature="e#12869#13571#0#PHP" expanded="false" />
<element signature="e#13576#14886#0#PHP" expanded="false" />
<element signature="e#14892#15468#0#PHP" expanded="false" />
<element signature="e#15473#16085#0#PHP" expanded="false" />
<element signature="e#16091#16807#0#PHP" expanded="false" />
<element signature="e#16812#19352#0#PHP" expanded="false" />
<element signature="e#19358#20260#0#PHP" expanded="false" />
<element signature="e#20265#23083#0#PHP" expanded="false" />
<element signature="e#23089#23466#0#PHP" expanded="false" />
<element signature="e#23471#23792#0#PHP" expanded="false" />
<element signature="e#23798#24303#0#PHP" expanded="false" />
<element signature="e#24308#24559#0#PHP" expanded="false" />
<element signature="e#24565#25044#0#PHP" expanded="false" />
<element signature="e#25049#25806#0#PHP" expanded="false" />
<element signature="e#25812#26293#0#PHP" expanded="false" />
<element signature="e#26298#27067#0#PHP" expanded="false" />
<element signature="e#27073#27436#0#PHP" expanded="false" />
<element signature="e#27441#27632#0#PHP" expanded="false" />
<element signature="e#27638#27996#0#PHP" expanded="false" />
<element signature="e#28001#28192#0#PHP" expanded="false" />
<element signature="e#28198#29341#0#PHP" expanded="false" />
<element signature="e#29346#32011#0#PHP" expanded="false" />
<element signature="e#32017#32515#0#PHP" expanded="false" />
<element signature="e#32520#34266#0#PHP" expanded="false" />
<element signature="e#34272#34685#0#PHP" expanded="false" />
<element signature="e#34690#35169#0#PHP" expanded="false" />
<element signature="e#35175#35709#0#PHP" expanded="false" />
<element signature="e#35714#37099#0#PHP" expanded="false" />
<element signature="e#37105#37759#0#PHP" expanded="false" />
<element signature="e#37764#39779#0#PHP" expanded="false" />
<element signature="e#39785#40545#0#PHP" expanded="false" />
<element signature="e#40550#43259#0#PHP" expanded="false" />
<element signature="e#43285#44116#0#PHP" expanded="false" />
<element signature="e#44122#44542#0#PHP" expanded="false" />
<element signature="e#44547#45030#0#PHP" expanded="false" />
<element signature="e#45036#45842#0#PHP" expanded="false" />
<element signature="e#45847#49005#0#PHP" expanded="false" />
<element signature="e#49020#50355#0#PHP" expanded="false" />
<element signature="e#50371#51405#0#PHP" expanded="false" />
<element signature="e#51411#52169#0#PHP" expanded="false" />
<element signature="e#52174#55917#0#PHP" expanded="false" />
<element signature="e#55923#56315#0#PHP" expanded="false" />
<element signature="e#56320#57272#0#PHP" expanded="false" />
<element signature="e#57296#57869#0#PHP" expanded="false" />
<element signature="e#57875#58474#0#PHP" expanded="false" />
<element signature="e#58479#59406#0#PHP" expanded="false" />
<element signature="e#59412#60126#0#PHP" expanded="false" />
<element signature="e#60132#60559#0#PHP" expanded="false" />
<element signature="e#60564#61033#0#PHP" expanded="false" />
<element signature="e#61040#62245#0#PHP" expanded="false" />
<element signature="e#62250#63953#0#PHP" expanded="false" />
<element signature="e#62397#62736#1#PHP" expanded="false" />
<element signature="e#62766#63120#1#PHP" expanded="false" />
<element signature="e#63959#64825#0#PHP" expanded="false" />
<element signature="e#64830#67365#0#PHP" expanded="false" />
<element signature="e#66002#66086#0#PHP" expanded="false" />
<element signature="e#67371#67880#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="368">
<caret line="43" column="10" lean-forward="true" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -154,7 +78,6 @@
<option value="$PROJECT_DIR$/application/admin/view/accredit/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/accredit/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/accredit.js" />
<option value="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
<option value="$PROJECT_DIR$/vendor/tecnickcom/tcpdf/examples/example_002.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
<option value="$PROJECT_DIR$/application/admin/view/order/shou.html" />
... ... @@ -179,6 +102,7 @@
<option value="$PROJECT_DIR$/application/admin/view/suggest/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/suggest.js" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
</list>
</option>
</component>
... ... @@ -197,8 +121,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="71" />
<option name="y" value="82" />
<option name="x" value="215" />
<option name="y" value="115" />
<option name="width" value="1569" />
<option name="height" value="956" />
</component>
... ... @@ -235,14 +159,27 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="order" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -343,7 +280,7 @@
<workItem from="1575959458925" duration="956000" />
<workItem from="1575979358020" duration="2589000" />
<workItem from="1576028218954" duration="680000" />
<workItem from="1576128183316" duration="3096000" />
<workItem from="1576128183316" duration="3635000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -370,7 +307,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="393330000" />
<option name="totallyTimeSpent" value="393869000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -382,7 +319,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="71" y="82" width="1569" height="956" extended-state="1" />
<frame x="215" y="115" width="1569" height="956" 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.22332671" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
... ... @@ -549,13 +486,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="206">
<caret line="43" column="10" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="57" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/shou.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="181">
... ... @@ -1100,5 +1030,13 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="43" column="10" lean-forward="true" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -45,7 +45,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">联系人电话:</label>
<div class="col-xs-12 col-sm-8">
{$data.tel}
{$data.linktel}
</div>
</div>
<div class="form-group">
... ...