郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 6c1af8070bf1642bc94c4faccc07d9cb0c7890f3 1 个父辈 81721e88
1 个管道 的构建 通过 耗费 1 秒

修改问价

内嵌 并排对比
正在显示 1 个修改的文件 包含 24 行增加 和 24 行删除
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment=""> 4 <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
5 - <change type="DELETED" beforePath="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" afterPath="" />  
6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/user/controller/IndexController.php" afterPath="$PROJECT_DIR$/app/user/controller/IndexController.php" />
7 </list> 7 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -44,16 +44,16 @@ @@ -44,16 +44,16 @@
44 <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="true"> 44 <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="true">
45 <entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php"> 45 <entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php">
46 <provider selected="true" editor-type-id="text-editor"> 46 <provider selected="true" editor-type-id="text-editor">
47 - <state relative-caret-position="200">  
48 - <caret line="47" column="37" lean-forward="true" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" /> 47 + <state relative-caret-position="250">
  48 + <caret line="49" column="12" lean-forward="false" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" />
49 <folding> 49 <folding>
50 - <element signature="e#1924#2026#0#PHP" expanded="false" />  
51 - <element signature="e#4937#4966#0#PHP" expanded="false" />  
52 - <element signature="e#4971#5333#0#PHP" expanded="false" />  
53 - <element signature="e#5339#5375#0#PHP" expanded="false" />  
54 - <element signature="e#5380#5584#0#PHP" expanded="false" />  
55 - <element signature="e#5590#5612#0#PHP" expanded="false" />  
56 - <element signature="e#5617#5749#0#PHP" expanded="false" /> 50 + <element signature="e#1937#2039#0#PHP" expanded="false" />
  51 + <element signature="e#4950#4979#0#PHP" expanded="false" />
  52 + <element signature="e#4984#5346#0#PHP" expanded="false" />
  53 + <element signature="e#5352#5388#0#PHP" expanded="false" />
  54 + <element signature="e#5393#5597#0#PHP" expanded="false" />
  55 + <element signature="e#5603#5625#0#PHP" expanded="false" />
  56 + <element signature="e#5630#5762#0#PHP" expanded="false" />
57 </folding> 57 </folding>
58 </state> 58 </state>
59 </provider> 59 </provider>
@@ -104,7 +104,6 @@ @@ -104,7 +104,6 @@
104 <option value="$PROJECT_DIR$/app/index/model/ShoppicModel.php" /> 104 <option value="$PROJECT_DIR$/app/index/model/ShoppicModel.php" />
105 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html" /> 105 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/edit.html" />
106 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html" /> 106 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/shopgoods/add.html" />
107 - <option value="$PROJECT_DIR$/app/user/controller/IndexController.php" />  
108 <option value="$PROJECT_DIR$/app/index/model/ShopgoodsModel.php" /> 107 <option value="$PROJECT_DIR$/app/index/model/ShopgoodsModel.php" />
109 <option value="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" /> 108 <option value="$PROJECT_DIR$/app/index/controller/ShopgoodsController.php" />
110 <option value="$PROJECT_DIR$/app/index/controller/DoorController.php" /> 109 <option value="$PROJECT_DIR$/app/index/controller/DoorController.php" />
@@ -125,6 +124,7 @@ @@ -125,6 +124,7 @@
125 <option value="$PROJECT_DIR$/app/config.php" /> 124 <option value="$PROJECT_DIR$/app/config.php" />
126 <option value="$PROJECT_DIR$/public/static/style/base.css" /> 125 <option value="$PROJECT_DIR$/public/static/style/base.css" />
127 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" /> 126 <option value="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
  127 + <option value="$PROJECT_DIR$/app/user/controller/IndexController.php" />
128 </list> 128 </list>
129 </option> 129 </option>
130 </component> 130 </component>
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
142 <sorting>DEFINITION_ORDER</sorting> 142 <sorting>DEFINITION_ORDER</sorting>
143 </component> 143 </component>
144 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> 144 <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
145 - <component name="ProjectFrameBounds" extendedState="1"> 145 + <component name="ProjectFrameBounds">
146 <option name="x" value="218" /> 146 <option name="x" value="218" />
147 <option name="y" value="54" /> 147 <option name="y" value="54" />
148 <option name="width" value="1678" /> 148 <option name="width" value="1678" />
@@ -267,15 +267,15 @@ @@ -267,15 +267,15 @@
267 <workItem from="1573448892997" duration="1343000" /> 267 <workItem from="1573448892997" duration="1343000" />
268 <workItem from="1573450754427" duration="9613000" /> 268 <workItem from="1573450754427" duration="9613000" />
269 <workItem from="1573463816109" duration="4867000" /> 269 <workItem from="1573463816109" duration="4867000" />
270 - <workItem from="1573517804403" duration="5906000" /> 270 + <workItem from="1573517804403" duration="6344000" />
271 </task> 271 </task>
272 <servers /> 272 <servers />
273 </component> 273 </component>
274 <component name="TimeTrackingManager"> 274 <component name="TimeTrackingManager">
275 - <option name="totallyTimeSpent" value="189749000" /> 275 + <option name="totallyTimeSpent" value="190187000" />
276 </component> 276 </component>
277 <component name="ToolWindowManager"> 277 <component name="ToolWindowManager">
278 - <frame x="218" y="54" width="1678" height="1086" extended-state="1" /> 278 + <frame x="218" y="54" width="1678" height="1086" extended-state="0" />
279 <editor active="true" /> 279 <editor active="true" />
280 <layout> 280 <layout>
281 <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" /> 281 <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" />
@@ -748,16 +748,16 @@ @@ -748,16 +748,16 @@
748 </entry> 748 </entry>
749 <entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php"> 749 <entry file="file://$PROJECT_DIR$/app/user/controller/IndexController.php">
750 <provider selected="true" editor-type-id="text-editor"> 750 <provider selected="true" editor-type-id="text-editor">
751 - <state relative-caret-position="200">  
752 - <caret line="47" column="37" lean-forward="true" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" /> 751 + <state relative-caret-position="250">
  752 + <caret line="49" column="12" lean-forward="false" selection-start-line="49" selection-start-column="12" selection-end-line="49" selection-end-column="12" />
753 <folding> 753 <folding>
754 - <element signature="e#1924#2026#0#PHP" expanded="false" />  
755 - <element signature="e#4937#4966#0#PHP" expanded="false" />  
756 - <element signature="e#4971#5333#0#PHP" expanded="false" />  
757 - <element signature="e#5339#5375#0#PHP" expanded="false" />  
758 - <element signature="e#5380#5584#0#PHP" expanded="false" />  
759 - <element signature="e#5590#5612#0#PHP" expanded="false" />  
760 - <element signature="e#5617#5749#0#PHP" expanded="false" /> 754 + <element signature="e#1937#2039#0#PHP" expanded="false" />
  755 + <element signature="e#4950#4979#0#PHP" expanded="false" />
  756 + <element signature="e#4984#5346#0#PHP" expanded="false" />
  757 + <element signature="e#5352#5388#0#PHP" expanded="false" />
  758 + <element signature="e#5393#5597#0#PHP" expanded="false" />
  759 + <element signature="e#5603#5625#0#PHP" expanded="false" />
  760 + <element signature="e#5630#5762#0#PHP" expanded="false" />
761 </folding> 761 </folding>
762 </state> 762 </state>
763 </provider> 763 </provider>