Commit 31a30cac93ed5d22c2de59977e1d05ece5a3338e
Exists in
master
Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/workspace.xml
Showing
1 changed file
with
28 additions
and
25 deletions
Show diff stats
.idea/workspace.xml
| 1 | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | 2 | <project version="4"> |
| 3 | 3 | <component name="ChangeListManager"> |
| 4 | - <list default="true" id="f4d76337-a637-4291-b959-8932bd0801ee" name="Default" comment=""> | |
| 4 | + <list default="true" id="f4d76337-a637-4291-b959-8932bd0801ee" name="Default" comment="app-wx(v0.1.0 build 2) F 修改文件名称home 改为user"> | |
| 5 | 5 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> |
| 6 | 6 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> |
| 7 | 7 | </list> |
| ... | ... | @@ -56,11 +56,21 @@ |
| 56 | 56 | </provider> |
| 57 | 57 | </entry> |
| 58 | 58 | </file> |
| 59 | - <file leaf-file-name="params.php" pinned="false" current-in-tab="true"> | |
| 59 | + <file leaf-file-name="params.php" pinned="false" current-in-tab="false"> | |
| 60 | 60 | <entry file="file://$PROJECT_DIR$/app-wx/config/params.php"> |
| 61 | 61 | <provider selected="true" editor-type-id="text-editor"> |
| 62 | - <state vertical-scroll-proportion="0.12073863"> | |
| 63 | - <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> | |
| 62 | + <state vertical-scroll-proportion="-1.9615384"> | |
| 63 | + <caret line="3" column="47" selection-start-line="3" selection-start-column="47" selection-end-line="3" selection-end-column="47" /> | |
| 64 | + <folding /> | |
| 65 | + </state> | |
| 66 | + </provider> | |
| 67 | + </entry> | |
| 68 | + </file> | |
| 69 | + <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true"> | |
| 70 | + <entry file="file://$PROJECT_DIR$/.gitignore"> | |
| 71 | + <provider selected="true" editor-type-id="text-editor"> | |
| 72 | + <state vertical-scroll-proportion="0.0"> | |
| 73 | + <caret line="0" column="5" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="5" /> | |
| 64 | 74 | <folding /> |
| 65 | 75 | </state> |
| 66 | 76 | </provider> |
| ... | ... | @@ -121,7 +131,6 @@ |
| 121 | 131 | <component name="Git.Settings"> |
| 122 | 132 | <option name="UPDATE_TYPE" value="MERGE" /> |
| 123 | 133 | <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> |
| 124 | - <option name="RESET_MODE" value="MIXED" /> | |
| 125 | 134 | </component> |
| 126 | 135 | <component name="IdeDocumentHistory"> |
| 127 | 136 | <option name="CHANGED_PATHS"> |
| ... | ... | @@ -190,8 +199,8 @@ |
| 190 | 199 | </component> |
| 191 | 200 | <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> |
| 192 | 201 | <component name="ProjectFrameBounds"> |
| 193 | - <option name="x" value="383" /> | |
| 194 | - <option name="y" value="195" /> | |
| 202 | + <option name="x" value="439" /> | |
| 203 | + <option name="y" value="461" /> | |
| 195 | 204 | <option name="width" value="1879" /> |
| 196 | 205 | <option name="height" value="1184" /> |
| 197 | 206 | </component> |
| ... | ... | @@ -433,18 +442,12 @@ |
| 433 | 442 | <option name="project" value="LOCAL" /> |
| 434 | 443 | <updated>1577435735367</updated> |
| 435 | 444 | </task> |
| 436 | - <task id="LOCAL-00019" summary="app-wx(v0.1.0 build 2) F 修改文件名称home 改为user"> | |
| 437 | - <created>1577435744215</created> | |
| 438 | - <option name="number" value="00019" /> | |
| 439 | - <option name="project" value="LOCAL" /> | |
| 440 | - <updated>1577435744215</updated> | |
| 441 | - </task> | |
| 442 | - <option name="localTasksCounter" value="20" /> | |
| 445 | + <option name="localTasksCounter" value="19" /> | |
| 443 | 446 | <servers /> |
| 444 | 447 | </component> |
| 445 | 448 | <component name="ToolWindowManager"> |
| 446 | - <frame x="383" y="195" width="1879" height="1184" extended-state="0" /> | |
| 447 | - <editor active="false" /> | |
| 449 | + <frame x="439" y="461" width="1879" height="1184" extended-state="0" /> | |
| 450 | + <editor active="true" /> | |
| 448 | 451 | <layout> |
| 449 | 452 | <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24278715" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
| 450 | 453 | <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" /> |
| ... | ... | @@ -452,7 +455,7 @@ |
| 452 | 455 | <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.15509468" sideWeight="0.5332666" order="7" side_tool="true" content_ui="tabs" /> |
| 453 | 456 | <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> |
| 454 | 457 | <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.16381909" sideWeight="0.49574786" order="1" side_tool="false" content_ui="tabs" /> |
| 455 | - <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30586082" sideWeight="0.48224112" order="7" side_tool="false" content_ui="tabs" /> | |
| 458 | + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.30586082" sideWeight="0.48224112" order="7" side_tool="false" content_ui="tabs" /> | |
| 456 | 459 | <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
| 457 | 460 | <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.10989011" sideWeight="0.46673337" order="7" side_tool="false" content_ui="tabs" /> |
| 458 | 461 | <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> |
| ... | ... | @@ -480,6 +483,7 @@ |
| 480 | 483 | <component name="VcsManagerConfiguration"> |
| 481 | 484 | <MESSAGE value="首次提交" /> |
| 482 | 485 | <MESSAGE value="app-wx F 重新提交文件" /> |
| 486 | + <MESSAGE value="app-wx(v0.1.0 build 2) F 修改文件名称home 改为user" /> | |
| 483 | 487 | <MESSAGE value="1. 调整环境配置文件名称 2. 提交入口文件" /> |
| 484 | 488 | <MESSAGE value="app-ht(v0.0.1 build 1) 1. F 清除无关配置信息" /> |
| 485 | 489 | <MESSAGE value="app-wx(v0.1.0 build 3) A 添加注册登录页面的前端逻辑" /> |
| ... | ... | @@ -494,8 +498,7 @@ |
| 494 | 498 | <MESSAGE value="app-wx(v0.1.0 build 11) 1. F 调整维修厂登录和注册的User 类 2. A 注册登录集成 发短信码 3. F 提交维修单界面，录入车型改为查找筛选. 非必填字段调整 4. A 完成维修订单那里默认价格0 去除了" /> |
| 495 | 499 | <MESSAGE value="app-wx(v0.1.0 build 12) 1. F 短链接跳转功能" /> |
| 496 | 500 | <MESSAGE value="过滤苹果电脑不上传的文件" /> |
| 497 | - <MESSAGE value="app-wx(v0.1.0 build 2) F 修改文件名称home 改为user" /> | |
| 498 | - <option name="LAST_COMMIT_MESSAGE" value="app-wx(v0.1.0 build 2) F 修改文件名称home 改为user" /> | |
| 501 | + <option name="LAST_COMMIT_MESSAGE" value="过滤苹果电脑不上传的文件" /> | |
| 499 | 502 | </component> |
| 500 | 503 | <component name="XDebuggerManager"> |
| 501 | 504 | <breakpoint-manager> |
| ... | ... | @@ -909,18 +912,18 @@ |
| 909 | 912 | </state> |
| 910 | 913 | </provider> |
| 911 | 914 | </entry> |
| 912 | - <entry file="file://$PROJECT_DIR$/.gitignore"> | |
| 915 | + <entry file="file://$PROJECT_DIR$/app-wx/config/params.php"> | |
| 913 | 916 | <provider selected="true" editor-type-id="text-editor"> |
| 914 | - <state vertical-scroll-proportion="0.0"> | |
| 915 | - <caret line="0" column="5" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="5" /> | |
| 917 | + <state vertical-scroll-proportion="-1.9615384"> | |
| 918 | + <caret line="3" column="47" selection-start-line="3" selection-start-column="47" selection-end-line="3" selection-end-column="47" /> | |
| 916 | 919 | <folding /> |
| 917 | 920 | </state> |
| 918 | 921 | </provider> |
| 919 | 922 | </entry> |
| 920 | - <entry file="file://$PROJECT_DIR$/app-wx/config/params.php"> | |
| 923 | + <entry file="file://$PROJECT_DIR$/.gitignore"> | |
| 921 | 924 | <provider selected="true" editor-type-id="text-editor"> |
| 922 | - <state vertical-scroll-proportion="0.12073863"> | |
| 923 | - <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" /> | |
| 925 | + <state vertical-scroll-proportion="0.0"> | |
| 926 | + <caret line="0" column="5" selection-start-line="0" selection-start-column="5" selection-end-line="0" selection-end-column="5" /> | |
| 924 | 927 | <folding /> |
| 925 | 928 | </state> |
| 926 | 929 | </provider> | ... | ... |