郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 1e9c79fe8dd979845845e83aa29c38d2230eafde 1 个父辈 1533bab2
1 个管道 的构建 失败 耗费 2 秒

发票信息

内嵌 并排对比
正在显示 5 个修改的文件 包含 71 行增加 和 72 行删除
@@ -2,11 +2,10 @@ @@ -2,11 +2,10 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> 4 <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
5 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />  
6 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />  
7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/order/fapiao.html" afterPath="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" /> 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
9 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/order.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/order.js" /> 8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
10 </list> 9 </list>
11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12 <option name="TRACKING_ENABLED" value="true" /> 11 <option name="TRACKING_ENABLED" value="true" />
@@ -17,21 +16,11 @@ @@ -17,21 +16,11 @@
17 </component> 16 </component>
18 <component name="FileEditorManager"> 17 <component name="FileEditorManager">
19 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 18 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
20 - <file leaf-file-name="order.js" pinned="false" current-in-tab="false">  
21 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">  
22 - <provider selected="true" editor-type-id="text-editor">  
23 - <state relative-caret-position="352">  
24 - <caret line="34" column="50" lean-forward="true" selection-start-line="34" selection-start-column="50" selection-end-line="34" selection-end-column="50" />  
25 - <folding />  
26 - </state>  
27 - </provider>  
28 - </entry>  
29 - </file>  
30 <file leaf-file-name="User.php" pinned="false" current-in-tab="true"> 19 <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
31 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 20 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
32 <provider selected="true" editor-type-id="text-editor"> 21 <provider selected="true" editor-type-id="text-editor">
33 - <state relative-caret-position="329">  
34 - <caret line="1820" column="11" lean-forward="true" selection-start-line="1820" selection-start-column="11" selection-end-line="1820" selection-end-column="11" /> 22 + <state relative-caret-position="-371">
  23 + <caret line="1794" column="5" lean-forward="false" selection-start-line="1794" selection-start-column="5" selection-end-line="1794" selection-end-column="5" />
35 <folding> 24 <folding>
36 <element signature="e#365#484#0#PHP" expanded="false" /> 25 <element signature="e#365#484#0#PHP" expanded="false" />
37 <element signature="e#490#1228#0#PHP" expanded="false" /> 26 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -98,6 +87,7 @@ @@ -98,6 +87,7 @@
98 <element signature="e#59104#59818#0#PHP" expanded="false" /> 87 <element signature="e#59104#59818#0#PHP" expanded="false" />
99 <element signature="e#59824#60251#0#PHP" expanded="false" /> 88 <element signature="e#59824#60251#0#PHP" expanded="false" />
100 <element signature="e#60256#60725#0#PHP" expanded="false" /> 89 <element signature="e#60256#60725#0#PHP" expanded="false" />
  90 + <element signature="e#60732#61937#0#PHP" expanded="false" />
101 </folding> 91 </folding>
102 </state> 92 </state>
103 </provider> 93 </provider>
@@ -106,26 +96,16 @@ @@ -106,26 +96,16 @@
106 <file leaf-file-name="Order.php" pinned="false" current-in-tab="false"> 96 <file leaf-file-name="Order.php" pinned="false" current-in-tab="false">
107 <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php"> 97 <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
108 <provider selected="true" editor-type-id="text-editor"> 98 <provider selected="true" editor-type-id="text-editor">
109 - <state relative-caret-position="544">  
110 - <caret line="37" column="29" lean-forward="false" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="29" /> 99 + <state relative-caret-position="529">
  100 + <caret line="40" column="21" lean-forward="false" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
