caoyuanye 4 år sedan
förälder
incheckning
d74942ca72
75 ändrade filer med 508 tillägg och 334 borttagningar
  1. 221 143
      .idea/workspace.xml
  2. 0 0
      c_image/bg-button.png
  3. 0 0
      c_image/bg-img.png
  4. 0 0
      c_image/bg_mob_vip_blue.png
  5. 0 0
      c_image/bg_mob_vip_green.png
  6. 0 0
      c_image/bg_mob_vip_yellow.png
  7. 0 0
      c_image/btn_addpic@2x.png
  8. 0 0
      c_image/djq_title.png
  9. 0 0
      c_image/europe-bg1.png
  10. 0 0
      c_image/europe-bg2.png
  11. 0 0
      c_image/europe-logo.png
  12. 0 0
      c_image/icon-bao.png
  13. 0 0
      c_image/icon-fadongji.png
  14. 0 0
      c_image/icon_bad_def@2x.png
  15. 0 0
      c_image/icon_bad_pre@2x.png
  16. 0 0
      c_image/icon_delpic@2x.png
  17. 0 0
      c_image/icon_good_def@2x.png
  18. 0 0
      c_image/icon_normal_def@2x.png
  19. 0 0
      c_image/icon_normal_pre@2x.png
  20. 0 0
      c_image/icon_ordernum@2x.png
  21. 0 0
      c_image/icon_shop@2x.png
  22. 0 0
      c_image/icon_star_def.png
  23. 0 0
      c_image/icon_star_def@2x.png
  24. 0 0
      c_image/icon_star_hover.png
  25. 0 0
      c_image/icon_star_pre@2x.png
  26. 0 0
      c_image/info-jt.png
  27. 0 0
      c_image/shopcar.png
  28. 0 0
      c_image/title.png
  29. 0 0
      c_image/tyk_bg.png
  30. 0 0
      c_image/tyk_title.png
  31. 0 0
      c_image/yl_title.png
  32. 0 0
      c_image/好评@2x.png
  33. 105 105
      fabric.js
  34. 1 0
      c_javascript/fabric.min.js
  35. 0 0
      c_javascript/维修品牌.js
  36. 6 6
      css/css.css
  37. 1 1
      css/css.css.map
  38. 6 6
      css/css.less
  39. 2 2
      css/project.css
  40. 1 1
      css/project.css.map
  41. 2 2
      css/project.less
  42. 28 7
      css/shop.css
  43. 1 1
      css/shop.css.map
  44. 28 7
      css/shop.less
  45. 1 1
      css/style.css
  46. 0 0
      c_style/style.css.map
  47. 0 0
      c_style/style.less
  48. 0 1
      fabric.min.js
  49. 1 1
      layui/lay/modules/colorpicker.js
  50. 1 1
      layui/lay/modules/laydate.js
  51. 1 1
      layui/lay/modules/layedit.js
  52. 1 1
      layui/lay/modules/layer.js
  53. 1 1
      layui/lay/modules/laypage.js
  54. 1 1
      layui/lay/modules/mobile.js
  55. 1 1
      layui/lay/modules/rate.js
  56. 1 1
      layui/lay/modules/slider.js
  57. 1 1
      layui/lay/modules/table.js
  58. 1 1
      layui/lay/modules/tree.js
  59. 1 1
      layui/lay/modules/util.js
  60. 2 2
      layui/layui.all.js
  61. 1 1
      layui/layui.js
  62. 60 6
      views/商城/商品列表.html
  63. 3 3
      views/商城/弹框.html
  64. 2 2
      views/商城/订单详情.html
  65. 2 2
      views/商城/购物车.html
  66. 3 3
      views/杂项/add-template.html
  67. 1 1
      views/杂项/客户管理.html
  68. 3 3
      views/杂项/检测开单.html
  69. 2 2
      views/杂项/维修品牌.html
  70. 5 5
      views/杂项/超值体验卡.html
  71. 2 2
      views/杂项/项目详情.html
  72. 3 3
      views/欧洲维修/europe.css
  73. 1 1
      views/欧洲维修/europe.css.map
  74. 3 3
      views/欧洲维修/europe.less
  75. 1 1
      views/运营-回访/回访.html

+ 221 - 143
.idea/workspace.xml

@@ -2,21 +2,81 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="5ae07691-f935-424c-bcfb-2ecce8956daa" name="Default Changelist" comment="">
-      <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 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$/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.less" beforeDir="false" afterPath="$PROJECT_DIR$/css/css.less" 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" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -30,56 +90,76 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/css/css.less">
+        <entry file="file://$PROJECT_DIR$/c_style/css.less">
           <provider selected="true" editor-type-id="text-editor">
-            <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 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>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/image/icon_delpic@2x.png">
-          <provider selected="true" editor-type-id="images" />
+        <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$/image/icon_good_def@2x.png">
-          <provider selected="true" editor-type-id="images" />
+        <entry file="file://$PROJECT_DIR$/c_javascript/fabric.min.js">
+          <provider selected="true" editor-type-id="text-editor" />
+        </entry>
+      </file>
+      <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="301" column="19" selection-start-line="301" selection-start-column="19" selection-end-line="301" selection-end-column="19" />
+            </state>
+          </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/image/icon_normal_def@2x.png">
-          <provider selected="true" editor-type-id="images" />
+        <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>
+          </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/image/icon_normal_pre@2x.png">
-          <provider selected="true" editor-type-id="images" />
+        <entry file="file://$PROJECT_DIR$/c_style/style.less">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="103">
+              <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="file://$PROJECT_DIR$/views/商城/商品列表.html">
           <provider selected="true" editor-type-id="text-editor">
-            <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" />
+            <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 pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/image/好评@2x.png">
-          <provider selected="true" editor-type-id="images" />
-        </entry>
-      </file>
-      <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="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" />
+            <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>
@@ -87,14 +167,11 @@
           </provider>
         </entry>
       </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$/c_javascript/维修品牌.js">
           <provider selected="true" editor-type-id="text-editor">
-            <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>
-                <element signature="n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
-              </folding>
+            <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>
           </provider>
         </entry>
@@ -102,11 +179,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="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 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>
           </provider>
         </entry>
@@ -122,24 +196,17 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>shop-container-search</find>
-      <find>shop-container-filter-item</find>
-      <find>wrapper</find>
-      <find>shop-container-filter-box-wrapper</find>
       <find>td-containe</find>
       <find>span</find>
       <find>shop-container-shopping-cart</find>
       <find>shop-container-filter-item-title</find>
-      <find>shop-container-filter-item-container</find>
       <find>配件列表</find>
       <find>th</find>
       <find>rmb-title</find>
-      <find>tr</find>
       <find>32</find>
       <find>ml10</find>
       <find>count-input-btn</find>
       <find>disa</find>
-      <find>count-input-btn-add</find>
       <find>disabled-tr</find>
       <find>table-operation</find>
       <find>全选</find>
@@ -152,6 +219,13 @@
       <find>table-operation2</find>
       <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>
     </findStrings>
     <replaceStrings>
       <replace>h4</replace>
@@ -180,15 +254,17 @@
         <option value="$PROJECT_DIR$/views/欧洲维修/europe.less" />
         <option value="$PROJECT_DIR$/html.html" />
         <option value="$PROJECT_DIR$/views/欧洲维修/index.html" />
-        <option value="$PROJECT_DIR$/views/商城/商品列表.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$/css/shop.less" />
         <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" />
       </list>
     </option>
   </component>
@@ -210,16 +286,6 @@
               <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="css" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="html" type="b2602c69:ProjectViewProjectNode" />
-              <item name="html" type="462c0819:PsiDirectoryNode" />
-              <item name="image" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="html" type="b2602c69:ProjectViewProjectNode" />
               <item name="html" type="462c0819:PsiDirectoryNode" />
@@ -248,6 +314,7 @@
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\workspace\html\c_javascript" />
       <recent name="D:\workspace\html\css" />
       <recent name="D:\workspace\html\views\杂项" />
       <recent name="D:\workspace\html" />
@@ -358,7 +425,7 @@
       <workItem from="1597971385163" duration="1671000" />
       <workItem from="1598230356145" duration="597000" />
       <workItem from="1598316904927" duration="596000" />
-      <workItem from="1598403779687" duration="6080000" />
+      <workItem from="1598403779687" duration="11608000" />
     </task>
     <task id="LOCAL-00001" summary="fix">
       <created>1594365774472</created>
@@ -402,11 +469,18 @@
       <option name="project" value="LOCAL" />
       <updated>1597910254847</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="商城">
+      <created>1598421767811</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1598421767811</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="193384000" />
+    <option name="totallyTimeSpent" value="198912000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
@@ -417,16 +491,16 @@
       <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 anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" weight="0.32956153" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.47754294" weight="0.3243626" />
+      <window_info anchor="bottom" id="Find" order="1" sideWeight="0.4980185" weight="0.3286119" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.47688243" weight="0.3243626" />
       <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="Inspection" order="5" weight="0.4" />
       <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.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="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="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" />
