商城

.idea/workspace.xml

@@ -2,15 +2,16 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="5ae07691-f935-424c-bcfb-2ecce8956daa" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/image/shopcar.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/shop.less" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/views/商城/商品列表.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/views/商城/购物车.html" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/views/欧洲维修/index.html" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/image/icon_ordernum@2x.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/image/icon_shop@2x.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/views/商城/订单详情.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css.css" beforeDir="false" afterPath="$PROJECT_DIR$/css.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/css.css.map" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css.less" beforeDir="false" afterPath="$PROJECT_DIR$/css.less" 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/shop.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/shop.css" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/css/shop.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/css/shop.css.map" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/css/shop.less" beforeDir="false" afterPath="$PROJECT_DIR$/css/shop.less" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -24,99 +25,84 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/css.css">
+        <entry file="file://$PROJECT_DIR$/css/css.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="227">
-              <caret line="20" column="21" lean-forward="true" selection-start-line="20" selection-start-column="21" selection-end-line="20" selection-end-column="21" />
+            <state relative-caret-position="208">
+              <caret line="207" column="16" lean-forward="true" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="16" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/css.less">
+        <entry file="file://$PROJECT_DIR$/css/css.less">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="266">
-              <caret line="29" column="13" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="13" />
+            <state relative-caret-position="227">
+              <caret line="252" column="1" lean-forward="true" selection-start-line="252" selection-start-column="1" selection-end-line="252" selection-end-column="1" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/shop.css">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="76">
-              <caret line="4" column="43" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
-            </state>
-          </provider>
+        <entry file="file://$PROJECT_DIR$/image/icon_ordernum@2x.png">
+          <provider selected="true" editor-type-id="images" />
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/shop.less">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/css/project.less">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="114">
-              <caret line="43" selection-start-line="43" selection-end-line="43" />
+            <state relative-caret-position="1235">
+              <caret line="65" column="7" lean-forward="true" selection-start-line="65" selection-start-column="7" selection-end-line="65" selection-end-column="7" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="jar://$APPLICATION_HOME_DIR$/lib/platform-impl.jar!/resources/html5-schema/html5/tables.rnc">
+        <entry file="file://$PROJECT_DIR$/css/shop.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="151">
-              <caret line="232" column="16" selection-start-line="232" selection-start-column="16" selection-end-line="232" selection-end-column="16" />
+            <state relative-caret-position="199">
+              <caret line="74" column="22" lean-forward="true" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="22" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/views/商城/商品列表.html">
+        <entry file="file://$PROJECT_DIR$/css/shop.less">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="133">
-              <caret line="153" column="12" lean-forward="true" selection-start-line="153" selection-start-column="12" selection-end-line="153" selection-end-column="12" />
+            <state relative-caret-position="208">
+              <caret line="120" column="12" lean-forward="true" selection-start-line="120" selection-start-column="12" selection-end-line="120" selection-end-column="12" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/views/运营-回访/回访.html">
+        <entry file="file://$PROJECT_DIR$/css/style.less">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1995">
-              <caret line="105" column="24" lean-forward="true" selection-start-line="105" selection-start-column="24" selection-end-line="105" selection-end-column="24" />
-              <folding>
-                <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-              </folding>
+            <state relative-caret-position="266">
+              <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/views/杂项/检测开单.html">
+        <entry file="file://$PROJECT_DIR$/views/商城/商品列表.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1425">
-              <caret line="281" selection-start-line="281" selection-end-line="282" selection-end-column="48" />
+            <state relative-caret-position="180">
+              <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-end-line="196" />
               <folding>
-                <element signature="n#select#0;n#div#0;n#form#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#2;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#3;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#4;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#5;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" />
-                <element signature="n#div#7;n#div#0;n#body#0;n#html#0;n#!!top" />
+                <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
               </folding>
             </state>
           </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$/views/商城/订单详情.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="228">