111 <folding> 101 <folding>
112 <element signature="e#40#74#0#PHP" expanded="true" /> 102 <element signature="e#40#74#0#PHP" expanded="true" />
113 - <element signature="e#769#2955#0#PHP" expanded="false" /> 103 + <element signature="e#951#3137#0#PHP" expanded="false" />
114 </folding> 104 </folding>
115 </state> 105 </state>
116 </provider> 106 </provider>
117 </entry> 107 </entry>
118 </file> 108 </file>
119 - <file leaf-file-name="fapiao.html" pinned="false" current-in-tab="false">  
120 - <entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html">  
121 - <provider selected="true" editor-type-id="text-editor">  
122 - <state relative-caret-position="1300">  
123 - <caret line="52" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />  
124 - <folding />  
125 - </state>  
126 - </provider>  
127 - </entry>  
128 - </file>  
129 </leaf> 109 </leaf>
130 </component> 110 </component>
131 <component name="FileTemplateManagerImpl"> 111 <component name="FileTemplateManagerImpl">
@@ -200,9 +180,9 @@ @@ -200,9 +180,9 @@
200 <option value="$PROJECT_DIR$/application/admin/view/accredit/index.html" /> 180 <option value="$PROJECT_DIR$/application/admin/view/accredit/index.html" />
201 <option value="$PROJECT_DIR$/public/assets/js/backend/accredit.js" /> 181 <option value="$PROJECT_DIR$/public/assets/js/backend/accredit.js" />
202 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" /> 182 <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
203 - <option value="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />  
204 <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" /> 183 <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
205 <option value="$PROJECT_DIR$/application/admin/controller/Order.php" /> 184 <option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
  185 + <option value="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
206 <option value="$PROJECT_DIR$/application/api/controller/User.php" /> 186 <option value="$PROJECT_DIR$/application/api/controller/User.php" />
207 </list> 187 </list>
208 </option> 188 </option>
@@ -221,9 +201,9 @@ @@ -221,9 +201,9 @@
221 <sorting>DEFINITION_ORDER</sorting> 201 <sorting>DEFINITION_ORDER</sorting>
222 </component> 202 </component>
223 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 203 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
224 - <component name="ProjectFrameBounds">  
225 - <option name="x" value="288" />  
226 - <option name="y" value="80" /> 204 + <component name="ProjectFrameBounds" extendedState="1">
  205 + <option name="x" value="123" />
  206 + <option name="y" value="82" />
227 <option name="width" value="1624" /> 207 <option name="width" value="1624" />
228 <option name="height" value="916" /> 208 <option name="height" value="916" />
229 </component> 209 </component>
@@ -422,7 +402,7 @@ @@ -422,7 +402,7 @@
422 <workItem from="1575773423431" duration="694000" /> 402 <workItem from="1575773423431" duration="694000" />
423 <workItem from="1575776183372" duration="2267000" /> 403 <workItem from="1575776183372" duration="2267000" />
424 <workItem from="1575790089275" duration="377000" /> 404 <workItem from="1575790089275" duration="377000" />
425 - <workItem from="1575851041026" duration="8499000" /> 405 + <workItem from="1575851041026" duration="10422000" />
426 </task> 406 </task>
427 <task id="LOCAL-00001" summary="调试"> 407 <task id="LOCAL-00001" summary="调试">
428 <created>1574145133364</created> 408 <created>1574145133364</created>
@@ -435,7 +415,7 @@ @@ -435,7 +415,7 @@
435 <servers /> 415 <servers />
436 </component> 416 </component>
437 <component name="TimeTrackingManager"> 417 <component name="TimeTrackingManager">
438 - <option name="totallyTimeSpent" value="348966000" /> 418 + <option name="totallyTimeSpent" value="350889000" />
439 </component> 419 </component>
440 <component name="TodoView"> 420 <component name="TodoView">
441 <todo-panel id="selected-file"> 421 <todo-panel id="selected-file">
@@ -447,9 +427,10 @@ @@ -447,9 +427,10 @@
447 </todo-panel> 427 </todo-panel>
448 </component> 428 </component>
449 <component name="ToolWindowManager"> 429 <component name="ToolWindowManager">
450 - <frame x="288" y="80" width="1624" height="916" extended-state="0" /> 430 + <frame x="123" y="82" width="1624" height="916" extended-state="1" />
  431 + <editor active="true" />
