|
@@ -2,16 +2,21 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="5ae07691-f935-424c-bcfb-2ecce8956daa" name="Default Changelist" comment="">
|
|
<list default="true" id="5ae07691-f935-424c-bcfb-2ecce8956daa" name="Default Changelist" comment="">
|
|
- <change afterPath="$PROJECT_DIR$/image/icon_ordernum@2x.png" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/image/icon_shop@2x.png" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/views/商城/订单详情.html" afterDir="false" />
|
|
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/image/btn_addpic@2x.png" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/image/icon_bad_def@2x.png" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/image/icon_bad_pre@2x.png" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/image/icon_delpic@2x.png" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/image/icon_good_def@2x.png" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/image/icon_normal_def@2x.png" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/image/icon_normal_pre@2x.png" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/image/icon_star_def@2x.png" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/image/icon_star_pre@2x.png" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/image/好评@2x.png" afterDir="false" />
|
|
|
|
+ <change afterPath="$PROJECT_DIR$/views/商城/弹框.html" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/css/css.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/css.css" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/css/css.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/css.css" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/css/css.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/css/css.css.map" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/css/css.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/css/css.css.map" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/css/css.less" beforeDir="false" afterPath="$PROJECT_DIR$/css/css.less" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/css/css.less" beforeDir="false" afterPath="$PROJECT_DIR$/css/css.less" afterDir="false" />
|
|
- <change beforePath="$PROJECT_DIR$/css/shop.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/shop.css" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/css/shop.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/css/shop.css.map" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/css/shop.less" beforeDir="false" afterPath="$PROJECT_DIR$/css/shop.less" afterDir="false" />
|
|
|
|
</list>
|
|
</list>
|
|
<ignored path="$PROJECT_DIR$/.tmp/" />
|
|
<ignored path="$PROJECT_DIR$/.tmp/" />
|
|
<ignored path="$PROJECT_DIR$/temp/" />
|
|
<ignored path="$PROJECT_DIR$/temp/" />
|
|
@@ -25,81 +30,68 @@
|
|
<component name="FileEditorManager">
|
|
<component name="FileEditorManager">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/css/css.css">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/css/css.less">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="208">
|
|
|
|
- <caret line="207" column="16" lean-forward="true" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="16" />
|
|
|
|
|
|
+ <state relative-caret-position="151">
|
|
|
|
+ <caret line="386" column="19" lean-forward="true" selection-start-line="386" selection-start-column="19" selection-end-line="386" selection-end-column="19" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/css/css.less">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="227">
|
|
|
|
- <caret line="252" column="1" lean-forward="true" selection-start-line="252" selection-start-column="1" selection-end-line="252" selection-end-column="1" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/icon_delpic@2x.png">
|
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/image/icon_ordernum@2x.png">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/icon_good_def@2x.png">
|
|
<provider selected="true" editor-type-id="images" />
|
|
<provider selected="true" editor-type-id="images" />
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/css/project.less">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="1235">
|
|
|
|
- <caret line="65" column="7" lean-forward="true" selection-start-line="65" selection-start-column="7" selection-end-line="65" selection-end-column="7" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/icon_normal_def@2x.png">
|
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/css/shop.css">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="199">
|
|
|
|
- <caret line="74" column="22" lean-forward="true" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="22" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/icon_normal_pre@2x.png">
|
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/css/shop.less">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/views/商城/商品列表.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="208">
|
|
|
|
- <caret line="120" column="12" lean-forward="true" selection-start-line="120" selection-start-column="12" selection-end-line="120" selection-end-column="12" />
|
|
|
|
|
|
+ <state relative-caret-position="258">
|
|
|
|
+ <caret line="199" column="71" lean-forward="true" selection-start-line="199" selection-start-column="71" selection-end-line="199" selection-end-column="71" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
|
|
|
|
+ </folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
- <entry file="file://$PROJECT_DIR$/css/style.less">
|
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
|
- <state relative-caret-position="266">
|
|
|
|
- <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
|
|
|
|
- </state>
|
|
|
|
- </provider>
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/好评@2x.png">
|
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
|
- <entry file="file://$PROJECT_DIR$/views/商城/商品列表.html">
|
|
|
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/views/商城/弹框.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="180">
|
|
|
|
- <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-end-line="196" />
|
|
|
|
|
|
+ <state relative-caret-position="239">
|
|
|
|
+ <caret line="23" column="52" lean-forward="true" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
|
|
|
|
|
|
+ <element signature="n#style#0;n#textarea#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
</file>
|
|
</file>
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/views/商城/订单详情.html">
|
|
<entry file="file://$PROJECT_DIR$/views/商城/订单详情.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="299">
|
|
|
|
- <caret line="84" column="16" lean-forward="true" selection-start-line="84" selection-start-column="16" selection-end-line="84" selection-end-column="16" />
|
|
|
|
|
|
+ <state relative-caret-position="532">
|
|
|
|
+ <caret line="85" column="24" lean-forward="true" selection-start-line="85" selection-start-column="24" selection-end-line="85" selection-end-column="24" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
|
|
<element signature="n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
|
|
</folding>
|
|
</folding>
|
|
@@ -110,8 +102,8 @@
|
|
<file pinned="false" current-in-tab="false">
|
|
<file pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/views/商城/购物车.html">
|
|
<entry file="file://$PROJECT_DIR$/views/商城/购物车.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="223">
|
|
|
|
- <caret line="220" column="12" lean-forward="true" selection-start-line="211" selection-start-column="5" selection-end-line="220" selection-end-column="12" />
|
|
|
|
|
|
+ <state relative-caret-position="287">
|
|
|
|
+ <caret line="231" column="42" selection-start-line="231" selection-start-column="15" selection-end-line="231" selection-end-column="42" />
|
|
<folding>
|
|
<folding>
|
|
<element signature="n#tr#0;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
|
|
<element signature="n#tr#0;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
|
|
</folding>
|
|
</folding>
|
|
@@ -130,7 +122,6 @@
|
|
</component>
|
|
</component>
|
|
<component name="FindInProjectRecents">
|
|
<component name="FindInProjectRecents">
|
|
<findStrings>
|
|
<findStrings>
|
|
- <find>13</find>
|
|
|
|
<find>shop-container-search</find>
|
|
<find>shop-container-search</find>
|
|
<find>shop-container-filter-item</find>
|
|
<find>shop-container-filter-item</find>
|
|
<find>wrapper</find>
|
|
<find>wrapper</find>
|
|
@@ -160,6 +151,7 @@
|
|
<find>right-oper</find>
|
|
<find>right-oper</find>
|
|
<find>table-operation2</find>
|
|
<find>table-operation2</find>
|
|
<find>table</find>
|
|
<find>table</find>
|
|
|
|
+ <find>dialog-form-item</find>
|
|
</findStrings>
|
|
</findStrings>
|
|
<replaceStrings>
|
|
<replaceStrings>
|
|
<replace>h4</replace>
|
|
<replace>h4</replace>
|
|
@@ -193,9 +185,10 @@
|
|
<option value="$PROJECT_DIR$/views/商城/购物车.html" />
|
|
<option value="$PROJECT_DIR$/views/商城/购物车.html" />
|
|
<option value="$PROJECT_DIR$/shop.less" />
|
|
<option value="$PROJECT_DIR$/shop.less" />
|
|
<option value="$PROJECT_DIR$/css/css.css" />
|
|
<option value="$PROJECT_DIR$/css/css.css" />
|
|
- <option value="$PROJECT_DIR$/css/css.less" />
|
|
|
|
<option value="$PROJECT_DIR$/css/shop.less" />
|
|
<option value="$PROJECT_DIR$/css/shop.less" />
|
|
<option value="$PROJECT_DIR$/views/商城/订单详情.html" />
|
|
<option value="$PROJECT_DIR$/views/商城/订单详情.html" />
|
|
|
|
+ <option value="$PROJECT_DIR$/css/css.less" />
|
|
|
|
+ <option value="$PROJECT_DIR$/views/商城/弹框.html" />
|
|
</list>
|
|
</list>
|
|
</option>
|
|
</option>
|
|
</component>
|
|
</component>
|
|
@@ -210,7 +203,6 @@
|
|
<foldersAlwaysOnTop value="true" />
|
|
<foldersAlwaysOnTop value="true" />
|
|
</navigator>
|
|
</navigator>
|
|
<panes>
|
|
<panes>
|
|
- <pane id="Scope" />
|
|
|
|
<pane id="ProjectPane">
|
|
<pane id="ProjectPane">
|
|
<subPane>
|
|
<subPane>
|
|
<expand>
|
|
<expand>
|
|
@@ -223,6 +215,11 @@
|
|
<item name="html" type="462c0819:PsiDirectoryNode" />
|
|
<item name="html" type="462c0819:PsiDirectoryNode" />
|
|
<item name="css" type="462c0819:PsiDirectoryNode" />
|
|
<item name="css" type="462c0819:PsiDirectoryNode" />
|
|
</path>
|
|
</path>
|
|
|
|
+ <path>
|
|
|
|
+ <item name="html" type="b2602c69:ProjectViewProjectNode" />
|
|
|
|
+ <item name="html" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ <item name="image" type="462c0819:PsiDirectoryNode" />
|
|
|
|
+ </path>
|
|
<path>
|
|
<path>
|
|
<item name="html" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="html" type="b2602c69:ProjectViewProjectNode" />
|
|
<item name="html" type="462c0819:PsiDirectoryNode" />
|
|
<item name="html" type="462c0819:PsiDirectoryNode" />
|
|
@@ -238,6 +235,7 @@
|
|
<select />
|
|
<select />
|
|
</subPane>
|
|
</subPane>
|
|
</pane>
|
|
</pane>
|
|
|
|
+ <pane id="Scope" />
|
|
</panes>
|
|
</panes>
|
|
</component>
|
|
</component>
|
|
<component name="PropertiesComponent">
|
|
<component name="PropertiesComponent">
|
|
@@ -249,16 +247,16 @@
|
|
<property name="settings.editor.selected.configurable" value="watcher.settings" />
|
|
<property name="settings.editor.selected.configurable" value="watcher.settings" />
|
|
</component>
|
|
</component>
|
|
<component name="RecentsManager">
|
|
<component name="RecentsManager">
|
|
- <key name="CopyFile.RECENT_KEYS">
|
|
|
|
- <recent name="D:\workspace\html\image" />
|
|
|
|
- <recent name="D:\workspace\html\img" />
|
|
|
|
- <recent name="D:\workspace\html" />
|
|
|
|
- </key>
|
|
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
<recent name="D:\workspace\html\css" />
|
|
<recent name="D:\workspace\html\css" />
|
|
<recent name="D:\workspace\html\views\杂项" />
|
|
<recent name="D:\workspace\html\views\杂项" />
|
|
<recent name="D:\workspace\html" />
|
|
<recent name="D:\workspace\html" />
|
|
</key>
|
|
</key>
|
|
|
|
+ <key name="CopyFile.RECENT_KEYS">
|
|
|
|
+ <recent name="D:\workspace\html\image" />
|
|
|
|
+ <recent name="D:\workspace\html\img" />
|
|
|
|
+ <recent name="D:\workspace\html" />
|
|
|
|
+ </key>
|
|
</component>
|
|
</component>
|
|
<component name="RunDashboard">
|
|
<component name="RunDashboard">
|
|
<option name="ruleStates">
|
|
<option name="ruleStates">
|
|
@@ -356,7 +354,11 @@
|
|
<workItem from="1597193641446" duration="599000" />
|
|
<workItem from="1597193641446" duration="599000" />
|
|
<workItem from="1597280400319" duration="2795000" />
|
|
<workItem from="1597280400319" duration="2795000" />
|
|
<workItem from="1597826006330" duration="9447000" />
|
|
<workItem from="1597826006330" duration="9447000" />
|
|
- <workItem from="1597885454978" duration="13823000" />
|
|
|
|
|
|
+ <workItem from="1597885454978" duration="15233000" />
|
|
|
|
+ <workItem from="1597971385163" duration="1671000" />
|
|
|
|
+ <workItem from="1598230356145" duration="597000" />
|
|
|
|
+ <workItem from="1598316904927" duration="596000" />
|
|
|
|
+ <workItem from="1598403779687" duration="6080000" />
|
|
</task>
|
|
</task>
|
|
<task id="LOCAL-00001" summary="fix">
|
|
<task id="LOCAL-00001" summary="fix">
|
|
<created>1594365774472</created>
|
|
<created>1594365774472</created>
|
|
@@ -393,30 +395,37 @@
|
|
<option name="project" value="LOCAL" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1597893297242</updated>
|
|
<updated>1597893297242</updated>
|
|
</task>
|
|
</task>
|
|
- <option name="localTasksCounter" value="6" />
|
|
|
|
|
|
+ <task id="LOCAL-00006" summary="商城">
|
|
|
|
+ <created>1597910254847</created>
|
|
|
|
+ <option name="number" value="00006" />
|
|
|
|
+ <option name="presentableId" value="LOCAL-00006" />
|
|
|
|
+ <option name="project" value="LOCAL" />
|
|
|
|
+ <updated>1597910254847</updated>
|
|
|
|
+ </task>
|
|
|
|
+ <option name="localTasksCounter" value="7" />
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<component name="TimeTrackingManager">
|
|
- <option name="totallyTimeSpent" value="183030000" />
|
|
|
|
|
|
+ <option name="totallyTimeSpent" value="193384000" />
|
|
</component>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<component name="ToolWindowManager">
|
|
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
|
|
<frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
|
|
<editor active="true" />
|
|
<editor active="true" />
|
|
<layout>
|
|
<layout>
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49858356" visible="true" weight="0.25363275" />
|
|
|
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49858356" visible="true" weight="0.25297225" />
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
<window_info id="npm" order="2" sideWeight="0.50141644" side_tool="true" weight="0.24966975" />
|
|
<window_info id="npm" order="2" sideWeight="0.50141644" side_tool="true" weight="0.24966975" />
|
|
<window_info id="Favorites" order="3" side_tool="true" />
|
|
<window_info id="Favorites" order="3" side_tool="true" />
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
<window_info anchor="bottom" id="Find" order="1" weight="0.32956153" />
|
|
<window_info anchor="bottom" id="Find" order="1" weight="0.32956153" />
|
|
- <window_info anchor="bottom" id="Run" order="2" sideWeight="0.47886392" weight="0.3243626" />
|
|
|
|
|
|
+ <window_info anchor="bottom" id="Run" order="2" sideWeight="0.47754294" weight="0.3243626" />
|
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
<window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.4993395" weight="0.3286119" />
|
|
<window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.4993395" weight="0.3286119" />
|
|
- <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.52113605" side_tool="true" visible="true" weight="0.3243626" />
|
|
|
|
|
|
+ <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.52245706" side_tool="true" visible="true" weight="0.32152975" />
|
|
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.4920635" weight="0.3266762" />
|
|
<window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.4920635" weight="0.3266762" />
|
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
@@ -451,6 +460,20 @@
|
|
</entry>
|
|
</entry>
|
|
</map>
|
|
</map>
|
|
</option>
|
|
</option>
|
|
|
|
+ <option name="RECENT_FILTERS">
|
|
|
|
+ <map>
|
|
|
|
+ <entry key="Branch">
|
|
|
|
+ <value>
|
|
|
|
+ <list />
|
|
|
|
+ </value>
|
|
|
|
+ </entry>
|
|
|
|
+ <entry key="User">
|
|
|
|
+ <value>
|
|
|
|
+ <list />
|
|
|
|
+ </value>
|
|
|
|
+ </entry>
|
|
|
|
+ </map>
|
|
|
|
+ </option>
|
|
</component>
|
|
</component>
|
|
<component name="VcsManagerConfiguration">
|
|
<component name="VcsManagerConfiguration">
|
|
<MESSAGE value="fix" />
|
|
<MESSAGE value="fix" />
|
|
@@ -615,8 +638,8 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/css/css.css.map">
|
|
<entry file="file://$PROJECT_DIR$/css/css.css.map">
|
|
- <provider editor-type-id="sourcemapFileViewerProvider" />
|
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
|
+ <provider editor-type-id="sourcemapFileViewerProvider" />
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/css/project.css">
|
|
<entry file="file://$PROJECT_DIR$/css/project.css">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -626,20 +649,20 @@
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/css/project.css.map">
|
|
<entry file="file://$PROJECT_DIR$/css/project.css.map">
|
|
- <provider editor-type-id="sourcemapFileViewerProvider" />
|
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
|
+ <provider editor-type-id="sourcemapFileViewerProvider" />
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/css/shop.css.map">
|
|
<entry file="file://$PROJECT_DIR$/css/shop.css.map">
|
|
- <provider editor-type-id="sourcemapFileViewerProvider" />
|
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
|
+ <provider editor-type-id="sourcemapFileViewerProvider" />
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/css/style.css.map">
|
|
<entry file="file://$PROJECT_DIR$/css/style.css.map">
|
|
- <provider editor-type-id="sourcemapFileViewerProvider" />
|
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state>
|
|
<state>
|
|
<caret column="54" selection-start-column="54" selection-end-column="54" />
|
|
<caret column="54" selection-start-column="54" selection-end-column="54" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
|
|
+ <provider editor-type-id="sourcemapFileViewerProvider" />
|
|
</entry>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/css/style.css">
|
|
<entry file="file://$PROJECT_DIR$/css/style.css">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
@@ -648,77 +671,111 @@
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/css/style.less">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/css/css.css">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="266">
|
|
|
|
- <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
|
|
|
|
|
|
+ <state relative-caret-position="3933">
|
|
|
|
+ <caret line="207" column="16" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="16" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/icon_ordernum@2x.png">
|
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
|
+ </entry>
|
|
<entry file="file://$PROJECT_DIR$/css/project.less">
|
|
<entry file="file://$PROJECT_DIR$/css/project.less">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="1235">
|
|
<state relative-caret-position="1235">
|
|
- <caret line="65" column="7" lean-forward="true" selection-start-line="65" selection-start-column="7" selection-end-line="65" selection-end-column="7" />
|
|
|
|
|
|
+ <caret line="65" column="7" selection-start-line="65" selection-start-column="7" selection-end-line="65" selection-end-column="7" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/image/icon_ordernum@2x.png">
|
|
|
|
- <provider selected="true" editor-type-id="images" />
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/css/shop.css">
|
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
|
+ <state relative-caret-position="1406">
|
|
|
|
+ <caret line="74" column="22" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="22" />
|
|
|
|
+ </state>
|
|
|
|
+ </provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/css/css.css">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/css/shop.less">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="208">
|
|
|
|
- <caret line="207" column="16" lean-forward="true" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="16" />
|
|
|
|
|
|
+ <state relative-caret-position="2280">
|
|
|
|
+ <caret line="120" column="12" lean-forward="true" selection-start-line="120" selection-start-column="12" selection-end-line="120" selection-end-column="12" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/css/css.less">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/css/style.less">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="227">
|
|
|
|
- <caret line="252" column="1" lean-forward="true" selection-start-line="252" selection-start-column="1" selection-end-line="252" selection-end-column="1" />
|
|
|
|
|
|
+ <state relative-caret-position="266">
|
|
|
|
+ <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/views/商城/商品列表.html">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/btn_addpic@2x.png">
|
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/icon_bad_def@2x.png">
|
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/icon_bad_pre@2x.png">
|
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/icon_delpic@2x.png">
|
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/icon_good_def@2x.png">
|
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/icon_normal_def@2x.png">
|
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/icon_normal_pre@2x.png">
|
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/image/好评@2x.png">
|
|
|
|
+ <provider selected="true" editor-type-id="images" />
|
|
|
|
+ </entry>
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/views/商城/订单详情.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="180">
|
|
|
|
- <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-end-line="196" />
|
|
|
|
|
|
+ <state relative-caret-position="532">
|
|
|
|
+ <caret line="85" column="24" lean-forward="true" selection-start-line="85" selection-start-column="24" selection-end-line="85" selection-end-column="24" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
|
|
|
|
|
|
+ <element signature="n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/views/商城/购物车.html">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/views/商城/商品列表.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="223">
|
|
|
|
- <caret line="220" column="12" lean-forward="true" selection-start-line="211" selection-start-column="5" selection-end-line="220" selection-end-column="12" />
|
|
|
|
|
|
+ <state relative-caret-position="258">
|
|
|
|
+ <caret line="199" column="71" lean-forward="true" selection-start-line="199" selection-start-column="71" selection-end-line="199" selection-end-column="71" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="n#tr#0;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
|
|
|
|
|
|
+ <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/css/shop.css">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/css/css.less">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="199">
|
|
|
|
- <caret line="74" column="22" lean-forward="true" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="22" />
|
|
|
|
|
|
+ <state relative-caret-position="151">
|
|
|
|
+ <caret line="386" column="19" lean-forward="true" selection-start-line="386" selection-start-column="19" selection-end-line="386" selection-end-column="19" />
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/css/shop.less">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/views/商城/购物车.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="208">
|
|
|
|
- <caret line="120" column="12" lean-forward="true" selection-start-line="120" selection-start-column="12" selection-end-line="120" selection-end-column="12" />
|
|
|
|
|
|
+ <state relative-caret-position="287">
|
|
|
|
+ <caret line="231" column="42" selection-start-line="231" selection-start-column="15" selection-end-line="231" selection-end-column="42" />
|
|
|
|
+ <folding>
|
|
|
|
+ <element signature="n#tr#0;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
|
|
|
|
+ </folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|
|
</entry>
|
|
</entry>
|
|
- <entry file="file://$PROJECT_DIR$/views/商城/订单详情.html">
|
|
|
|
|
|
+ <entry file="file://$PROJECT_DIR$/views/商城/弹框.html">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
- <state relative-caret-position="299">
|
|
|
|
- <caret line="84" column="16" lean-forward="true" selection-start-line="84" selection-start-column="16" selection-end-line="84" selection-end-column="16" />
|
|
|
|
|
|
+ <state relative-caret-position="239">
|
|
|
|
+ <caret line="23" column="52" lean-forward="true" selection-start-line="23" selection-start-column="52" selection-end-line="23" selection-end-column="52" />
|
|
<folding>
|
|
<folding>
|
|
- <element signature="n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
|
|
|
|
|
|
+ <element signature="n#style#0;n#textarea#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
</folding>
|
|
</folding>
|
|
</state>
|
|
</state>
|
|
</provider>
|
|
</provider>
|