-              <caret line="12" column="50" lean-forward="true" selection-start-line="12" selection-start-column="50" selection-end-line="12" selection-end-column="50" />
+            <state relative-caret-position="299">
+              <caret line="84" column="16" lean-forward="true" selection-start-line="84" selection-start-column="16" selection-end-line="84" selection-end-column="16" />
+              <folding>
+                <element signature="n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -124,8 +110,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="291">
-              <caret line="218" column="46" lean-forward="true" selection-start-line="218" selection-start-column="46" selection-end-line="218" selection-end-column="46" />
+            <state relative-caret-position="223">
+              <caret line="220" column="12" lean-forward="true" selection-start-line="211" selection-start-column="5" selection-end-line="220" selection-end-column="12" />
               <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>
@@ -144,15 +130,10 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>2</find>
-      <find>png</find>
-      <find>shop-container-search-box</find>
-      <find>shop-container-search-btn</find>
       <find>13</find>
       <find>shop-container-search</find>
       <find>shop-container-filter-item</find>
       <find>wrapper</find>
-      <find>table</find>
       <find>shop-container-filter-box-wrapper</find>
       <find>td-containe</find>
       <find>span</find>
@@ -169,11 +150,16 @@
       <find>disa</find>
       <find>count-input-btn-add</find>
       <find>disabled-tr</find>
+      <find>table-operation</find>
+      <find>全选</find>
       <find>color-</find>
       <find>dis</find>
-      <find>table-operation</find>
+      <find>icon-</find>
       <find>btn</find>
-      <find>全选</find>
+      <find>ml</find>
+      <find>right-oper</find>
+      <find>table-operation2</find>
+      <find>table</find>
     </findStrings>
     <replaceStrings>
       <replace>h4</replace>
@@ -206,6 +192,10 @@
         <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/css.less" />
+        <option value="$PROJECT_DIR$/css/shop.less" />
+        <option value="$PROJECT_DIR$/views/商城/订单详情.html" />
       </list>
     </option>
   </component>
@@ -231,29 +221,18 @@
             <path>
               <item name="html" type="b2602c69:ProjectViewProjectNode" />
               <item name="html" type="462c0819:PsiDirectoryNode" />
-              <item name="views" 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="views" type="462c0819:PsiDirectoryNode" />
-              <item name="商城" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="html" type="b2602c69:ProjectViewProjectNode" />
               <item name="html" type="462c0819:PsiDirectoryNode" />
               <item name="views" type="462c0819:PsiDirectoryNode" />
-              <item name="运营-回访" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="html" type="b2602c69:ProjectViewProjectNode" />
-              <item name="html" type="462c0819:PsiDirectoryNode" />
-              <item name="project.less" type="620a8d5e:NestingTreeNode" />
-            </path>
-            <path>
-              <item name="html" type="b2602c69:ProjectViewProjectNode" />
-              <item name="html" type="462c0819:PsiDirectoryNode" />
-              <item name="style.less" type="620a8d5e:NestingTreeNode" />
+              <item name="商城" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -276,6 +255,7 @@
       <recent name="D:\workspace\html" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\workspace\html\css" />
       <recent name="D:\workspace\html\views\杂项" />
       <recent name="D:\workspace\html" />
     </key>
@@ -376,7 +356,7 @@
       <workItem from="1597193641446" duration="599000" />
       <workItem from="1597280400319" duration="2795000" />
       <workItem from="1597826006330" duration="9447000" />
-      <workItem from="1597885454978" duration="5571000" />
+      <workItem from="1597885454978" duration="13823000" />
     </task>
     <task id="LOCAL-00001" summary="fix">
       <created>1594365774472</created>
@@ -399,11 +379,25 @@
       <option name="project" value="LOCAL" />
       <updated>1596614425841</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="商城">
+      <created>1597893028386</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1597893028386</updated>
+    </task>
+    <task id="LOCAL-00005" summary="商城">
+      <created>1597893297242</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1597893297242</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="174778000" />
+    <option name="totallyTimeSpent" value="183030000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
@@ -415,14 +409,14 @@
       <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.48150593" weight="0.3243626" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.47886392" 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" />