451 <layout> 432 <layout>
452 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15345268" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> 433 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15345268" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
453 <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" /> 434 <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" />
454 <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="0" side_tool="true" content_ui="tabs" /> 435 <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="0" side_tool="true" content_ui="tabs" />
455 <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" /> 436 <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" />
@@ -457,7 +438,7 @@ @@ -457,7 +438,7 @@
457 <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" /> 438 <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" />
458 <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" /> 439 <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" />
459 <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" /> 440 <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" />
460 - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.169448" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 441 + <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.169448" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
461 <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" /> 442 <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" />
462 <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" /> 443 <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" />
463 <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" /> 444 <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" />
@@ -839,45 +820,45 @@ @@ -839,45 +820,45 @@
839 </state> 820 </state>
840 </provider> 821 </provider>
841 </entry> 822 </entry>
842 - <entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html"> 823 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
843 <provider selected="true" editor-type-id="text-editor"> 824 <provider selected="true" editor-type-id="text-editor">
844 - <state relative-caret-position="1300">  
845 - <caret line="52" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" /> 825 + <state relative-caret-position="675">
  826 + <caret line="44" column="24" lean-forward="true" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="152" />
846 <folding /> 827 <folding />
847 </state> 828 </state>
848 </provider> 829 </provider>
849 </entry> 830 </entry>
850 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js"> 831 + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
851 <provider selected="true" editor-type-id="text-editor"> 832 <provider selected="true" editor-type-id="text-editor">
852 - <state relative-caret-position="675">  
853 - <caret line="44" column="24" lean-forward="true" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="152" /> 833 + <state relative-caret-position="352">
  834 + <caret line="34" column="50" lean-forward="true" selection-start-line="34" selection-start-column="50" selection-end-line="34" selection-end-column="50" />
854 <folding /> 835 <folding />
855 </state> 836 </state>
856 </provider> 837 </provider>
857 </entry> 838 </entry>
858 <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php"> 839 <entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
859 <provider selected="true" editor-type-id="text-editor"> 840 <provider selected="true" editor-type-id="text-editor">
860 - <state relative-caret-position="544">  
861 - <caret line="37" column="29" lean-forward="false" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="29" /> 841 + <state relative-caret-position="529">
  842 + <caret line="40" column="21" lean-forward="false" selection-start-line="40" selection-start-column="21" selection-end-line="40" selection-end-column="21" />
862 <folding> 843 <folding>
863 <element signature="e#40#74#0#PHP" expanded="true" /> 844 <element signature="e#40#74#0#PHP" expanded="true" />
864 - <element signature="e#769#2955#0#PHP" expanded="false" /> 845 + <element signature="e#951#3137#0#PHP" expanded="false" />
865 </folding> 846 </folding>
866 </state> 847 </state>
867 </provider> 848 </provider>
868 </entry> 849 </entry>
869 - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js"> 850 + <entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html">
870 <provider selected="true" editor-type-id="text-editor"> 851 <provider selected="true" editor-type-id="text-editor">
871 - <state relative-caret-position="352">  
872 - <caret line="34" column="50" lean-forward="true" selection-start-line="34" selection-start-column="50" selection-end-line="34" selection-end-column="50" /> 852 + <state relative-caret-position="129">
  853 + <caret line="31" column="10" lean-forward="true" selection-start-line="31" selection-start-column="10" selection-end-line="31" selection-end-column="10" />
873 <folding /> 854 <folding />
874 </state> 855 </state>
875 </provider> 856 </provider>
876 </entry> 857 </entry>
877 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php"> 858 <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
878 <provider selected="true" editor-type-id="text-editor"> 859 <provider selected="true" editor-type-id="text-editor">
879 - <state relative-caret-position="329">  
880 - <caret line="1820" column="11" lean-forward="true" selection-start-line="1820" selection-start-column="11" selection-end-line="1820" selection-end-column="11" /> 860 + <state relative-caret-position="-371">
  861 + <caret line="1794" column="5" lean-forward="false" selection-start-line="1794" selection-start-column="5" selection-end-line="1794" selection-end-column="5" />