@@ -497,13 +571,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/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>
     <entry file="file://$PROJECT_DIR$/img/icon_circle_big.png" />
     <entry file="file://$PROJECT_DIR$/layui/css/layui.css">
       <provider selected="true" editor-type-id="text-editor">
@@ -512,13 +579,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/维修品牌.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="247">
-          <caret line="13" column="2" selection-start-line="13" selection-start-column="2" selection-end-line="13" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/views/杂项/add-template.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="456">
@@ -554,10 +614,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/image/europe-bg1.png">
+    <entry file="file://$PROJECT_DIR$/c_image/europe-bg1.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/image/europe-bg2.png">
+    <entry file="file://$PROJECT_DIR$/c_image/europe-bg2.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
     <entry file="file://$PROJECT_DIR$/views/欧洲维修/europe.css">
@@ -637,26 +697,26 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/css.css.map">
+    <entry file="file://$PROJECT_DIR$/c_style/css.css.map">
       <provider selected="true" editor-type-id="text-editor" />
       <provider editor-type-id="sourcemapFileViewerProvider" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/project.css">
+    <entry file="file://$PROJECT_DIR$/c_style/project.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="247">
           <caret line="13" column="42" selection-start-line="13" selection-start-column="42" selection-end-line="13" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/project.css.map">
+    <entry file="file://$PROJECT_DIR$/c_style/project.css.map">
       <provider selected="true" editor-type-id="text-editor" />
       <provider editor-type-id="sourcemapFileViewerProvider" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/shop.css.map">
+    <entry file="file://$PROJECT_DIR$/c_style/shop.css.map">
       <provider selected="true" editor-type-id="text-editor" />
       <provider editor-type-id="sourcemapFileViewerProvider" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css.map">
+    <entry file="file://$PROJECT_DIR$/c_style/style.css.map">
       <provider selected="true" editor-type-id="text-editor">
         <state>
           <caret column="54" selection-start-column="54" selection-end-column="54" />
@@ -664,121 +724,139 @@
       </provider>
       <provider editor-type-id="sourcemapFileViewerProvider" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/style.css">
+    <entry file="file://$PROJECT_DIR$/c_style/style.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="386">
           <caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/css.css">
+    <entry file="file://$PROJECT_DIR$/c_style/css.css">
       <provider selected="true" editor-type-id="text-editor">
         <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/image/icon_ordernum@2x.png">
+    <entry file="file://$PROJECT_DIR$/c_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$/c_style/project.less">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1235">
           <caret line="65" column="7" selection-start-line="65" selection-start-column="7" selection-end-line="65" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <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 file="file://$PROJECT_DIR$/css/shop.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <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>
-      </provider>
-    </entry>
-    <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>
-    <entry file="file://$PROJECT_DIR$/image/btn_addpic@2x.png">
+    <entry file="file://$PROJECT_DIR$/c_image/btn_addpic@2x.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/image/icon_bad_def@2x.png">
+    <entry file="file://$PROJECT_DIR$/c_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">
+    <entry file="file://$PROJECT_DIR$/c_image/icon_bad_pre@2x.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/image/icon_delpic@2x.png">
+    <entry file="file://$PROJECT_DIR$/c_image/icon_delpic@2x.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/image/icon_good_def@2x.png">
+    <entry file="file://$PROJECT_DIR$/c_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">
+    <entry file="file://$PROJECT_DIR$/c_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">
+    <entry file="file://$PROJECT_DIR$/c_image/icon_normal_pre@2x.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/image/好评@2x.png">
+    <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" lean-forward="true" selection-start-line="85" selection-start-column="24" selection-end-line="85" selection-end-column="24" />
+          <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">
+    <entry file="file://$PROJECT_DIR$/views/商城/弹框.html">
       <provider selected="true" editor-type-id="text-editor">
         <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" />
+          <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#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>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/css.less">
+    <entry file="file://$PROJECT_DIR$/views/商城/购物车.html">
       <provider selected="true" editor-type-id="text-editor">
-        <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 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>
       </provider>
     </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="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 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">
+    <entry file="file://$PROJECT_DIR$/views/商城/商品列表.html">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <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#textarea#0;n#div#1;n#div#3;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#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>
+    <entry file="file://$PROJECT_DIR$/c_style/style.less">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="103">
+          <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">
+      <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" />
+        </state>
+      </provider>
+    </entry>
+    <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>
+    <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="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>
+      </provider>
+    </entry>
   </component>
 </project>

image/bg-button.png → c_image/bg-button.png


image/bg-img.png → c_image/bg-img.png


image/bg_mob_vip_blue.png → c_image/bg_mob_vip_blue.png


image/bg_mob_vip_green.png → c_image/bg_mob_vip_green.png


image/bg_mob_vip_yellow.png → c_image/bg_mob_vip_yellow.png


image/btn_addpic@2x.png → c_image/btn_addpic@2x.png


image/djq_title.png → c_image/djq_title.png


image/europe-bg1.png → c_image/europe-bg1.png


image/europe-bg2.png → c_image/europe-bg2.png


image/europe-logo.png → c_image/europe-logo.png


image/icon-bao.png → c_image/icon-bao.png


image/icon-fadongji.png → c_image/icon-fadongji.png


image/icon_bad_def@2x.png → c_image/icon_bad_def@2x.png


image/icon_bad_pre@2x.png → c_image/icon_bad_pre@2x.png


image/icon_delpic@2x.png → c_image/icon_delpic@2x.png


image/icon_good_def@2x.png → c_image/icon_good_def@2x.png


image/icon_normal_def@2x.png → c_image/icon_normal_def@2x.png


image/icon_normal_pre@2x.png → c_image/icon_normal_pre@2x.png


image/icon_ordernum@2x.png → c_image/icon_ordernum@2x.png


image/icon_shop@2x.png → c_image/icon_shop@2x.png


image/icon_star_def.png → c_image/icon_star_def.png


image/icon_star_def@2x.png → c_image/icon_star_def@2x.png


image/icon_star_hover.png → c_image/icon_star_hover.png


image/icon_star_pre@2x.png → c_image/icon_star_pre@2x.png


image/info-jt.png → c_image/info-jt.png


image/shopcar.png → c_image/shopcar.png


image/title.png → c_image/title.png


image/tyk_bg.png → c_image/tyk_bg.png


image/tyk_title.png → c_image/tyk_title.png


image/yl_title.png → c_image/yl_title.png


image/好评@2x.png → c_image/好评@2x.png


+ 105 - 105
fabric.js