-      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.51849407" side_tool="true" visible="true" weight="0.3186969" />
+      <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.4993395" weight="0.3286119" />
+      <window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.52113605" side_tool="true" visible="true" weight="0.3243626" />
       <window_info anchor="bottom" id="Terminal" order="10" sideWeight="0.4920635" weight="0.3266762" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -432,10 +426,37 @@
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="1" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State>
+              <option name="RECENTLY_FILTERED_USER_GROUPS">
+                <collection />
+              </option>
+              <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+                <collection />
+              </option>
+              <option name="COLUMN_ORDER">
+                <list>
+                  <option value="0" />
+                  <option value="1" />
+                  <option value="2" />
+                  <option value="3" />
+                </list>
+              </option>
+            </State>
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="fix" />
     <MESSAGE value="欧洲维修登录" />
-    <option name="LAST_COMMIT_MESSAGE" value="欧洲维修登录" />
+    <MESSAGE value="商城" />
+    <option name="LAST_COMMIT_MESSAGE" value="商城" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/package-lock.json" />
@@ -453,10 +474,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css.css.map">
-      <provider editor-type-id="sourcemapFileViewerProvider" />
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/fabric.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="266">
@@ -472,20 +489,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/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$/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$/维修品牌.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="247">
@@ -500,13 +503,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/project.less">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1235">
-          <caret line="65" column="7" lean-forward="true" selection-start-line="65" selection-start-column="7" selection-end-line="65" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/views/杂项/客户管理.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="608">
@@ -573,21 +569,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/style.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <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$/style.css.map">
-      <provider editor-type-id="sourcemapFileViewerProvider" />
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="54" selection-start-column="54" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/views/运营-回访/回访.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1995">
@@ -633,48 +614,112 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css.css">
+    <entry file="file://$PROJECT_DIR$/css/css.css.map">
+      <provider editor-type-id="sourcemapFileViewerProvider" />
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/project.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="227">
-          <caret line="20" column="21" lean-forward="true" selection-start-line="20" selection-start-column="21" selection-end-line="20" selection-end-column="21" />
+        <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$/views/商城/商品列表.html">
+    <entry file="file://$PROJECT_DIR$/css/project.css.map">
+      <provider editor-type-id="sourcemapFileViewerProvider" />
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/shop.css.map">
+      <provider editor-type-id="sourcemapFileViewerProvider" />
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/style.css.map">
+      <provider editor-type-id="sourcemapFileViewerProvider" />
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="54" selection-start-column="54" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/style.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="153" column="12" lean-forward="true" selection-start-line="153" selection-start-column="12" selection-end-line="153" selection-end-column="12" />
+        <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.less">
+    <entry file="file://$PROJECT_DIR$/css/style.less">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="266">
-          <caret line="29" column="13" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="13" />
+          <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$/css/project.less">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1235">
+          <caret line="65" column="7" lean-forward="true" selection-start-line="65" selection-start-column="7" selection-end-line="65" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/image/icon_ordernum@2x.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/css.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="207" column="16" lean-forward="true" selection-start-line="207" selection-start-column="16" selection-end-line="207" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop.css">
+    <entry file="file://$PROJECT_DIR$/css/css.less">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="4" column="43" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
+        <state relative-caret-position="227">
+          <caret line="252" column="1" lean-forward="true" selection-start-line="252" selection-start-column="1" selection-end-line="252" selection-end-column="1" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/views/商城/商品列表.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="88" column="34" lean-forward="true" selection-start-line="88" selection-end-line="196" />
+          <folding>
+            <element signature="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$/views/商城/购物车.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="291">
-          <caret line="218" column="46" lean-forward="true" selection-start-line="218" selection-start-column="46" selection-end-line="218" selection-end-column="46" />
+        <state relative-caret-position="223">
+          <caret line="220" column="12" lean-forward="true" selection-start-line="211" selection-start-column="5" selection-end-line="220" selection-end-column="12" />
           <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>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/shop.less">
