王晓刚 / adverh5 · 提交

转到一个项目

作者 王晓刚
提交 25983a00361dd772064d6bc7c6de6b6e12d0a63c 1 个父辈 00c3eff9

小修改

内嵌 并排对比
正在显示 6 个修改的文件 包含 233 行增加 和 109 行删除
... ... @@ -2,30 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="3bd62d6a-e12b-4534-8418-e8a5d7424d73" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/home/view/index/index.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/home/view/index/login.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/css/index.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/css/login.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/css/public.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/10.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/2.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/3.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/4.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/5.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/6.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/7.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/8.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/9.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/bg1.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/bg2.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/img/image.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/js/base.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/js/jquery.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/adverh5/js/public.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/goods/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/goods/add.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/goods/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/goods/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/view/index/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/index/login.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/js/backend/goods.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/goods.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -34,16 +16,16 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="ComposerSettings" synchronizationState="SYNCHRONIZE">
<component name="ComposerSettings" doNotAsk="true" synchronizationState="SYNCHRONIZE">
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Index.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="31" column="5" lean-forward="true" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
<caret line="31" column="33" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
<folding>
<element signature="e#128#163#0#PHP" expanded="true" />
</folding>
... ... @@ -51,11 +33,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="config.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/config.php">
<file leaf-file-name="helper.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="477">
<caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" />
<state relative-caret-position="289">
<caret line="279" column="13" selection-start-line="279" selection-start-column="13" selection-end-line="279" selection-end-column="13" />
</state>
</provider>
</entry>
... ... @@ -63,17 +45,8 @@
<file leaf-file-name="login.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="487">
<caret line="75" column="32" selection-start-line="75" selection-start-column="32" selection-end-line="75" selection-end-column="32" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="public.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/js/public.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
<state relative-caret-position="470">
<caret line="74" column="116" selection-start-line="74" selection-start-column="116" selection-end-line="74" selection-end-column="116" />
</state>
</provider>
</entry>
... ... @@ -90,7 +63,7 @@
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2210">
<state relative-caret-position="810">
<caret line="130" column="52" selection-start-line="130" selection-start-column="52" selection-end-line="130" selection-end-column="52" />
<folding>
<element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -99,15 +72,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="679">
<caret line="116" column="22" selection-start-line="116" selection-start-column="22" selection-end-line="116" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -139,8 +103,6 @@
<option value="$PROJECT_DIR$/public/assets/adverh5/css/public.css" />
<option value="$PROJECT_DIR$/application/admin/view/password/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/password.js" />
<option value="$PROJECT_DIR$/public/assets/js/backend/goods.js" />
<option value="$PROJECT_DIR$/application/admin/view/goods/index.html" />
<option value="$PROJECT_DIR$/application/admin/view/dashboard/index.html" />
<option value="$PROJECT_DIR$/application/admin/view/index/login.html" />
<option value="$PROJECT_DIR$/application/admin/view/index/index.html" />
... ... @@ -149,11 +111,15 @@
<option value="$PROJECT_DIR$/application/extra/site.php" />
<option value="$PROJECT_DIR$/public/assets/adverh5/js/public.js" />
<option value="$PROJECT_DIR$/public/assets/adverh5/css/login.css" />
<option value="$PROJECT_DIR$/application/home/view/index/login.html" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
<option value="$PROJECT_DIR$/public/assets/adverh5/css/index.css" />
<option value="$PROJECT_DIR$/application/config.php" />
<option value="$PROJECT_DIR$/application/admin/view/goods/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/goods/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/goods/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/goods.js" />
<option value="$PROJECT_DIR$/application/home/view/index/login.html" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
</list>
</option>
</component>
... ... @@ -242,6 +208,41 @@
<item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="validate" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="goods" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="extra" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -270,6 +271,21 @@
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="adverh5" type="b2602c69:ProjectViewProjectNode" />
<item name="adverh5" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
<item name="backend" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
... ... @@ -322,38 +338,39 @@
<option name="presentableId" value="Default" />
<updated>1571368480027</updated>
<workItem from="1571368481262" duration="23015000" />
<workItem from="1571618159935" duration="2519000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="23015000" />
<option name="totallyTimeSpent" value="25534000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14818764" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="调试" />
<window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
<window_info anchor="bottom" id="运行" />
<window_info anchor="bottom" id="Terminal" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
<window_info anchor="bottom" id="Docker" show_stripe_button="false" />
<window_info anchor="right" id="Database" />
<window_info anchor="bottom" id="调试" order="7" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" side_tool="true" />
<window_info anchor="bottom" id="找到" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info anchor="bottom" id="运行" order="7" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="找到" order="7" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
... ... @@ -363,6 +380,61 @@
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="31" column="5" lean-forward="true" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
<folding>
<element signature="e#128#163#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="935">
<caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1275">
<caret line="75" column="32" selection-start-line="75" selection-start-column="32" selection-end-line="75" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/js/public.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="6" column="1" selection-start-line="6" selection-start-column="1" selection-end-line="6" selection-end-column="1" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="19" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2210">
<caret line="130" column="52" selection-start-line="130" selection-start-column="52" selection-end-line="130" selection-end-column="52" />
<folding>
<element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1972">
<caret line="116" column="22" selection-start-line="116" selection-start-column="22" selection-end-line="116" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -413,20 +485,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/goods/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="20" column="33" selection-start-line="14" selection-start-column="24" selection-end-line="20" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/goods.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="21" column="36" selection-start-line="21" selection-start-column="36" selection-end-line="21" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/password.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
... ... @@ -486,13 +544,6 @@
<entry file="file://$PROJECT_DIR$/application/admin/config.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="271">
<caret line="186" column="13" selection-start-line="186" selection-start-column="8" selection-end-line="186" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/site.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
... ... @@ -509,14 +560,28 @@
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="679">
<state relative-caret-position="1972">
<caret line="116" column="22" selection-start-line="116" selection-start-column="22" selection-end-line="116" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="19" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="935">
<caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2210">
<state relative-caret-position="810">
<caret line="130" column="52" selection-start-line="130" selection-start-column="52" selection-end-line="130" selection-end-column="52" />
<folding>
<element signature="n#style#0;n#div#5;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -524,31 +589,69 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/adverh5/css/login.css">
<entry file="file://$PROJECT_DIR$/application/admin/validate/Goods.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="17" column="4" selection-start-line="17" selection-start-column="4" selection-end-line="19" selection-end-column="24" />
<state relative-caret-position="1337">
<caret line="489" column="44" lean-forward="true" selection-start-line="489" selection-start-column="44" selection-end-line="489" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/config.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/goods/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="477">
<caret line="63" column="38" selection-start-line="63" selection-start-column="38" selection-end-line="63" selection-end-column="38" />
<state relative-caret-position="187">
<caret line="11" column="95" selection-start-line="11" selection-start-column="95" selection-end-line="11" selection-end-column="95" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/goods/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="33" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/goods.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
<caret line="8" column="44" lean-forward="true" selection-start-line="8" selection-start-column="44" selection-end-line="8" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/goods/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="10" column="67" lean-forward="true" selection-start-line="10" selection-start-column="67" selection-end-line="10" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="22" column="24" selection-start-line="22" selection-start-column="24" selection-end-line="22" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="279" column="13" selection-start-line="279" selection-start-column="13" selection-end-line="279" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/index/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="487">
<caret line="75" column="32" selection-start-line="75" selection-start-column="32" selection-end-line="75" selection-end-column="32" />
<state relative-caret-position="470">
<caret line="74" column="116" selection-start-line="74" selection-start-column="116" selection-end-line="74" selection-end-column="116" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="31" column="5" lean-forward="true" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
<caret line="31" column="33" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
<folding>
<element signature="e#128#163#0#PHP" expanded="true" />
</folding>
... ...
... ... @@ -7,6 +7,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-password" data-rule="required" class="form-control" name="row[password]" type="text">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Starttime')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-starttime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[starttime]" type="text" value="{:date('Y-m-d H:i:s')}">
... ...
... ... @@ -7,6 +7,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Password')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-password" data-rule="required" class="form-control" name="row[password]" type="text" value="{$row.password|htmlentities}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Starttime')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-starttime" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[starttime]" type="text" value="{:$row.starttime?datetime($row.starttime):''}">
... ...
... ... @@ -23,18 +23,26 @@ class Index extends Controller
if(empty($param['password'])){
$this->error('404');
}
$password = Db::name('password')->where(['id'=>1])->value('password');
/*$password = Db::name('password')->where(['id'=>1])->value('password');
if($param['password'] != $password){
$this->error('密码错误');
}*/
$data = Db::name('goods')->where(['password'=>$param['password']])->order('id desc')->find();
if(empty($data)){
$this->error('密码错误');
}
session('status',1);
$this->success('SUCCESS');
session("status_$data[id]",1);
$this->success('SUCCESS','',$data);
}
public function index(){
if(empty(session('status'))){
$goods_id = $this->request->param('goods_id',0,'intval');
if(empty($goods_id)){
$this->error('404');
}
if(empty(session("status_$goods_id"))){
$this->redirect('login');
}
$data = Db::name('goods')->where(['id'=>1])->find();
$data = Db::name('goods')->where(['id'=>$goods_id])->find();
$data = collection($data)->toArray();
$images = explode(',',$data['images']);
foreach($images as $key => $i){
... ...
... ... @@ -72,7 +72,7 @@
if(res.code == 1){
toast('登陆成功');
setTimeout(function(){
window.location.href = "{:url('home/index/index')}";
window.location.href = "{:url('home/index/index','',false,true)}/goods_id/"+res.data.id;
},2500);
}else{
toast(res.msg);
... ...
... ... @@ -28,6 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{checkbox: true},
{field: 'id', title: __('Id')},
{field: 'title', title: __('Title')},
{field: 'password', title: __('密码')},
{field: 'starttime', title: __('Starttime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'endtime', title: __('Endtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'images', title: __('Images'), events: Table.api.events.image, formatter: Table.api.formatter.images},
... ...