Pārlūkot izejas kodu

fix 整理后问题

caoyuanye 4 gadi atpakaļ
vecāks
revīzija
49124938ca
7 mainītis faili ar 77 papildinājumiem un 134 dzēšanām
  1. 67 126
      .idea/workspace.xml
  2. 2 2
      c_style/css.css
  3. 1 1
      c_style/css.css.map
  4. 2 2
      c_style/css.less
  5. 2 1
      c_style/shop.css
  6. 1 1
      c_style/shop.css.map
  7. 2 1
      c_style/shop.less

+ 67 - 126
.idea/workspace.xml

@@ -2,81 +2,13 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="5ae07691-f935-424c-bcfb-2ecce8956daa" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/c_javascript/fabric.min.js" 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$/c_style/css.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/css.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/css.css.map" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/css.less" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/css.less" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/project.css" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/project.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/project.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/project.css.map" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/project.less" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/project.less" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/shop.css" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/shop.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/shop.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/shop.css.map" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/shop.less" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/shop.less" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/style.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/style.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/style.css.map" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/style.less" beforeDir="false" afterPath="$PROJECT_DIR$/c_style/style.less" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fabric.js" beforeDir="false" afterPath="$PROJECT_DIR$/c_javascript/fabric.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/fabric.min.js" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/bg-button.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/bg-button.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/bg-img.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/bg-img.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/bg_mob_vip_blue.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/bg_mob_vip_blue.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/bg_mob_vip_green.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/bg_mob_vip_green.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/bg_mob_vip_yellow.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/bg_mob_vip_yellow.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/btn_addpic@2x.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/btn_addpic@2x.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/djq_title.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/djq_title.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/europe-bg1.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/europe-bg1.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/europe-bg2.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/europe-bg2.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/europe-logo.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/europe-logo.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon-bao.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon-bao.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon-fadongji.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon-fadongji.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon_bad_def@2x.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon_bad_def@2x.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon_bad_pre@2x.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon_bad_pre@2x.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon_delpic@2x.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon_delpic@2x.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon_good_def@2x.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon_good_def@2x.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon_normal_def@2x.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon_normal_def@2x.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon_normal_pre@2x.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon_normal_pre@2x.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon_ordernum@2x.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon_ordernum@2x.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon_shop@2x.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon_shop@2x.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon_star_def.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon_star_def.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon_star_def@2x.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon_star_def@2x.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon_star_hover.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon_star_hover.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/icon_star_pre@2x.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/icon_star_pre@2x.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/info-jt.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/info-jt.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/shopcar.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/shopcar.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/title.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/title.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/tyk_bg.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/tyk_bg.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/tyk_title.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/tyk_title.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/yl_title.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/yl_title.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/image/好评@2x.png" beforeDir="false" afterPath="$PROJECT_DIR$/c_image/好评@2x.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/layui/lay/modules/colorpicker.js" beforeDir="false" afterPath="$PROJECT_DIR$/layui/lay/modules/colorpicker.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/layui/lay/modules/laydate.js" beforeDir="false" afterPath="$PROJECT_DIR$/layui/lay/modules/laydate.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/layui/lay/modules/layedit.js" beforeDir="false" afterPath="$PROJECT_DIR$/layui/lay/modules/layedit.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/layui/lay/modules/layer.js" beforeDir="false" afterPath="$PROJECT_DIR$/layui/lay/modules/layer.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/layui/lay/modules/laypage.js" beforeDir="false" afterPath="$PROJECT_DIR$/layui/lay/modules/laypage.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/layui/lay/modules/mobile.js" beforeDir="false" afterPath="$PROJECT_DIR$/layui/lay/modules/mobile.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/layui/lay/modules/rate.js" beforeDir="false" afterPath="$PROJECT_DIR$/layui/lay/modules/rate.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/layui/lay/modules/slider.js" beforeDir="false" afterPath="$PROJECT_DIR$/layui/lay/modules/slider.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/layui/lay/modules/table.js" beforeDir="false" afterPath="$PROJECT_DIR$/layui/lay/modules/table.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/layui/lay/modules/tree.js" beforeDir="false" afterPath="$PROJECT_DIR$/layui/lay/modules/tree.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/layui/lay/modules/util.js" beforeDir="false" afterPath="$PROJECT_DIR$/layui/lay/modules/util.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/layui/layui.all.js" beforeDir="false" afterPath="$PROJECT_DIR$/layui/layui.all.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/layui/layui.js" beforeDir="false" afterPath="$PROJECT_DIR$/layui/layui.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/商城/商品列表.html" beforeDir="false" afterPath="$PROJECT_DIR$/views/商城/商品列表.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/商城/弹框.html" beforeDir="false" afterPath="$PROJECT_DIR$/views/商城/弹框.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/商城/订单详情.html" beforeDir="false" afterPath="$PROJECT_DIR$/views/商城/订单详情.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/商城/购物车.html" beforeDir="false" afterPath="$PROJECT_DIR$/views/商城/购物车.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/杂项/add-template.html" beforeDir="false" afterPath="$PROJECT_DIR$/views/杂项/add-template.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/杂项/客户管理.html" beforeDir="false" afterPath="$PROJECT_DIR$/views/杂项/客户管理.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/杂项/检测开单.html" beforeDir="false" afterPath="$PROJECT_DIR$/views/杂项/检测开单.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/杂项/维修品牌.html" beforeDir="false" afterPath="$PROJECT_DIR$/views/杂项/维修品牌.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/杂项/超值体验卡.html" beforeDir="false" afterPath="$PROJECT_DIR$/views/杂项/超值体验卡.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/杂项/项目详情.html" beforeDir="false" afterPath="$PROJECT_DIR$/views/杂项/项目详情.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/欧洲维修/europe.css" beforeDir="false" afterPath="$PROJECT_DIR$/views/欧洲维修/europe.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/欧洲维修/europe.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/views/欧洲维修/europe.css.map" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/欧洲维修/europe.less" beforeDir="false" afterPath="$PROJECT_DIR$/views/欧洲维修/europe.less" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/views/运营-回访/回访.html" beforeDir="false" afterPath="$PROJECT_DIR$/views/运营-回访/回访.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/维修品牌.js" beforeDir="false" afterPath="$PROJECT_DIR$/c_javascript/维修品牌.js" 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" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -89,11 +21,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <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="189">
-              <caret line="388" column="28" selection-start-line="388" selection-start-column="28" selection-end-line="388" selection-end-column="28" />
+            <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>
@@ -116,7 +48,7 @@
         <entry file="file://$PROJECT_DIR$/c_style/shop.css">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="5719">