+    <entry file="file://$PROJECT_DIR$/css/shop.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="43" selection-start-line="43" selection-end-line="43" />
+        <state relative-caret-position="199">
+          <caret line="74" column="22" lean-forward="true" selection-start-line="74" selection-start-column="22" selection-end-line="74" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/css/shop.less">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="208">
+          <caret line="120" column="12" lean-forward="true" selection-start-line="120" selection-start-column="12" selection-end-line="120" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/views/商城/订单详情.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="299">
+          <caret line="84" column="16" lean-forward="true" selection-start-line="84" selection-start-column="16" selection-end-line="84" selection-end-column="16" />
+          <folding>
+            <element signature="n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" />
+          </folding>
         </state>
       </provider>
     </entry>

css/css.css

@@ -13,6 +13,20 @@
 .color-orange {
   color: #ff4f00;
 }
+.icon-danhao {
+  width: 15px;
+  height: 17px;
+  background: url('../image/icon_ordernum@2x.png') no-repeat;
+  background-size: contain;
+  display: inline-block;
+}
+.icon-danhao {
+  width: 15px;
+  height: 17px;
+  background: url('../image/icon_shop@2x.png') no-repeat;
+  background-size: contain;
+  display: inline-block;
+}
 .card-box {
   border: 1px solid #eeeeee;
 }
@@ -187,6 +201,9 @@
 .ml10 {
   margin-left: 10px ;
 }
+.mr10 {
+  margin-right: 10px ;
+}
 .count-input {
   display: flex;
 }

css/css.less

@@ -1,7 +1,13 @@
 .border() {
   border: 1px solid rgba(238, 238, 238, 1);
 }
