郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 072fd5300d2bf528e6549a9cd07ecaa8c4344530 1 个父辈 e94408b1
1 个管道 的构建 通过 耗费 5 秒

个人中心

内嵌 并排对比
正在显示 4 个修改的文件 包含 403 行增加 和 201 行删除
... ... @@ -2,7 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/user/controller/IndexController.php" afterPath="$PROJECT_DIR$/app/user/controller/IndexController.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/index/controller/UserController.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/themes/simpleboot3/index/user/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" afterPath="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -24,29 +27,17 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="ShopgoodsController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="48" column="11" lean-forward="true" selection-start-line="48" selection-start-column="11" selection-end-line="48" selection-end-column="11" />
<folding>
<element signature="e#361#615#0#PHP" expanded="false" />
<element signature="e#632#1322#0#PHP" expanded="false" />
<element signature="e#1340#1586#0#PHP" expanded="false" />
<element signature="e#1604#2000#0#PHP" expanded="false" />
<element signature="e#2018#2406#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="true">
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="48" column="39" lean-forward="false" selection-start-line="48" selection-start-column="39" selection-end-line="48" selection-end-column="39" />
<state relative-caret-position="350">
<caret line="96" column="71" lean-forward="false" selection-start-line="96" selection-start-column="71" selection-end-line="96" selection-end-column="71" />
<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" />
... ... @@ -58,6 +49,26 @@
</provider>
</entry>
</file>
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="17" column="30" lean-forward="false" selection-start-line="17" selection-start-column="30" selection-end-line="17" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/user/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2749">
<caret line="127" column="14" lean-forward="true" selection-start-line="127" selection-start-column="14" selection-end-line="127" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -73,8 +84,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/index.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/sever/add.html" />
<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" />
... ... @@ -104,7 +113,6 @@
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html" />
<option value="$PROJECT_DIR$/app/index/model/ShopgoodsModel.php" />
<option value="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/app/index/controller/DoorController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html" />
... ... @@ -124,6 +132,9 @@
<option value="$PROJECT_DIR$/public/static/style/base.css" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
<option value="$PROJECT_DIR$/app/user/controller/IndexController.php" />
<option value="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/index/user/index.html" />
<option value="$PROJECT_DIR$/app/index/controller/UserController.php" />
</list>
</option>
</component>
... ... @@ -141,9 +152,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="218" />
<option name="y" value="54" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="192" />
<option name="y" value="87" />
<option name="width" value="1678" />
<option name="height" value="1086" />
</component>
... ... @@ -173,6 +184,24 @@
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<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>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
... ... @@ -196,6 +225,15 @@
<item name="simpleboot3" 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="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -205,7 +243,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../decor/decor" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../project/lawyer" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
</component>
<component name="RecentsManager">
... ... @@ -266,15 +304,15 @@
<workItem from="1573448892997" duration="1343000" />
<workItem from="1573450754427" duration="9613000" />
<workItem from="1573463816109" duration="4867000" />
<workItem from="1573517804403" duration="6518000" />
<workItem from="1573517804403" duration="10398000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="190361000" />
<option name="totallyTimeSpent" value="194241000" />
</component>
<component name="ToolWindowManager">
<frame x="218" y="54" width="1678" height="1086" extended-state="0" />
<frame x="192" y="87" width="1678" height="1086" 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" />
... ... @@ -323,104 +361,88 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="3" />
<option name="time" value="4" />
</breakpoint-manager>
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
<caret line="43" column="36" lean-forward="false" selection-start-line="43" selection-start-column="36" selection-end-line="43" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="43" column="16" lean-forward="false" selection-start-line="43" selection-start-column="16" selection-end-line="50" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/point/edit.html">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="55" column="53" lean-forward="false" selection-start-line="55" selection-start-column="53" selection-end-line="55" selection-end-column="53" />
<state relative-caret-position="275">
<caret line="20" column="78" lean-forward="true" selection-start-line="20" selection-start-column="78" selection-end-line="20" selection-end-column="78" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/PointController.php">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/rtype/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="73" column="5" lean-forward="true" selection-start-line="73" selection-start-column="5" selection-end-line="73" selection-end-column="5" />
<folding>
<element signature="e#131#170#0#PHP" expanded="false" />
<element signature="e#262#867#0#PHP" expanded="false" />
<element signature="e#882#2069#0#PHP" expanded="false" />
<element signature="e#2084#3731#0#PHP" expanded="false" />
<element signature="e#3746#4212#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="400">
<caret line="37" column="11" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/index.html">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/about/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="47" column="32" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="129" selection-end-column="0" />
<state relative-caret-position="538">
<caret line="52" column="20" lean-forward="false" selection-start-line="52" selection-start-column="20" selection-end-line="57" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/select.html">
<entry file="file://$PROJECT_DIR$/app/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="761">
<caret line="48" column="18" lean-forward="false" selection-start-line="48" selection-start-column="18" selection-end-line="48" selection-end-column="18" />
<state relative-caret-position="738">
<caret line="234" column="0" lean-forward="true" selection-start-line="234" selection-start-column="0" selection-end-line="234" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/library/think/Config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="29" lean-forward="false" selection-start-line="8" selection-start-column="29" selection-end-line="8" selection-end-column="29" />
<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$/data/conf/database.php">
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="12" column="10" lean-forward="true" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
<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$/app/admin/controller/AboutController.php">
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="370">
<caret line="25" column="32" lean-forward="true" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
<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#131#170#0#PHP" expanded="false" />
<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$/app/admin/controller/RgoodsController.php">
<entry file="file://$PROJECT_DIR$/api/admin/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="97">
<caret line="17" column="27" lean-forward="false" selection-start-line="17" selection-start-column="27" selection-end-line="17" selection-end-column="27" />
<folding>
<element signature="e#263#998#0#PHP" expanded="false" />
</folding>
<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/admin/controller/RecycleController.php">
<entry file="file://$PROJECT_DIR$/app/portal/controller/PayController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<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/admin/controller/RtypeController.php">
<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" />
... ... @@ -428,7 +450,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/HomeController.php">
<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" />
... ... @@ -436,7 +458,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/HomePicController.php">
<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" />
... ... @@ -444,112 +466,120 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/ShoporderController.php">
<entry file="file://$PROJECT_DIR$/app/portal/controller/SearchController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="41" column="8" lean-forward="false" selection-start-line="41" selection-start-column="8" selection-end-line="42" selection-end-column="87" />
<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/themes/admin_simpleboot3/admin/shopgoods/index.html">
<entry file="file://$PROJECT_DIR$/app/portal/api/CategoryApi.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="8" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="61" selection-end-column="7" />
<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>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html">
<entry file="file://$PROJECT_DIR$/public/static/swiper3/swiper.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1131">
<caret line="59" column="21" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="181" selection-end-column="0" />
<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/themes/admin_simpleboot3/admin/shoporder/index.html">
<entry file="file://$PROJECT_DIR$/public/static/style/base.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="29" column="28" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="70" selection-end-column="7" />
<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>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/fee/index.html">
<entry file="file://$USER_HOME$/Desktop/garbageCollect/Shoporder.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="20" column="78" lean-forward="true" selection-start-line="20" selection-start-column="78" selection-end-line="20" selection-end-column="78" />
<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/themes/admin_simpleboot3/admin/rtype/edit.html">
<entry file="file://$USER_HOME$/Desktop/garbageCollect/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="37" column="11" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="71" selection-end-column="0" />
<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/about/index.html">
<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="538">
<caret line="52" column="20" lean-forward="false" selection-start-line="52" selection-start-column="20" selection-end-line="57" selection-end-column="25" />
<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/config.php">
<entry file="file://$PROJECT_DIR$/app/admin/controller/ProjectController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="738">
<caret line="234" column="0" lean-forward="true" selection-start-line="234" selection-start-column="0" selection-end-line="234" selection-end-column="0" />
<folding />
<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$/simplewind/thinkphp/library/think/Config.php">
<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="-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" />
<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$/simplewind/thinkphp/helper.php">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html">
<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" />
<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$/api/wxapp/controller/PublicController.php">
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.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" />
<state relative-caret-position="99">
<caret line="27" column="0" lean-forward="true" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
<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" />
<element signature="e#1708#2104#0#PHP" expanded="false" />
<element signature="e#2122#2510#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/admin/controller/PublicController.php">
<entry file="file://$PROJECT_DIR$/api/home/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1275">
<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/PayController.php">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.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" />
<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>
<entry file="file://$PROJECT_DIR$/app/portal/controller/PageController.php">
<entry file="file://$PROJECT_DIR$/app/extra/wechat.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" />
... ... @@ -557,9 +587,9 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
<entry file="file://$PROJECT_DIR$/app/install/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<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>
... ... @@ -567,13 +597,13 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/controller/WechatController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-237">
<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>
<entry file="file://$PROJECT_DIR$/app/portal/controller/TagController.php">
<entry file="file://$PROJECT_DIR$/app/user/validate/UserArticlesValidate.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" />
... ... @@ -581,7 +611,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/controller/SearchController.php">
<entry file="file://$PROJECT_DIR$/app/user/validate/FavoriteValidate.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" />
... ... @@ -589,15 +619,15 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/api/CategoryApi.php">
<entry file="file://$PROJECT_DIR$/app/user/controller/VerificationCodeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-562">
<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>
<entry file="file://$PROJECT_DIR$/app/install/controller/IndexController.php">
<entry file="file://$PROJECT_DIR$/app/user/controller/UeditorController.php">
<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" />
... ... @@ -605,152 +635,148 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/AdminAssetController.php">
<entry file="file://$PROJECT_DIR$/app/user/controller/TestController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-675">
<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/user/controller/AdminIndexController.php">
<entry file="file://$PROJECT_DIR$/app/user/controller/RegisterController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1575">
<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>
<entry file="file://$PROJECT_DIR$/app/user/controller/AdminOauthController.php">
<entry file="file://$PROJECT_DIR$/app/user/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-750">
<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/user/controller/AdminUserActionController.php">
<entry file="file://$PROJECT_DIR$/app/user/controller/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1500">
<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>
<entry file="file://$PROJECT_DIR$/app/user/controller/AssetController.php">
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.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 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>
<entry file="file://$PROJECT_DIR$/app/user/controller/FavoriteController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-187">
<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>
<entry file="file://$PROJECT_DIR$/public/static/swiper3/swiper.min.js">
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<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>
<entry file="file://$PROJECT_DIR$/public/static/style/base.css">
<entry file="file://$PROJECT_DIR$/app/user/controller/AssetController.php">
<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" />
<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>
<entry file="file://$USER_HOME$/Desktop/garbageCollect/Shoporder.html">
<entry file="file://$PROJECT_DIR$/app/user/controller/AdminUserActionController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<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>
<entry file="file://$USER_HOME$/Desktop/garbageCollect/index.html">
<entry file="file://$PROJECT_DIR$/app/user/controller/AdminOauthController.php">
<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" />
<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>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/project/detail.html">
<entry file="file://$PROJECT_DIR$/app/user/controller/AdminIndexController.php">
<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" />
<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/admin/controller/ProjectController.php">
<entry file="file://$PROJECT_DIR$/app/user/controller/AdminAssetController.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="true" />
<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 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/themes/admin_simpleboot3/admin/project/addlist.html">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/webuploader2.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" />
<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/user/controller/CommentController.php">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/webuploader.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<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>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html">
<entry file="file://$USER_HOME$/Desktop/garbageCollect/mine.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" />
<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>
<entry file="file://$PROJECT_DIR$/app/index/controller/ShopgoodsController.php">
<entry file="file://$PROJECT_DIR$/app/admin/validate/UserValidate.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="48" column="11" lean-forward="true" selection-start-line="48" selection-start-column="11" selection-end-line="48" selection-end-column="11" />
<folding>
<element signature="e#361#615#0#PHP" expanded="false" />
<element signature="e#632#1322#0#PHP" expanded="false" />
<element signature="e#1340#1586#0#PHP" expanded="false" />
<element signature="e#1604#2000#0#PHP" expanded="false" />
<element signature="e#2018#2406#0#PHP" expanded="false" />
</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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="48" column="39" lean-forward="false" selection-start-line="48" selection-start-column="39" selection-end-line="48" selection-end-column="39" />
<state relative-caret-position="350">
<caret line="96" column="71" lean-forward="false" selection-start-line="96" selection-start-column="71" selection-end-line="96" selection-end-column="71" />
<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" />
... ... @@ -761,5 +787,21 @@
</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="300">
<caret line="17" column="30" lean-forward="false" selection-start-line="17" selection-start-column="30" selection-end-line="17" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/index/user/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2749">
<caret line="127" column="14" lean-forward="true" selection-start-line="127" selection-start-column="14" selection-end-line="127" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -23,8 +23,7 @@ class ShopgoodsController extends HomeBaseController
$where['delete_time'] = ['eq',0];
$shopTypeModel = new ShoptypeModel();
$data = $shopTypeModel->selectData($where)->toArray();
$this->assign('data',$data);
return $this->fetch();
return $data;
}
//商品类表
... ... @@ -33,14 +32,18 @@ class ShopgoodsController extends HomeBaseController
if(empty($shoptype_id)){
$shopGoodsModel = new ShopgoodsModel();
$where['delete_time'] = ['eq',0];
$data = $shopGoodsModel->selectData($where)->toArray();
$data['goods'] = $shopGoodsModel->selectData($where)->toArray();
$data['type'] = $this->index();
$data['photo'] = $this->photo();
$this->assign('data',$data);
return $this->fetch();
}else{
$shopGoodsModel = new ShopgoodsModel();
$where['delete_time'] = ['eq',0];
$where['shoptype_id'] = ['eq',$shoptype_id];
$data = $shopGoodsModel->selectData($where)->toArray();
$data['goods'] = $shopGoodsModel->selectData($where)->toArray();
$data['type'] = $this->index();
$data['photo'] = $this->photo();
$this->assign('data',$data);
return $this->fetch();
}
... ... @@ -51,8 +54,7 @@ class ShopgoodsController extends HomeBaseController
$where['delete_time'] = ['eq',0];
$shopPicModel = new ShoppicModel();
$data = $shopPicModel->selectData($where)->toArray();
$this->assign('data',$data);
return $this->fetch();
return $data;
}
//商城搜索页
... ...
<?php
/**
* Created by PhpStorm.
* User: Administrator
* Date: 2019/11/12
* Time: 11:24
*/
namespace app\index\controller;
use cmf\controller\HomeBaseController;
class UserController extends HomeBaseController
{
public function index()
{
return $this->fetch();
}
}
\ No newline at end of file
... ...
<!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="__STATIC__/style/base.css">
<link rel="stylesheet" href="__STATIC__/style/common.css">
<script src="__STATIC__/js/base.js"></script>
</head>
<body>
<!-- 吐司 -->
<div class="toast">
<div class="toast_title">1234</div>
</div>
<div class="mine_top">
<div class="mine_infor layer_star">
<div class="mine_infor_img">
<img src="__STATIC__/image/微信图片_20190925170523.png" alt="">
</div>
<div class="mine_infor_title" id="login">登录/注册</div>
</div>
<div class="mine_num layer_between">
<div class="mine_num_one flex_center">
<div class="mine_num_number">21</div>
<div class="mine_num_word">当前积分</div>
</div>
<div class="mine_num_one flex_center">
<div class="mine_num_number">57</div>
<div class="mine_num_word">参与次数</div>
</div>
<div class="mine_num_one flex_center">
<div class="mine_num_number">36</div>
<div class="mine_num_word">累计积分</div>
</div>
</div>
<div class="mine_card layer_between">
<div class="mine_card_one flex_center">
<div class="mine_card_img">
<img src="__STATIC__/image/sun_33.png" alt="">
</div>
<div class="mine_card_title">我要充值</div>
</div>
<div class="mine_card_one flex_center">
<div class="mine_card_img">
<img src="__STATIC__/image/sun_34.png" alt="">
</div>
<div class="mine_card_title">我要提现</div>
</div>
<div class="mine_card_one flex_center">
<div class="mine_card_img">
<img src="__STATIC__/image/sun_35.png" alt="">
</div>
<div class="mine_card_title">积分明细</div>
</div>
</div>
</div>
<div class="mine_list">
<div class="mine_list_one layer_between">
<div class="mine_list_left layer_star">
<div class="mine_list_img">
<img src="__STATIC__/image/sun_40.png" alt="">
</div>
<div class="mine_list_title">回收订单</div>
</div>
<div class="mine_list_right">
<div class="mine_list_icon">
<img src="__STATIC__/image/righthui.png" alt="">
</div>
</div>
</div>
<div class="mine_list_one layer_between">
<div class="mine_list_left layer_star">
<div class="mine_list_img">
<img src="__STATIC__/image/sun_41.png" alt="">
</div>
<div class="mine_list_title">商城订单</div>
</div>
<div class="mine_list_right">
<div class="mine_list_icon">
<img src="__STATIC__/image/righthui.png" alt="">
</div>
</div>
</div>
<div class="mine_list_one layer_between">
<div class="mine_list_left layer_star">
<div class="mine_list_img">
<img src="__STATIC__/image/sun_42.png" alt="">
</div>
<div class="mine_list_title">家政订单</div>
</div>
<div class="mine_list_right">
<div class="mine_list_icon">
<img src="__STATIC__/image/righthui.png" alt="">
</div>
</div>
</div>
<div class="mine_list_one layer_between">
<div class="mine_list_left layer_star">
<div class="mine_list_img">
<img src="__STATIC__/image/sun_43.png" alt="">
</div>
<div class="mine_list_title">有奖分享</div>
</div>
<div class="mine_list_right">
<div class="mine_list_icon">
<img src="__STATIC__/image/righthui.png" alt="">
</div>
</div>
</div>
<div class="mine_list_one layer_between">
<div class="mine_list_left layer_star">
<div class="mine_list_img">
<img src="__STATIC__/image/sun_44.png" alt="">
</div>
<div class="mine_list_title">订单处理</div>
</div>
<div class="mine_list_right">
<div class="mine_list_icon">
<img src="__STATIC__/image/righthui.png" alt="">
</div>
</div>
</div>
</div>
<script src="__STATIC__/js/jquery.js"></script>
<script type="text/javascript">
function hide() {
$(".toast").hide()
};
// 登录
</script>
</body>
\ No newline at end of file
... ...