郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 1533bab2832a4492b28f7c8ee77f892b9de1a70e 1 个父辈 5c1552f1
1 个管道 的构建 失败 耗费 3 秒

发票信息

内嵌 并排对比
正在显示 6 个修改的文件 包含 265 行增加 和 71 行删除
... ... @@ -2,7 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" />
<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/assets/js/backend/order.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/order.js" />
</list>
... ... @@ -18,8 +20,8 @@
<file leaf-file-name="order.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="25" column="70" lean-forward="true" selection-start-line="25" selection-start-column="70" selection-end-line="25" selection-end-column="70" />
<state relative-caret-position="352">
<caret line="34" column="50" lean-forward="true" selection-start-line="34" selection-start-column="50" selection-end-line="34" selection-end-column="50" />
<folding />
</state>
</provider>
... ... @@ -28,8 +30,8 @@
<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="632">
<caret line="1807" column="48" lean-forward="false" selection-start-line="1807" selection-start-column="48" selection-end-line="1807" selection-end-column="48" />
<state relative-caret-position="329">
<caret line="1820" column="11" lean-forward="true" selection-start-line="1820" selection-start-column="11" selection-end-line="1820" selection-end-column="11" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -96,20 +98,50 @@
<element signature="e#59104#59818#0#PHP" expanded="false" />
<element signature="e#59824#60251#0#PHP" expanded="false" />
<element signature="e#60256#60725#0#PHP" expanded="false" />
<element signature="e#60732#61937#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Order.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="37" column="29" lean-forward="false" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="29" />
<folding>
<element signature="e#40#74#0#PHP" expanded="true" />
<element signature="e#769#2955#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="fapiao.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/order/fapiao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1300">
<caret line="52" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="HTML File" />
</list>
</option>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>image</find>
<find>init($token)</find>
<find>BaseCli</find>
<find>picpay</find>
<find>data-area</find>
</findStrings>
<dirStrings>
<dir>D:\htdocs\areial</dir>
... ... @@ -121,7 +153,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/database.php" />
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/public/.gitignore" />
... ... @@ -133,7 +164,6 @@
<option value="$PROJECT_DIR$/application/admin/view/order/index.html" />
<option value="$PROJECT_DIR$/application/admin/model/User.php" />
<option value="$PROJECT_DIR$/application/admin/model/Order.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/vendor/overtrue/wechat/src/Payment/Kernel/BaseClient.php" />
<option value="$PROJECT_DIR$/application/admin/view/vip/add.html" />
<option value="$PROJECT_DIR$/application/api/controller/Notify.php" />
... ... @@ -170,7 +200,9 @@
<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/lang/zh-cn/order.php" />
<option value="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
... ... @@ -190,10 +222,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="764" />
<option name="y" value="4" />
<option name="width" value="1430" />
<option name="height" value="920" />
<option name="x" value="288" />
<option name="y" value="80" />
<option name="width" value="1624" />
<option name="height" value="916" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -227,6 +259,42 @@
<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" />
</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="controller" 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" />
</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="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="pic" 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" />
</path>
<path>
... ... @@ -271,7 +339,8 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../scrap1/scrap" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
... ... @@ -353,7 +422,7 @@
<workItem from="1575773423431" duration="694000" />
<workItem from="1575776183372" duration="2267000" />
<workItem from="1575790089275" duration="377000" />
<workItem from="1575851041026" duration="6193000" />
<workItem from="1575851041026" duration="8499000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -366,7 +435,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="346660000" />
<option name="totallyTimeSpent" value="348966000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -378,17 +447,17 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="764" y="4" width="1430" height="920" extended-state="0" />
<editor active="true" />
<frame x="288" y="80" width="1624" height="916" extended-state="0" />
<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.17518248" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<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" />
<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="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" />
<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="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="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="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="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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16985951" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<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" />
<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="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="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" />
... ... @@ -396,7 +465,6 @@
<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="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" />
</layout>
<layout-to-restore>
... ... @@ -436,34 +504,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="39" column="4" lean-forward="true" selection-start-line="39" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="575">
<caret line="23" column="26" lean-forward="true" selection-start-line="23" selection-start-column="26" selection-end-line="23" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/api.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2175">
<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://$PROJECT_DIR$/application/admin/view/pic/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<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://$PROJECT_DIR$/application/admin/view/category/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="271">
... ... @@ -719,14 +759,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="32" column="24" lean-forward="true" selection-start-line="32" selection-start-column="24" selection-end-line="32" selection-end-column="152" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
... ... @@ -735,14 +767,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="25" column="4" lean-forward="false" selection-start-line="25" selection-start-column="4" selection-end-line="38" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/accredit/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
... ... @@ -791,18 +815,69 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" 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$/application/admin/view/order/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="19" column="10" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="38" column="10" lean-forward="true" selection-start-line="38" selection-start-column="10" selection-end-line="38" selection-end-column="10" />
<folding />
</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="1300">
<caret line="52" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675">
<caret line="44" column="24" lean-forward="true" selection-start-line="44" selection-start-column="24" selection-end-line="44" selection-end-column="152" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="37" column="29" lean-forward="false" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="29" />
<folding>
<element signature="e#40#74#0#PHP" expanded="true" />
<element signature="e#769#2955#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="25" column="70" lean-forward="true" selection-start-line="25" selection-start-column="70" selection-end-line="25" selection-end-column="70" />
<state relative-caret-position="352">
<caret line="34" column="50" lean-forward="true" selection-start-line="34" selection-start-column="50" selection-end-line="34" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="632">
<caret line="1807" column="48" lean-forward="false" selection-start-line="1807" selection-start-column="48" selection-end-line="1807" selection-end-column="48" />
<state relative-caret-position="329">
<caret line="1820" column="11" lean-forward="true" selection-start-line="1820" selection-start-column="11" selection-end-line="1820" selection-end-column="11" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
... ... @@ -869,7 +944,6 @@
<element signature="e#59104#59818#0#PHP" expanded="false" />
<element signature="e#59824#60251#0#PHP" expanded="false" />
<element signature="e#60256#60725#0#PHP" expanded="false" />
<element signature="e#60732#61937#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -3,6 +3,7 @@
namespace app\admin\controller;
use app\common\controller\Backend;
use think\Db;
/**
* 图片订单管理
... ... @@ -32,6 +33,12 @@ class Order extends Backend
*/
public function fapiao(){
$id = $this->request->param('ids');
$data = Db::name('');
}
/**
* 查看
*/
... ...
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
<div class="col-xs-12 col-sm-8">
<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}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Pic_id')}:</label>
<div class="col-xs-12 col-sm-8">
<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}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Video_id')}:</label>
<div class="col-xs-12 col-sm-8">
<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}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Total')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-total" class="form-control" step="0.01" name="row[total]" type="number" value="{$row.total|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-status" class="form-control" name="row[status]" type="number" value="{$row.status|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Num')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-num" class="form-control" name="row[num]" type="text" value="{$row.num|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Paytime')}:</label>
<div class="col-xs-12 col-sm-8">
<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):''}">
</div>
</div>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
<button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
</div>
</div>
</form>
... ...
... ... @@ -1795,6 +1795,33 @@ class User extends Api
{
$param['user_id'] = $this->uid;
$param = $this->request->param();
$validate = new Validate([
'order_id'=>'require',
'name'=>'require',
'tel'=>'require',
'adress'=>'require',
'duty'=>'require',
'bank'=>'require',
'card'=>'require',
'linkname'=>'require',
'linktel'=>'require',
'linkadress'=>'require',
]);
$validate->message([
'order_id'=>'订单ID不能为空',
'name'=>'公司名称不能为空',
'tel'=>'公司电话不能为空',
'adress'=>'公司地址不能为空',
'duty'=>'纳税人识别号不能为空',
'bank'=>'银行名称不能为空',
'card'=>'银行账号不能为空',
'linkname'=>'收件人姓名不能为空',
'linktel'=>'收件人电话不能为空',
'linkadress'=>'收件人地址不能为空',
]);
if (!$validate->check($param)) {
$this->error($validate->getError());
}
$param['createtime'] = time();
$data = Db::name('invoice')
->insertGetId($param);
... ... @@ -1811,6 +1838,4 @@ class User extends Api
$this->error('sql运行失败');
}
}
}
... ...
... ... @@ -6681,6 +6681,18 @@
<td>公司名称</td>
</tr>
<tr>
<td>tel</td>
<td>string</td>
<td>是</td>
<td>公司电话</td>
</tr>
<tr>
<td>adress</td>
<td>string</td>
<td>是</td>
<td>公司地址</td>
</tr>
<tr>
<td>duty</td>
<td>string</td>
<td>是</td>
... ... @@ -6754,6 +6766,14 @@
<input type="string" class="form-control input-sm" id="name" required placeholder="公司名称" name="name">
</div>
<div class="form-group">
<label class="control-label" for="tel">tel</label>
<input type="string" class="form-control input-sm" id="tel" required placeholder="公司电话" name="tel">
</div>
<div class="form-group">
<label class="control-label" for="adress">adress</label>
<input type="string" class="form-control input-sm" id="adress" required placeholder="公司地址" name="adress">
</div>
<div class="form-group">
<label class="control-label" for="duty">duty</label>
<input type="string" class="form-control input-sm" id="duty" required placeholder="纳税人识别号" name="duty">
</div>
... ... @@ -6827,7 +6847,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2019-12-09 09:49:08 </div>
Generated on 2019-12-09 11:02:11 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...
... ... @@ -29,6 +29,22 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'video_id', title: __('Video_id'), operate:false},
{field: 'total', title: __('Total'), operate:'BETWEEN'},
{field: 'invoice_status', title: __('Invoice_status'),formatter: Table.api.formatter.label,searchList:{'0': '未开票', '1':'已开票'}},
{field: 'id', title: __('按钮'), table: table, events: Table.api.events.operate, buttons:
[
{
name: 'name1',
text: '发票信息',
title: '发票信息',
icon: 'fa fa-list',
classname: 'btn btn-xs btn-primary btn-dialog',
url: 'order/fapiao',
extend: 'data-area=\'["80%","80%"]\'',
callback:function(data){
}
},
], operate:false, formatter: Table.api.formatter.buttons
},
{field: 'status', title: __('Status'),formatter: Table.api.formatter.status,searchList:{'1': '待支付', '2': '已完成'}},
{field: 'num', title: __('Num'), operate:false},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
... ...