-
+.icon(@width,@height,@bg){
+  width: @width;
+  height: @height;
+  background: url(@bg) no-repeat;
+  background-size: contain;
+  display: inline-block;
+}
 .line-block(@top:0,@left:0,@bg:rgba(38,150,92,1)) {
   position: absolute;
   display: block;
@@ -30,6 +36,12 @@
 .color-orange{
   color:rgba(255,79,0,1);
 }
+.icon-danhao{
+  .icon(15px,17px,'../image/icon_ordernum@2x.png')
+}
+.icon-danhao{
+  .icon(15px,17px,'../image/icon_shop@2x.png')
+}
 .card-box {
   .border();
 
@@ -236,6 +248,9 @@
 .ml10{
   margin-left:10px ;
 }
+.mr10{
+  margin-right:10px ;
+}
 .count-input{
   display: flex;
   .count-input-btn{

css/shop.css

@@ -2,6 +2,73 @@
   width: 1600px;
   margin: 0 auto;
 }
+.shop-container .shop-container-title {
+  display: flex;
+  align-items: center;
+  margin: 20px 0;
+}
+.shop-container .shop-container-title .shop-container-title-state {
+  font-size: 14px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #ff4f00;
+}
+.shop-container .shop-container-info-box {
+  display: flex;
+  justify-content: space-between;
+}
+.shop-container .shop-container-info-box .shop-container-info-item {
+  width: 355px;
+  min-height: 117px;
+  border: 1px solid #eeeeee;
+  padding: 15px;
+}
+.shop-container .shop-container-info-box .shop-container-info-item > h4 {
+  font-size: 14px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #3c3c3c;
+}
+.shop-container .shop-container-info-box .shop-container-info-item .shop-container-info-item-message {
+  margin-top: 10px;
+  display: flex;
+}
+.shop-container .shop-container-info-box .shop-container-info-item .shop-container-info-item-message > span {
+  display: block;
+  font-size: 12px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #555555;
+  width: 70px;
+  min-width: 70px;
+}
+.shop-container .shop-container-info-box .shop-container-info-item .shop-container-info-item-message > p {
+  font-size: 12px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #666666;
+}
+.shop-container .shop-container-table-box .table-operation2 {
+  margin-top: 50px;
+  padding: 10px;
+  background: #f6f6f6;
+  border: 1px solid #dddddd;
+  display: flex;
+  position: relative;
+  justify-content: flex-end;
+}
+.shop-container .shop-container-table-box .table-operation2 .table-operation2-item {
+  padding: 5px;
+  text-align: right;
+  margin-right: 10px;
+}
+.shop-container .shop-container-table-box .table-operation2 .table-operation2-item > span,
+.shop-container .shop-container-table-box .table-operation2 .table-operation2-item > a {
+  font-size: 13px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #3c3c3c;
+}
 .shop-container .shop-container-table-box .table-operation {
   margin-top: 50px;
   height: 50px;
@@ -51,6 +118,8 @@
 }
 .shop-container .shop-container-table-box > table {
   width: 100%;
+  max-height: 800px;
+  overflow-y: auto;
 }
 .shop-container .shop-container-table-box > table thead {
   background: #f6f6f6;

css/shop.less

@@ -1,7 +1,73 @@
 .shop-container{
   width: 1600px;
   margin: 0 auto;
+  .shop-container-title{
+    display: flex;
+    align-items: center;
+    margin: 20px 0;
+    .shop-container-title-state{
+      font-size:14px;
+      font-family:PingFangSC-Medium,PingFang SC;
+      font-weight:500;
+      color:rgba(255,79,0,1);
+    }
+  }
+  .shop-container-info-box{
+    display: flex;
+    justify-content: space-between;
+    .shop-container-info-item{
+      width:355px;
+      min-height:117px;
+      border:1px solid rgba(238,238,238,1);
+      padding: 15px;
+      >h4{
+        font-size:14px;
+        font-family:PingFangSC-Medium,PingFang SC;
+        font-weight:500;
+        color:rgba(60,60,60,1);
+      }
+      .shop-container-info-item-message{
+        margin-top: 10px;
+        display: flex;
+        >span{
+          display: block;
+          font-size:12px;
+          font-family:PingFangSC-Medium,PingFang SC;
+          font-weight:500;
+          color:rgba(85,85,85,1);
+          width: 70px;
+          min-width: 70px;
+        }
+        >p{
+          font-size:12px;
+          font-family:PingFangSC-Regular,PingFang SC;
+          font-weight:400;
+          color:rgba(102,102,102,1);
+        }
+      }
+    }
+  }
   .shop-container-table-box{
+    .table-operation2{
+      margin-top: 50px;
+      padding: 10px;
+      background:rgba(246,246,246,1);
+      border:1px solid rgba(221,221,221,1);
+      display: flex;
+      position: relative;
+      justify-content: flex-end;
+      .table-operation2-item{
+        padding: 5px;
+        text-align: right;
+        margin-right: 10px;
+        >span,>a{
+          font-size:13px;
+          font-family:PingFangSC-Regular,PingFang SC;
+          font-weight:400;
+          color:rgba(60,60,60,1);
+        }
+      }
+    }
     .table-operation{
       margin-top: 50px;
       height:50px;
@@ -50,6 +116,8 @@
     }
     >table{
       width: 100%;
+      max-height: 800px;
+      overflow-y: auto;
       thead{
         background:rgba(246,246,246,1);
         th{

views/商城/订单详情.html

@@ -0,0 +1,153 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <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">
+</head>
+<body>
+<div class="shop-container">
+  <div class="shop-container-title">
+    <i class="icon-danhao mr10"></i>
+    单号：SO20093299903376
+    <span class="ml20 shop-container-title-state">待确认</span>
+  </div>
+  <div class="shop-container-info-box">
+    <div class="shop-container-info-item">
+      <h4>订单信息</h4>
+      <div class="shop-container-info-item-message">
+        <span>状态</span>
+        <p>状态</p>
+      </div>
+      <div class="shop-container-info-item-message">
+        <span>下单人</span>
+        <p>张丹娜</p>
+      </div>
+      <div class="shop-container-info-item-message">
+        <span>下单时间</span>
+        <p>2020-10-02 12:12:13</p>
+      </div>
+      <div class="shop-container-info-item-message">
+        <span>订单备注</span>
+        <p>山东省济南市历下区舜华路街道长了换行展示很长很长就换行</p>
+      </div>
+    </div>
+    <div class="shop-container-info-item">
+      <h4>收货人信息</h4>
+      <div class="shop-container-info-item-message">
+        <span>收货人</span>
+        <p>状态</p>
+      </div>
+      <div class="shop-container-info-item-message">
+        <span>手机号码</span>
+        <p>张丹娜</p>
+      </div>
+      <div class="shop-container-info-item-message">
+        <span>地址</span>
+        <p>山东省济南市历下区舜华路街道长了换行展示很长很长就换行</p>
+      </div>
+    </div>
+    <div class="shop-container-info-item">
+      <h4>配送信息</h4>
+      <div class="shop-container-info-item-message">
+        <span>配送方式</span>
+        <p>状态</p>
+      </div>
+      <div class="shop-container-info-item-message">
+        <span>配送时效</span>
+        <p>张丹娜</p>
+      </div>
+    </div>
+    <div class="shop-container-info-item">
+      <h4>付款信息</h4>
+      <div class="shop-container-info-item-message">
+        <span>付款方式</span>
+        <p>状态</p>
+      </div>
+      <div class="shop-container-info-item-message">
+        <span>付款时间</span>
+        <p>张丹娜</p>
+      </div>
+      <div class="shop-container-info-item-message">
+        <span>实付金额</span>
+        <p>2020-10-02 12:12:13</p>
+      </div>
+    </div>
+  </div>
+  <div class="shop-container-title">
+    <i class="icon-danhao mr10"></i>
+    张庄汽配店
+  </div>
+  <div class="shop-container-table-box">
+    <table>
+      <colgroup>
+        <col width="8%">
+        <col width="15%">
+        <col width="20%">
+        <col width="10%">
+        <col width="10%">
+        <col width="10%">
+        <col width="15%">
+      </colgroup>
+      <thead>
+      <tr>
+        <th>图片</th>
+        <th>品牌/名称/供应商编码</th>
+        <th>规格型号/出厂编码</th>
+        <th>价格</th>
+        <th>数量</th>
+        <th>实际发货数量</th>
+      </tr>
+      </thead>
+      <tbody>
+      <tr>
+        <td>
+          <img
+            src="https://upload.jianshu.io/users/upload_avatars/14368237/e85f3cbe-9fc7-46e1-b43e-eaa734694690.jpg?imageMogr2/auto-orient/strip|imageView2/1/w/90/h/90/format/webp"
+            alt="">
+        </td>
+        <td>
+          <div class="td-containe">
+            <p>品牌/名称</p>
+            <span>2218-18MMX25M</span>
+          </div>
+        </td>
+        <td>
+          <div class="td-containe">
+            <span>2218-18MMX25M</span>
+            <span>2218-18MMX25M</span>
+          </div>
+        </td>
+        <td>
+          <span><span class="rmb-title">￥400.00</span>（单位）</span>
+        </td>
+        <td>
+          <span>2</span>
+        </td>
+        <td>
+          <div class="td-containe">
+            <span>1</span>
+          </div>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+    <div class="table-operation2">
+      <div class="right-oper">
+        <div class="table-operation2-item">
+          <span class="ml10">共选商品 <span class="color-orange">3</span>种，总数量<span class="color-orange">3</span></span>
+          <span class="ml10">合计金额 <b class="color-orange">￥111111</b></span>
+        </div>
+        <div class="table-operation2-item">
+          <span class="ml10">共选商品 <span class="color-orange">3</span>种，总数量<span class="color-orange">3</span></span>
+          <span class="ml10">合计金额 <b class="color-orange">￥111111</b></span>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</div>
+</body>
+</html>