881 <folding> 862 <folding>
882 <element signature="e#365#484#0#PHP" expanded="false" /> 863 <element signature="e#365#484#0#PHP" expanded="false" />
883 <element signature="e#490#1228#0#PHP" expanded="false" /> 864 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -944,6 +925,7 @@ @@ -944,6 +925,7 @@
944 <element signature="e#59104#59818#0#PHP" expanded="false" /> 925 <element signature="e#59104#59818#0#PHP" expanded="false" />
945 <element signature="e#59824#60251#0#PHP" expanded="false" /> 926 <element signature="e#59824#60251#0#PHP" expanded="false" />
946 <element signature="e#60256#60725#0#PHP" expanded="false" /> 927 <element signature="e#60256#60725#0#PHP" expanded="false" />
  928 + <element signature="e#60732#61937#0#PHP" expanded="false" />
947 </folding> 929 </folding>
948 </state> 930 </state>
949 </provider> 931 </provider>
@@ -35,7 +35,13 @@ class Order extends Backend @@ -35,7 +35,13 @@ class Order extends Backend
35 35
36 public function fapiao(){ 36 public function fapiao(){
37 $id = $this->request->param('ids'); 37 $id = $this->request->param('ids');
38 - $data = Db::name(''); 38 + $order_id = ','.$id.',';
  39 + $data = Db::name('invoice')
  40 + ->whereLike('order_id',$order_id)
  41 + ->find();
  42 + $this->assign('data',$data);
  43 + return $this->view->fetch();
  44 +
39 } 45 }
40 46
41 47
1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action=""> 1 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
2 2
3 <div class="form-group"> 3 <div class="form-group">
4 - <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label> 4 + <label class="control-label col-xs-12 col-sm-2">公司名称:</label>
5 <div class="col-xs-12 col-sm-8"> 5 <div class="col-xs-12 col-sm-8">
6 - <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}"> 6 + {$data.name}
7 </div> 7 </div>
8 </div> 8 </div>
9 <div class="form-group"> 9 <div class="form-group">
10 - <label class="control-label col-xs-12 col-sm-2">{:__('Pic_id')}:</label> 10 + <label class="control-label col-xs-12 col-sm-2">公司电话:</label>
11 <div class="col-xs-12 col-sm-8"> 11 <div class="col-xs-12 col-sm-8">
12 - <input id="c-pic_id" data-rule="required" data-source="pic/index" class="form-control selectpage" name="row[pic_id]" type="text" value="{$row.pic_id|htmlentities}"> 12 + {$data.tel}
13 </div> 13 </div>
14 </div> 14 </div>
15 <div class="form-group"> 15 <div class="form-group">
16 - <label class="control-label col-xs-12 col-sm-2">{:__('Video_id')}:</label> 16 + <label class="control-label col-xs-12 col-sm-2">公司地址:</label>
17 <div class="col-xs-12 col-sm-8"> 17 <div class="col-xs-12 col-sm-8">
18 - <input id="c-video_id" data-rule="required" data-source="video/index" class="form-control selectpage" name="row[video_id]" type="text" value="{$row.video_id|htmlentities}"> 18 + {$data.adress}
19 </div> 19 </div>
20 </div> 20 </div>
21 <div class="form-group"> 21 <div class="form-group">
22 - <label class="control-label col-xs-12 col-sm-2">{:__('Total')}:</label> 22 + <label class="control-label col-xs-12 col-sm-2">税号:</label>
23 <div class="col-xs-12 col-sm-8"> 23 <div class="col-xs-12 col-sm-8">
24 - <input id="c-total" class="form-control" step="0.01" name="row[total]" type="number" value="{$row.total|htmlentities}"> 24 + {$data.duty}
25 </div> 25 </div>
26 </div> 26 </div>
27 <div class="form-group"> 27 <div class="form-group">
28 - <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label> 28 + <label class="control-label col-xs-12 col-sm-2">银行名称:</label>
29 <div class="col-xs-12 col-sm-8"> 29 <div class="col-xs-12 col-sm-8">
30 - <input id="c-status" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}"> 30 + {$data.bank}
31 </div> 31 </div>
32 </div> 32 </div>
33 <div class="form-group"> 33 <div class="form-group">
34 - <label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label> 34 + <label class="control-label col-xs-12 col-sm-2">银行账号:</label>
35 <div class="col-xs-12 col-sm-8"> 35 <div class="col-xs-12 col-sm-8">
36 - <input id="c-num" class="form-control" name="row[num]" type="text" value="{$row.num|htmlentities}"> 36 + {$data.card}
37 </div> 37 </div>
38 </div> 38 </div>
39 <div class="form-group"> 39 <div class="form-group">
40 - <label class="control-label col-xs-12 col-sm-2">{:__('Paytime')}:</label> 40 + <label class="control-label col-xs-12 col-sm-2">联系人名称:</label>
41 <div class="col-xs-12 col-sm-8"> 41 <div class="col-xs-12 col-sm-8">
42 - <input id="c-paytime" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[paytime]" type="text" value="{:$row.paytime?datetime($row.paytime):''}"> 42 + {$data.linkname}
43 </div> 43 </div>
44 </div> 44 </div>
45 - <div class="form-group layer-footer">  
46 - <label class="control-label col-xs-12 col-sm-2"></label> 45 + <div class="form-group">
  46 + <label class="control-label col-xs-12 col-sm-2">联系人电话:</label>
  47 + <div class="col-xs-12 col-sm-8">
  48 + {$data.tel}
  49 + </div>
  50 + </div>
  51 + <div class="form-group">
  52 + <label class="control-label col-xs-12 col-sm-2">联系人地址:</label>
