|  | @@ -3,12 +3,10 @@
 | 
	
		
			
				|  |  |    <component name="ChangeListManager">
 | 
	
		
			
				|  |  |      <list default="true" id="5ae07691-f935-424c-bcfb-2ecce8956daa" name="Default Changelist" comment="">
 | 
	
		
			
				|  |  |        <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
 | 
	
		
			
				|  |  | -      <change beforePath="$PROJECT_DIR$/c_style/css.css" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/css.css" afterDir="false" />
 | 
	
		
			
				|  |  | -      <change beforePath="$PROJECT_DIR$/c_style/css.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/css.css.map" afterDir="false" />
 | 
	
		
			
				|  |  | -      <change beforePath="$PROJECT_DIR$/c_style/css.less" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/css.less" afterDir="false" />
 | 
	
		
			
				|  |  |        <change beforePath="$PROJECT_DIR$/c_style/shop.css" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/shop.css" afterDir="false" />
 | 
	
		
			
				|  |  |        <change beforePath="$PROJECT_DIR$/c_style/shop.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/shop.css.map" afterDir="false" />
 | 
	
		
			
				|  |  |        <change beforePath="$PROJECT_DIR$/c_style/shop.less" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/shop.less" afterDir="false" />
 | 
	
		
			
				|  |  | +      <change beforePath="$PROJECT_DIR$/views/商城/购物车.html" beforeDir="false" afterPath="$PROJECT_DIR$/views/商城/购物车.html" afterDir="false" />
 | 
	
		
			
				|  |  |      </list>
 | 
	
		
			
				|  |  |      <ignored path="$PROJECT_DIR$/.tmp/" />
 | 
	
		
			
				|  |  |      <ignored path="$PROJECT_DIR$/temp/" />
 | 
	
	
		
			
				|  | @@ -21,24 +19,6 @@
 | 
	
		
			
				|  |  |    </component>
 | 
	
		
			
				|  |  |    <component name="FileEditorManager">
 | 
	
		
			
				|  |  |      <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
 | 
	
		
			
				|  |  | -      <file pinned="false" current-in-tab="true">
 | 
	
		
			
				|  |  | -        <entry file="file://$PROJECT_DIR$/c_style/css.less">
 | 
	
		
			
				|  |  | -          <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -            <state relative-caret-position="169">
 | 
	
		
			
				|  |  | -              <caret line="43" column="1" lean-forward="true" selection-start-line="43" selection-start-column="1" selection-end-line="43" selection-end-column="1" />
 | 
	
		
			
				|  |  | -            </state>
 | 
	
		
			
				|  |  | -          </provider>
 | 
	
		
			
				|  |  | -        </entry>
 | 
	
		
			
				|  |  | -      </file>
 | 
	
		
			
				|  |  | -      <file pinned="false" current-in-tab="false">
 | 
	
		
			
				|  |  | -        <entry file="file://$PROJECT_DIR$/c_javascript/fabric.js">
 | 
	
		
			
				|  |  | -          <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -            <state relative-caret-position="266">
 | 
	
		
			
				|  |  | -              <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
 | 
	
		
			
				|  |  | -            </state>
 | 
	
		
			
				|  |  | -          </provider>
 | 
	
		
			
				|  |  | -        </entry>
 | 
	
		
			
				|  |  | -      </file>
 | 
	
		
			
				|  |  |        <file pinned="false" current-in-tab="false">
 | 
	
		
			
				|  |  |          <entry file="file://$PROJECT_DIR$/c_javascript/fabric.min.js">
 | 
	
		
			
				|  |  |            <provider selected="true" editor-type-id="text-editor" />
 | 
	
	
		
			
				|  | @@ -47,8 +27,8 @@
 | 
	
		
			
				|  |  |        <file pinned="false" current-in-tab="false">
 | 
	
		
			
				|  |  |          <entry file="file://$PROJECT_DIR$/c_style/shop.css">
 | 
	
		
			
				|  |  |            <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -            <state relative-caret-position="5719">
 | 
	
		
			
				|  |  | -              <caret line="302" column="19" selection-start-line="302" selection-start-column="19" selection-end-line="302" selection-end-column="19" />
 | 
	
		
			
				|  |  | +            <state relative-caret-position="142">
 | 
	
		
			
				|  |  | +              <caret line="51" column="43" selection-start-line="51" selection-start-column="43" selection-end-line="51" selection-end-column="43" />
 | 
	
		
			
				|  |  |              </state>
 | 
	
		
			
				|  |  |            </provider>
 | 
	
		
			
				|  |  |          </entry>
 | 
	
	
		
			
				|  | @@ -56,8 +36,8 @@
 | 
	
		
			
				|  |  |        <file pinned="false" current-in-tab="false">
 | 
	
		
			
				|  |  |          <entry file="file://$PROJECT_DIR$/c_style/shop.less">
 | 
	
		
			
				|  |  |            <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -            <state relative-caret-position="262">
 | 
	
		
			
				|  |  | -              <caret line="458" column="1" lean-forward="true" selection-start-line="458" selection-start-column="1" selection-end-line="458" selection-end-column="1" />
 | 
	
		
			
				|  |  | +            <state relative-caret-position="169">
 | 
	
		
			
				|  |  | +              <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
 | 
	
		
			
				|  |  |              </state>
 | 
	
		
			
				|  |  |            </provider>
 | 
	
		
			
				|  |  |          </entry>
 | 
	
	
		
			
				|  | @@ -65,23 +45,41 @@
 | 
	
		
			
				|  |  |        <file pinned="false" current-in-tab="false">
 | 
	
		
			
				|  |  |          <entry file="file://$PROJECT_DIR$/c_style/style.less">
 | 
	
		
			
				|  |  |            <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -            <state relative-caret-position="103">
 | 
	
		
			
				|  |  | +            <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 pinned="false" current-in-tab="false">
 | 
	
		
			
				|  |  | +        <entry file="jar://$APPLICATION_HOME_DIR$/lib/platform-impl.jar!/resources/html5-schema/html5/tables.rnc">
 | 
	
		
			
				|  |  | +          <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | +            <state relative-caret-position="283">
 | 
	
		
			
				|  |  | +              <caret line="173" column="14" lean-forward="true" selection-start-line="173" selection-start-column="14" selection-end-line="173" selection-end-column="14" />
 | 
	
		
			
				|  |  | +            </state>
 | 
	
		
			
				|  |  | +          </provider>
 | 
	
		
			
				|  |  | +        </entry>
 | 
	
		
			
				|  |  | +      </file>
 | 
	
		
			
				|  |  |        <file pinned="false" current-in-tab="false">
 | 
	
		
			
				|  |  |          <entry file="file://$PROJECT_DIR$/views/商城/商品列表.html">
 | 
	
		
			
				|  |  |            <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -            <state relative-caret-position="303">
 | 
	
		
			
				|  |  | -              <caret line="249" column="36" selection-start-line="249" selection-start-column="36" selection-end-line="249" selection-end-column="36" />
 | 
	
		
			
				|  |  | +            <state relative-caret-position="3116">
 | 
	
		
			
				|  |  | +              <caret line="164" column="14" selection-start-line="164" selection-start-column="14" selection-end-line="164" selection-end-column="14" />
 | 
	
		
			
				|  |  |                <folding>
 | 
	
		
			
				|  |  |                  <element signature="n#style#0;n#div#3;n#div#1;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 | 
	
		
			
				|  |  |                  <element signature="n#style#0;n#div#3;n#div#2;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 | 
	
		
			
				|  |  | -                <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
 | 
	
		
			
				|  |  | -                <element signature="n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
 | 
	
		
			
				|  |  | -                <element signature="n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
 | 
	
		
			
				|  |  | +              </folding>
 | 
	
		
			
				|  |  | +            </state>
 | 
	
		
			
				|  |  | +          </provider>
 | 
	
		
			
				|  |  | +        </entry>
 | 
	
		
			
				|  |  | +      </file>
 | 
	
		
			
				|  |  | +      <file pinned="false" current-in-tab="false">
 | 
	
		
			
				|  |  | +        <entry file="file://$PROJECT_DIR$/views/商城/弹框.html">
 | 
	
		
			
				|  |  | +          <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | +            <state relative-caret-position="1254">
 | 
	
		
			
				|  |  | +              <caret line="66" column="19" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" />
 | 
	
		
			
				|  |  | +              <folding>
 | 
	
		
			
				|  |  | +                <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>
 | 
	
		
			
				|  |  |              </state>
 | 
	
		
			
				|  |  |            </provider>
 | 
	
	
		
			
				|  | @@ -91,7 +89,7 @@
 | 
	
		
			
				|  |  |          <entry file="file://$PROJECT_DIR$/c_javascript/维修品牌.js">
 | 
	
		
			
				|  |  |            <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  |              <state relative-caret-position="304">
 | 
	
		
			
				|  |  | -              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
 | 
	
		
			
				|  |  | +              <caret line="16" selection-start-line="16" selection-end-line="16" />
 | 
	
		
			
				|  |  |              </state>
 | 
	
		
			
				|  |  |            </provider>
 | 
	
		
			
				|  |  |          </entry>
 | 
	
	
		
			
				|  | @@ -99,8 +97,8 @@
 | 
	
		
			
				|  |  |        <file pinned="false" current-in-tab="false">
 | 
	
		
			
				|  |  |          <entry file="file://$PROJECT_DIR$/views/商城/订单详情.html">
 | 
	
		
			
				|  |  |            <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -            <state relative-caret-position="260">
 | 
	
		
			
				|  |  | -              <caret line="77" column="8" lean-forward="true" selection-start-line="77" selection-start-column="8" selection-end-line="77" selection-end-column="8" />
 | 
	
		
			
				|  |  | +            <state relative-caret-position="133">
 | 
	
		
			
				|  |  | +              <caret line="82" column="31" lean-forward="true" selection-start-line="82" selection-start-column="31" selection-end-line="82" selection-end-column="31" />
 | 
	
		
			
				|  |  |                <folding>
 | 
	
		
			
				|  |  |                  <element signature="n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
 | 
	
		
			
				|  |  |                </folding>
 | 
	
	
		
			
				|  | @@ -108,11 +106,11 @@
 | 
	
		
			
				|  |  |            </provider>
 | 
	
		
			
				|  |  |          </entry>
 | 
	
		
			
				|  |  |        </file>
 | 
	
		
			
				|  |  | -      <file pinned="false" current-in-tab="false">
 | 
	
		
			
				|  |  | +      <file pinned="false" current-in-tab="true">
 | 
	
		
			
				|  |  |          <entry file="file://$PROJECT_DIR$/views/商城/购物车.html">
 | 
	
		
			
				|  |  |            <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -            <state relative-caret-position="208">
 | 
	
		
			
				|  |  | -              <caret line="92" column="15" selection-start-line="86" selection-start-column="9" selection-end-line="92" selection-end-column="15" />
 | 
	
		
			
				|  |  | +            <state relative-caret-position="246">
 | 
	
		
			
				|  |  | +              <caret line="16" column="26" lean-forward="true" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
 | 
	
		
			
				|  |  |              </state>
 | 
	
		
			
				|  |  |            </provider>
 | 
	
		
			
				|  |  |          </entry>
 | 
	
	
		
			
				|  | @@ -128,7 +126,6 @@
 | 
	
		
			
				|  |  |    </component>
 | 
	
		
			
				|  |  |    <component name="FindInProjectRecents">
 | 
	
		
			
				|  |  |      <findStrings>
 | 
	
		
			
				|  |  | -      <find>shop-container-filter-item-title</find>
 | 
	
		
			
				|  |  |        <find>配件列表</find>
 | 
	
		
			
				|  |  |        <find>th</find>
 | 
	
		
			
				|  |  |        <find>rmb-title</find>
 | 
	
	
		
			
				|  | @@ -149,15 +146,16 @@
 | 
	
		
			
				|  |  |        <find>table</find>
 | 
	
		
			
				|  |  |        <find>dialog-form-item</find>
 | 
	
		
			
				|  |  |        <find>count-input-btn-add</find>
 | 
	
		
			
				|  |  | -      <find>tr</find>
 | 
	
		
			
				|  |  |        <find>shop-container-filter-item-car-type</find>
 | 
	
		
			
				|  |  |        <find>shop-container</find>
 | 
	
		
			
				|  |  |        <find>shop-container-filter-item-brand</find>
 | 
	
		
			
				|  |  | -      <find>shop-container-filter-item-container</find>
 | 
	
		
			
				|  |  | -      <find>image</find>
 | 
	
		
			
				|  |  |        <find>shop-container-info-item</find>
 | 
	
		
			
				|  |  |        <find>url</find>
 | 
	
		
			
				|  |  | +      <find>image</find>
 | 
	
		
			
				|  |  |        <find>icon-danhao</find>
 | 
	
		
			
				|  |  | +      <find>shop-container-filter-item-container</find>
 | 
	
		
			
				|  |  | +      <find>tr</find>
 | 
	
		
			
				|  |  | +      <find>table-items-center</find>
 | 
	
		
			
				|  |  |      </findStrings>
 | 
	
		
			
				|  |  |      <replaceStrings>
 | 
	
		
			
				|  |  |        <replace>h4</replace>
 | 
	
	
		
			
				|  | @@ -187,17 +185,17 @@
 | 
	
		
			
				|  |  |          <option value="$PROJECT_DIR$/html.html" />
 | 
	
		
			
				|  |  |          <option value="$PROJECT_DIR$/views/欧洲维修/index.html" />
 | 
	
		
			
				|  |  |          <option value="$PROJECT_DIR$/css.less" />
 | 
	
		
			
				|  |  | -        <option value="$PROJECT_DIR$/views/商城/购物车.html" />
 | 
	
		
			
				|  |  |          <option value="$PROJECT_DIR$/shop.less" />
 | 
	
		
			
				|  |  |          <option value="$PROJECT_DIR$/css/css.css" />
 | 
	
		
			
				|  |  |          <option value="$PROJECT_DIR$/views/商城/订单详情.html" />
 | 
	
		
			
				|  |  |          <option value="$PROJECT_DIR$/css/css.less" />
 | 
	
		
			
				|  |  |          <option value="$PROJECT_DIR$/views/商城/弹框.html" />
 | 
	
		
			
				|  |  |          <option value="$PROJECT_DIR$/css/shop.less" />
 | 
	
		
			
				|  |  | -        <option value="$PROJECT_DIR$/views/商城/商品列表.html" />
 | 
	
		
			
				|  |  |          <option value="$PROJECT_DIR$/style/shop.less" />
 | 
	
		
			
				|  |  | -        <option value="$PROJECT_DIR$/c_style/shop.less" />
 | 
	
		
			
				|  |  |          <option value="$PROJECT_DIR$/c_style/css.less" />
 | 
	
		
			
				|  |  | +        <option value="$PROJECT_DIR$/views/商城/商品列表.html" />
 | 
	
		
			
				|  |  | +        <option value="$PROJECT_DIR$/c_style/shop.less" />
 | 
	
		
			
				|  |  | +        <option value="$PROJECT_DIR$/views/商城/购物车.html" />
 | 
	
		
			
				|  |  |        </list>
 | 
	
		
			
				|  |  |      </option>
 | 
	
		
			
				|  |  |    </component>
 | 
	
	
		
			
				|  | @@ -219,6 +217,17 @@
 | 
	
		
			
				|  |  |                <item name="html" type="b2602c69:ProjectViewProjectNode" />
 | 
	
		
			
				|  |  |                <item name="html" type="462c0819:PsiDirectoryNode" />
 | 
	
		
			
				|  |  |              </path>
 | 
	
		
			
				|  |  | +            <path>
 | 
	
		
			
				|  |  | +              <item name="html" type="b2602c69:ProjectViewProjectNode" />
 | 
	
		
			
				|  |  | +              <item name="html" type="462c0819:PsiDirectoryNode" />
 | 
	
		
			
				|  |  | +              <item name="c_style" type="462c0819:PsiDirectoryNode" />
 | 
	
		
			
				|  |  | +            </path>
 | 
	
		
			
				|  |  | +            <path>
 | 
	
		
			
				|  |  | +              <item name="html" type="b2602c69:ProjectViewProjectNode" />
 | 
	
		
			
				|  |  | +              <item name="html" type="462c0819:PsiDirectoryNode" />
 | 
	
		
			
				|  |  | +              <item name="c_style" type="462c0819:PsiDirectoryNode" />
 | 
	
		
			
				|  |  | +              <item name="shop.less" type="620a8d5e:NestingTreeNode" />
 | 
	
		
			
				|  |  | +            </path>
 | 
	
		
			
				|  |  |              <path>
 | 
	
		
			
				|  |  |                <item name="html" type="b2602c69:ProjectViewProjectNode" />
 | 
	
		
			
				|  |  |                <item name="html" type="462c0819:PsiDirectoryNode" />
 | 
	
	
		
			
				|  | @@ -358,7 +367,8 @@
 | 
	
		
			
				|  |  |        <workItem from="1597971385163" duration="1671000" />
 | 
	
		
			
				|  |  |        <workItem from="1598230356145" duration="597000" />
 | 
	
		
			
				|  |  |        <workItem from="1598316904927" duration="596000" />
 | 
	
		
			
				|  |  | -      <workItem from="1598403779687" duration="12380000" />
 | 
	
		
			
				|  |  | +      <workItem from="1598403779687" duration="15677000" />
 | 
	
		
			
				|  |  | +      <workItem from="1599025721173" duration="1271000" />
 | 
	
		
			
				|  |  |      </task>
 | 
	
		
			
				|  |  |      <task id="LOCAL-00001" summary="fix">
 | 
	
		
			
				|  |  |        <created>1594365774472</created>
 | 
	
	
		
			
				|  | @@ -416,17 +426,31 @@
 | 
	
		
			
				|  |  |        <option name="project" value="LOCAL" />
 | 
	
		
			
				|  |  |        <updated>1598427795885</updated>
 | 
	
		
			
				|  |  |      </task>
 | 
	
		
			
				|  |  | -    <option name="localTasksCounter" value="9" />
 | 
	
		
			
				|  |  | +    <task id="LOCAL-00009" summary="fix 整理后问题">
 | 
	
		
			
				|  |  | +      <created>1598428553623</created>
 | 
	
		
			
				|  |  | +      <option name="number" value="00009" />
 | 
	
		
			
				|  |  | +      <option name="presentableId" value="LOCAL-00009" />
 | 
	
		
			
				|  |  | +      <option name="project" value="LOCAL" />
 | 
	
		
			
				|  |  | +      <updated>1598428553623</updated>
 | 
	
		
			
				|  |  | +    </task>
 | 
	
		
			
				|  |  | +    <task id="LOCAL-00010" summary="fix 整理后问题">
 | 
	
		
			
				|  |  | +      <created>1598430496579</created>
 | 
	
		
			
				|  |  | +      <option name="number" value="00010" />
 | 
	
		
			
				|  |  | +      <option name="presentableId" value="LOCAL-00010" />
 | 
	
		
			
				|  |  | +      <option name="project" value="LOCAL" />
 | 
	
		
			
				|  |  | +      <updated>1598430496579</updated>
 | 
	
		
			
				|  |  | +    </task>
 | 
	
		
			
				|  |  | +    <option name="localTasksCounter" value="11" />
 | 
	
		
			
				|  |  |      <servers />
 | 
	
		
			
				|  |  |    </component>
 | 
	
		
			
				|  |  |    <component name="TimeTrackingManager">
 | 
	
		
			
				|  |  | -    <option name="totallyTimeSpent" value="199684000" />
 | 
	
		
			
				|  |  | +    <option name="totallyTimeSpent" value="204252000" />
 | 
	
		
			
				|  |  |    </component>
 | 
	
		
			
				|  |  |    <component name="ToolWindowManager">
 | 
	
		
			
				|  |  |      <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
 | 
	
		
			
				|  |  |      <editor active="true" />
 | 
	
		
			
				|  |  |      <layout>
 | 
	
		
			
				|  |  | -      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49858356" visible="true" weight="0.25297225" />
 | 
	
		
			
				|  |  | +      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49858356" visible="true" weight="0.25231177" />
 | 
	
		
			
				|  |  |        <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="Favorites" order="3" side_tool="true" />
 | 
	
	
		
			
				|  | @@ -439,8 +463,8 @@
 | 
	
		
			
				|  |  |        <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="Version Control" order="8" sideWeight="0.4993395" weight="0.3286119" />
 | 
	
		
			
				|  |  | -      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.509247" side_tool="true" visible="true" weight="0.32577905" />
 | 
	
		
			
				|  |  | -      <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49075297" visible="true" weight="0.32577905" />
 | 
	
		
			
				|  |  | +      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.50990754" side_tool="true" visible="true" weight="0.32577905" />
 | 
	
		
			
				|  |  | +      <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49009246" visible="true" weight="0.32577905" />
 | 
	
		
			
				|  |  |        <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" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
 | 
	
	
		
			
				|  | @@ -494,7 +518,8 @@
 | 
	
		
			
				|  |  |      <MESSAGE value="欧洲维修登录" />
 | 
	
		
			
				|  |  |      <MESSAGE value="商城" />
 | 
	
		
			
				|  |  |      <MESSAGE value="整理" />
 | 
	
		
			
				|  |  | -    <option name="LAST_COMMIT_MESSAGE" value="整理" />
 | 
	
		
			
				|  |  | +    <MESSAGE value="fix 整理后问题" />
 | 
	
		
			
				|  |  | +    <option name="LAST_COMMIT_MESSAGE" value="fix 整理后问题" />
 | 
	
		
			
				|  |  |    </component>
 | 
	
		
			
				|  |  |    <component name="editorHistoryManager">
 | 
	
		
			
				|  |  |      <entry file="file://$PROJECT_DIR$/package-lock.json" />
 | 
	
	
		
			
				|  | @@ -631,16 +656,9 @@
 | 
	
		
			
				|  |  |          </state>
 | 
	
		
			
				|  |  |        </provider>
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  | -    <entry file="jar://$APPLICATION_HOME_DIR$/lib/platform-impl.jar!/resources/html5-schema/html5/tables.rnc">
 | 
	
		
			
				|  |  | -      <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -        <state relative-caret-position="151">
 | 
	
		
			
				|  |  | -          <caret line="232" column="16" selection-start-line="232" selection-start-column="16" selection-end-line="232" selection-end-column="16" />
 | 
	
		
			
				|  |  | -        </state>
 | 
	
		
			
				|  |  | -      </provider>
 | 
	
		
			
				|  |  | -    </entry>
 | 
	
		
			
				|  |  |      <entry file="file://$PROJECT_DIR$/c_style/css.css.map">
 | 
	
		
			
				|  |  | -      <provider selected="true" editor-type-id="text-editor" />
 | 
	
		
			
				|  |  |        <provider editor-type-id="sourcemapFileViewerProvider" />
 | 
	
		
			
				|  |  | +      <provider selected="true" editor-type-id="text-editor" />
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  |      <entry file="file://$PROJECT_DIR$/c_style/project.css">
 | 
	
		
			
				|  |  |        <provider selected="true" editor-type-id="text-editor">
 | 
	
	
		
			
				|  | @@ -650,20 +668,20 @@
 | 
	
		
			
				|  |  |        </provider>
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  |      <entry file="file://$PROJECT_DIR$/c_style/project.css.map">
 | 
	
		
			
				|  |  | -      <provider selected="true" editor-type-id="text-editor" />
 | 
	
		
			
				|  |  |        <provider editor-type-id="sourcemapFileViewerProvider" />
 | 
	
		
			
				|  |  | +      <provider selected="true" editor-type-id="text-editor" />
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  |      <entry file="file://$PROJECT_DIR$/c_style/shop.css.map">
 | 
	
		
			
				|  |  | -      <provider selected="true" editor-type-id="text-editor" />
 | 
	
		
			
				|  |  |        <provider editor-type-id="sourcemapFileViewerProvider" />
 | 
	
		
			
				|  |  | +      <provider selected="true" editor-type-id="text-editor" />
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  |      <entry file="file://$PROJECT_DIR$/c_style/style.css.map">
 | 
	
		
			
				|  |  | +      <provider editor-type-id="sourcemapFileViewerProvider" />
 | 
	
		
			
				|  |  |        <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  |          <state>
 | 
	
		
			
				|  |  |            <caret column="54" selection-start-column="54" selection-end-column="54" />
 | 
	
		
			
				|  |  |          </state>
 | 
	
		
			
				|  |  |        </provider>
 | 
	
		
			
				|  |  | -      <provider editor-type-id="sourcemapFileViewerProvider" />
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  |      <entry file="file://$PROJECT_DIR$/c_style/style.css">
 | 
	
		
			
				|  |  |        <provider selected="true" editor-type-id="text-editor">
 | 
	
	
		
			
				|  | @@ -713,89 +731,93 @@
 | 
	
		
			
				|  |  |      <entry file="file://$PROJECT_DIR$/c_image/好评@2x.png">
 | 
	
		
			
				|  |  |        <provider selected="true" editor-type-id="images" />
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  | -    <entry file="file://$PROJECT_DIR$/views/商城/弹框.html">
 | 
	
		
			
				|  |  | +    <entry file="file://$PROJECT_DIR$/c_style/css.less">
 | 
	
		
			
				|  |  |        <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -        <state relative-caret-position="258">
 | 
	
		
			
				|  |  | -          <caret line="66" column="19" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" />
 | 
	
		
			
				|  |  | -          <folding>
 | 
	
		
			
				|  |  | -            <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>
 | 
	
		
			
				|  |  | +        <state relative-caret-position="7106">
 | 
	
		
			
				|  |  | +          <caret line="374" column="19" selection-start-line="374" selection-start-column="19" selection-end-line="374" selection-end-column="19" />
 | 
	
		
			
				|  |  |          </state>
 | 
	
		
			
				|  |  |        </provider>
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  | -    <entry file="file://$PROJECT_DIR$/views/商城/购物车.html">
 | 
	
		
			
				|  |  | +    <entry file="file://$PROJECT_DIR$/c_javascript/fabric.js">
 | 
	
		
			
				|  |  |        <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -        <state relative-caret-position="208">
 | 
	
		
			
				|  |  | -          <caret line="92" column="15" selection-start-line="86" selection-start-column="9" selection-end-line="92" selection-end-column="15" />
 | 
	
		
			
				|  |  | +        <state relative-caret-position="266">
 | 
	
		
			
				|  |  | +          <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
 | 
	
		
			
				|  |  |          </state>
 | 
	
		
			
				|  |  |        </provider>
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  | -    <entry file="file://$PROJECT_DIR$/views/商城/商品列表.html">
 | 
	
		
			
				|  |  | -      <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -        <state relative-caret-position="303">
 | 
	
		
			
				|  |  | -          <caret line="249" column="36" selection-start-line="249" selection-start-column="36" selection-end-line="249" selection-end-column="36" />
 | 
	
		
			
				|  |  | -          <folding>
 | 
	
		
			
				|  |  | -            <element signature="n#style#0;n#div#3;n#div#1;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 | 
	
		
			
				|  |  | -            <element signature="n#style#0;n#div#3;n#div#2;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 | 
	
		
			
				|  |  | -            <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
 | 
	
		
			
				|  |  | -            <element signature="n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
 | 
	
		
			
				|  |  | -            <element signature="n#tr#1;n#tbody#0;n#table#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
 | 
	
		
			
				|  |  | -          </folding>
 | 
	
		
			
				|  |  | -        </state>
 | 
	
		
			
				|  |  | -      </provider>
 | 
	
		
			
				|  |  | +    <entry file="file://$PROJECT_DIR$/c_javascript/fabric.min.js">
 | 
	
		
			
				|  |  | +      <provider selected="true" editor-type-id="text-editor" />
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  |      <entry file="file://$PROJECT_DIR$/c_style/style.less">
 | 
	
		
			
				|  |  |        <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -        <state relative-caret-position="103">
 | 
	
		
			
				|  |  | +        <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>
 | 
	
		
			
				|  |  | -    <entry file="file://$PROJECT_DIR$/c_style/shop.css">
 | 
	
		
			
				|  |  | +    <entry file="file://$PROJECT_DIR$/views/商城/商品列表.html">
 | 
	
		
			
				|  |  |        <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -        <state relative-caret-position="5719">
 | 
	
		
			
				|  |  | -          <caret line="302" column="19" selection-start-line="302" selection-start-column="19" selection-end-line="302" selection-end-column="19" />
 | 
	
		
			
				|  |  | +        <state relative-caret-position="3116">
 | 
	
		
			
				|  |  | +          <caret line="164" column="14" selection-start-line="164" selection-start-column="14" selection-end-line="164" selection-end-column="14" />
 | 
	
		
			
				|  |  | +          <folding>
 | 
	
		
			
				|  |  | +            <element signature="n#style#0;n#div#3;n#div#1;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 | 
	
		
			
				|  |  | +            <element signature="n#style#0;n#div#3;n#div#2;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 | 
	
		
			
				|  |  | +          </folding>
 | 
	
		
			
				|  |  |          </state>
 | 
	
		
			
				|  |  |        </provider>
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  | -    <entry file="file://$PROJECT_DIR$/c_javascript/fabric.js">
 | 
	
		
			
				|  |  | +    <entry file="file://$PROJECT_DIR$/views/商城/弹框.html">
 | 
	
		
			
				|  |  |        <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -        <state relative-caret-position="266">
 | 
	
		
			
				|  |  | -          <caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
 | 
	
		
			
				|  |  | +        <state relative-caret-position="1254">
 | 
	
		
			
				|  |  | +          <caret line="66" column="19" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" />
 | 
	
		
			
				|  |  | +          <folding>
 | 
	
		
			
				|  |  | +            <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>
 | 
	
		
			
				|  |  |          </state>
 | 
	
		
			
				|  |  |        </provider>
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  | -    <entry file="file://$PROJECT_DIR$/c_javascript/fabric.min.js">
 | 
	
		
			
				|  |  | -      <provider selected="true" editor-type-id="text-editor" />
 | 
	
		
			
				|  |  | -    </entry>
 | 
	
		
			
				|  |  |      <entry file="file://$PROJECT_DIR$/c_javascript/维修品牌.js">
 | 
	
		
			
				|  |  |        <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  |          <state relative-caret-position="304">
 | 
	
		
			
				|  |  | -          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
 | 
	
		
			
				|  |  | +          <caret line="16" selection-start-line="16" selection-end-line="16" />
 | 
	
		
			
				|  |  | +        </state>
 | 
	
		
			
				|  |  | +      </provider>
 | 
	
		
			
				|  |  | +    </entry>
 | 
	
		
			
				|  |  | +    <entry file="jar://$APPLICATION_HOME_DIR$/lib/platform-impl.jar!/resources/html5-schema/html5/tables.rnc">
 | 
	
		
			
				|  |  | +      <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | +        <state relative-caret-position="283">
 | 
	
		
			
				|  |  | +          <caret line="173" column="14" lean-forward="true" selection-start-line="173" selection-start-column="14" selection-end-line="173" selection-end-column="14" />
 | 
	
		
			
				|  |  |          </state>
 | 
	
		
			
				|  |  |        </provider>
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  |      <entry file="file://$PROJECT_DIR$/views/商城/订单详情.html">
 | 
	
		
			
				|  |  |        <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -        <state relative-caret-position="260">
 | 
	
		
			
				|  |  | -          <caret line="77" column="8" lean-forward="true" selection-start-line="77" selection-start-column="8" selection-end-line="77" selection-end-column="8" />
 | 
	
		
			
				|  |  | +        <state relative-caret-position="133">
 | 
	
		
			
				|  |  | +          <caret line="82" column="31" lean-forward="true" selection-start-line="82" selection-start-column="31" selection-end-line="82" selection-end-column="31" />
 | 
	
		
			
				|  |  |            <folding>
 | 
	
		
			
				|  |  |              <element signature="n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
 | 
	
		
			
				|  |  |            </folding>
 | 
	
		
			
				|  |  |          </state>
 | 
	
		
			
				|  |  |        </provider>
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  | -    <entry file="file://$PROJECT_DIR$/c_style/shop.less">
 | 
	
		
			
				|  |  | +    <entry file="file://$PROJECT_DIR$/c_style/shop.css">
 | 
	
		
			
				|  |  |        <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | -        <state relative-caret-position="262">
 | 
	
		
			
				|  |  | -          <caret line="458" column="1" lean-forward="true" selection-start-line="458" selection-start-column="1" selection-end-line="458" selection-end-column="1" />
 | 
	
		
			
				|  |  | +        <state relative-caret-position="142">
 | 
	
		
			
				|  |  | +          <caret line="51" column="43" selection-start-line="51" selection-start-column="43" selection-end-line="51" selection-end-column="43" />
 | 
	
		
			
				|  |  |          </state>
 | 
	
		
			
				|  |  |        </provider>
 | 
	
		
			
				|  |  |      </entry>
 | 
	
		
			
				|  |  | -    <entry file="file://$PROJECT_DIR$/c_style/css.less">
 | 
	
		
			
				|  |  | +    <entry file="file://$PROJECT_DIR$/c_style/shop.less">
 | 
	
		
			
				|  |  |        <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  |          <state relative-caret-position="169">
 | 
	
		
			
				|  |  | -          <caret line="43" column="1" lean-forward="true" selection-start-line="43" selection-start-column="1" selection-end-line="43" selection-end-column="1" />
 | 
	
		
			
				|  |  | +          <caret line="53" column="5" lean-forward="true" selection-start-line="53" selection-start-column="5" selection-end-line="53" selection-end-column="5" />
 | 
	
		
			
				|  |  | +        </state>
 | 
	
		
			
				|  |  | +      </provider>
 | 
	
		
			
				|  |  | +    </entry>
 | 
	
		
			
				|  |  | +    <entry file="file://$PROJECT_DIR$/views/商城/购物车.html">
 | 
	
		
			
				|  |  | +      <provider selected="true" editor-type-id="text-editor">
 | 
	
		
			
				|  |  | +        <state relative-caret-position="246">
 | 
	
		
			
				|  |  | +          <caret line="16" column="26" lean-forward="true" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
 | 
	
		
			
				|  |  |          </state>
 | 
	
		
			
				|  |  |        </provider>
 | 
	
		
			
				|  |  |      </entry>
 |