修改公司名称

@@ -2,8 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/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/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/order.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/order.js" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -14,11 +15,21 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="order.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="475">
+              <caret line="30" column="148" lean-forward="false" selection-start-line="30" selection-start-column="148" selection-end-line="30" selection-end-column="148" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="458">
-              <caret line="1790" column="7" lean-forward="true" selection-start-line="1790" selection-start-column="7" selection-end-line="1790" selection-end-column="7" />
+            <state relative-caret-position="408">
+              <caret line="1766" column="0" lean-forward="true" selection-start-line="1766" selection-start-column="0" selection-end-line="1766" selection-end-column="0" />
               <folding>
                 <element signature="e#365#484#0#PHP" expanded="false" />
                 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -85,8 +96,8 @@
                 <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#61768#0#PHP" expanded="false" />
-                <element signature="e#61773#62130#0#PHP" expanded="false" />
+                <element signature="e#60732#61937#0#PHP" expanded="false" />
+                <element signature="e#61942#62299#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -123,8 +134,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$/public/assets/js/backend/order.js" />
-        <option value="$PROJECT_DIR$/application/admin/lang/zh-cn/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" />
@@ -161,6 +170,8 @@
         <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/lang/zh-cn/order.php" />
+        <option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
         <option value="$PROJECT_DIR$/application/api/controller/User.php" />
       </list>
     </option>
@@ -180,8 +191,8 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds" extendedState="1">
-    <option name="x" value="347" />
-    <option name="y" value="60" />
+    <option name="x" value="334" />
+    <option name="y" value="104" />
     <option name="width" value="1430" />
     <option name="height" value="920" />
   </component>
@@ -217,6 +228,27 @@
               <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="lang" 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="lang" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="zh-cn" 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>
@@ -226,6 +258,32 @@
               <item name="api" 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="public" 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" />
+              <item name="assets" 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" />
+              <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="js" 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" />
+              <item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
+              <item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -317,7 +375,7 @@
       <workItem from="1575773423431" duration="694000" />
       <workItem from="1575776183372" duration="2267000" />
       <workItem from="1575790089275" duration="377000" />
-      <workItem from="1575851041026" duration="4123000" />
+      <workItem from="1575851041026" duration="5855000" />
     </task>
     <task id="LOCAL-00001" summary="调试">
       <created>1574145133364</created>
@@ -330,7 +388,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="344590000" />
+    <option name="totallyTimeSpent" value="346322000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -342,7 +400,7 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="347" y="60" width="1430" height="920" extended-state="1" />
+    <frame x="334" y="104" width="1430" height="920" 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.17518248" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
@@ -400,13 +458,6 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/application/nsms/nsms.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1644">
-          <caret line="66" column="50" lean-forward="false" selection-start-line="66" selection-start-column="50" selection-end-line="66" selection-end-column="50" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
@@ -428,13 +479,6 @@
         </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="575">
-          <caret line="34" column="140" lean-forward="false" selection-start-line="34" selection-start-column="71" selection-end-line="34" selection-end-column="140" />
-        </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">
@@ -761,10 +805,18 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/order.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="175">
+          <caret line="7" column="35" lean-forward="true" selection-start-line="7" selection-start-column="35" selection-end-line="7" selection-end-column="35" />
+          <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="458">
-          <caret line="1790" column="7" lean-forward="true" selection-start-line="1790" selection-start-column="7" selection-end-line="1790" selection-end-column="7" />
+        <state relative-caret-position="408">
+          <caret line="1766" column="0" lean-forward="true" selection-start-line="1766" selection-start-column="0" selection-end-line="1766" selection-end-column="0" />
           <folding>
             <element signature="e#365#484#0#PHP" expanded="false" />
             <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -831,11 +883,19 @@
             <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#61768#0#PHP" expanded="false" />
-            <element signature="e#61773#62130#0#PHP" expanded="false" />
+            <element signature="e#60732#61937#0#PHP" expanded="false" />
+            <element signature="e#61942#62299#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="475">
+          <caret line="30" column="148" lean-forward="false" selection-start-line="30" selection-start-column="148" selection-end-line="30" selection-end-column="148" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file

@@ -5,6 +5,7 @@ return [
     'Pic_id'              => '图片标题',
     'Video_id'            => '视频标题',
     'Total'               => '价格',
+    'Invoice_status'      =>'发票状态',
     'Status'              => '状态',
     'Num'                 => '订单号',
     'Createtime'          => '创建时间',

@@ -1776,6 +1776,8 @@ class User extends Api
      *
      * @ApiParams   (name="order_id", type="inter", required=true, description="订单ID")
      * @ApiParams   (name="name", type="string", required=true, description="公司名称")
+     * @ApiParams   (name="tel", type="string", required=true, description="公司电话")
+     * @ApiParams   (name="adress", type="string", required=true, description="公司地址")
      * @ApiParams   (name="duty", type="string", required=true, description="纳税人识别号")
      * @ApiParams   (name="bank", type="string", required=true, description="银行名称")
      * @ApiParams   (name="card", type="string", required=true, description="银行账号")

@@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'pic_id', title: __('Pic_id'), operate:false},
                         {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: '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},