47 <div class="col-xs-12 col-sm-8"> 53 <div class="col-xs-12 col-sm-8">
48 - <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>  
49 - <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button> 54 + {$data.linkadress}
50 </div> 55 </div>
51 </div> 56 </div>
52 </form> 57 </form>
@@ -1793,8 +1793,8 @@ class User extends Api @@ -1793,8 +1793,8 @@ class User extends Api
1793 */ 1793 */
1794 public function invoice() 1794 public function invoice()
1795 { 1795 {
1796 - $param['user_id'] = $this->uid;  
1797 $param = $this->request->param(); 1796 $param = $this->request->param();
  1797 + $param['user_id'] = $this->uid;
1798 $validate = new Validate([ 1798 $validate = new Validate([
1799 'order_id'=>'require', 1799 'order_id'=>'require',
1800 'name'=>'require', 1800 'name'=>'require',
@@ -1822,6 +1822,12 @@ class User extends Api @@ -1822,6 +1822,12 @@ class User extends Api
1822 if (!$validate->check($param)) { 1822 if (!$validate->check($param)) {
1823 $this->error($validate->getError()); 1823 $this->error($validate->getError());
1824 } 1824 }
  1825 + $info = Db::name('invoice')
  1826 + ->whereLike('order_id',$param['order_id'])
  1827 + ->find();
  1828 + if(!empty($info)){
  1829 + $this->error(['code'=>2,'msg'=>'您已经提交过发票了']);
  1830 + }
1825 $param['createtime'] = time(); 1831 $param['createtime'] = time();
1826 $data = Db::name('invoice') 1832 $data = Db::name('invoice')
1827 ->insertGetId($param); 1833 ->insertGetId($param);
@@ -6847,7 +6847,7 @@ @@ -6847,7 +6847,7 @@
6847 6847
6848 <div class="row mt0 footer"> 6848 <div class="row mt0 footer">
6849 <div class="col-md-6" align="left"> 6849 <div class="col-md-6" align="left">
6850 - Generated on 2019-12-09 11:02:11 </div> 6850 + Generated on 2019-12-09 11:34:15 </div>
6851 <div class="col-md-6" align="right"> 6851 <div class="col-md-6" align="right">
6852 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a> 6852 <a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
6853 </div> 6853 </div>