郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 64293bac7d19f1821066d78d4b0cb25aba9791cc 1 个父辈 616fd657
1 个管道 的构建 通过 耗费 7 秒

修改

内嵌 并排对比
正在显示 10 个修改的文件 包含 321 行增加 和 236 行删除
... ... @@ -2,9 +2,16 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/simpleboot3/index/user/login.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" afterPath="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/config.php" afterPath="$PROJECT_DIR$/app/config.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/index/controller/UserController.php" afterPath="$PROJECT_DIR$/app/index/controller/UserController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -26,30 +33,32 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/index/controller/UserController.php">
<file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/admin/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="19" selection-end-column="5" />
<folding>
<element signature="e#130#170#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="311">
<caret line="32" column="9" lean-forward="false" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<file leaf-file-name="config.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="44" column="40" lean-forward="true" selection-start-line="44" selection-start-column="40" selection-end-line="44" selection-end-column="40" />
<folding>
<element signature="e#391#495#0#PHP" expanded="false" />
<element signature="e#514#722#0#PHP" expanded="false" />
<element signature="e#1707#1907#0#PHP" expanded="false" />
<element signature="e#1925#2321#0#PHP" expanded="false" />
<element signature="e#2339#2727#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="585">
<caret line="232" column="43" lean-forward="true" selection-start-line="232" selection-start-column="43" selection-end-line="232" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="975">
<caret line="39" column="42" lean-forward="false" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
... ... @@ -69,14 +78,11 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/edit.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SeverController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/HomeController.php" />
<option value="$USER_HOME$/Desktop/Index.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/FeeController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/app/index/model/RecycletypeModel.php" />
<option value="$PROJECT_DIR$/app/index/model/RecyclegoodsModel.php" />
<option value="$PROJECT_DIR$/app/index/model/NorecyclegoodsModel.php" />
... ... @@ -109,17 +115,20 @@
<option value="$PROJECT_DIR$/data/conf/database.php" />
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
<option value="$PROJECT_DIR$/app/admin/controller/AboutController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
<option value="$PROJECT_DIR$/app/config.php" />
<option value="$PROJECT_DIR$/public/static/style/base.css" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/index/user/index.html" />
<option value="$PROJECT_DIR$/app/user/controller/IndexController.php" />
<option value="$PROJECT_DIR$/app/index/controller/RecycleController.php" />
<option value="$PROJECT_DIR$/app/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/index/user/login.html" />
<option value="$PROJECT_DIR$/app/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html" />
<option value="$PROJECT_DIR$/app/admin/controller/ProjectController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html" />
<option value="$PROJECT_DIR$/app/admin/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html" />
<option value="$PROJECT_DIR$/app/config.php" />
</list>
</option>
</component>
... ... @@ -138,10 +147,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="299" />
<option name="y" value="71" />
<option name="x" value="265" />
<option name="y" value="38" />
<option name="width" value="1678" />
<option name="height" value="1086" />
<option name="height" value="1097" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -158,7 +167,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -171,29 +179,17 @@
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/lawyer" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/competition" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
... ... @@ -254,18 +250,19 @@
<workItem from="1573448892997" duration="1343000" />
<workItem from="1573450754427" duration="9613000" />
<workItem from="1573463816109" duration="4867000" />
<workItem from="1573517804403" duration="14189000" />
<workItem from="1573517804403" duration="18784000" />
<workItem from="1573542205740" duration="500000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="198032000" />
<option name="totallyTimeSpent" value="203127000" />
</component>
<component name="ToolWindowManager">
<frame x="299" y="71" width="1678" height="1086" extended-state="1" />
<frame x="265" y="38" width="1678" height="1097" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19592088" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19839308" 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.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
... ... @@ -311,79 +308,15 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="5" />
<option name="time" value="6" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3212">
<caret line="13" column="6" lean-forward="false" selection-start-line="13" selection-start-column="6" selection-end-line="13" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="107" column="21" lean-forward="false" selection-start-line="107" selection-start-column="21" selection-end-line="107" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="20" column="7" lean-forward="false" selection-start-line="20" selection-start-column="7" selection-end-line="20" selection-end-column="7" />
<folding>
<element signature="e#602#906#0#PHP" expanded="false" />
<element signature="e#911#1805#0#PHP" expanded="false" />
<element signature="e#1811#2278#0#PHP" expanded="false" />
<element signature="e#2283#5971#0#PHP" expanded="false" />
<element signature="e#5977#6278#0#PHP" expanded="false" />
<element signature="e#6283#7591#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/admin/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1275">
<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$/app/portal/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1350">
<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$/app/portal/controller/PageController.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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/controller/TagController.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" />
<folding />
</state>
</provider>
</entry>
... ... @@ -391,7 +324,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -399,7 +331,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-562">
<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>
... ... @@ -407,7 +338,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -415,7 +345,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="354" column="19" lean-forward="true" selection-start-line="354" selection-start-column="19" selection-end-line="354" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
... ... @@ -423,7 +352,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -431,53 +359,14 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="32" column="42" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="62" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="14" column="32" lean-forward="false" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="122" column="5" lean-forward="false" selection-start-line="122" selection-start-column="5" selection-end-line="122" selection-end-column="5" />
<folding>
<element signature="e#131#170#0#PHP" expanded="false" />
<element signature="e#275#1168#0#PHP" expanded="false" />
<element signature="e#1185#2077#0#PHP" expanded="false" />
<element signature="e#2098#3253#0#PHP" expanded="false" />
<element signature="e#3274#3743#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
<caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-75">
<caret line="12" column="62" lean-forward="true" selection-start-line="12" selection-start-column="62" selection-end-line="12" selection-end-column="62" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
<entry file="file://$PROJECT_DIR$/api/home/controller/IndexController.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" />
<folding />
</state>
</provider>
</entry>
... ... @@ -485,7 +374,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-675">
<caret line="17" column="6" lean-forward="false" selection-start-line="17" selection-start-column="6" selection-end-line="17" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
... ... @@ -493,7 +381,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -501,7 +388,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-150">
<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>
... ... @@ -509,7 +395,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-476">
<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>
... ... @@ -517,7 +402,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -525,7 +409,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -533,7 +416,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1401">
<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>
... ... @@ -541,7 +423,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3000">
<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>
... ... @@ -549,7 +430,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-951">
<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>
... ... @@ -557,7 +437,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -565,7 +444,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2925">
<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>
... ... @@ -573,11 +451,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="22" column="27" lean-forward="true" selection-start-line="22" selection-start-column="27" selection-end-line="22" selection-end-column="27" />
<folding>
<element signature="e#1318#3631#0#PHP" expanded="false" />
<element signature="e#3665#3754#0#PHP" expanded="false" />
<element signature="e#3790#5900#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -585,7 +458,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-225">
<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>
... ... @@ -593,7 +465,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-226">
<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>
... ... @@ -601,7 +472,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2250">
<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>
... ... @@ -609,7 +479,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1875">
<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>
... ... @@ -617,7 +486,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-840">
<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>
... ... @@ -625,7 +493,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -633,7 +500,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -641,7 +507,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -649,7 +514,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-900">
<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>
... ... @@ -657,7 +521,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="15" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="137" selection-end-column="7" />
<folding />
</state>
</provider>
</entry>
... ... @@ -665,7 +528,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
... ... @@ -673,7 +535,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="18" column="19" lean-forward="true" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
... ... @@ -689,7 +550,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="21" column="41" lean-forward="true" selection-start-line="21" selection-start-column="41" selection-end-line="21" selection-end-column="41" />
<folding />
</state>
</provider>
</entry>
... ... @@ -697,7 +557,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="332">
<caret line="72" column="1" lean-forward="true" selection-start-line="72" selection-start-column="1" selection-end-line="72" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
... ... @@ -705,7 +564,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="17" column="1" lean-forward="true" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
... ... @@ -713,19 +571,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="20" column="22" lean-forward="true" selection-start-line="20" selection-start-column="22" selection-end-line="20" selection-end-column="22" />
<folding>
<element signature="e#813#1918#0#PHP" expanded="false" />
<element signature="e#1924#2026#0#PHP" expanded="false" />
<element signature="e#2031#3227#0#PHP" expanded="false" />
<element signature="e#3233#3328#0#PHP" expanded="false" />
<element signature="e#3333#4931#0#PHP" expanded="false" />
<element signature="e#4937#4966#0#PHP" expanded="false" />
<element signature="e#4971#5333#0#PHP" expanded="false" />
<element signature="e#5339#5375#0#PHP" expanded="false" />
<element signature="e#5380#5584#0#PHP" expanded="false" />
<element signature="e#5590#5612#0#PHP" expanded="false" />
<element signature="e#5617#5749#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -733,33 +578,100 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3000">
<caret line="18" column="6" lean-forward="false" selection-start-line="18" selection-start-column="6" selection-end-line="18" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="26" column="12" lean-forward="true" selection-start-line="26" selection-start-column="12" selection-end-line="26" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/garbageCollect/register.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="16" column="28" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="149" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="19" selection-end-column="5" />
<folding>
<element signature="e#130#170#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="325">
<caret line="22" column="45" lean-forward="true" selection-start-line="22" selection-start-column="45" selection-end-line="22" selection-end-column="45" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/user/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="44" column="40" lean-forward="true" selection-start-line="44" selection-start-column="40" selection-end-line="44" selection-end-column="40" />
<state relative-caret-position="474">
<caret line="53" column="44" lean-forward="false" selection-start-line="53" selection-start-column="44" selection-end-line="53" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1090">
<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$/app/admin/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-375">
<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$/public/themes/admin_simpleboot3/admin/project/detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1050">
<caret line="45" column="16" lean-forward="true" selection-start-line="45" selection-start-column="16" selection-end-line="45" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/addlist.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="259">
<caret line="34" column="17" lean-forward="true" selection-start-line="34" selection-start-column="17" selection-end-line="34" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="485">
<caret line="118" column="32" lean-forward="true" selection-start-line="118" selection-start-column="32" selection-end-line="118" selection-end-column="32" />
<folding>
<element signature="e#391#495#0#PHP" expanded="false" />
<element signature="e#514#722#0#PHP" expanded="false" />
<element signature="e#1707#1907#0#PHP" expanded="false" />
<element signature="e#1925#2321#0#PHP" expanded="false" />
<element signature="e#2339#2727#0#PHP" expanded="false" />
<element signature="e#275#1168#0#PHP" expanded="false" />
<element signature="e#1185#2077#0#PHP" expanded="false" />
<element signature="e#2098#3379#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/subscribe/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="975">
<caret line="39" column="42" lean-forward="false" selection-start-line="39" selection-start-column="42" selection-end-line="39" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="311">
<caret line="32" column="9" lean-forward="false" selection-start-line="32" selection-start-column="9" selection-end-line="32" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="585">
<caret line="232" column="43" lean-forward="true" selection-start-line="232" selection-start-column="43" selection-end-line="232" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -80,23 +80,26 @@ class ProjectController extends AdminBaseController
//加入我们信息列表
public function addlist()
{
$where['delete_time'] = ['eq',0];
$where['a.delete_time'] = ['eq',0];
$param = $this->request->param();
$startTime = empty($param['start_time']) ? '' : strtotime($param['start_time']);
$endTime = empty($param['end_time']) ? '' : (strtotime($param['end_time']));
if (!empty($startTime) && !empty($endTime)) {
$where['create_time'] = [['>= time', $startTime], ['<= time', $endTime]];
$where['a.create_time'] = [['>= time', $startTime], ['<= time', $endTime]];
} else {
if (!empty($startTime)) {
$where['create_time'] = ['>= time', $startTime];
$where['a.create_time'] = ['>= time', $startTime];
}
if (!empty($endTime)) {
$where['create_time'] = ['<= time', $endTime];
$where['a.create_time'] = ['<= time', $endTime];
}
}
$data = Db::name('join')
->alias('a')
->join('user b','a.user_id = b.id')
->field('a.*,b.user_nickname')
->where($where)
->order('id desc')
->order('a.id desc')
->paginate(10);
$list=$data->items();
$this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
... ... @@ -114,6 +117,9 @@ class ProjectController extends AdminBaseController
$param = $this->request->param();
$id = $this->request->param('id', 1, 'intval');
$data = Db::name('join')
->alias('a')
->join('user b','a.user_id = b.id')
->field('a.*,b.user_nickname')
->where('id',$id)
->find();
$this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');
... ...
... ... @@ -34,7 +34,8 @@ class SubscribeController extends AdminBaseController
$data = Db::name('subscribe')
->alias('r')
->join('recycle t','r.recycle_id = t.id')
->field('r.*,t.*')
->join('user u','r.user_id = u.id')
->field('r.*,t.*,u.user_nickname')
->where($where)
->order('r.id desc')
->paginate(10);
... ...
... ... @@ -234,7 +234,7 @@ $configs = [
'cmf_admin_default_theme' => 'admin_simpleboot3',
//公众号配置
'app_id'=>'wx46239f7a46865161',
'app_secret'=>'f1bf05366ba86a619cf9da0a166cebd2',
'app_id'=>'wxc6ef42cbfc3497cf',
'app_secret'=>'752789aeeb5b72a97e733c79d060e1d4',
];
return array_merge($configs, $runtimeConfig,$wechatConfig);
\ No newline at end of file
... ...
... ... @@ -43,7 +43,6 @@ class ShopgoodsController extends WeChatBaseController
$data['type'] = $this->index();
$data['photo'] = $this->photo();
$this->assign('data',$data);
print_r($data);die;
return $this->fetch();
}else{
$shopGoodsModel = new ShopgoodsModel();
... ... @@ -53,7 +52,6 @@ class ShopgoodsController extends WeChatBaseController
$data['type'] = $this->index();
$data['photo'] = $this->photo();
$this->assign('data',$data);
print_r($data);die;
return $this->fetch();
}
}
... ...
... ... @@ -21,9 +21,22 @@ class UserController extends WeChatBaseController
public function index()
{
$user_id = cmf_get_current_user_id();
$data = Db::name('user')->where(['id'=>$user_id])->find();
$data = Db::name('integral')
->where('user_id',$user_id)
->find()
->toArray();
if(empty($data)){
return $this->fetch();
}else{
$this->assign('data',$data);
return $this->fetch();
}
}
$this->assign('data',$data);
//注册（绑定手机号）
public function login()
{
return $this->fetch();
}
}
\ No newline at end of file
... ...
... ... @@ -26,6 +26,7 @@
<thead>
<tr>
<th>ID</th>
<th>昵称</th>
<th>姓名</th>
<th>电话</th>
<th>邮箱</th>
... ... @@ -37,6 +38,7 @@
<foreach name="data" item="vo">
<tr>
<td>{$vo.id}</td>
<td>{$vo.user_nickname}</td>
<td>{$vo.name}</td>
<td>{$vo.phone}</td>
<td>{$vo.email}</td>
... ...
... ... @@ -22,28 +22,31 @@
<tr>
<th width="100">姓名</th>
<td>
<input class="form-control" type="text" name="name"
id="name" value="{$data.name}" placeholder="请输入分类名称"/>
{$data.name}
</td>
</tr>
<tr>
<th width="100">昵称</th>
<td>
{$data.user_nickname}
</td>
</tr>
<tr>
<th width="100">电话</th>
<td>
<input class="form-control" type="text" name="phone"
id="phone" value="{$data.phone}" placeholder="请输入联系方式"/>
{$data.phone}
</td>
</tr>
<tr>
<th width="100">邮箱</th>
<td>
<input class="form-control" type="text" name="email"
id="email" value="{$data.email}" placeholder="请输入邮箱"/>
{$data.email}
</td>
</tr>
<tr>
<th width="100">加盟信息</th>
<td>
<script type="text/plain" id="content" name="content">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.content))}</script>
<script type="text/plain">{:cmf_replace_content_file_url(htmlspecialchars_decode($data.content))}</script>
</td>
</tr>
</table>
... ...
... ... @@ -37,7 +37,7 @@
<foreach name="data" item="vo">
<tr>
<td>{$vo.id}</td>
<td>下单人</td>
<td>{$vo.user_nickname}</td>
<td>{$vo.num}</td>
<td>{:date('Y-m-d H:i:s',$vo.sub_time)}</td>
<if condition=" $vo.status eq 0 ">
... ...
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta name="viewport" content="maximum-scale=1.0, minimum-scale=1.0, user-scalable=0, initial-scale=1.0, width=device-width" />
<meta name="format-detection" content="telephone=no, email=no, date=no, address=no" />
<title>注册</title>
<meta name="description" content="" />
<meta name="keywords" content="" />
<link rel="stylesheet" href="./style/base.css">
<link rel="stylesheet" href="./style/common.css">
<script src="./js/base.js"></script>
<style>
body {
background: #fff
}
</style>
</head>
<body>
<!-- 吐司 -->
<div class="toast">
<div class="toast_title">1234</div>
</div>
<!-- 顶部 -->
<div class="register_top">
<div class="register_img"></div>
</div>
<div class="register_box">
<div class="register_contant">
<div class="register_title">登录</div>
<div class="register_one layer_star register_one_padding">
<div class="register_one_left layer_star">
<div class="register_one_icon">
<img src="./image/sun_46.png" alt="">
</div>
<div class="register_one_title">
手机号
</div>
</div>
<div class="register_one_right">
<input type="text" placeholder="请输入手机号码" id="phone" maxlength="11">
</div>
</div>
<div class="register_one layer_star">
<div class="register_one_padding layer_star">
<div class="register_one_left layer_star">
<div class="register_one_icon">
<img src="./image/sun_47.png" alt="">
</div>
<div class="register_one_title">
密&nbsp;&nbsp;&nbsp;码
</div>
</div>
<div class="register_one_right">
<input type="text" placeholder="请输入密码" id="password">
</div>
</div>
<div class="register_one_code" onclick="codeButton()" id="code">发送验证码</div>
</div>
<div class="register_btn">确认注册</div>
<div class="register_word">
注册即表示你已阅读并同意<a href="">《XX协议》</a>
</div>
</div>
</div>
<script src="js/jquery.js"></script>
<script type="text/javascript">
// 验证码
function codeButton() {
var phone = $("#phone").val();
var toast;
if (phone == "") {
toast = "手机号不能为空";
$(".toast").show();
$(".toast_title").text(toast)
setTimeout(function() {
hide()
}, 1500)
} else if (!(/^1[3456789]\d{9}$/.test(phone))) {
toast = "请输入正确的手机号码";
$(".toast").show();
$(".toast_title").text(toast)
setTimeout(function() {
hide()
}, 1500)
} else {
var code = $("#code");
code.attr("disabled", "disabled");
setTimeout(function() {
code.css("opacity", "0.8");
}, 1000);
var time = 60;
var set = setInterval(function() {
code.text("" + --time + "s");
}, 1000);
setTimeout(function() {
code.attr("disabled", false).text("重新获取");
clearInterval(set);
}, 60000);
}
};
// 确认注册
$(".register_btn").click(function() {
var phone = $("#phone").val();
var password = $("#password").val();
var toast;
if (phone == "") {
toast = "手机号不能为空";
$(".toast").show();
$(".toast_title").text(toast)
setTimeout(function() {
hide()
}, 1500)
} else if (!(/^1[3456789]\d{9}$/.test(phone))) {
toast = "请输入正确的手机号码";
$(".toast").show();
$(".toast_title").text(toast)
setTimeout(function() {
hide()
}, 1500)
} else if (password == '') {
toast = "密码不能为空";
$(".toast").show();
$(".toast_title").text(toast)
setTimeout(function() {
hide()
}, 1500)
} else if (password != '1234') {
toast = "密码不正确";
$(".toast").show();
$(".toast_title").text(toast)
setTimeout(function() {
hide()
}, 1500)
} else {
console.log("注册成功")
}
})
function hide() {
$(".toast").hide()
}
</script>
</body>
</html>
\ No newline at end of file
... ...