景龙 / gangjuren · 提交

转到一个项目

作者 景龙
提交 6c214809fbfae5f2fcc6f4e7621406f59772d3ff 1 个父辈 46ac9b33

增加个人中心，修改姓名接口

内嵌 并排对比
正在显示 30 个修改的文件 包含 537 行增加 和 450 行删除
... ... @@ -2,29 +2,36 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="61dc3f00-6d8a-4d88-a90a-bb5e2de6911f" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/api/controller/Abouts.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/api/controller/Person.php" />
<change type="DELETED" beforePath="$PROJECT_DIR$/public/uploads/20190809/1a5e50b8f9d2916b9bd17e448e5e891f.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/public/uploads/20190809/26f5e51b8ac7fbd6f1c649cc45a18265.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/public/uploads/20190809/bca486d6411bb255e90ce37b60f781fe.jpg" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/public/uploads/20190820/08e5a9045a9a8e79c44666f58fd8302a.png" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/public/uploads/20190820/75b681edff066b31dc01af3304a2a45d.jpg" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/public/uploads/20190820/8d933d50c149a57d0a08db8f5e0cb5f4.jpg" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/public/uploads/20190820/d1157584e407e824d6e672b492d9082b.jpg" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/public/uploads/20190820/dad7224e83a3744c95eb1ba836fb3b7f.png" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/about.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/about.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/banner.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/banner.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/introduce.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/introduce.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/about/add.html" afterPath="$PROJECT_DIR$/application/admin/view/about/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/about/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/about/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/about/index.html" afterPath="$PROJECT_DIR$/application/admin/view/about/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/banner/index.html" afterPath="$PROJECT_DIR$/application/admin/view/banner/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/introduce/add.html" afterPath="$PROJECT_DIR$/application/admin/view/introduce/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/introduce/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/introduce/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/introduce/index.html" afterPath="$PROJECT_DIR$/application/admin/view/introduce/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Common.php" afterPath="$PROJECT_DIR$/application/api/controller/Common.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Index.php" afterPath="$PROJECT_DIR$/application/api/controller/Index.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Customer.php" afterPath="$PROJECT_DIR$/application/admin/controller/Customer.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Equipment.php" afterPath="$PROJECT_DIR$/application/admin/controller/Equipment.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/model/User.php" afterPath="$PROJECT_DIR$/application/admin/model/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/customer/add.html" afterPath="$PROJECT_DIR$/application/admin/view/customer/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/customer/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/customer/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/equipment/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/equipment/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Abouts.php" afterPath="$PROJECT_DIR$/application/api/controller/Abouts.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Demo.php" afterPath="$PROJECT_DIR$/application/api/controller/Demo.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Ems.php" afterPath="$PROJECT_DIR$/application/api/controller/Ems.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Sms.php" afterPath="$PROJECT_DIR$/application/api/controller/Sms.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$/application/common/controller/Api.php" afterPath="$PROJECT_DIR$/application/common/controller/Api.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/common/library/Auth.php" afterPath="$PROJECT_DIR$/application/common/library/Auth.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/config.php" afterPath="$PROJECT_DIR$/application/config.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/extra/site.php" afterPath="$PROJECT_DIR$/application/extra/site.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/addons.js" afterPath="$PROJECT_DIR$/public/assets/js/addons.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/about.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/about.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/banner.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/banner.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/introduce.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/introduce.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/runtime/cache/cb/78ef4a9130f39208ff10858ddd8377.php" afterPath="$PROJECT_DIR$/runtime/cache/cb/78ef4a9130f39208ff10858ddd8377.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/runtime/temp/2c7406a6a21e5d04da9083a40635dbe2.php" afterPath="$PROJECT_DIR$/runtime/temp/2c7406a6a21e5d04da9083a40635dbe2.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/runtime/temp/423852597805221394b55d8f75a881a1.php" afterPath="$PROJECT_DIR$/runtime/temp/423852597805221394b55d8f75a881a1.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/runtime/temp/b3db684625a57e742ba538bde35e791f.php" afterPath="$PROJECT_DIR$/runtime/temp/b3db684625a57e742ba538bde35e791f.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/runtime/temp/c33a541f7d5e4272d59b0b349726baed.php" afterPath="$PROJECT_DIR$/runtime/temp/c33a541f7d5e4272d59b0b349726baed.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -35,55 +42,21 @@
</component>
<component name="FileEditorManager">
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="68" column="23" lean-forward="true" selection-start-line="68" selection-start-column="23" selection-end-line="68" selection-end-column="23" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1105">
<caret line="147" column="36" lean-forward="true" selection-start-line="147" selection-start-column="36" selection-end-line="147" selection-end-column="36" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Abouts.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/Abouts.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="760">
<caret line="36" column="7" lean-forward="true" selection-start-line="36" selection-start-column="7" selection-end-line="36" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="addons.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/extra/addons.php">
<file leaf-file-name="site.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/extra/site.php">
<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 relative-caret-position="561">
<caret line="76" column="38" lean-forward="false" selection-start-line="76" selection-start-column="38" selection-end-line="76" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="site.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/extra/site.php">
<file leaf-file-name="Person.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/Person.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="645">
<caret line="72" column="44" lean-forward="true" selection-start-line="72" selection-start-column="44" selection-end-line="72" selection-end-column="44" />
<state relative-caret-position="331">
<caret line="117" column="46" lean-forward="true" selection-start-line="117" selection-start-column="46" selection-end-line="117" selection-end-column="46" />
<folding />
</state>
</provider>
... ... @@ -93,7 +66,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>new</find>
<find>sidebar-menu</find>
<find>相关链接</find>
<find>main-sidebar</find>
... ... @@ -123,6 +95,7 @@
<find>gjr_customer</find>
<find>gc_gbanner</find>
<find>Common</find>
<find>user_token</find>
</findStrings>
<replaceStrings>
<replace>gjr_customers</replace>
... ... @@ -138,35 +111,22 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php" />
<option value="$PROJECT_DIR$/application/admin/controller/general/Attachment.php" />
<option value="$PROJECT_DIR$/application/index/view/index/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/auth/admin.js" />
<option value="$PROJECT_DIR$/application/admin/validate/Admin.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/auth/group.js" />
<option value="$PROJECT_DIR$/application/admin/view/auth/admin/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/auth/admin/add.html" />
<option value="$USER_HOME$/AppData/Local/Temp/gjr_admin.sql" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/customer.php" />
<option value="$PROJECT_DIR$/application/admin/view/customer/add.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Customer1.php" />
<option value="$PROJECT_DIR$/application/admin/view/customer/edit.html" />
<option value="$PROJECT_DIR$/application/admin/model/Customer.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/customer.js" />
<option value="$PROJECT_DIR$/application/admin/view/equipment/add.html" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/equipment.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/equipment.js" />
<option value="$PROJECT_DIR$/application/admin/controller/auth/Admin.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Customer.php" />
<option value="$USER_HOME$/AppData/Local/Temp/gjr_customer.sql" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/customers.php" />
<option value="$PROJECT_DIR$/application/admin/view/customers/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/auth/group/index.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Customers.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/customers.js" />
<option value="$PROJECT_DIR$/application/admin/view/customers/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/equipment/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Equipment.php" />
<option value="$USER_HOME$/AppData/Local/Temp/gc_gbanner.sql" />
<option value="$USER_HOME$/AppData/Local/Temp/gc_about.sql" />
<option value="$PROJECT_DIR$/public/assets/js/backend/banner.js" />
... ... @@ -182,13 +142,26 @@
<option value="$PROJECT_DIR$/public/assets/js/backend/about.js" />
<option value="$PROJECT_DIR$/application/admin/view/about/edit.html" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/about.php" />
<option value="$PROJECT_DIR$/application/common/library/Auth.php" />
<option value="$PROJECT_DIR$/application/common/controller/Api.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/Common.php" />
<option value="$PROJECT_DIR$/application/extra/site.php" />
<option value="$PROJECT_DIR$/application/api/controller/Index.php" />
<option value="$PROJECT_DIR$/application/config.php" />
<option value="$PROJECT_DIR$/application/admin/view/auth/group/index.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Customer.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Equipment.php" />
<option value="$PROJECT_DIR$/application/admin/view/equipment/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/equipment/edit.html" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/common/controller/Api.php" />
<option value="$PROJECT_DIR$/application/common/library/Auth.php" />
<option value="$PROJECT_DIR$/application/admin/view/customer/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/customer/edit.html" />
<option value="$PROJECT_DIR$/application/extra/site.php" />
<option value="$PROJECT_DIR$/application/api/controller/Abouts.php" />
<option value="$PROJECT_DIR$/application/api/controller/Demo.php" />
<option value="$PROJECT_DIR$/application/api/controller/Ems.php" />
<option value="$PROJECT_DIR$/application/api/controller/Sms.php" />
<option value="$PROJECT_DIR$/application/admin/model/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/Person.php" />
</list>
</option>
</component>
... ... @@ -241,7 +214,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
... ... @@ -259,51 +231,38 @@
<item name="gangjuren" type="b2602c69:ProjectViewProjectNode" />
<item name="gangjuren" 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="gangjuren" type="b2602c69:ProjectViewProjectNode" />
<item name="gangjuren" 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="gangjuren" type="b2602c69:ProjectViewProjectNode" />
<item name="gangjuren" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="extra" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="gangjuren" type="b2602c69:ProjectViewProjectNode" />
<item name="gangjuren" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="gangjuren" type="b2602c69:ProjectViewProjectNode" />
<item name="gangjuren" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="gangjuren" type="b2602c69:ProjectViewProjectNode" />
<item name="gangjuren" 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="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="gangjuren" type="b2602c69:ProjectViewProjectNode" />
<item name="gangjuren" 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>
</pane>
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -316,7 +275,7 @@
<property name="node.js.path.for.package.standard" value="project" />
<property name="node.js.selected.package.standard" value="" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../feipin" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../xiaofang" />
<property name="node.js.detected.package.jscs" value="true" />
<property name="node.js.detected.package.eslint" value="true" />
</component>
... ... @@ -359,18 +318,18 @@
<workItem from="1566093783713" duration="138000" />
<workItem from="1566175275257" duration="11645000" />
<workItem from="1566191545801" duration="12833000" />
<workItem from="1566261385946" duration="26877000" />
<workItem from="1566261385946" duration="26976000" />
<workItem from="1566350578213" duration="14787000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="83322000" />
<option name="totallyTimeSpent" value="98208000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<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.15831557" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15991472" sideWeight="0.5" order="0" 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.33" sideWeight="0.5" order="6" 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="7" 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="3" side_tool="false" content_ui="tabs" />
... ... @@ -378,7 +337,7 @@
<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="7" 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="2" 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="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.3297062" sideWeight="0.5" order="7" 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.32964602" sideWeight="0.5" order="7" 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="2" 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="3" 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="4" side_tool="false" content_ui="tabs" />
... ... @@ -421,442 +380,385 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">
<entry file="file://$USER_HOME$/AppData/Local/Temp/gc_gbanner.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="333" column="33" lean-forward="true" selection-start-line="333" selection-start-column="33" selection-end-line="333" selection-end-column="33" />
<folding>
<element signature="e#44#71#0#PHP" expanded="false" />
<marker date="1562338655000" expanded="true" signature="13159:13266" ph="SELECT COLUM... COLUMNS" />
</folding>
<state relative-caret-position="-123">
<caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="35" selection-end-column="59" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
<entry file="file://$USER_HOME$/AppData/Local/Temp/gc_about.sql">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="287">
<caret line="249" column="23" lean-forward="false" selection-start-line="249" selection-start-column="23" selection-end-line="249" selection-end-column="23" />
<folding />
<state relative-caret-position="291">
<caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="35" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/model/Customer.php">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Customers.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="22" column="41" lean-forward="false" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" />
<state relative-caret-position="1564">
<caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/customer/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="119">
<caret line="7" column="10" lean-forward="true" selection-start-line="7" selection-start-column="10" selection-end-line="7" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/auth/Admin.php">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/customers.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="460">
<caret line="103" column="36" lean-forward="true" selection-start-line="103" selection-start-column="36" selection-end-line="103" selection-end-column="36" />
<folding>
<element signature="e#45#75#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="184">
<caret line="26" column="55" lean-forward="false" selection-start-line="26" selection-start-column="55" selection-end-line="26" selection-end-column="55" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/equipment.js">
<entry file="file://$PROJECT_DIR$/application/admin/controller/About.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="506">
<caret line="37" column="15" lean-forward="false" selection-start-line="37" selection-start-column="15" selection-end-line="37" selection-end-column="15" />
<state relative-caret-position="507">
<caret line="26" column="4" lean-forward="true" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Temp/gjr_customer.sql">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/banner.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="65" column="36" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="74" selection-end-column="0" />
<folding />
<state relative-caret-position="92">
<caret line="4" column="23" lean-forward="false" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/equipment.php">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/banner.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="11" column="30" lean-forward="false" selection-start-line="11" selection-start-column="30" selection-end-line="11" selection-end-column="30" />
<folding />
<state relative-caret-position="368">
<caret line="25" column="41" lean-forward="false" selection-start-line="25" selection-start-column="41" selection-end-line="25" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/customer.php">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Banner.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="9" column="33" lean-forward="true" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
<state relative-caret-position="-91">
<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/lang/zh-cn/customers.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/customer/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="10" column="31" lean-forward="true" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
<folding />
<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/customer/add.html">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/customer.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="13" column="28" lean-forward="true" selection-start-line="13" selection-start-column="28" selection-end-line="13" selection-end-column="28" />
<folding>
<element signature="n#style#0;n#span#0;n#label#0;n#div#0;n#form#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#span#0;n#label#0;n#div#1;n#form#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#span#0;n#label#0;n#div#2;n#form#0;n#!!top" expanded="false" />
</folding>
<state relative-caret-position="897">
<caret line="39" column="22" lean-forward="true" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/auth/Group.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/introduce/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1380">
<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 relative-caret-position="253">
<caret line="11" column="88" lean-forward="false" selection-start-line="11" selection-start-column="88" selection-end-line="11" selection-end-column="88" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/auth/group.js">
<entry file="file://$PROJECT_DIR$/application/admin/view/introduce/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
<caret line="30" column="36" lean-forward="true" selection-start-line="30" selection-start-column="36" selection-end-line="30" selection-end-column="36" />
<folding />
<state relative-caret-position="345">
<caret line="15" column="64" lean-forward="true" selection-start-line="15" selection-start-column="64" selection-end-line="15" selection-end-column="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/auth/group/index.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/introduce/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="207">
<caret line="9" column="51" lean-forward="true" selection-start-line="9" selection-start-column="51" selection-end-line="9" selection-end-column="51" />
<folding />
<state relative-caret-position="391">
<caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Customer.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/banner/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="898">
<caret line="114" column="0" lean-forward="true" selection-start-line="114" selection-start-column="0" selection-end-line="114" selection-end-column="0" />
<folding>
<element signature="e#40#66#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="483">
<caret line="20" column="34" lean-forward="false" selection-start-line="12" selection-start-column="28" selection-end-line="20" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/customers/edit.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/about/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="276">
<caret line="36" column="14" lean-forward="true" selection-start-line="36" selection-start-column="14" selection-end-line="36" selection-end-column="14" />
<folding>
<element signature="n#style#0;n#span#0;n#label#0;n#div#0;n#form#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#span#0;n#label#0;n#div#1;n#form#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#span#0;n#label#0;n#div#2;n#form#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#span#0;n#label#0;n#div#3;n#form#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#span#0;n#label#0;n#div#4;n#form#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#span#0;n#label#0;n#div#5;n#form#0;n#!!top" expanded="false" />
</folding>
<state relative-caret-position="115">
<caret line="5" column="88" lean-forward="false" selection-start-line="5" selection-start-column="88" selection-end-line="5" selection-end-column="88" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/equipment/add.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/about/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="33" column="78" lean-forward="true" selection-start-line="33" selection-start-column="78" selection-end-line="33" selection-end-column="78" />
<folding />
<state relative-caret-position="184">
<caret line="9" column="143" lean-forward="true" selection-start-line="9" selection-start-column="143" selection-end-line="9" selection-end-column="143" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/customers/add.html">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/introduce.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="69">
<caret line="9" column="107" lean-forward="false" selection-start-line="9" selection-start-column="74" selection-end-line="9" selection-end-column="107" />
<folding>
<element signature="n#style#0;n#span#0;n#label#0;n#div#0;n#form#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#span#0;n#label#0;n#div#1;n#form#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#span#0;n#label#0;n#div#2;n#form#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#span#0;n#label#0;n#div#3;n#form#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#span#0;n#label#0;n#div#4;n#form#0;n#!!top" expanded="false" />
<element signature="n#style#0;n#span#0;n#label#0;n#div#5;n#form#0;n#!!top" expanded="false" />
</folding>
<state relative-caret-position="437">
<caret line="25" column="41" lean-forward="true" selection-start-line="25" selection-start-column="41" selection-end-line="25" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/model/Equipment.php">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/introduce.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-781">
<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 relative-caret-position="115">
<caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Temp/gc_gbanner.sql">
<entry file="file://$PROJECT_DIR$/application/admin/view/about/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-123">
<caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="35" selection-end-column="59" />
<folding />
<state relative-caret-position="230">
<caret line="10" column="73" lean-forward="false" selection-start-line="10" selection-start-column="62" selection-end-line="10" selection-end-column="73" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/AppData/Local/Temp/gc_about.sql">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/about.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="291">
<caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="35" selection-end-column="53" />
<folding />
<state relative-caret-position="115">
<caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Equipment.php">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/about.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="438">
<caret line="145" column="49" lean-forward="true" selection-start-line="145" selection-start-column="49" selection-end-line="145" selection-end-column="49" />
<folding>
<element signature="e#40#74#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="483">
<caret line="27" column="42" lean-forward="false" selection-start-line="27" selection-start-column="42" selection-end-line="27" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Customers.php">
<entry file="file://$PROJECT_DIR$/application/extra/upload.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1564">
<caret line="80" column="25" lean-forward="false" selection-start-line="80" selection-start-column="25" selection-end-line="80" selection-end-column="25" />
<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/equipment/edit.html">
<entry file="file://$PROJECT_DIR$/application/extra/addons.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="621">
<caret line="27" column="14" lean-forward="false" selection-start-line="27" selection-start-column="14" selection-end-line="27" selection-end-column="14" />
<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$/public/assets/js/backend/customers.js">
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="26" column="55" lean-forward="false" selection-start-line="26" selection-start-column="55" selection-end-line="26" selection-end-column="55" />
<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/controller/About.php">
<entry file="file://$PROJECT_DIR$/application/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="507">
<caret line="26" column="4" lean-forward="true" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
<state relative-caret-position="345">
<caret line="59" column="51" lean-forward="true" selection-start-line="59" selection-start-column="51" selection-end-line="59" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/banner.php">
<entry file="file://$PROJECT_DIR$/application/api/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92">
<caret line="4" column="23" lean-forward="false" selection-start-line="4" selection-start-column="23" selection-end-line="4" selection-end-column="23" />
<folding />
<state relative-caret-position="3345">
<caret line="147" column="36" lean-forward="false" selection-start-line="147" selection-start-column="36" selection-end-line="147" selection-end-column="36" />
<folding>
<element signature="e#38#68#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/banner.js">
<entry file="file://$PROJECT_DIR$/application/admin/view/auth/group/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="368">
<caret line="25" column="41" lean-forward="false" selection-start-line="25" selection-start-column="41" selection-end-line="25" selection-end-column="41" />
<state relative-caret-position="207">
<caret line="9" column="51" lean-forward="true" selection-start-line="9" selection-start-column="51" selection-end-line="9" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Banner.php">
<entry file="file://$PROJECT_DIR$/application/admin/library/Auth.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-91">
<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 relative-caret-position="287">
<caret line="227" column="20" lean-forward="false" selection-start-line="227" selection-start-column="20" selection-end-line="227" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/customer/index.html">
<entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
<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 relative-caret-position="2056">
<caret line="393" column="42" lean-forward="true" selection-start-line="393" selection-start-column="42" selection-end-line="393" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/customer.js">
<entry file="file://$PROJECT_DIR$/application/admin/view/equipment/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="897">
<caret line="39" column="22" lean-forward="true" selection-start-line="39" selection-start-column="22" selection-end-line="39" selection-end-column="22" />
<state relative-caret-position="667">
<caret line="33" column="78" lean-forward="true" selection-start-line="33" selection-start-column="78" selection-end-line="33" selection-end-column="78" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/introduce/edit.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/equipment/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="253">
<caret line="11" column="88" lean-forward="false" selection-start-line="11" selection-start-column="88" selection-end-line="11" selection-end-column="88" />
<state relative-caret-position="96">
<caret line="63" column="0" lean-forward="true" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/introduce/add.html">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Equipment.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="345">
<caret line="15" column="64" lean-forward="true" selection-start-line="15" selection-start-column="64" selection-end-line="15" selection-end-column="64" />
<state relative-caret-position="555">
<caret line="42" column="40" lean-forward="true" selection-start-line="42" selection-start-column="40" selection-end-line="42" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/introduce/index.html">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Customer.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="21" column="0" lean-forward="true" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
<state relative-caret-position="585">
<caret line="110" column="46" lean-forward="true" selection-start-line="110" selection-start-column="46" selection-end-line="110" selection-end-column="46" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/banner/index.html">
<entry file="file://$PROJECT_DIR$/application/common/library/token/driver/Mysql.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483">
<caret line="20" column="34" lean-forward="false" selection-start-line="12" selection-start-column="28" selection-end-line="20" selection-end-column="34" />
<state relative-caret-position="563">
<caret line="56" column="18" lean-forward="true" selection-start-line="56" selection-start-column="18" selection-end-line="56" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/about/add.html">
<entry file="file://$PROJECT_DIR$/application/common/library/Auth.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="5" column="88" lean-forward="false" selection-start-line="5" selection-start-column="88" selection-end-line="5" selection-end-column="88" />
<state relative-caret-position="210">
<caret line="104" column="40" lean-forward="true" selection-start-line="104" selection-start-column="40" selection-end-line="104" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/about/index.html">
<entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="9" column="143" lean-forward="true" selection-start-line="9" selection-start-column="143" selection-end-line="9" selection-end-column="143" />
<state relative-caret-position="540">
<caret line="157" column="42" lean-forward="true" selection-start-line="157" selection-start-column="42" selection-end-line="157" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/introduce.js">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="25" column="41" lean-forward="true" selection-start-line="25" selection-start-column="41" selection-end-line="25" selection-end-column="41" />
<state relative-caret-position="851">
<caret line="84" column="64" lean-forward="true" selection-start-line="84" selection-start-column="64" selection-end-line="84" selection-end-column="64" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/introduce.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/customer/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
<state relative-caret-position="460">
<caret line="38" column="110" lean-forward="false" selection-start-line="38" selection-start-column="110" selection-end-line="38" selection-end-column="110" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/about/edit.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/customer/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="230">
<caret line="10" column="73" lean-forward="false" selection-start-line="10" selection-start-column="62" selection-end-line="10" selection-end-column="73" />
<state relative-caret-position="805">
<caret line="35" column="59" lean-forward="false" selection-start-line="35" selection-start-column="59" selection-end-line="35" selection-end-column="59" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/about.php">
<entry file="file://$PROJECT_DIR$/application/extra/site.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="115">
<caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
<state relative-caret-position="561">
<caret line="76" column="38" lean-forward="false" selection-start-line="76" selection-start-column="38" selection-end-line="76" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/about.js">
<entry file="file://$PROJECT_DIR$/application/api/controller/Ems.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483">
<caret line="27" column="42" lean-forward="false" selection-start-line="27" selection-start-column="42" selection-end-line="27" selection-end-column="42" />
<state relative-caret-position="55">
<caret line="74" column="11" lean-forward="false" selection-start-line="74" selection-start-column="11" selection-end-line="74" selection-end-column="11" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/library/Auth.php">
<entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="284">
<caret line="195" column="20" lean-forward="false" selection-start-line="195" selection-start-column="20" selection-end-line="195" selection-end-column="20" />
<state relative-caret-position="161">
<caret line="11" column="7" lean-forward="true" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
<entry file="file://$PROJECT_DIR$/application/api/controller/Token.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="100" column="60" lean-forward="true" selection-start-line="100" selection-start-column="60" selection-end-line="100" selection-end-column="60" />
<folding>
<element signature="e#41#69#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="-37">
<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/extra/upload.php">
<entry file="file://$PROJECT_DIR$/application/api/controller/Sms.php">
<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 relative-caret-position="676">
<caret line="79" column="52" lean-forward="true" selection-start-line="79" selection-start-column="52" selection-end-line="79" selection-end-column="52" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/addons.php">
<entry file="file://$PROJECT_DIR$/application/api/controller/Demo.php">
<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 relative-caret-position="538">
<caret line="66" column="7" lean-forward="true" selection-start-line="66" selection-start-column="7" selection-end-line="66" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
<entry file="file://$PROJECT_DIR$/application/api/controller/Abouts.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-115">
<caret line="11" column="7" lean-forward="true" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" />
<state relative-caret-position="138">
<caret line="7" column="9" lean-forward="true" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/site.php">
<entry file="file://$PROJECT_DIR$/application/admin/model/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="645">
<caret line="72" column="44" lean-forward="true" selection-start-line="72" selection-start-column="44" selection-end-line="72" selection-end-column="44" />
<state relative-caret-position="414">
<caret line="25" column="40" lean-forward="false" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" />
<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="391">
<caret line="68" column="23" lean-forward="true" selection-start-line="68" selection-start-column="23" selection-end-line="68" selection-end-column="23" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
</folding>
</state>
<entry file="file://$PROJECT_DIR$/public/uploads/20190809/bca486d6411bb255e90ce37b60f781fe.jpg">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1105">
<caret line="147" column="36" lean-forward="true" selection-start-line="147" selection-start-column="36" selection-end-line="147" selection-end-column="36" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
</folding>
</state>
<entry file="file://$PROJECT_DIR$/public/uploads/20190809/26f5e51b8ac7fbd6f1c649cc45a18265.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Abouts.php">
<entry file="file://$PROJECT_DIR$/public/uploads/20190809/1a5e50b8f9d2916b9bd17e448e5e891f.png">
<provider selected="true" editor-type-id="images">
<state />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Person.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="760">
<caret line="36" column="7" lean-forward="true" selection-start-line="36" selection-start-column="7" selection-end-line="36" selection-end-column="7" />
<state relative-caret-position="331">
<caret line="117" column="46" lean-forward="true" selection-start-line="117" selection-start-column="46" selection-end-line="117" selection-end-column="46" />
<folding />
</state>
</provider>
... ...
... ... @@ -100,7 +100,12 @@ class Customer extends Backend
$users = $adminModel->create($user);
//创建权限分组表
$AuthGroupAccessModel = new AuthGroupAccess();
$AuthGroupAccessModel->create(['uid'=>$users->id,'group_id'=>3]);
$group_id = $this->auth->getGroups()[0]['group_id'];
if($group_id == 2){
$AuthGroupAccessModel->create(['uid'=>$users->id,'group_id'=>3]);
}else if($group_id == 3){
$AuthGroupAccessModel->create(['uid'=>$users->id,'group_id'=>4]);
}
//创建服务系统客户表
$params['ad_id'] = $users->id;
... ...
... ... @@ -27,30 +27,19 @@ class Equipment extends Backend
//系统关联客户
$uid = $this->auth->id;
$pid = $this->auth->pid;
if($pid == 0){
$res = Db::name('admin')
->where('pid',$uid)
->field('id,pid')
->select();
$uids = array_column($res,'id');
$cus_data = Db::name('customer')
->whereIn('ad_id',$uids)
->field('id,cus_name')
->select();
foreach($cus_data as $v){
$user[$v['id']] = $v['cus_name'];
}
}else{
//前端用户
$uid = $this->auth->id;
$cus_data = Db::name('customers')
->where('ad_id',$uid)
->field('id,cus_name')
->select();
foreach($cus_data as $v){
$user[$v['id']] = $v['cus_name'];
}
$res = Db::name('admin')
->where('pid',$uid)
->field('id,pid')
->select();
$uids = array_column($res,'id');
$cus_data = Db::name('customer')
->whereIn('ad_id',$uids)
->field('id,cus_name')
->select();
foreach($cus_data as $v){
$user[$v['id']] = $v['cus_name'];
}
$this->view->assign('pid',$pid);
$this->view->assign('cus_data', $user);
... ... @@ -78,38 +67,6 @@ class Equipment extends Backend
$this->relationSearch = true;
//设置过滤方法
$this->request->filter(['strip_tags']);
if ($this->request->request('keyField'))
{
return $this->selectpage();
}
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
$u_ids = $this->getUid();
$total = $this->model
->with(['customer'])
->where($where)
->whereIn('c_id',$u_ids)
->order($sort, $order)
->count();
$list = $this->model
->with(['customer'])
->where($where)
->whereIn('c_id',$u_ids)
->order($sort, $order)
->limit($offset, $limit)
->select();
foreach ($list as $row) {
//判断是一级用户还是二级用户
if($this->auth->pid == 0){
$row->getRelation('customer')->visible(['cus_name']);
}else{
unset($row['customer']);
$row->cus_name = $this->getName($row->cs_id);
}
}
if ($this->request->isAjax())
{
//如果发送的来源是Selectpage，则转发到Selectpage
... ... @@ -153,7 +110,7 @@ class Equipment extends Backend
//根据id查询关联客户名称
public function getName($id){
$res = Db::name('customers')
$res = Db::name('customer')
->where('id',$id)
->field('id,cus_name')
->find();
... ...
... ... @@ -22,6 +22,9 @@ class User extends Model
'jointime_text'
];
//设置域名
CONST DOMAIN = 'http://www.gangjuren.cn';
public function getOriginData()
{
return $this->origin;
... ...
... ... @@ -18,27 +18,27 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Cer_type')}:</label>
<label class="control-label col-xs-12 col-sm-2">{:__('Cer_type')}:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cer_type" class="form-control" name="row[cer_type]" type="text" value="">
<input id="c-cer_type" data-rule="required" class="form-control" name="row[cer_type]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Cer_number')}:</label>
<label class="control-label col-xs-12 col-sm-2">{:__('Cer_number')}:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cer_number" class="form-control" name="row[cer_number]" type="text" value="">
<input id="c-cer_number" data-rule="required" class="form-control" name="row[cer_number]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Cont_name')}:</label>
<label class="control-label col-xs-12 col-sm-2">{:__('Cont_name')}:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cont_name" class="form-control" name="row[cont_name]" type="text" value="">
<input id="c-cont_name" data-rule="required" class="form-control" name="row[cont_name]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Cont_mobile')}:</label>
<label class="control-label col-xs-12 col-sm-2">{:__('Cont_mobile')}:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cont_mobile" class="form-control" name="row[cont_mobile]" type="text" value="">
<input id="c-cont_mobile" data-rule="required" class="form-control" name="row[cont_mobile]" type="text" value="">
</div>
</div>
<div class="form-group">
... ...
... ... @@ -13,27 +13,27 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Cer_type')}:</label>
<label class="control-label col-xs-12 col-sm-2">{:__('Cer_type')}:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cer_type" class="form-control" name="row[cer_type]" type="text" value="{$row.cer_type|htmlentities}">
<input id="c-cer_type" data-rule="required" class="form-control" name="row[cer_type]" type="text" value="{$row.cer_type|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Cer_number')}:</label>
<label class="control-label col-xs-12 col-sm-2">{:__('Cer_number')}:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cer_number" class="form-control" name="row[cer_number]" type="text" value="{$row.cer_number|htmlentities}">
<input id="c-cer_number" data-rule="required" class="form-control" name="row[cer_number]" type="text" value="{$row.cer_number|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Cont_name')}:</label>
<label class="control-label col-xs-12 col-sm-2">{:__('Cont_name')}:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cont_name" class="form-control" name="row[cont_name]" type="text" value="{$row.cont_name|htmlentities}">
<input id="c-cont_name" data-rule="required" class="form-control" name="row[cont_name]" type="text" value="{$row.cont_name|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Cont_mobile')}:</label>
<label class="control-label col-xs-12 col-sm-2">{:__('Cont_mobile')}:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cont_mobile" class="form-control" name="row[cont_mobile]" type="text" value="{$row.cont_mobile|htmlentities}">
<input id="c-cont_mobile" data-rule="required" class="form-control" name="row[cont_mobile]" type="text" value="{$row.cont_mobile|htmlentities}">
</div>
</div>
<div class="form-group">
... ...
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<?php
if($pid == 0){
?>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Number')}:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-number" data-rule="required" class="form-control" name="row[number]" type="text" value="{$row.number|htmlentities}">
</div>
</div>
<?php
}
?>
<?php
if($pid == 0){
?>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Type')}:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
{:build_select('row[type]', $type, $row.type, ['class'=>'form-control', 'required'=>''])}
</div>
</div>
<?php
}
?>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('cus_name')}:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
... ... @@ -28,6 +43,9 @@
?>
</div>
</div>
<?php
if($pid == 0){
?>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Start_time')}:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
... ... @@ -40,10 +58,24 @@
<input id="c-end_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[end_time]" type="text" value="{:$row.end_time?datetime($row.end_time):''}">
</div>
</div>
<?php
}
?>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Mark')}:</label>
<div class="col-xs-12 col-sm-8">
<?php
if($pid == 0){
?>
<input id="c-mark" class="form-control" name="row[mark]" type="text" value="{$row.mark|htmlentities}">
<?php
}else{
?>
<input id="c-mark1" class="form-control" name="row[mark1]" type="text" value="{$row.mark1|htmlentities}">
<?php
}
?>
</div>
</div>
<div class="form-group layer-footer">
... ...
... ... @@ -5,15 +5,16 @@ namespace app\api\controller;
use app\common\controller\Api;
use think\Db;
/**
* 关于我们接口**
* 关于我们接口
*/
class Abouts extends Api
{
protected $noNeedLogin = ['aboutDetail'];
protected $noNeedLogin = [];
protected $noNeedRight = '*';
public function _initialize()
{
parent::_initialize();
}
/**
... ...
... ... @@ -38,7 +38,7 @@ class Demo extends Api
'msg':'返回成功'
})
*/
public function test()
private function test()
{
$this->success('返回成功', $this->request->param());
}
... ... @@ -47,7 +47,7 @@ class Demo extends Api
* 无需登录的接口
*
*/
public function test1()
private function test1()
{
$this->success('返回成功', ['action' => 'test1']);
}
... ... @@ -56,7 +56,7 @@ class Demo extends Api
* 需要登录的接口
*
*/
public function test2()
private function test2()
{
$this->success('返回成功', ['action' => 'test2']);
}
... ... @@ -65,7 +65,7 @@ class Demo extends Api
* 需要登录且需要验证有相应组的权限
*
*/
public function test3()
private function test3()
{
$this->success('返回成功', ['action' => 'test3']);
}
... ...
... ... @@ -34,7 +34,7 @@ class Ems extends Api
* @param string $email 邮箱
* @param string $event 事件名称
*/
public function send()
private function send()
{
$email = $this->request->request("email");
$event = $this->request->request("event");
... ... @@ -72,7 +72,7 @@ class Ems extends Api
* @param string $event 事件名称
* @param string $captcha 验证码
*/
public function check()
private function check()
{
$email = $this->request->request("email");
$event = $this->request->request("event");
... ...
<?php
namespace app\api\controller;
use app\common\controller\Api;
use app\admin\model\Bank;
use app\admin\model\off\Line;
use think\Db;
use think\Validate;
/**
* 个人信息接口
*/
class Person extends Api
{
protected $noNeedLogin = [];
protected $noNeedRight = '*';
protected $user_id = '';//token存贮user_id
public function _initialize()
{
parent::_initialize();
$this->user_id = $this->auth->getUserId();
}
/**
* @ApiTitle (获取用户信息)
* @ApiSummary (获取用户信息)
* @ApiMethod (GET)
* @ApiRoute (/api/person/getUserInfo)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiReturn ({
"code": 1,
"msg": "成功",
"time": "1553838039",
"data": {
"id": 26,
"username": "风起时呀",//姓名
"nickname":昵称
"avatar"://头像
}
})
*/
public function getUserInfo(){
if($this->request->isGet()){
$data = Db::name('user')
->where(['id'=>$this->user_id])
->field('id,nickname,username,avatar')
->find();
$this->success('成功', $data);
}else{
$this->error('请求方式错误');
}
}
/**
* @ApiTitle (修改用户姓名)
* @ApiSummary (修改用户姓名)
* @ApiMethod (POST)
* @ApiRoute (/api/person/updateInfo)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name="username", type="string", required=true, description="用户名（姓名）")
* @ApiReturn({
"code": 1,
"msg": "保存成功",
"time": "1553838137",
"data": null
})
*/
public function updateInfo(){
if ($this->request->isPost()) {
$raw_data = $this->request->post();
$rule = config('site.person');
$validate = new Validate($rule['rule'],$rule['msg']);
if (!$validate->check($raw_data)) {
$this->error($validate->getError());
}
$user = new \app\admin\model\User();
$data = $user->where(['id'=>$this->user_id])->update($raw_data);
if($data){
$this->success('保存成功');
}else{
$this->error('姓名相同了');
}
}else{
$this->error('请求方式错误');
}
}
/**
* @ApiTitle (上传文件)
* @ApiSummary (上传文件)
* @ApiMethod (POST)
* @ApiRoute (/api/person/upload)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
* @ApiParams (name="images[]", type="file", required=true, description="上传文件（图片）")
* @ApiReturn ({
"code": 1,
"msg": "上传成功",
"time": "1553777266",
"data":[
{
"/uploads/20190328/0179b6b111307ef8be3c832ef808e1c1.jpg,/uploads/20190328/42bbc2f2692023d43957c3ee0b580443.jpg"
}
]
})
*/
public function upload(){
// 获取表单上传文件
$files = request()->file('images');
if (empty($files)) {
$this->error('未检出文件上传');
}
$countFile = count($files);
if($countFile > 9){
$this->error('最多上传9张图片');
}
$date = date('Ymd',time());
$host = \app\admin\model\User::DOMAIN;
$images = '';
foreach($files as $file){
//移动到框架应用根目录/public/uploads/ 目录下
//允许文件大小200k
$info = $file->validate(['size'=>20480000,'ext'=>'jpg,png,gif'])->move(ROOT_PATH . 'public' . DS . 'uploads');
if($info){
$images .= $host.'/uploads/'.$date.'/'.$info->getFilename().',';
}else{
// 上传失败获取错误信息
$this->error($file->getError());
}
}
$this->success('上传成功',rtrim($images,','));
}
}
... ...
... ... @@ -20,7 +20,7 @@ class Sms extends Api
* @param string $mobile 手机号
* @param string $event 事件名称
*/
public function send()
private function send()
{
$mobile = $this->request->request("mobile");
$event = $this->request->request("event");
... ... @@ -65,7 +65,7 @@ class Sms extends Api
* @param string $event 事件名称
* @param string $captcha 验证码
*/
public function check()
private function check()
{
$mobile = $this->request->request("mobile");
$event = $this->request->request("event");
... ...
... ... @@ -80,8 +80,10 @@ class User extends Api
'openid' => $json['openid'],
'nickname' => $raw_data['nickname'],
'avatar' => $raw_data['avatar'],
'mobile' => $raw_data['mobile']
];
if(isset($raw_data['mobile'])){
$result['mobile'] = $raw_data['mobile'];
}
$ret = $this->auth->login($result);
if ($ret) {
$data = ['userInfo' => $this->auth->getUserinfo(),'openid' => $result['openid']];
... ...
... ... @@ -19,6 +19,7 @@ class Auth
protected $_logined = false;
protected $_user = null;
protected $_token = '';
private $user_id = '';
//Token默认有效时长
protected $keeptime = 2592000;
protected $requestUri = '';
... ... @@ -51,6 +52,15 @@ class Auth
}
/**
* 获取user_id
* @return mixed
*/
public function getUserId()
{
return $this->user_id;
}
/**
* 获取User模型
* @return User
*/
... ... @@ -78,38 +88,45 @@ class Auth
*/
public function init($token)
{
if ($this->_logined) {
return true;
}
if ($this->_error) {
return false;
if ($this->_logined)
{
return TRUE;
}
if ($this->_error)
return FALSE;
$data = Token::get($token);
if (!$data) {
return false;
if (!$data)
{
return FALSE;
}
$user_id = intval($data['user_id']);
if ($user_id > 0) {
if ($user_id > 0)
{
$user = User::get($user_id);
if (!$user) {
$this->setError('Account not exist');
return false;
if (!$user)
{
// $this->setError('Account not exist');
return '该用户不存在';
}
if ($user['status'] != 'normal') {
$this->setError('Account is locked');
return false;
if ($user['status'] != 'normal')
{
// $this->setError('Account is locked');
return '该用户已被锁定';
}
$this->_user = $user;
$this->_logined = true;
$this->_logined = TRUE;
$this->user_id = $user_id;
$this->_token = $token;
//初始化成功的事件
Hook::listen("user_init_successed", $this->_user);
return true;
} else {
return '成功';
}
else
{
$this->setError('You are not logged in');
return false;
return FALSE;
}
}
... ...
... ... @@ -57,7 +57,7 @@ return [
// 默认模块名
'default_module' => 'index',
// 禁止访问模块
'deny_module_list' => ['common'],
'deny_module_list' => ['common','admin'],
// 默认控制器名
'default_controller' => 'Index',
// 默认操作名
... ...
... ... @@ -37,8 +37,8 @@ return array (
'mail_from' => '10000@qq.com',
'raw' => [
'app_id' => 'wxcce140865f93090b',//客户app_id
'secret' => '3356ffb367f67bfba05ab17cfddee89f',//客户秘钥
'app_id' => 'wx501cda0ef4db38a2',//客户app_id
'secret' => '7a5783b501fc3bab1bf6087303358199',//客户秘钥
],
'host' => 'http://jinglong.springchunjia.cn',
'user' => [
... ... @@ -46,13 +46,11 @@ return array (
'code' => 'require',
'nickname' => 'require',
'avatar' => 'require',
'mobile' => 'require'
],
'msg' => [
'name.require' => '昵称不能为空',
'code.require' => 'code码不能为空',
'avatar' => '头像不能为空',
'mobile' => '手机号不能为空',
]
],
'binkMobile' => [
... ... @@ -73,4 +71,13 @@ return array (
'id.number' => 'id必须为数字',
]
],
//修改用户
'person' => [
'rule' => [
'username' => 'require',
],
'msg' => [
'username.require' => '姓名不能为空',
]
],
);
\ No newline at end of file
... ...
此 diff 太大无法显示。
<?php
//000000000000
exit();?>
a:24:{i:0;a:13:{s:2:"id";i:1;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:9:"dashboard";s:5:"title";s:9:"Dashboard";s:4:"icon";s:15:"fa fa-dashboard";s:9:"condition";s:0:"";s:6:"remark";s:14:"Dashboard tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497429920;s:5:"weigh";i:143;s:6:"status";s:6:"normal";}i:1;a:13:{s:2:"id";i:2;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:7:"general";s:5:"title";s:7:"General";s:4:"icon";s:10:"fa fa-cogs";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430169;s:5:"weigh";i:137;s:6:"status";s:6:"normal";}i:2;a:13:{s:2:"id";i:3;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:8:"category";s:5:"title";s:8:"Category";s:4:"icon";s:10:"fa fa-leaf";s:9:"condition";s:0:"";s:6:"remark";s:13:"Category tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497429920;s:5:"weigh";i:119;s:6:"status";s:6:"normal";}i:3;a:13:{s:2:"id";i:9;s:4:"type";s:4:"file";s:3:"pid";i:5;s:4:"name";s:10:"auth/admin";s:5:"title";s:5:"Admin";s:4:"icon";s:10:"fa fa-user";s:9:"condition";s:0:"";s:6:"remark";s:10:"Admin tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430320;s:5:"weigh";i:118;s:6:"status";s:6:"normal";}i:4;a:13:{s:2:"id";i:10;s:4:"type";s:4:"file";s:3:"pid";i:5;s:4:"name";s:13:"auth/adminlog";s:5:"title";s:9:"Admin log";s:4:"icon";s:14:"fa fa-list-alt";s:9:"condition";s:0:"";s:6:"remark";s:14:"Admin log tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430307;s:5:"weigh";i:113;s:6:"status";s:6:"normal";}i:5;a:13:{s:2:"id";i:11;s:4:"type";s:4:"file";s:3:"pid";i:5;s:4:"name";s:10:"auth/group";s:5:"title";s:5:"Group";s:4:"icon";s:11:"fa fa-group";s:9:"condition";s:0:"";s:6:"remark";s:10:"Group tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497429920;s:5:"weigh";i:109;s:6:"status";s:6:"normal";}i:6;a:13:{s:2:"id";i:12;s:4:"type";s:4:"file";s:3:"pid";i:5;s:4:"name";s:9:"auth/rule";s:5:"title";s:4:"Rule";s:4:"icon";s:10:"fa fa-bars";s:9:"condition";s:0:"";s:6:"remark";s:9:"Rule tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430581;s:5:"weigh";i:104;s:6:"status";s:6:"normal";}i:7;a:13:{s:2:"id";i:5;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:4:"auth";s:5:"title";s:4:"Auth";s:4:"icon";s:11:"fa fa-group";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430092;s:5:"weigh";i:99;s:6:"status";s:6:"normal";}i:8;a:13:{s:2:"id";i:4;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:5:"addon";s:5:"title";s:12:"插件管理";s:4:"icon";s:12:"fa fa-rocket";s:9:"condition";s:0:"";s:6:"remark";s:10:"Addon tips";s:6:"ismenu";i:1;s:10:"createtime";i:1502035509;s:10:"updatetime";i:1565403215;s:5:"weigh";i:98;s:6:"status";s:6:"normal";}i:9;a:13:{s:2:"id";i:66;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:4:"user";s:5:"title";s:12:"会员管理";s:4:"icon";s:10:"fa fa-list";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1516374729;s:10:"updatetime";i:1565403228;s:5:"weigh";i:97;s:6:"status";s:6:"normal";}i:10;a:13:{s:2:"id";i:86;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:7:"command";s:5:"title";s:18:"在线命令管理";s:4:"icon";s:14:"fa fa-terminal";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1565408505;s:10:"updatetime";i:1565408565;s:5:"weigh";i:96;s:6:"status";s:6:"normal";}i:11;a:13:{s:2:"id";i:85;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:8:"customer";s:5:"title";s:12:"客户管理";s:4:"icon";s:10:"fa fa-list";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1565403317;s:10:"updatetime";i:1566282967;s:5:"weigh";i:90;s:6:"status";s:6:"normal";}i:12;a:13:{s:2:"id";i:102;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:9:"customers";s:5:"title";s:12:"客户管理";s:4:"icon";s:10:"fa fa-list";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1566280830;s:10:"updatetime";i:1566282975;s:5:"weigh";i:86;s:6:"status";s:6:"normal";}i:13;a:13:{s:2:"id";i:97;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:9:"equipment";s:5:"title";s:12:"设备管理";s:4:"icon";s:10:"fa fa-list";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1566207989;s:10:"updatetime";i:1566282984;s:5:"weigh";i:85;s:6:"status";s:6:"normal";}i:14;a:13:{s:2:"id";i:6;s:4:"type";s:4:"file";s:3:"pid";i:2;s:4:"name";s:14:"general/config";s:5:"title";s:6:"Config";s:4:"icon";s:9:"fa fa-cog";s:9:"condition";s:0:"";s:6:"remark";s:11:"Config tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430683;s:5:"weigh";i:60;s:6:"status";s:6:"normal";}i:15;a:13:{s:2:"id";i:7;s:4:"type";s:4:"file";s:3:"pid";i:2;s:4:"name";s:18:"general/attachment";s:5:"title";s:10:"Attachment";s:4:"icon";s:18:"fa fa-file-image-o";s:9:"condition";s:0:"";s:6:"remark";s:15:"Attachment tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430699;s:5:"weigh";i:53;s:6:"status";s:6:"normal";}i:16;a:13:{s:2:"id";i:8;s:4:"type";s:4:"file";s:3:"pid";i:2;s:4:"name";s:15:"general/profile";s:5:"title";s:7:"Profile";s:4:"icon";s:10:"fa fa-user";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497429920;s:5:"weigh";i:34;s:6:"status";s:6:"normal";}i:17;a:13:{s:2:"id";i:107;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:7:"setting";s:5:"title";s:12:"文案设置";s:4:"icon";s:10:"fa fa-list";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1566289359;s:10:"updatetime";i:1566289370;s:5:"weigh";i:20;s:6:"status";s:6:"normal";}i:18;a:13:{s:2:"id";i:67;s:4:"type";s:4:"file";s:3:"pid";i:66;s:4:"name";s:9:"user/user";s:5:"title";s:4:"User";s:4:"icon";s:10:"fa fa-user";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1516374729;s:10:"updatetime";i:1516374729;s:5:"weigh";i:0;s:6:"status";s:6:"normal";}i:19;a:13:{s:2:"id";i:73;s:4:"type";s:4:"file";s:3:"pid";i:66;s:4:"name";s:10:"user/group";s:5:"title";s:10:"User group";s:4:"icon";s:11:"fa fa-users";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1516374729;s:10:"updatetime";i:1516374729;s:5:"weigh";i:0;s:6:"status";s:6:"normal";}i:20;a:13:{s:2:"id";i:79;s:4:"type";s:4:"file";s:3:"pid";i:66;s:4:"name";s:9:"user/rule";s:5:"title";s:9:"User rule";s:4:"icon";s:14:"fa fa-circle-o";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1516374729;s:10:"updatetime";i:1516374729;s:5:"weigh";i:0;s:6:"status";s:6:"normal";}i:21;a:13:{s:2:"id";i:108;s:4:"type";s:4:"file";s:3:"pid";i:107;s:4:"name";s:6:"banner";s:5:"title";s:15:"轮播图管理";s:4:"icon";s:14:"fa fa-circle-o";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1566289432;s:10:"updatetime";i:1566289432;s:5:"weigh";i:0;s:6:"status";s:6:"normal";}i:22;a:13:{s:2:"id";i:109;s:4:"type";s:4:"file";s:3:"pid";i:107;s:4:"name";s:9:"introduce";s:5:"title";s:18:"数板数管介绍";s:4:"icon";s:14:"fa fa-circle-o";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1566289514;s:10:"updatetime";i:1566289514;s:5:"weigh";i:0;s:6:"status";s:6:"normal";}i:23;a:13:{s:2:"id";i:110;s:4:"type";s:4:"file";s:3:"pid";i:107;s:4:"name";s:5:"about";s:5:"title";s:12:"关于我们";s:4:"icon";s:14:"fa fa-circle-o";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1566289544;s:10:"updatetime";i:1566289544;s:5:"weigh";i:0;s:6:"status";s:6:"normal";}}
\ No newline at end of file
a:23:{i:0;a:13:{s:2:"id";i:1;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:9:"dashboard";s:5:"title";s:9:"Dashboard";s:4:"icon";s:15:"fa fa-dashboard";s:9:"condition";s:0:"";s:6:"remark";s:14:"Dashboard tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497429920;s:5:"weigh";i:143;s:6:"status";s:6:"normal";}i:1;a:13:{s:2:"id";i:2;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:7:"general";s:5:"title";s:7:"General";s:4:"icon";s:10:"fa fa-cogs";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430169;s:5:"weigh";i:137;s:6:"status";s:6:"normal";}i:2;a:13:{s:2:"id";i:3;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:8:"category";s:5:"title";s:8:"Category";s:4:"icon";s:10:"fa fa-leaf";s:9:"condition";s:0:"";s:6:"remark";s:13:"Category tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497429920;s:5:"weigh";i:119;s:6:"status";s:6:"normal";}i:3;a:13:{s:2:"id";i:9;s:4:"type";s:4:"file";s:3:"pid";i:5;s:4:"name";s:10:"auth/admin";s:5:"title";s:5:"Admin";s:4:"icon";s:10:"fa fa-user";s:9:"condition";s:0:"";s:6:"remark";s:10:"Admin tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430320;s:5:"weigh";i:118;s:6:"status";s:6:"normal";}i:4;a:13:{s:2:"id";i:10;s:4:"type";s:4:"file";s:3:"pid";i:5;s:4:"name";s:13:"auth/adminlog";s:5:"title";s:9:"Admin log";s:4:"icon";s:14:"fa fa-list-alt";s:9:"condition";s:0:"";s:6:"remark";s:14:"Admin log tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430307;s:5:"weigh";i:113;s:6:"status";s:6:"normal";}i:5;a:13:{s:2:"id";i:11;s:4:"type";s:4:"file";s:3:"pid";i:5;s:4:"name";s:10:"auth/group";s:5:"title";s:5:"Group";s:4:"icon";s:11:"fa fa-group";s:9:"condition";s:0:"";s:6:"remark";s:10:"Group tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497429920;s:5:"weigh";i:109;s:6:"status";s:6:"normal";}i:6;a:13:{s:2:"id";i:12;s:4:"type";s:4:"file";s:3:"pid";i:5;s:4:"name";s:9:"auth/rule";s:5:"title";s:4:"Rule";s:4:"icon";s:10:"fa fa-bars";s:9:"condition";s:0:"";s:6:"remark";s:9:"Rule tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430581;s:5:"weigh";i:104;s:6:"status";s:6:"normal";}i:7;a:13:{s:2:"id";i:5;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:4:"auth";s:5:"title";s:4:"Auth";s:4:"icon";s:11:"fa fa-group";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430092;s:5:"weigh";i:99;s:6:"status";s:6:"normal";}i:8;a:13:{s:2:"id";i:4;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:5:"addon";s:5:"title";s:12:"插件管理";s:4:"icon";s:12:"fa fa-rocket";s:9:"condition";s:0:"";s:6:"remark";s:10:"Addon tips";s:6:"ismenu";i:1;s:10:"createtime";i:1502035509;s:10:"updatetime";i:1565403215;s:5:"weigh";i:98;s:6:"status";s:6:"normal";}i:9;a:13:{s:2:"id";i:66;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:4:"user";s:5:"title";s:12:"会员管理";s:4:"icon";s:10:"fa fa-list";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1516374729;s:10:"updatetime";i:1565403228;s:5:"weigh";i:97;s:6:"status";s:6:"normal";}i:10;a:13:{s:2:"id";i:86;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:7:"command";s:5:"title";s:18:"在线命令管理";s:4:"icon";s:14:"fa fa-terminal";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1565408505;s:10:"updatetime";i:1565408565;s:5:"weigh";i:96;s:6:"status";s:6:"normal";}i:11;a:13:{s:2:"id";i:85;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:8:"customer";s:5:"title";s:12:"客户管理";s:4:"icon";s:10:"fa fa-list";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1565403317;s:10:"updatetime";i:1566282967;s:5:"weigh";i:90;s:6:"status";s:6:"normal";}i:12;a:13:{s:2:"id";i:97;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:9:"equipment";s:5:"title";s:12:"设备管理";s:4:"icon";s:10:"fa fa-list";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1566207989;s:10:"updatetime";i:1566282984;s:5:"weigh";i:85;s:6:"status";s:6:"normal";}i:13;a:13:{s:2:"id";i:6;s:4:"type";s:4:"file";s:3:"pid";i:2;s:4:"name";s:14:"general/config";s:5:"title";s:6:"Config";s:4:"icon";s:9:"fa fa-cog";s:9:"condition";s:0:"";s:6:"remark";s:11:"Config tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430683;s:5:"weigh";i:60;s:6:"status";s:6:"normal";}i:14;a:13:{s:2:"id";i:7;s:4:"type";s:4:"file";s:3:"pid";i:2;s:4:"name";s:18:"general/attachment";s:5:"title";s:10:"Attachment";s:4:"icon";s:18:"fa fa-file-image-o";s:9:"condition";s:0:"";s:6:"remark";s:15:"Attachment tips";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497430699;s:5:"weigh";i:53;s:6:"status";s:6:"normal";}i:15;a:13:{s:2:"id";i:8;s:4:"type";s:4:"file";s:3:"pid";i:2;s:4:"name";s:15:"general/profile";s:5:"title";s:7:"Profile";s:4:"icon";s:10:"fa fa-user";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1497429920;s:10:"updatetime";i:1497429920;s:5:"weigh";i:34;s:6:"status";s:6:"normal";}i:16;a:13:{s:2:"id";i:107;s:4:"type";s:4:"file";s:3:"pid";i:0;s:4:"name";s:7:"setting";s:5:"title";s:12:"文案设置";s:4:"icon";s:10:"fa fa-list";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1566289359;s:10:"updatetime";i:1566289370;s:5:"weigh";i:20;s:6:"status";s:6:"normal";}i:17;a:13:{s:2:"id";i:67;s:4:"type";s:4:"file";s:3:"pid";i:66;s:4:"name";s:9:"user/user";s:5:"title";s:4:"User";s:4:"icon";s:10:"fa fa-user";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1516374729;s:10:"updatetime";i:1516374729;s:5:"weigh";i:0;s:6:"status";s:6:"normal";}i:18;a:13:{s:2:"id";i:73;s:4:"type";s:4:"file";s:3:"pid";i:66;s:4:"name";s:10:"user/group";s:5:"title";s:10:"User group";s:4:"icon";s:11:"fa fa-users";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1516374729;s:10:"updatetime";i:1516374729;s:5:"weigh";i:0;s:6:"status";s:6:"normal";}i:19;a:13:{s:2:"id";i:79;s:4:"type";s:4:"file";s:3:"pid";i:66;s:4:"name";s:9:"user/rule";s:5:"title";s:9:"User rule";s:4:"icon";s:14:"fa fa-circle-o";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1516374729;s:10:"updatetime";i:1516374729;s:5:"weigh";i:0;s:6:"status";s:6:"normal";}i:20;a:13:{s:2:"id";i:108;s:4:"type";s:4:"file";s:3:"pid";i:107;s:4:"name";s:6:"banner";s:5:"title";s:15:"轮播图管理";s:4:"icon";s:14:"fa fa-circle-o";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1566289432;s:10:"updatetime";i:1566289432;s:5:"weigh";i:0;s:6:"status";s:6:"normal";}i:21;a:13:{s:2:"id";i:109;s:4:"type";s:4:"file";s:3:"pid";i:107;s:4:"name";s:9:"introduce";s:5:"title";s:18:"数板数管介绍";s:4:"icon";s:14:"fa fa-circle-o";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1566289514;s:10:"updatetime";i:1566289514;s:5:"weigh";i:0;s:6:"status";s:6:"normal";}i:22;a:13:{s:2:"id";i:110;s:4:"type";s:4:"file";s:3:"pid";i:107;s:4:"name";s:5:"about";s:5:"title";s:12:"关于我们";s:4:"icon";s:14:"fa fa-circle-o";s:9:"condition";s:0:"";s:6:"remark";s:0:"";s:6:"ismenu";i:1;s:10:"createtime";i:1566289544;s:10:"updatetime";i:1566289544;s:5:"weigh";i:0;s:6:"status";s:6:"normal";}}
\ No newline at end of file
... ...
<?php if (!defined('THINK_PATH')) exit(); /*a:4:{s:82:"F:\wamp64\www\project\gangjuren\public/../application/admin\view\customer\add.html";i:1566182806;s:74:"F:\wamp64\www\project\gangjuren\application\admin\view\layout\default.html";i:1562338655;s:71:"F:\wamp64\www\project\gangjuren\application\admin\view\common\meta.html";i:1562338655;s:73:"F:\wamp64\www\project\gangjuren\application\admin\view\common\script.html";i:1562338655;}*/ ?>
<?php if (!defined('THINK_PATH')) exit(); /*a:4:{s:82:"F:\wamp64\www\project\gangjuren\public/../application/admin\view\customer\add.html";i:1566373908;s:74:"F:\wamp64\www\project\gangjuren\application\admin\view\layout\default.html";i:1562338655;s:71:"F:\wamp64\www\project\gangjuren\application\admin\view\common\meta.html";i:1562338655;s:73:"F:\wamp64\www\project\gangjuren\application\admin\view\common\script.html";i:1562338655;}*/ ?>
<!DOCTYPE html>
<html lang="<?php echo $config['language']; ?>">
<head>
... ... @@ -70,27 +70,27 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cer_type'); ?>:</label>
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cer_type'); ?>:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cer_type" class="form-control" name="row[cer_type]" type="text" value="">
<input id="c-cer_type" data-rule="required" class="form-control" name="row[cer_type]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cer_number'); ?>:</label>
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cer_number'); ?>:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cer_number" class="form-control" name="row[cer_number]" type="text" value="">
<input id="c-cer_number" data-rule="required" class="form-control" name="row[cer_number]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cont_name'); ?>:</label>
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cont_name'); ?>:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cont_name" class="form-control" name="row[cont_name]" type="text" value="">
<input id="c-cont_name" data-rule="required" class="form-control" name="row[cont_name]" type="text" value="">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cont_mobile'); ?>:</label>
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cont_mobile'); ?>:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cont_mobile" class="form-control" name="row[cont_mobile]" type="text" value="">
<input id="c-cont_mobile" data-rule="required" class="form-control" name="row[cont_mobile]" type="text" value="">
</div>
</div>
<div class="form-group">
... ...
<?php if (!defined('THINK_PATH')) exit(); /*a:4:{s:84:"F:\wamp64\www\project\gangjuren\public/../application/admin\view\equipment\edit.html";i:1566286729;s:74:"F:\wamp64\www\project\gangjuren\application\admin\view\layout\default.html";i:1562338655;s:71:"F:\wamp64\www\project\gangjuren\application\admin\view\common\meta.html";i:1562338655;s:73:"F:\wamp64\www\project\gangjuren\application\admin\view\common\script.html";i:1562338655;}*/ ?>
<?php if (!defined('THINK_PATH')) exit(); /*a:4:{s:84:"F:\wamp64\www\project\gangjuren\public/../application/admin\view\equipment\edit.html";i:1566369431;s:74:"F:\wamp64\www\project\gangjuren\application\admin\view\layout\default.html";i:1562338655;s:71:"F:\wamp64\www\project\gangjuren\application\admin\view\common\meta.html";i:1562338655;s:73:"F:\wamp64\www\project\gangjuren\application\admin\view\common\script.html";i:1562338655;}*/ ?>
<!DOCTYPE html>
<html lang="<?php echo $config['language']; ?>">
<head>
... ... @@ -52,18 +52,29 @@
<div class="content">
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<?php
if($pid == 0){
?>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Number'); ?>:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-number" data-rule="required" class="form-control" name="row[number]" type="text" value="<?php echo htmlentities($row['number']); ?>">
</div>
</div>
<?php
}
if($pid == 0){
?>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Type'); ?>:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<?php echo build_select('row[type]', $type, $row['type'], ['class'=>'form-control', 'required'=>'']); ?>
</div>
</div>
<?php
}
?>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?php echo __('cus_name'); ?>:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
... ... @@ -76,6 +87,9 @@
?>
</div>
</div>
<?php
if($pid == 0){
?>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Start_time'); ?>:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
... ... @@ -88,10 +102,24 @@
<input id="c-end_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[end_time]" type="text" value="<?php echo $row['end_time']?datetime($row['end_time']):''; ?>">
</div>
</div>
<?php
}
?>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Mark'); ?>:</label>
<div class="col-xs-12 col-sm-8">
<?php
if($pid == 0){
?>
<input id="c-mark" class="form-control" name="row[mark]" type="text" value="<?php echo htmlentities($row['mark']); ?>">
<?php
}else{
?>
<input id="c-mark1" class="form-control" name="row[mark1]" type="text" value="<?php echo htmlentities($row['mark1']); ?>">
<?php
}
?>
</div>
</div>
<div class="form-group layer-footer">
... ...
<?php if (!defined('THINK_PATH')) exit(); /*a:4:{s:83:"F:\wamp64\www\project\gangjuren\public/../application/admin\view\customer\edit.html";i:1566200456;s:74:"F:\wamp64\www\project\gangjuren\application\admin\view\layout\default.html";i:1562338655;s:71:"F:\wamp64\www\project\gangjuren\application\admin\view\common\meta.html";i:1562338655;s:73:"F:\wamp64\www\project\gangjuren\application\admin\view\common\script.html";i:1562338655;}*/ ?>
<?php if (!defined('THINK_PATH')) exit(); /*a:4:{s:83:"F:\wamp64\www\project\gangjuren\public/../application/admin\view\customer\edit.html";i:1566374291;s:74:"F:\wamp64\www\project\gangjuren\application\admin\view\layout\default.html";i:1562338655;s:71:"F:\wamp64\www\project\gangjuren\application\admin\view\common\meta.html";i:1562338655;s:73:"F:\wamp64\www\project\gangjuren\application\admin\view\common\script.html";i:1562338655;}*/ ?>
<!DOCTYPE html>
<html lang="<?php echo $config['language']; ?>">
<head>
... ... @@ -65,27 +65,27 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cer_type'); ?>:</label>
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cer_type'); ?>:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cer_type" class="form-control" name="row[cer_type]" type="text" value="<?php echo htmlentities($row['cer_type']); ?>">
<input id="c-cer_type" data-rule="required" class="form-control" name="row[cer_type]" type="text" value="<?php echo htmlentities($row['cer_type']); ?>">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cer_number'); ?>:</label>
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cer_number'); ?>:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cer_number" class="form-control" name="row[cer_number]" type="text" value="<?php echo htmlentities($row['cer_number']); ?>">
<input id="c-cer_number" data-rule="required" class="form-control" name="row[cer_number]" type="text" value="<?php echo htmlentities($row['cer_number']); ?>">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cont_name'); ?>:</label>
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cont_name'); ?>:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cont_name" class="form-control" name="row[cont_name]" type="text" value="<?php echo htmlentities($row['cont_name']); ?>">
<input id="c-cont_name" data-rule="required" class="form-control" name="row[cont_name]" type="text" value="<?php echo htmlentities($row['cont_name']); ?>">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cont_mobile'); ?>:</label>
<label class="control-label col-xs-12 col-sm-2"><?php echo __('Cont_mobile'); ?>:<span style="color:red;">*</span></label>
<div class="col-xs-12 col-sm-8">
<input id="c-cont_mobile" class="form-control" name="row[cont_mobile]" type="text" value="<?php echo htmlentities($row['cont_mobile']); ?>">
<input id="c-cont_mobile" data-rule="required" class="form-control" name="row[cont_mobile]" type="text" value="<?php echo htmlentities($row['cont_mobile']); ?>">
</div>
</div>
<div class="form-group">
... ...
<?php if (!defined('THINK_PATH')) exit(); /*a:4:{s:86:"F:\wamp64\www\project\gangjuren\public/../application/admin\view\auth\group\index.html";i:1566282756;s:74:"F:\wamp64\www\project\gangjuren\application\admin\view\layout\default.html";i:1562338655;s:71:"F:\wamp64\www\project\gangjuren\application\admin\view\common\meta.html";i:1562338655;s:73:"F:\wamp64\www\project\gangjuren\application\admin\view\common\script.html";i:1562338655;}*/ ?>
<?php if (!defined('THINK_PATH')) exit(); /*a:4:{s:86:"F:\wamp64\www\project\gangjuren\public/../application/admin\view\auth\group\index.html";i:1566365912;s:74:"F:\wamp64\www\project\gangjuren\application\admin\view\layout\default.html";i:1562338655;s:71:"F:\wamp64\www\project\gangjuren\application\admin\view\common\meta.html";i:1562338655;s:73:"F:\wamp64\www\project\gangjuren\application\admin\view\common\script.html";i:1562338655;}*/ ?>
<!DOCTYPE html>
<html lang="<?php echo $config['language']; ?>">
<head>
... ...