-              <caret line="301" column="19" selection-start-line="301" selection-start-column="19" selection-end-line="301" selection-end-column="19" />
+              <caret line="302" column="19" selection-start-line="302" selection-start-column="19" selection-end-line="302" selection-end-column="19" />
             </state>
           </provider>
         </entry>
@@ -124,8 +56,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="114">
-              <caret line="6" column="19" lean-forward="true" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
+            <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>
           </provider>
         </entry>
@@ -156,22 +88,22 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/views/商城/弹框.html">
+        <entry file="file://$PROJECT_DIR$/c_javascript/维修品牌.js">
           <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="304">
+              <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/c_javascript/维修品牌.js">
+      <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="228">
-              <caret line="12" column="4" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
+            <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" />
+              <folding>
+                <element signature="n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -196,9 +128,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>td-containe</find>
-      <find>span</find>
-      <find>shop-container-shopping-cart</find>
       <find>shop-container-filter-item-title</find>
       <find>配件列表</find>
       <find>th</find>
@@ -226,6 +155,9 @@
       <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>icon-danhao</find>
     </findStrings>
     <replaceStrings>
       <replace>h4</replace>
@@ -265,6 +197,7 @@
         <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" />
       </list>
     </option>
   </component>
@@ -425,7 +358,7 @@
       <workItem from="1597971385163" duration="1671000" />
       <workItem from="1598230356145" duration="597000" />
       <workItem from="1598316904927" duration="596000" />
-      <workItem from="1598403779687" duration="11608000" />
+      <workItem from="1598403779687" duration="12380000" />
     </task>
     <task id="LOCAL-00001" summary="fix">
       <created>1594365774472</created>