@@ -868,12 +868,12 @@ fabric.CommonMethods = {
     },
 
     /**
-     * Loads image element from given url and passes it to a callback
+     * Loads c_image element from given url and passes it to a callback
      * @memberOf fabric.util
-     * @param {String} url URL representing an image
-     * @param {Function} callback Callback; invoked with loaded image
+     * @param {String} url URL representing an c_image
+     * @param {Function} callback Callback; invoked with loaded c_image
      * @param {*} [context] Context to invoke callback in
-     * @param {Object} [crossOrigin] crossOrigin value to set image element to
+     * @param {Object} [crossOrigin] crossOrigin value to set c_image element to
      */
     loadImage: function(url, callback, context, crossOrigin) {
       if (!url) {
@@ -908,7 +908,7 @@ fabric.CommonMethods = {
       // IE10 / IE11-Fix: SVG contents from data: URI
       // will only be available if the IMG is present
       // in the DOM (and visible)
-      if (url.substring(0,14) === 'data:image/svg') {
+      if (url.substring(0,14) === 'data:c_image/svg') {
         img.onload = null;
         fabric.util.loadImageInDom(img, onLoadCallback);
       }
@@ -917,11 +917,11 @@ fabric.CommonMethods = {
     },
 
     /**
-     * Attaches SVG image with data: URL to the dom
+     * Attaches SVG c_image with data: URL to the dom
      * @memberOf fabric.util
-     * @param {Object} img Image object with data:image/svg src
-     * @param {Function} callback Callback; invoked with loaded image
-     * @return {Object} DOM element (div containing the SVG image)
+     * @param {Object} img Image object with data:c_image/svg src
+     * @param {Function} callback Callback; invoked with loaded c_image
+     * @return {Object} DOM element (div containing the SVG c_image)
      */
     loadImageInDom: function(img, onLoadCallback) {
       var div = fabric.document.createElement('div');
@@ -1127,10 +1127,10 @@ fabric.CommonMethods = {
     },
 
     /**
-     * Creates image element (works on client and node)
+     * Creates c_image element (works on client and node)
      * @static
      * @memberOf fabric.util
-     * @return {HTMLImageElement} HTML image element
+     * @return {HTMLImageElement} HTML c_image element
      */
     createImage: function() {
       return fabric.document.createElement('img');
@@ -1251,7 +1251,7 @@ fabric.CommonMethods = {
           imageData = ctx.getImageData(x, y, (tolerance * 2) || 1, (tolerance * 2) || 1),
           l = imageData.data.length;
 
-      // Split image data - for tolerance > 1, pixelDataSize = 4;
+      // Split c_image data - for tolerance > 1, pixelDataSize = 4;
       for (i = 3; i < l; i += 4) {
         temp = imageData.data[i];
         _isTransparent = temp <= 0;
@@ -2000,7 +2000,7 @@ fabric.CommonMethods = {
 (function () {
 
   /**
-   * Cross-browser wrapper for setting element's style
+   * Cross-browser wrapper for setting element's c_style
    * @memberOf fabric.util
    * @param {HTMLElement} element
    * @param {Object} styles
@@ -2246,9 +2246,9 @@ fabric.CommonMethods = {
   }
 
   /**
-   * Returns style attribute value of a given element
+   * Returns c_style attribute value of a given element
    * @memberOf fabric.util
-   * @param {HTMLElement} element Element to get style attribute for
+   * @param {HTMLElement} element Element to get c_style attribute for
    * @param {String} attr Style attribute to get for element
    * @return {String} Style attribute value of the given element.
    */
@@ -3687,7 +3687,7 @@ if (typeof console !== 'undefined') {
     backgroundColor: '',
 
     /**
-     * Background image of canvas instance.
+     * Background c_image of canvas instance.
      * Should be set via {@link fabric.StaticCanvas#setBackgroundImage}.
      * <b>Backwards incompatibility note:</b> The "backgroundImageOpacity"
      * and "backgroundImageStretch" properties are deprecated since 1.3.9.
@@ -3707,7 +3707,7 @@ if (typeof console !== 'undefined') {
     overlayColor: '',
 
     /**
-     * Overlay image of canvas instance.
+     * Overlay c_image of canvas instance.
      * Should be set via {@link fabric.StaticCanvas#setOverlayImage}.
      * <b>Backwards incompatibility note:</b> The "overlayImageLeft"
      * and "overlayImageTop" properties are deprecated since 1.3.9.
@@ -3753,7 +3753,7 @@ if (typeof console !== 'undefined') {
     clipTo: null,
 
     /**
-     * Indicates whether object controls (borders/controls) are rendered above overlay image
+     * Indicates whether object controls (borders/controls) are rendered above overlay c_image
      * @type Boolean
      * @default
      */
@@ -3767,7 +3767,7 @@ if (typeof console !== 'undefined') {
     allowTouchScrolling: false,
 
     /**
-     * Indicates whether this canvas will use image smoothing, this is on by default in browsers
+     * Indicates whether this canvas will use c_image smoothing, this is on by default in browsers
      * @type Boolean
      * @default
      */
@@ -3781,7 +3781,7 @@ if (typeof console !== 'undefined') {
     viewportTransform: fabric.iMatrix.concat(),
 
     /**
-     * if set to false background image is not affected by viewport transform
+     * if set to false background c_image is not affected by viewport transform
      * @since 1.6.3
      * @type Boolean
      * @default
@@ -3789,7 +3789,7 @@ if (typeof console !== 'undefined') {
     backgroundVpt: true,
 
     /**
-     * if set to false overlya image is not affected by viewport transform
+     * if set to false overlya c_image is not affected by viewport transform
      * @since 1.6.3
      * @type Boolean
      * @default
@@ -3906,10 +3906,10 @@ if (typeof console !== 'undefined') {
     },
 
     /**
-     * Sets {@link fabric.StaticCanvas#overlayImage|overlay image} for this canvas
-     * @param {(fabric.Image|String)} image fabric.Image instance or URL of an image to set overlay to
-     * @param {Function} callback callback to invoke when image is loaded and set as an overlay
-     * @param {Object} [options] Optional options to set for the {@link fabric.Image|overlay image}.
+     * Sets {@link fabric.StaticCanvas#overlayImage|overlay c_image} for this canvas
+     * @param {(fabric.Image|String)} image fabric.Image instance or URL of an c_image to set overlay to
+     * @param {Function} callback callback to invoke when c_image is loaded and set as an overlay
+     * @param {Object} [options] Optional options to set for the {@link fabric.Image|overlay c_image}.
      * @return {fabric.Canvas} thisArg
      * @chainable
      * @see {@link http://jsfiddle.net/fabricjs/MnzHT/|jsFiddle demo}
@@ -3957,10 +3957,10 @@ if (typeof console !== 'undefined') {
     },
 
     /**
-     * Sets {@link fabric.StaticCanvas#backgroundImage|background image} for this canvas
-     * @param {(fabric.Image|String)} image fabric.Image instance or URL of an image to set background to
-     * @param {Function} callback Callback to invoke when image is loaded and set as background
-     * @param {Object} [options] Optional options to set for the {@link fabric.Image|background image}.
+     * Sets {@link fabric.StaticCanvas#backgroundImage|background c_image} for this canvas
+     * @param {(fabric.Image|String)} image fabric.Image instance or URL of an c_image to set background to
+     * @param {Function} callback Callback to invoke when c_image is loaded and set as background
+     * @param {Object} [options] Optional options to set for the {@link fabric.Image|background c_image}.
      * @return {fabric.Canvas} thisArg
      * @chainable
      * @see {@link http://jsfiddle.net/djnr8o7a/28/|jsFiddle demo}
@@ -4073,8 +4073,8 @@ if (typeof console !== 'undefined') {
      * @private
      * @param {String} property Property to set ({@link fabric.StaticCanvas#backgroundImage|backgroundImage}
      * or {@link fabric.StaticCanvas#overlayImage|overlayImage})
-     * @param {(fabric.Image|String|null)} image fabric.Image instance, URL of an image or null to set background or overlay to
-     * @param {Function} callback Callback to invoke when image is loaded and set as background or overlay
+     * @param {(fabric.Image|String|null)} image fabric.Image instance, URL of an c_image or null to set background or overlay to
+     * @param {Function} callback Callback to invoke when c_image is loaded and set as background or overlay
      * @param {Object} [options] Optional options to set for the {@link fabric.Image|image}.
      */
     __setBgOverlayImage: function(property, image, callback, options) {
@@ -4191,7 +4191,7 @@ if (typeof console !== 'undefined') {
      * @param {Number|String} value                         Value to set width to
      * @param {Object}        [options]                     Options object
      * @param {Boolean}       [options.backstoreOnly=false] Set the given dimensions only as canvas backstore dimensions
-     * @param {Boolean}       [options.cssOnly=false]       Set the given dimensions only as css dimensions
+     * @param {Boolean}       [options.cssOnly=false]       Set the given dimensions only as c_style dimensions
      * @return {fabric.Canvas} instance
      * @chainable true
      */
@@ -4204,7 +4204,7 @@ if (typeof console !== 'undefined') {
      * @param {Number|String} value                         Value to set height to
      * @param {Object}        [options]                     Options object
      * @param {Boolean}       [options.backstoreOnly=false] Set the given dimensions only as canvas backstore dimensions
-     * @param {Boolean}       [options.cssOnly=false]       Set the given dimensions only as css dimensions
+     * @param {Boolean}       [options.cssOnly=false]       Set the given dimensions only as c_style dimensions
      * @return {fabric.Canvas} instance
      * @chainable true
      */
@@ -4219,7 +4219,7 @@ if (typeof console !== 'undefined') {
      * @param {Number|String} [dimensions.height]           Height of canvas element
      * @param {Object}        [options]                     Options object
      * @param {Boolean}       [options.backstoreOnly=false] Set the given dimensions only as canvas backstore dimensions
-     * @param {Boolean}       [options.cssOnly=false]       Set the given dimensions only as css dimensions
+     * @param {Boolean}       [options.cssOnly=false]       Set the given dimensions only as c_style dimensions
      * @return {fabric.Canvas} thisArg
      * @chainable
      */
@@ -4280,7 +4280,7 @@ if (typeof console !== 'undefined') {
     },
 
     /**
-     * Helper for setting css width/height
+     * Helper for setting c_style width/height
      * @private
      * @param {String} prop property (width|height)
      * @param {String} value value to set property to
@@ -4997,11 +4997,11 @@ if (typeof console !== 'undefined') {
 
       if (markup) {
         markup = [
-          '\t<style type="text/css">',
+          '\t<c_style type="text/c_style">',
           '<![CDATA[\n',
           markup,
           ']]>',
-          '</style>\n'
+          '</c_style>\n'
         ].join('');
       }
 
@@ -5371,7 +5371,7 @@ if (typeof console !== 'undefined') {
 
         case 'toDataURLWithQuality':
           try {
-            el.toDataURL('image/jpeg', 0);
+            el.toDataURL('c_image/jpeg', 0);
             return true;
           }
           catch (e) { }
@@ -5420,16 +5420,16 @@ if (typeof console !== 'undefined') {
   fabric.util.object.extend(fabric.StaticCanvas.prototype, /** @lends fabric.StaticCanvas.prototype */ {
 
     /**
-     * Exports canvas element to a dataurl image. Note that when multiplier is used, cropping is scaled appropriately
+     * Exports canvas element to a dataurl c_image. Note that when multiplier is used, cropping is scaled appropriately
      * @param {Object} [options] Options object
-     * @param {String} [options.format=png] The format of the output image. Either "jpeg" or "png"
+     * @param {String} [options.format=png] The format of the output c_image. Either "jpeg" or "png"
      * @param {Number} [options.quality=1] Quality level (0..1). Only used for jpeg.
      * @param {Number} [options.multiplier=1] Multiplier to scale by, to have consistent
      * @param {Number} [options.left] Cropping left offset. Introduced in v1.2.14
      * @param {Number} [options.top] Cropping top offset. Introduced in v1.2.14
      * @param {Number} [options.width] Cropping width. Introduced in v1.2.14
      * @param {Number} [options.height] Cropping height. Introduced in v1.2.14
-     * @param {Boolean} [options.enableRetinaScaling] Enable retina scaling for clone image. Introduce in 2.0.0
+     * @param {Boolean} [options.enableRetinaScaling] Enable retina scaling for clone c_image. Introduce in 2.0.0
      * @return {String} Returns a data: URL containing a representation of the object in the format specified by options.format
      * @see {@link http://jsfiddle.net/fabricjs/NfZVb/|jsFiddle demo}
      * @example <caption>Generate jpeg dataURL with lower quality</caption>
@@ -5520,8 +5520,8 @@ if (typeof console !== 'undefined') {
       }
 
       var data = supportQuality
-        ? canvasEl.toDataURL('image/' + format, quality)
-        : canvasEl.toDataURL('image/' + format);
+        ? canvasEl.toDataURL('c_image/' + format, quality)
+        : canvasEl.toDataURL('c_image/' + format);
 
       return data;
     },
@@ -5759,7 +5759,7 @@ if (typeof console !== 'undefined') {
     cornerStrokeColor:        null,
 
     /**
-     * Specify style of control, 'rect' or 'circle'
+     * Specify c_style of control, 'rect' or 'circle'
      * @since 1.6.2
      * @type String
      */
@@ -5794,7 +5794,7 @@ if (typeof console !== 'undefined') {
 
     /**
      * Color of object's fill
-     * takes css colors https://www.w3.org/TR/css-color-3/
+     * takes c_style colors https://www.w3.org/TR/css-color-3/
      * @type String
      * @default
      */
@@ -5818,7 +5818,7 @@ if (typeof console !== 'undefined') {
 
     /**
      * Background color of an object.
-     * takes css colors https://www.w3.org/TR/css-color-3/
+     * takes c_style colors https://www.w3.org/TR/css-color-3/
      * @type String
      * @default
      */
@@ -5834,7 +5834,7 @@ if (typeof console !== 'undefined') {
 
     /**
      * When defined, an object is rendered via stroke and this property specifies its color
-     * takes css colors https://www.w3.org/TR/css-color-3/
+     * takes c_style colors https://www.w3.org/TR/css-color-3/
      * @type String
      * @default
      */
@@ -5854,14 +5854,14 @@ if (typeof console !== 'undefined') {
     strokeDashArray:          null,
 
     /**
-     * Line endings style of an object's stroke (one of "butt", "round", "square")
+     * Line endings c_style of an object's stroke (one of "butt", "round", "square")
      * @type String
      * @default
      */
     strokeLineCap:            'butt',
 
     /**
-     * Corner style of an object's stroke (one of "bevil", "round", "miter")
+     * Corner c_style of an object's stroke (one of "bevil", "round", "miter")
      * @type String
      * @default
      */
@@ -6732,7 +6732,7 @@ if (typeof console !== 'undefined') {
     /**
      * Renders controls and borders for the object
      * @param {CanvasRenderingContext2D} ctx Context to render on
-     * @param {Object} [styleOverride] properties to override the object style
+     * @param {Object} [styleOverride] properties to override the object c_style
      */
     _renderControls: function(ctx, styleOverride) {
       var vpt = this.getViewportTransform(),
@@ -6942,8 +6942,8 @@ if (typeof console !== 'undefined') {
     /**
      * Creates an instance of fabric.Image out of an object
      * @param {Function} callback callback, invoked with an instance as a first argument
-     * @param {Object} [options] for clone as image, passed to toDataURL
-     * @param {Boolean} [options.enableRetinaScaling] enable retina scaling for the cloned image
+     * @param {Object} [options] for clone as c_image, passed to toDataURL
+     * @param {Boolean} [options.enableRetinaScaling] enable retina scaling for the cloned c_image
      * @return {fabric.Object} thisArg
      */
     cloneAsImage: function(callback, options) {
@@ -6959,14 +6959,14 @@ if (typeof console !== 'undefined') {
     /**
      * Converts an object into a data-url-like string
      * @param {Object} options Options object
-     * @param {String} [options.format=png] The format of the output image. Either "jpeg" or "png"
+     * @param {String} [options.format=png] The format of the output c_image. Either "jpeg" or "png"
      * @param {Number} [options.quality=1] Quality level (0..1). Only used for jpeg.
      * @param {Number} [options.multiplier=1] Multiplier to scale by
      * @param {Number} [options.left] Cropping left offset. Introduced in v1.2.14
      * @param {Number} [options.top] Cropping top offset. Introduced in v1.2.14
      * @param {Number} [options.width] Cropping width. Introduced in v1.2.14
      * @param {Number} [options.height] Cropping height. Introduced in v1.2.14
-     * @param {Boolean} [options.enableRetinaScaling] Enable retina scaling for clone image. Introduce in 1.6.4
+     * @param {Boolean} [options.enableRetinaScaling] Enable retina scaling for clone c_image. Introduce in 1.6.4
      * @return {String} Returns a data: URL containing a representation of the object in the format specified by options.format
      */
     toDataURL: function(options) {
@@ -7004,7 +7004,7 @@ if (typeof console !== 'undefined') {
       var data = canvas.toDataURL(options);
       this.set(origParams).setCoords();
       this.canvas = originalCanvas;
-      // canvas.dispose will call image.dispose that will nullify the elements
+      // canvas.dispose will call c_image.dispose that will nullify the elements
       // since this canvas is a simple element for the process, we remove references
       // to objects in this way in order to avoid object trashing.
       canvas._objects = [];
@@ -8059,7 +8059,7 @@ if (typeof console !== 'undefined') {
         this.aCoords = this.calcCoords(true);
       }
 
-      // set coordinates of the draggable boxes in the corners used to scale/rotate the image
+      // set coordinates of the draggable boxes in the corners used to scale/rotate the c_image
       ignoreZoom || (this._setCornerCoords && this._setCornerCoords());
 
       return this;
@@ -8368,8 +8368,8 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
 
     /**
      * Returns styles-string for svg-export
-     * @param {Object} style the object from which to retrieve style properties
-     * @param {Boolean} useWhiteSpace a boolean to include an additional attribute in the style.
+     * @param {Object} style the object from which to retrieve c_style properties
+     * @param {Boolean} useWhiteSpace a boolean to include an additional attribute in the c_style.
      * @return {String}
      */
     getSvgSpanStyles: function(style, useWhiteSpace) {
@@ -8380,7 +8380,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
       var strokeWidth = style.strokeWidth ? 'stroke-width: ' + style.strokeWidth + term : '',
           fontFamily = fontFamily,
           fontSize = style.fontSize ? 'font-size: ' + style.fontSize + 'px' + term : '',
-          fontStyle = style.fontStyle ? 'font-style: ' + style.fontStyle + term : '',
+          fontStyle = style.fontStyle ? 'font-c_style: ' + style.fontStyle + term : '',
           fontWeight = style.fontWeight ? 'font-weight: ' + style.fontWeight + term : '',
           fill = style.fill ? getSvgColorString('fill', style.fill) : '',
           stroke = style.stroke ? getSvgColorString('stroke', style.stroke) : '',
@@ -8406,7 +8406,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
 
     /**
      * Returns text-decoration property for svg-export
-     * @param {Object} style the object from which to retrieve style properties
+     * @param {Object} style the object from which to retrieve c_style properties
      * @return {String}
      */
     getSvgTextDecoration: function(style) {
@@ -8892,7 +8892,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
         '" y1="', p.y1,
         '" x2="', p.x2,
         '" y2="', p.y2,
-        '" style="', this.getSvgStyles(),
+        '" c_style="', this.getSvgStyles(),
         '" transform="', this.getSvgTransform(),
         this.getSvgTransformMatrix(),
         '"/>\n'
@@ -8903,7 +8903,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     /* _TO_SVG_END_ */
   });
 
-  
+
 
   /**
    * Returns fabric.Line instance from an object representation
@@ -9044,7 +9044,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
           '<circle ', this.getSvgId(),
           'cx="' + x + '" cy="' + y + '" ',
           'r="', this.radius,
-          '" style="', this.getSvgStyles(),
+          '" c_style="', this.getSvgStyles(),
           '" transform="', this.getSvgTransform(),
           ' ', this.getSvgTransformMatrix(), '"',
           this.addPaintOrder(),
@@ -9062,7 +9062,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
           '<path d="M ' + startX + ' ' + startY,
           ' A ' + this.radius + ' ' + this.radius,
           ' 0 ', +largeFlag + ' 1', ' ' + endX + ' ' + endY,
-          '" style="', this.getSvgStyles(),
+          '" c_style="', this.getSvgStyles(),
           '" transform="', this.getSvgTransform(),
           ' ', this.getSvgTransformMatrix(), '"',
           this.addPaintOrder(),
@@ -9115,7 +9115,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     },
   });
 
-  
+
 
   /**
    * Returns {@link fabric.Circle} instance from an object representation
@@ -9225,7 +9225,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
       markup.push(
         '<polygon ', this.getSvgId(),
         'points="', points,
-        '" style="', this.getSvgStyles(),
+        '" c_style="', this.getSvgStyles(),
         '" transform="', this.getSvgTransform(), '"',
         this.addPaintOrder(),
         '/>'
@@ -9367,7 +9367,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
         'cx="0" cy="0" ',
         'rx="', this.rx,
         '" ry="', this.ry,
-        '" style="', this.getSvgStyles(),
+        '" c_style="', this.getSvgStyles(),
         '" transform="', this.getSvgTransform(),
         this.getSvgTransformMatrix(), '"',
         this.addPaintOrder(),
@@ -9398,7 +9398,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     },
   });
 
-  
+
 
   /**
    * Returns {@link fabric.Ellipse} instance from an object representation
@@ -9571,7 +9571,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
         'x="', x, '" y="', y,
         '" rx="', this.get('rx'), '" ry="', this.get('ry'),
         '" width="', this.width, '" height="', this.height,
-        '" style="', this.getSvgStyles(),
+        '" c_style="', this.getSvgStyles(),
         '" transform="', this.getSvgTransform(),
         this.getSvgTransformMatrix(), '"',
         this.addPaintOrder(),
@@ -9582,7 +9582,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     /* _TO_SVG_END_ */
   });
 
-  
+
 
   /**
    * Returns {@link fabric.Rect} instance from an object representation
@@ -9734,7 +9734,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
       markup.push(
         '<', this.type, ' ', this.getSvgId(),
         'points="', points.join(''),
-        '" style="', this.getSvgStyles(),
+        '" c_style="', this.getSvgStyles(),
         '" transform="', this.getSvgTransform(),
         ' ', this.getSvgTransformMatrix(), '"',
         this.addPaintOrder(),
@@ -9804,7 +9804,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     }
   });
 
-  
+
 
   /**
    * Returns fabric.Polyline instance from an object representation
@@ -9869,7 +9869,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     },
   });
 
-  
+
 
   /**
    * Returns fabric.Polygon instance from an object representation
@@ -10368,7 +10368,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
       markup.push(
         '<path ', this.getSvgId(),
         'd="', path,
-        '" style="', this.getSvgStyles(),
+        '" c_style="', this.getSvgStyles(),
         '" transform="', this.getSvgTransform(), addTransform,
         this.getSvgTransformMatrix(), '" stroke-linecap="round" ',
         this.addPaintOrder(),
@@ -10782,7 +10782,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     }
   };
 
-  
+
 
 })(typeof exports !== 'undefined' ? exports : this);
 
@@ -11324,7 +11324,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
         /* avoiding styles intentionally */
         this.getSvgTransform(),
         this.getSvgTransformMatrix(),
-        '" style="',
+        '" c_style="',
         this.getSvgFilter(),
         '">\n'
       );
@@ -11399,7 +11399,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
 
     /**
      * Width of a stroke.
-     * For image quality a stroke multiple of 2 gives better results.
+     * For c_image quality a stroke multiple of 2 gives better results.
      * @type Number
      * @default
      */
@@ -11436,7 +11436,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     _filterScalingY: 1,
 
     /**
-     * minimum scale factor under which any resizeFilter is triggered to resize the image
+     * minimum scale factor under which any resizeFilter is triggered to resize the c_image
      * 0 will disable the automatic resize. 1 will trigger automatically always.
      * number bigger than 1 are not implemented yet.
      * @type Number
@@ -11461,7 +11461,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     objectCaching: false,
 
     /**
-     * key used to retrieve the texture representing this image
+     * key used to retrieve the texture representing this c_image
      * since 2.0.0
      * @type String
      * @default
@@ -11469,7 +11469,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     cacheKey: '',
 
     /**
-     * Image crop in pixels from original image size.
+     * Image crop in pixels from original c_image size.
      * since 2.0.0
      * @type Number
      * @default
@@ -11477,7 +11477,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     cropX: 0,
 
     /**
-     * Image crop in pixels from original image size.
+     * Image crop in pixels from original c_image size.
      * since 2.0.0
      * @type Number
      * @default
@@ -11500,7 +11500,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     },
 
     /**
-     * Returns image element which this instance if based on
+     * Returns c_image element which this instance if based on
      * @return {HTMLImageElement} Image element
      */
     getElement: function() {
@@ -11508,9 +11508,9 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     },
 
     /**
-     * Sets image element for this instance to a specified one.
-     * If filters defined they are applied to new image.
-     * You might need to call `canvas.renderAll` and `object.setCoords` after replacing, to render new image and update controls area.
+     * Sets c_image element for this instance to a specified one.
+     * If filters defined they are applied to new c_image.
+     * You might need to call `canvas.renderAll` and `object.setCoords` after replacing, to render new c_image and update controls area.
      * @param {HTMLImageElement} element
      * @param {Object} [options] Options object
      * @return {fabric.Image} thisArg
@@ -11536,7 +11536,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
 
     /**
      * Delete cacheKey if we have a webGlBackend
-     * delete reference to image elements
+     * delete reference to c_image elements
      */
     dispose: function() {
       var backend = fabric.filterBackend;
@@ -11550,7 +11550,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     },
 
     /**
-     * Sets crossOrigin value (on an instance and corresponding image element)
+     * Sets crossOrigin value (on an instance and corresponding c_image element)
      * @return {fabric.Image} thisArg
      * @chainable
      */
@@ -11562,7 +11562,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     },
 
     /**
-     * Returns original size of an image
+     * Returns original size of an c_image
      * @return {Object} Object with "width" and "height" properties
      */
     getOriginalSize: function() {
@@ -11641,7 +11641,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     },
 
     /**
-     * Returns true if an image has crop applied, inspecting values of cropX,cropY,width,hight.
+     * Returns true if an c_image has crop applied, inspecting values of cropX,cropY,width,hight.
      * @return {Boolean}
      */
     hasCrop: function() {
@@ -11666,16 +11666,16 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
         clipPath = ' clip-path="url(#imageCrop_' + clipPathId + ')" ';
       }
       markup.push('<g transform="', this.getSvgTransform(), this.getSvgTransformMatrix(), '">\n');
-      var imageMarkup = ['\t<image ', this.getSvgId(), 'xlink:href="', this.getSvgSrc(true),
+      var imageMarkup = ['\t<c_image ', this.getSvgId(), 'xlink:href="', this.getSvgSrc(true),
         '" x="', x - this.cropX, '" y="', y - this.cropY,
-        '" style="', this.getSvgStyles(),
+        '" c_style="', this.getSvgStyles(),
         // we're essentially moving origin of transformation from top/left corner to the center of the shape
         // by wrapping it in container <g> element with actual transformation, then offsetting object to the top/left
         // so that object's center aligns with container's left/top
         '" width="', this._element.width || this._element.naturalWidth,
         '" height="', this._element.height || this._element.height,
         '"', clipPath,
-        '></image>\n'];
+        '></c_image>\n'];
       if (this.paintFirst === 'fill') {
         Array.prototype.push.apply(markup, imageMarkup);
       }
@@ -11686,7 +11686,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
           '\t<rect ',
           'x="', x, '" y="', y,
           '" width="', this.width, '" height="', this.height,
-          '" style="', this.getSvgStyles(),
+          '" c_style="', this.getSvgStyles(),
           '"/>\n'
         );
         this.fill = origFill;
@@ -11701,9 +11701,9 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     /* _TO_SVG_END_ */
 
     /**
-     * Returns source of an image
+     * Returns source of an c_image
      * @param {Boolean} filtered indicates if the src is needed for svg
-     * @return {String} Source of an image
+     * @return {String} Source of an c_image
      */
     getSrc: function(filtered) {
       var element = filtered ? this._element : this._originalElement;
@@ -11719,9 +11719,9 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     },
 
     /**
-     * Sets source of an image
+     * Sets source of an c_image
      * @param {String} src Source string (URL)
-     * @param {Function} [callback] Callback is invoked when image has been loaded (and all filters have been applied)
+     * @param {Function} [callback] Callback is invoked when c_image has been loaded (and all filters have been applied)
      * @param {Object} [options] Options object
      * @return {fabric.Image} thisArg
      * @chainable
@@ -11777,7 +11777,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     },
 
     /**
-     * Applies filters assigned to this image (from "filters" array) or from filter param
+     * Applies filters assigned to this c_image (from "filters" array) or from filter param
      * @method applyFilters
      * @param {Array} filters to be applied
      * @param {Boolean} forResizing specify if the filter operation is a resize operation
@@ -11854,7 +11854,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     },
 
     /**
-     * @private, needed to check if image needs resize
+     * @private, needed to check if c_image needs resize
      */
     _needsResize: function() {
       return (this.scaleX !== this._lastScaleX || this.scaleY !== this._lastScaleY);
@@ -11874,7 +11874,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
      * The Image class's initialization method. This method is automatically
      * called by the constructor.
      * @private
-     * @param {HTMLImageElement|String} element The element representing the image
+     * @param {HTMLImageElement|String} element The element representing the c_image
      * @param {Object} [options] Options object
      */
     _initElement: function(element, options) {
@@ -11930,7 +11930,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     },
 
     /**
-     * Calculate offset for center and scale factor for the image in order to respect
+     * Calculate offset for center and scale factor for the c_image in order to respect
      * the preserveAspectRatio attribute
      * @private
      * @return {Object}
@@ -12013,7 +12013,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
    * Creates an instance of fabric.Image from its object representation
    * @static
    * @param {Object} object Object to create an instance from
-   * @param {Function} callback Callback to invoke when an image instance is created
+   * @param {Function} callback Callback to invoke when an c_image instance is created
    */
   fabric.Image.fromObject = function(_object, callback) {
     var object = fabric.util.object.clone(_object);
@@ -12036,8 +12036,8 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
   /**
    * Creates an instance of fabric.Image from an URL string
    * @static
-   * @param {String} url URL to create an image from
-   * @param {Function} [callback] Callback to invoke when image is created (newly created image is passed as a first argument)
+   * @param {String} url URL to create an c_image from
+   * @param {Function} [callback] Callback to invoke when c_image is created (newly created c_image is passed as a first argument)
    * @param {Object} [imgOptions] Options object
    */
   fabric.Image.fromURL = function(url, callback, imgOptions) {
@@ -12046,7 +12046,7 @@ fabric.util.object.extend(fabric.Object.prototype, /** @lends fabric.Object.prot
     }, null, imgOptions && imgOptions.crossOrigin);
   };
 
-  
+
 
 })(typeof exports !== 'undefined' ? exports : this);
 

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 0
c_javascript/fabric.min.js


维修品牌.js → c_javascript/维修品牌.js


+ 6 - 6
css/css.css

@@ -266,7 +266,7 @@
   left: 0;
   width: 16px;
   height: 16px;
-  background: url("../image/好评@2x.png") no-repeat;
+  background: url("../c_image/好评@2x.png") no-repeat;
   content: '';
   background-size: contain;
 }
@@ -276,7 +276,7 @@
   left: 0;
   width: 16px;
   height: 16px;
-  background: url("../image/icon_good_def@2x.png") no-repeat;
+  background: url("../c_image/icon_good_def@2x.png") no-repeat;
   content: '';
   background-size: contain;
 }
@@ -289,7 +289,7 @@
   left: 0;
   width: 16px;
   height: 16px;
-  background: url("../image/icon_normal_pre@2x.png") no-repeat;
+  background: url("../c_image/icon_normal_pre@2x.png") no-repeat;
   content: '';
   background-size: contain;
 }
@@ -299,7 +299,7 @@
   left: 0;
   width: 16px;
   height: 16px;
-  background: url("../image/icon_normal_def@2x.png") no-repeat;
+  background: url("../c_image/icon_normal_def@2x.png") no-repeat;
   content: '';
   background-size: contain;
 }
@@ -312,7 +312,7 @@
   left: 0;
   width: 16px;
   height: 16px;
-  background: url("../image/icon_bad_pre@2x.png") no-repeat;
+  background: url("../c_image/icon_bad_pre@2x.png") no-repeat;
   content: '';
   background-size: contain;
 }
@@ -322,7 +322,7 @@
   left: 0;
   width: 16px;
   height: 16px;
-  background: url("../image/icon_bad_def@2x.png") no-repeat;
+  background: url("../c_image/icon_bad_def@2x.png") no-repeat;
   content: '';
   background-size: contain;
 }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
css/css.css.map


+ 6 - 6
css/css.less

@@ -315,7 +315,7 @@
               left: 0;
               width: 16px;
               height: 16px;
-              background: url("../image/好评@2x.png") no-repeat;
+              background: url("../c_image/好评@2x.png") no-repeat;
               content: '';
               background-size: contain;
             }
@@ -326,7 +326,7 @@
             left: 0;
             width: 16px;
             height: 16px;
-            background: url("../image/icon_good_def@2x.png") no-repeat;
+            background: url("../c_image/icon_good_def@2x.png") no-repeat;
             content: '';
             background-size: contain;
           }
@@ -340,7 +340,7 @@
               left: 0;
               width: 16px;
               height: 16px;
-              background: url("../image/icon_normal_pre@2x.png") no-repeat;
+              background: url("../c_image/icon_normal_pre@2x.png") no-repeat;
               content: '';
               background-size: contain;
             }
@@ -351,7 +351,7 @@
             left: 0;
             width: 16px;
             height: 16px;
-            background: url("../image/icon_normal_def@2x.png") no-repeat;
+            background: url("../c_image/icon_normal_def@2x.png") no-repeat;
             content: '';
             background-size: contain;
           }
@@ -365,7 +365,7 @@
               left: 0;
               width: 16px;
               height: 16px;
-              background: url("../image/icon_bad_pre@2x.png") no-repeat;
+              background: url("../c_image/icon_bad_pre@2x.png") no-repeat;
               content: '';
               background-size: contain;
             }
@@ -376,7 +376,7 @@
             left: 0;
             width: 16px;
             height: 16px;
-            background: url("../image/icon_bad_def@2x.png") no-repeat;
+            background: url("../c_image/icon_bad_def@2x.png") no-repeat;
             content: '';
             background-size: contain;
           }

+ 2 - 2
css/project.css

@@ -106,7 +106,7 @@
   width: 15px;
   height: 10px;
   display: inline-block;
-  background: url("../image/icon-fadongji.png");
+  background: url("../c_image/icon-fadongji.png");
   background-size: contain;
   margin-right: 3px;
 }
@@ -115,7 +115,7 @@
   height: 13px;
   transform: translateY(2px);
   display: inline-block;
-  background: url("../image/icon-bao.png") no-repeat;
+  background: url("../c_image/icon-bao.png") no-repeat;
   background-size: contain;
   margin-right: 3px;
 }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
css/project.css.map


+ 2 - 2
css/project.less

@@ -103,7 +103,7 @@
           width:15px;
           height:10px;
           display: inline-block;
-          background: url("../image/icon-fadongji.png");
+          background: url("../c_image/icon-fadongji.png");
           background-size: contain;
           margin-right: 3px;
         }
@@ -112,7 +112,7 @@
           height:13px;
           transform: translateY(2px);
           display: inline-block;
-          background: url("../image/icon-bao.png") no-repeat;
+          background: url("../c_image/icon-bao.png") no-repeat;
           background-size: contain;
           margin-right: 3px;
         }

+ 28 - 7
css/shop.css

@@ -1,5 +1,5 @@
 .shop-container {
-  width: 1600px;
+  width: 1300px;
   margin: 0 auto;
 }
 .shop-container .shop-container-title {
@@ -262,6 +262,7 @@
   color: #666666;
   padding: 0 8px;
   cursor: pointer;
+  line-height: 40px;
 }
 .shop-container .shop-container-filter-box .shop-container-filter-item .shop-container-filter-item-brand.checked {
   color: #3f90f7;
@@ -279,13 +280,31 @@
   bottom: 0;
   left: 0;
 }
+.shop-container .shop-container-filter-box .shop-container-filter-item .shop-container-filter-item-more {
+  display: inline-block;
+  background-color: #fff;
+  width: 58px;
+  padding: 3px 0;
+  text-align: center;
+  vertical-align: top;
+  position: absolute;
+  cursor: pointer;
+  border: 1px solid #e1e5ed;
+  color: #666;
+  right: 10px;
+  top: 6px;
+}
 .shop-container .shop-container-filter-box .shop-container-filter-item .shop-container-filter-item-container {
-  padding: 10px;
   padding-left: 120px;
   display: flex;
   flex-wrap: wrap;
   align-items: center;
-  min-height: 20px;
+  min-height: 40px;
+  margin-right: 80px;
+}
+.shop-container .shop-container-filter-box .shop-container-filter-item .shop-container-filter-item-container.put-container {
+  height: 40px;
+  overflow: hidden;
 }
 .shop-container .shop-container-filter-box .shop-container-filter-item .shop-container-filter-item-container .shop-container-filter-item-container-top-filter {
   width: 88px;
@@ -356,13 +375,15 @@
   color: #3c3c3c;
   position: relative;
 }
-.shop-container .shop-container-filter-box .shop-container-filter-item .shop-container-filter-item-container .shop-container-filter-item-car-type:before {
+.shop-container .shop-container-filter-box .shop-container-filter-item .shop-container-filter-item-container .shop-container-filter-item-car-type .clear-btn {
   position: absolute;
   display: block;
-  content: '×';
   font-size: 20px;
-  right: 10px;
+  right: 0px;
   cursor: pointer;
+  top: 0;
+  width: 25px;
+  height: 25px;
 }
 .shop-container .shop-container-search-box {
   padding-top: 40px;
@@ -415,7 +436,7 @@
   cursor: pointer;
 }
 .icon-shopcar {
-  background: url("../image/shopcar.png") no-repeat;
+  background: url("../c_image/shopcar.png") no-repeat;
   width: 20px;
   height: 16px;
   background-size: contain;

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
css/shop.css.map


+ 28 - 7
css/shop.less

@@ -1,5 +1,5 @@
 .shop-container{
-  width: 1600px;
+  width: 1300px;
   margin: 0 auto;
   .shop-container-title{
     display: flex;
@@ -271,6 +271,7 @@
         color:rgba(102,102,102,1);
         padding: 0 8px;
         cursor: pointer;
+        line-height: 40px;
         &.checked{
           color:rgba(63,144,247,1);
         }
@@ -288,13 +289,31 @@
         bottom: 0;
         left: 0;
       }
+      .shop-container-filter-item-more{
+        display: inline-block;
+        background-color: #fff;
+        width: 58px;
+        padding: 3px 0;
+        text-align: center;
+        vertical-align: top;
+        position: absolute;
+        cursor: pointer;
+        border: 1px solid #e1e5ed;
+        color: #666;
+        right: 10px;
+        top: 6px;
+      }
       .shop-container-filter-item-container{
-        padding: 10px;
         padding-left: 120px;
         display: flex;
         flex-wrap: wrap;
         align-items: center;
-        min-height: 20px;
+        min-height: 40px;
+        margin-right: 80px;
+        &.put-container{
+          height: 40px;
+          overflow: hidden;
+        }
         .shop-container-filter-item-container-top-filter{
           width: 88px;
           height: 40px;
@@ -363,13 +382,15 @@
           font-weight:400;
           color:rgba(60,60,60,1);
           position: relative;
-          &:before{
+          .clear-btn{
             position: absolute;
             display: block;
-            content: '×';
             font-size: 20px;
-            right: 10px;
+            right: 0px;
             cursor: pointer;
+            top: 0;
+            width: 25px;
+            height: 25px;
           }
         }
       }
@@ -428,7 +449,7 @@
   }
 }
 .icon-shopcar{
-  background: url("../image/shopcar.png") no-repeat;
+  background: url("../c_image/shopcar.png") no-repeat;
   width:20px;
   height:16px;
   background-size: contain;

+ 1 - 1
css/style.css

@@ -41,4 +41,4 @@
   border: 1px solid #26965c;
   color: #26965c;
 }
-/*# sourceMappingURL=style.css.map */
+/*# sourceMappingURL=c_style.c_style.map */

css/style.css.map → c_style/style.css.map


css/style.less → c_style/style.less


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 1
fabric.min.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
layui/lay/modules/colorpicker.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
layui/lay/modules/laydate.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
layui/lay/modules/layedit.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
layui/lay/modules/layer.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
layui/lay/modules/laypage.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
layui/lay/modules/mobile.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
layui/lay/modules/rate.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
layui/lay/modules/slider.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
layui/lay/modules/table.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
layui/lay/modules/tree.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
layui/lay/modules/util.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 2 - 2
layui/layui.all.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
layui/layui.js


+ 60 - 6
views/商城/商品列表.html

@@ -4,7 +4,8 @@
   <meta charset="UTF-8">
   <title>Title</title>
   <link rel="stylesheet" href="../../layui/css/layui.css">
-  <link rel="stylesheet" href="../../css/shop.css">
+  <link rel="stylesheet" href="../../c_style/css.css">
+  <link rel="stylesheet" href="../../c_style/shop.css">
 </head>
 <body>
 <div>
@@ -22,8 +23,8 @@
         <div class="shop-container-filter-item dotted-line">
           <div class="shop-container-filter-item-title">车型</div>
           <div class="shop-container-filter-item-container">
-            <div class="shop-container-filter-item-car-type">东风日产奇骏20102.5 无级 XV
-              至尊版( 20112011 )
+            <div class="shop-container-filter-item-car-type">东风日产奇骏20102.5 无级 XV 至尊版( 20112011 )
+              <a class="clear-btn">×</a>
             </div>
             <div class="shop-container-filter-item-btn btn-1">选择车型</div>
             <div class="shop-container-filter-item-btn btn-2">VIN 图片识别</div>
@@ -32,7 +33,7 @@
         </div>
         <div class="shop-container-filter-item">
           <div class="shop-container-filter-item-title">品类</div>
-          <div class="shop-container-filter-item-container">
+          <div id="brand-filter" class="shop-container-filter-item-container put-container">
             <span class="shop-container-filter-item-brand">不限</span>
             <span class="shop-container-filter-item-brand checked">滤清器类</span>
             <span class="shop-container-filter-item-brand">滤清器类</span>
@@ -52,10 +53,12 @@
             <span class="shop-container-filter-item-brand">滤清器类</span>
             <span class="shop-container-filter-item-brand">滤清器类</span>
           </div>
+          <div id="brand-show" class="shop-container-filter-item-more">展开∨</div>
+          <div id="brand-hide" class="shop-container-filter-item-more" style="display: none">收起∧</div>
         </div>
         <div class="shop-container-filter-item dotted-line">
           <div class="shop-container-filter-item-title">子品类</div>
-          <div class="shop-container-filter-item-container">
+          <div id="brand-children-filter" class="shop-container-filter-item-container put-container">
             <span class="shop-container-filter-item-brand">不限</span>
             <span class="shop-container-filter-item-brand checked">滤清器类</span>
             <span class="shop-container-filter-item-brand">滤清器类</span>
@@ -66,6 +69,8 @@
             <span class="shop-container-filter-item-brand">滤清器类</span>
             <span class="shop-container-filter-item-brand">滤清器类</span>
           </div>
+          <div id="brand-children-show" class="shop-container-filter-item-more">展开∨</div>
+          <div id="brand-children-hide" class="shop-container-filter-item-more" style="display: none">收起∧</div>
         </div>
         <div class="shop-container-filter-item">
           <div class="shop-container-filter-item-title">品牌</div>
@@ -95,7 +100,9 @@
           <col width="10%">
           <col width="10%">
           <col width="10%">
-          <col width="15%">
+          <col width="10%">
+          <col width="8%">
+          <col width="8%">
         </colgroup>
         <thead>
         <tr>
@@ -107,6 +114,7 @@
           <th>商品品质/产地</th>
           <th>适配车型</th>
           <th>替换件</th>
+          <th>数量</th>
           <th>操作</th>
         </tr>
         </thead>
@@ -147,6 +155,13 @@
           <td>
             <span class="color-blue">32</span>
           </td>
+          <td>
+            <div class="count-input">
+              <div class="count-input-btn count-input-btn-add">+</div>
+              <input type="text" value="1">
+              <div class="count-input-btn count-input-btn-sub">-</div>
+            </div>
+          </td>
           <td>
             <i class="icon-shopcar"></i>
           </td>
@@ -187,6 +202,13 @@
           <td>
             <span class="color-blue">32</span>
           </td>
+          <td>
+            <div class="count-input">
+              <div class="count-input-btn count-input-btn-add">+</div>
+              <input type="text" value="1">
+              <div class="count-input-btn count-input-btn-sub">-</div>
+            </div>
+          </td>
           <td>
             <i class="icon-shopcar"></i>
           </td>
@@ -199,4 +221,36 @@
 </body>
 <script src="http://libs.baidu.com/jquery/2.0.0/jquery.min.js"></script>
 <script src="../../layui/layui.all.js"></script>
+<script type="text/javascript">
+$(function () {
+  $('.count-input-btn-add').on('click',function (e) {
+    if($(e.target).parent().hasClass('count-input-disabled')) return
+    $(e.target).parent().children('input').attr('value',~~$(e.target).parent().children('input').attr('value')+1)
+  })
+  $('.count-input-btn-sub').on('click',function (e) {
+    if($(e.target).parent().hasClass('count-input-disabled')) return
+    $(e.target).parent().children('input').attr('value',~~$(e.target).parent().children('input').attr('value')-1>0?~~$(e.target).parent().children('input').attr('value')-1:1)
+  })
+  $('#brand-show').on('click',function (e) {
+    $('#brand-hide').show()
+    $('#brand-show').hide()
+    $('#brand-filter').removeClass('put-container')
+  })
+  $('#brand-hide').on('click',function (e) {
+    $('#brand-hide').hide()
+    $('#brand-show').show()
+    $('#brand-filter').addClass('put-container')
+  })
+  $('#brand-children-show').on('click',function (e) {
+    $('#brand-children-hide').show()
+    $('#brand-children-show').hide()
+    $('#brand-children-filter').removeClass('put-container')
+  })
+  $('#brand-children-hide').on('click',function (e) {
+    $('#brand-children-hide').hide()
+    $('#brand-children-show').show()
+    $('#brand-children-filter').addClass('put-container')
+  })
+})
+</script>
 </html>

+ 3 - 3
views/商城/弹框.html

@@ -4,8 +4,8 @@
   <meta charset="UTF-8">
   <title>Title</title>
   <link rel="stylesheet" href="../../layui/css/layui.css">
-  <link rel="stylesheet" href="../../css/css.css">
-  <link rel="stylesheet" href="../../css/shop.css">
+  <link rel="stylesheet" href="../../c_style/css.css">
+  <link rel="stylesheet" href="../../c_style/shop.css">
 </head>
 <body>
 <div class="dialog">
@@ -57,7 +57,7 @@ layui.use(['rate', 'form'], function () {
   //基础效果
   rate.render({
     elem: '#score-1'
-    , value: 3
+    , value: 5
     , text: true
     , theme: '#F03B3B' //自定义主题色
     , setText: function (value) { //自定义文本的回调

+ 2 - 2
views/商城/订单详情.html

@@ -4,8 +4,8 @@
   <meta charset="UTF-8">
   <title>Title</title>
   <link rel="stylesheet" href="../../layui/css/layui.css">
-  <link rel="stylesheet" href="../../css/css.css">
-  <link rel="stylesheet" href="../../css/shop.css">
+  <link rel="stylesheet" href="../../c_style/css.css">
+  <link rel="stylesheet" href="../../c_style/shop.css">
 </head>
 <body>
 <div class="shop-container">

+ 2 - 2
views/商城/购物车.html

@@ -4,8 +4,8 @@
   <meta charset="UTF-8">
   <title>Title</title>
   <link rel="stylesheet" href="../../layui/css/layui.css">
-  <link rel="stylesheet" href="../../css/css.css">
-  <link rel="stylesheet" href="../../css/shop.css">
+  <link rel="stylesheet" href="../../c_style/css.css">
+  <link rel="stylesheet" href="../../c_style/shop.css">
 </head>
 <body>
 <div>

+ 3 - 3
views/杂项/add-template.html

@@ -6,7 +6,7 @@
         content="width=device-width, initial-scale=1, maximum-scale=1">
   <title>检测开单</title>
   <link rel="stylesheet" href="../../layui/css/layui.css">
-  <link rel="stylesheet" href="../../css/css.css">
+  <link rel="stylesheet" href="../../c_style/css.css">
 </head>
 <body>
 <div class="add-template-main">
@@ -26,7 +26,7 @@
 </div>
 <script src="http://libs.baidu.com/jquery/2.0.0/jquery.min.js"></script>
 <script src="../../layui/layui.all.js"></script>
-<script src="../../fabric.js"></script>
-<script src="../../fabric.min.js"></script>
+<script src="../../c_javascript/fabric.js"></script>
+<script src="../../c_javascript/fabric.min.js"></script>
 </body>
 </html>

+ 1 - 1
views/杂项/客户管理.html

@@ -5,7 +5,7 @@
   <meta name="viewport"
         content="width=device-width, initial-scale=1, maximum-scale=1">
   <title>客户管理</title>
-  <link rel="stylesheet" href="../../css/project.css">
+  <link rel="stylesheet" href="../../c_style/project.css">
 </head>
 <body>
 <div class="car-message-container">

+ 3 - 3
views/杂项/检测开单.html

@@ -6,7 +6,7 @@
         content="width=device-width, initial-scale=1, maximum-scale=1">
   <title>检测开单</title>
   <link rel="stylesheet" href="../../layui/css/layui.css">
-  <link rel="stylesheet" href="../../css/css.css">
+  <link rel="stylesheet" href="../../c_style/css.css">
 </head>
 <body>
 <div class="report-main">
@@ -281,8 +281,8 @@
 </div>
 <script src="http://libs.baidu.com/jquery/2.0.0/jquery.min.js"></script>
 <script src="../../layui/layui.all.js"></script>
-<script src="../../fabric.js"></script>
-<script src="../../fabric.min.js"></script>
+<script src="../../c_javascript/fabric.js"></script>
+<script src="../../c_javascript/fabric.min.js"></script>
 <script>
 var t_select
 $(function () {

+ 2 - 2
views/杂项/维修品牌.html

@@ -5,10 +5,10 @@
   <meta name="viewport"
         content="width=device-width, initial-scale=1, maximum-scale=1">
   <title>检测开单</title>
-  <link rel="stylesheet" href="../../css/style.css">
+  <link rel="stylesheet" href="../../c_style/style.css">
 </head>
 <script src="http://lib.sinaapp.com/js/jquery/1.9.1/jquery-1.9.1.min.js"></script>
-<script type="application/javascript" src="../../维修品牌.js"></script>
+<script type="application/javascript" src="../../c_javascript/维修品牌.js"></script>
 <body>
   <div class="dialog-main-1">
     <div class="brand-select">

+ 5 - 5
views/杂项/超值体验卡.html

@@ -5,13 +5,13 @@
   <meta name="viewport"
         content="width=device-width, initial-scale=1, maximum-scale=1">
   <title>超值体验卡</title>
-  <link rel="stylesheet" href="../../css/css.css">
+  <link rel="stylesheet" href="../../c_style/css.css">
 </head>
 <body>
 <div class="experience-card">
   <div class="experience-card-title"></div>
   <div class="experience-card-image">
-    <img src="../../image/tyk_bg.png" alt="">
+    <img src="../../c_image/tyk_bg.png" alt="">
   </div>
   <div class="experience-card-price">
     <span class="experience-card-blue">¥</span>0.10
@@ -22,7 +22,7 @@
       尊享以下<span class="experience-card-blue">N</span>种免费体验
     </div>
     <div class="experience-card-list-item">
-      <img src="../../image/tyk_bg.png" alt="">
+      <img src="../../c_image/tyk_bg.png" alt="">
       <div class="experience-card-list-item-info">
         冷却液更换冷却液更换这是多行示 例冷却液更换冷却液更换这是多
       </div>
@@ -31,7 +31,7 @@
       </div>
     </div>
     <div class="experience-card-list-item">
-      <img src="../../image/tyk_bg.png" alt="">
+      <img src="../../c_image/tyk_bg.png" alt="">
       <div class="experience-card-list-item-info">
         冷却液更换冷却液更换这是多行示 例冷却液更换冷却液更换这是多
       </div>
@@ -40,7 +40,7 @@
       </div>
     </div>
     <div class="experience-card-list-item">
-      <img src="../../image/tyk_bg.png" alt="">
+      <img src="../../c_image/tyk_bg.png" alt="">
       <div class="experience-card-list-item-info">
         冷却液更换冷却液更换这是多行示 例冷却液更换冷却液更换这是多
       </div>

+ 2 - 2
views/杂项/项目详情.html

@@ -5,13 +5,13 @@
   <meta name="viewport"
         content="width=device-width, initial-scale=1, maximum-scale=1">
   <title>详情详情</title>
-  <link rel="stylesheet" href="../../css/css.css">
+  <link rel="stylesheet" href="../../c_style/css.css">
 </head>
 <body>
   <div class="project">
     <div class="project-title"></div>
     <div class="project-detail-image">
-      <img src="../../image/bg-img.png" alt="">
+      <img src="../../c_image/bg-img.png" alt="">
     </div>
     <div class="project-detail-info">
       <div class="project-detail-info-title">

+ 3 - 3
views/欧洲维修/europe.css

@@ -4,7 +4,7 @@
   bottom: 0;
   left: 0;
   right: 0;
-  background: url("../../image/europe-bg2.png") 100% no-repeat;
+  background: url("../../c_image/europe-bg2.png") 100% no-repeat;
   background-attachment: fixed;
   background-size: cover;
   display: flex;
@@ -17,7 +17,7 @@
   background: #ffffff;
   box-shadow: 0px 2px 24px 0px rgba(0, 0, 0, 0.1);
   border-radius: 20px;
-  background: url("../../image/europe-bg1.png") 101% 101% no-repeat;
+  background: url("../../c_image/europe-bg1.png") 101% 101% no-repeat;
   background-color: #fff;
   background-size: 916px 590px;
   position: relative;
@@ -27,7 +27,7 @@
   top: 130px;
   left: 102px;
   width: 340px;
-  background: url("../../image/europe-logo.png") no-repeat;
+  background: url("../../c_image/europe-logo.png") no-repeat;
   background-size: 255px 54px;
   padding-top: 85px;
 }

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 1 - 1
views/欧洲维修/europe.css.map


+ 3 - 3
views/欧洲维修/europe.less

@@ -4,7 +4,7 @@
   bottom: 0;
   left: 0;
   right: 0;
-  background: url("../../image/europe-bg2.png") 100% no-repeat;
+  background: url("../../c_image/europe-bg2.png") 100% no-repeat;
   background-attachment: fixed;
   background-size: cover;
   display: flex;
@@ -16,7 +16,7 @@
     background:rgba(255,255,255,1);
     box-shadow:0px 2px 24px 0px rgba(0,0,0,0.1);
     border-radius:20px;
-    background: url("../../image/europe-bg1.png") 101% 101% no-repeat;
+    background: url("../../c_image/europe-bg1.png") 101% 101% no-repeat;
     background-color: #fff;
     background-size: 916px 590px;
     position: relative;
@@ -25,7 +25,7 @@
       top: 130px;
       left: 102px;
       width: 340px;
-      background: url("../../image/europe-logo.png") no-repeat;
+      background: url("../../c_image/europe-logo.png") no-repeat;
       background-size: 255px 54px;
       padding-top: 85px;
       .europe-login-main-form-title{

+ 1 - 1
views/运营-回访/回访.html

@@ -6,7 +6,7 @@
         content="width=device-width, initial-scale=1, maximum-scale=1">
   <title>检测开单</title>
   <link rel="stylesheet" href="../../layui/css/layui.css">
-  <link rel="stylesheet" href="../../css/css.css">
+  <link rel="stylesheet" href="../../c_style/css.css">
 </head>
 <body>
 <div class="tow-container-box">