|
@@ -2,15 +2,7 @@
|
|
<project version="4">
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="">
|
|
<list default="true" id="2054d288-d3d9-47a2-840a-057f9d2a0c35" name="Default" comment="">
|
|
- <change afterPath="$PROJECT_DIR$/shop/static/images/banner.jpg" afterDir="false" />
|
|
|
|
- <change afterPath="$PROJECT_DIR$/shop/static/images/specialistBg.png" 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$/shop/src/main/resource/templates/detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/shop/src/main/resource/templates/detail.html" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/images/erweima.png" beforeDir="false" afterPath="$PROJECT_DIR$/shop/static/images/erweima.png" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/images/logo.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/shop/static/images/logo.jpg" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/images/search.png" beforeDir="false" afterPath="$PROJECT_DIR$/shop/static/images/search.png" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/images/subscribe.png" beforeDir="false" afterPath="$PROJECT_DIR$/shop/static/images/subscribe.png" afterDir="false" />
|
|
|
|
- <change beforePath="$PROJECT_DIR$/shop/static/style/main.css" beforeDir="false" afterPath="$PROJECT_DIR$/shop/static/style/main.css" afterDir="false" />
|
|
|
|
<change beforePath="$PROJECT_DIR$/shop/static/style/nHeader.css" beforeDir="false" afterPath="$PROJECT_DIR$/shop/static/style/nHeader.css" afterDir="false" />
|
|
<change beforePath="$PROJECT_DIR$/shop/static/style/nHeader.css" beforeDir="false" afterPath="$PROJECT_DIR$/shop/static/style/nHeader.css" afterDir="false" />
|
|
</list>
|
|
</list>
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -212,7 +204,8 @@
|
|
<workItem from="1585568529588" duration="46000" />
|
|
<workItem from="1585568529588" duration="46000" />
|
|
<workItem from="1585622547624" duration="1347000" />
|
|
<workItem from="1585622547624" duration="1347000" />
|
|
<workItem from="1585628259581" duration="1403000" />
|
|
<workItem from="1585628259581" duration="1403000" />
|
|
- <workItem from="1585706005737" duration="75000" />
|
|
|
|
|
|
+ <workItem from="1585706005737" duration="789000" />
|
|
|
|
+ <workItem from="1585792990603" duration="101000" />
|
|
</task>
|
|
</task>
|
|
<servers />
|
|
<servers />
|
|
</component>
|
|
</component>
|
|
@@ -224,36 +217,44 @@
|
|
<screen x="0" y="23" width="1440" height="822" />
|
|
<screen x="0" y="23" width="1440" height="822" />
|
|
</state>
|
|
</state>
|
|
<state x="184" y="96" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.1440.822@0.23.1440.822" timestamp="1584449391479" />
|
|
<state x="184" y="96" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.23.1440.822@0.23.1440.822" timestamp="1584449391479" />
|
|
- <state width="1398" height="380" key="GridCell.Tab.0.bottom" timestamp="1585647421909">
|
|
|
|
- <screen x="0" y="23" width="1440" height="827" />
|
|
|
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.bottom" timestamp="1585707136936">
|
|
|
|
+ <screen x="0" y="23" width="1440" height="825" />
|
|
</state>
|
|
</state>
|
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136936" />
|
|
<state width="1398" height="232" key="GridCell.Tab.0.bottom/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
|
|
<state width="1398" height="232" key="GridCell.Tab.0.bottom/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421909" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421909" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.827@0.23.1440.827" timestamp="1585568481547" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.827@0.23.1440.827" timestamp="1585568481547" />
|
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287029" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585565681676" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.828@0.23.1440.828" timestamp="1585565681676" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560326117" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.bottom/0.23.1440.829@0.23.1440.829" timestamp="1585560326117" />
|
|
- <state width="1398" height="380" key="GridCell.Tab.0.center" timestamp="1585647421908">
|
|
|
|
- <screen x="0" y="23" width="1440" height="827" />
|
|
|
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.center" timestamp="1585707136935">
|
|
|
|
+ <screen x="0" y="23" width="1440" height="825" />
|
|
</state>
|
|
</state>
|
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136935" />
|
|
<state width="1398" height="232" key="GridCell.Tab.0.center/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
|
|
<state width="1398" height="232" key="GridCell.Tab.0.center/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421908" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421908" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.827@0.23.1440.827" timestamp="1585568481546" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.827@0.23.1440.827" timestamp="1585568481546" />
|
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287028" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.828@0.23.1440.828" timestamp="1585565681675" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.828@0.23.1440.828" timestamp="1585565681675" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.829@0.23.1440.829" timestamp="1585560326115" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.center/0.23.1440.829@0.23.1440.829" timestamp="1585560326115" />
|
|
- <state width="1398" height="380" key="GridCell.Tab.0.left" timestamp="1585647421907">
|
|
|
|
- <screen x="0" y="23" width="1440" height="827" />
|
|
|
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.left" timestamp="1585707136935">
|
|
|
|
+ <screen x="0" y="23" width="1440" height="825" />
|
|
</state>
|
|
</state>
|
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136935" />
|
|
<state width="1398" height="232" key="GridCell.Tab.0.left/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
|
|
<state width="1398" height="232" key="GridCell.Tab.0.left/0.23.1440.826@0.23.1440.826" timestamp="1585555485988" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421907" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421907" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.827@0.23.1440.827" timestamp="1585568481545" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.827@0.23.1440.827" timestamp="1585568481545" />
|
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287027" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.828@0.23.1440.828" timestamp="1585565681675" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.828@0.23.1440.828" timestamp="1585565681675" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.829@0.23.1440.829" timestamp="1585560326115" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.left/0.23.1440.829@0.23.1440.829" timestamp="1585560326115" />
|
|
- <state width="1398" height="380" key="GridCell.Tab.0.right" timestamp="1585647421908">
|
|
|
|
- <screen x="0" y="23" width="1440" height="827" />
|
|
|
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.right" timestamp="1585707136936">
|
|
|
|
+ <screen x="0" y="23" width="1440" height="825" />
|
|
</state>
|
|
</state>
|
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.825/-1920.-72.1920.1057@0.23.1440.825" timestamp="1585707136936" />
|
|
<state width="1398" height="232" key="GridCell.Tab.0.right/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
|
|
<state width="1398" height="232" key="GridCell.Tab.0.right/0.23.1440.826@0.23.1440.826" timestamp="1585555485989" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421908" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.827/-1920.-72.1920.1057@0.23.1440.827" timestamp="1585647421908" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.827@0.23.1440.827" timestamp="1585568481547" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.827@0.23.1440.827" timestamp="1585568481547" />
|
|
|
|
+ <state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706287028" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.828@0.23.1440.828" timestamp="1585565681676" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.828@0.23.1440.828" timestamp="1585565681676" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.829@0.23.1440.829" timestamp="1585560326116" />
|
|
<state width="1398" height="380" key="GridCell.Tab.0.right/0.23.1440.829@0.23.1440.829" timestamp="1585560326116" />
|
|
<state width="1398" height="380" key="GridCell.Tab.1.bottom" timestamp="1585647421910">
|
|
<state width="1398" height="380" key="GridCell.Tab.1.bottom" timestamp="1585647421910">
|
|
@@ -297,9 +298,10 @@
|
|
<state x="794" y="313" key="com.intellij.ide.util.TipDialog/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706024772" />
|
|
<state x="794" y="313" key="com.intellij.ide.util.TipDialog/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706024772" />
|
|
<state x="794" y="314" key="com.intellij.ide.util.TipDialog/0.23.1440.829@0.23.1440.829" timestamp="1585363207913" />
|
|
<state x="794" y="314" key="com.intellij.ide.util.TipDialog/0.23.1440.829@0.23.1440.829" timestamp="1585363207913" />
|
|
<state x="794" y="314" key="com.intellij.ide.util.TipDialog/0.23.1440.830@0.23.1440.830" timestamp="1585360101388" />
|
|
<state x="794" y="314" key="com.intellij.ide.util.TipDialog/0.23.1440.830@0.23.1440.830" timestamp="1585360101388" />
|
|
- <state x="520" y="85" width="837" height="551" key="find.popup" timestamp="1585706205429">
|
|
|
|
- <screen x="0" y="23" width="1440" height="828" />
|
|
|
|
|
|
+ <state x="520" y="85" width="837" height="550" key="find.popup" timestamp="1585793066665">
|
|
|
|
+ <screen x="0" y="23" width="1440" height="822" />
|
|
</state>
|
|
</state>
|
|
|
|
+ <state x="520" y="85" width="837" height="550" key="find.popup/0.23.1440.822/-1920.-72.1920.1057@0.23.1440.822" timestamp="1585793066665" />
|
|
<state x="520" y="85" width="837" height="550" key="find.popup/0.23.1440.827@0.23.1440.827" timestamp="1585561388202" />
|
|
<state x="520" y="85" width="837" height="550" key="find.popup/0.23.1440.827@0.23.1440.827" timestamp="1585561388202" />
|
|
<state x="520" y="85" width="837" height="551" key="find.popup/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706205429" />
|
|
<state x="520" y="85" width="837" height="551" key="find.popup/0.23.1440.828/-1920.-72.1920.1057@0.23.1440.828" timestamp="1585706205429" />
|
|
<state x="603" y="159" width="837" height="550" key="find.popup/0.23.1440.830@0.23.1440.830" timestamp="1585360905858" />
|
|
<state x="603" y="159" width="837" height="550" key="find.popup/0.23.1440.830@0.23.1440.830" timestamp="1585360905858" />
|