@@ -476,11 +409,18 @@
       <option name="project" value="LOCAL" />
       <updated>1598421767811</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="整理">
+      <created>1598427795885</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1598427795885</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="198912000" />
+    <option name="totallyTimeSpent" value="199684000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
@@ -499,8 +439,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.5019815" side_tool="true" visible="true" weight="0.32577905" />
-      <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.49141347" weight="0.32577905" />
+      <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="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" />
@@ -553,7 +493,8 @@
     <MESSAGE value="fix" />
     <MESSAGE value="欧洲维修登录" />
     <MESSAGE value="商城" />
-    <option name="LAST_COMMIT_MESSAGE" value="商城" />
+    <MESSAGE value="整理" />
+    <option name="LAST_COMMIT_MESSAGE" value="整理" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/package-lock.json" />
@@ -772,16 +713,6 @@
     <entry file="file://$PROJECT_DIR$/c_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">
-        <state relative-caret-position="532">
-          <caret line="85" column="24" selection-start-line="85" selection-start-column="24" selection-end-line="85" selection-end-column="24" />
-          <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$/views/商城/弹框.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="258">
@@ -799,13 +730,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/c_style/css.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="388" column="28" selection-start-line="388" selection-start-column="28" selection-end-line="388" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/views/商城/商品列表.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="303">
@@ -830,14 +754,7 @@
     <entry file="file://$PROJECT_DIR$/c_style/shop.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="5719">
-          <caret line="301" column="19" selection-start-line="301" selection-start-column="19" selection-end-line="301" selection-end-column="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/c_style/shop.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="6" column="19" lean-forward="true" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="19" />
+          <caret line="302" column="19" selection-start-line="302" selection-start-column="19" selection-end-line="302" selection-end-column="19" />
         </state>
       </provider>
     </entry>
@@ -853,8 +770,32 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/c_javascript/维修品牌.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="228">
-          <caret line="12" column="4" lean-forward="true" selection-start-line="12" selection-start-column="4" selection-end-line="12" selection-end-column="4" />
+        <state relative-caret-position="304">
+          <caret line="16" lean-forward="true" selection-start-line="16" selection-end-line="16" />
+        </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" />
+          <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">
+      <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>
+      </provider>
+    </entry>
+    <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>

+ 2 - 2
c_style/css.css

@@ -16,14 +16,14 @@
 .icon-danhao {
   width: 15px;
   height: 17px;
-  background: url('../image/icon_ordernum@2x.png') no-repeat;
+  background: url('../c_image/icon_ordernum@2x.png') no-repeat;
   background-size: contain;
   display: inline-block;
 }
 .icon-danhao {
   width: 15px;
   height: 17px;
-  background: url('../image/icon_shop@2x.png') no-repeat;
+  background: url('../c_image/icon_shop@2x.png') no-repeat;
   background-size: contain;
   display: inline-block;
 }

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
c_style/css.css.map


+ 2 - 2
c_style/css.less

@@ -37,10 +37,10 @@
   color:rgba(255,79,0,1);
 }
 .icon-danhao{
-  .icon(15px,17px,'../image/icon_ordernum@2x.png')
+  .icon(15px,17px,'../c_image/icon_ordernum@2x.png')
 }
 .icon-danhao{
-  .icon(15px,17px,'../image/icon_shop@2x.png')
+  .icon(15px,17px,'../c_image/icon_shop@2x.png')
 }
 .card-box {
   .border();

+ 2 - 1
c_style/shop.css

@@ -18,7 +18,8 @@
   justify-content: space-between;
 }
 .shop-container .shop-container-info-box .shop-container-info-item {
-  width: 355px;
+  width: 22%;
+  min-width: 280px;
   min-height: 117px;
   border: 1px solid #eeeeee;
   padding: 15px;

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
c_style/shop.css.map


+ 2 - 1
c_style/shop.less

@@ -16,7 +16,8 @@
     display: flex;
     justify-content: space-between;
     .shop-container-info-item{
-      width:355px;
+      width:22%;
+      min-width: 280px;
       min-height:117px;
       border:1px solid rgba(238,238,238,1);
       padding: 15px;