fix(goods): 移除下载结算单接口URL中的多余斜杠

先注释掉未实际使用功能，后续优化密码修改内容
feat(manager): 调整分页组件默认页面大小为20
2025-12-19 01:15:53 +08:00 · 2025-12-09 16:44:18 +08:00 · 2025-12-01 18:55:46 +08:00 · 2025-11-24 13:09:11 +08:00 · 2025-11-24 11:33:54 +08:00 · 2025-11-23 16:30:41 +08:00
1319 changed files with 329178 additions and 54845 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*/.vscode/
+/.idea/
+*/dist/
+.DS_Store
+node_modules/
+yarn.lock
+package-lock.json
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,17 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="OTHER_INDENT_OPTIONS">
-      <value>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </value>
-    </option>
-    <codeStyleSettings language="JavaScript">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="0" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>
--- a/.idea/lili-shop-ui.iml
+++ b/.idea/lili-shop-ui.iml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/lili-shop-ui.iml" filepath="$PROJECT_DIR$/.idea/lili-shop-ui.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,380 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="BranchesTreeState">
-    <expand>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-      <path>
-        <item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
-        <item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
-      </path>
-    </expand>
-    <select />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="7e964aa0-753b-43f7-854a-2942a3e76fe4" name="默认更改列表" comment="店铺设置">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-<<<<<<< HEAD
-      <change beforePath="$PROJECT_DIR$/buyer/src/pages/home/orderCenter/AddAddress.vue" beforeDir="false" afterPath="$PROJECT_DIR$/buyer/src/pages/home/orderCenter/AddAddress.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/manager/src/config/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/manager/src/config/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/seller/src/config/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/seller/src/config/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/seller/src/views/statistics/goods/goodsStatistics.vue" beforeDir="false" afterPath="$PROJECT_DIR$/seller/src/views/statistics/goods/goodsStatistics.vue" afterDir="false" />
-=======
-      <change beforePath="$PROJECT_DIR$/manager/src/views/goods-unit/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/manager/src/views/goods-unit/index.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/manager/src/views/sensitiveWords/index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/manager/src/views/sensitiveWords/index.vue" afterDir="false" />
->>>>>>> new-lmr
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FileTemplateManagerImpl">
-    <option name="RECENT_TEMPLATES">
-      <list>
-        <option value="Vue File" />
-        <option value="Vue Single File Component" />
-        <option value="JavaScript File" />
-      </list>
-    </option>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="ProjectId" id="1gGPnr0TWcTGoYhLT7QHFe5MrX4" />
-  <component name="ProjectLevelVcsManager">
-    <ConfirmationsSetting value="2" id="Add" />
-  </component>
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-<<<<<<< HEAD
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/manager/src/api" />
-=======
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/manager/src/views/sys/setting-manage" />
->>>>>>> new-lmr
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.detected.package.tslint" value="true" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.path.for.package.tslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="settings.editor.selected.configurable" value="preferences.sourceCode.XML" />
-    <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-<<<<<<< HEAD
-      <recent name="$PROJECT_DIR$/manager/src/api" />
-      <recent name="$PROJECT_DIR$/manager/src/views/my-components" />
-=======
-      <recent name="$PROJECT_DIR$/manager/src/views/sys/setting-manage" />
->>>>>>> new-lmr
-      <recent name="$PROJECT_DIR$/buyer/src/components/verify" />
-      <recent name="$PROJECT_DIR$/buyer/src/components/change" />
-    </key>
-    <key name="MoveFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/buyer/src/components/change" />
-      <recent name="$PROJECT_DIR$/buyer/src/pages/home/memberCenter" />
-      <recent name="$PROJECT_DIR$/buyer/src/pages/home/orderCenter" />
-      <recent name="$PROJECT_DIR$/buyer/src/pages/home" />
-      <recent name="$PROJECT_DIR$/buyer/src/components/home/order" />
-    </key>
-  </component>
-  <component name="RunManager">
-    <configuration name="Home.vue" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/lili-shop-ui/buyer/src/page/user/Home.vue" useBuiltInWebServerPort="true">
-      <method v="2" />
-    </configuration>
-    <recent_temporary>
-      <list>
-        <item itemvalue="JavaScript Debug.Home.vue" />
-      </list>
-    </recent_temporary>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="7e964aa0-753b-43f7-854a-2942a3e76fe4" name="默认更改列表" comment="" />
-      <created>1597738125477</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1597738125477</updated>
-      <workItem from="1597738127938" duration="6268000" />
-      <workItem from="1597825716012" duration="3768000" />
-      <workItem from="1597830090678" duration="7632000" />
-      <workItem from="1597972262326" duration="865000" />
-      <workItem from="1597974893526" duration="112000" />
-      <workItem from="1597975021121" duration="17000" />
-      <workItem from="1597975216701" duration="17254000" />
-      <workItem from="1598184961388" duration="14000" />
-      <workItem from="1598233017859" duration="10307000" />
-      <workItem from="1598259954059" duration="2720000" />
-      <workItem from="1598318520176" duration="726000" />
-      <workItem from="1598319433942" duration="106000" />
-      <workItem from="1598319554477" duration="13265000" />
-      <workItem from="1598406300597" duration="6030000" />
-      <workItem from="1598422866858" duration="7787000" />
-      <workItem from="1598491104901" duration="37245000" />
-      <workItem from="1606876680167" duration="61000" />
-      <workItem from="1611131536390" duration="5616000" />
-      <workItem from="1611537245379" duration="828000" />
-      <workItem from="1611538362285" duration="350000" />
-      <workItem from="1611560515629" duration="834000" />
-      <workItem from="1611650051294" duration="3000" />
-      <workItem from="1611818003333" duration="239000" />
-      <workItem from="1613989205923" duration="7005000" />
-      <workItem from="1614076082765" duration="8973000" />
-      <workItem from="1614142479169" duration="2129000" />
-      <workItem from="1614162982178" duration="8343000" />
-      <workItem from="1614228135182" duration="3456000" />
-      <workItem from="1614248866969" duration="8023000" />
-      <workItem from="1614313313338" duration="83000" />
-      <workItem from="1614313447954" duration="211000" />
-    </task>
-    <task id="LOCAL-00001" summary="管理端页面优化">
-      <created>1613996019944</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1613996019944</updated>
-    </task>
-    <task id="LOCAL-00002" summary="修复修改商家地址报错问题">
-      <created>1613996389449</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1613996389449</updated>
-    </task>
-    <task id="LOCAL-00003" summary="去掉id">
-      <created>1614076370139</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1614076370139</updated>
-    </task>
-    <task id="LOCAL-00004" summary="选择物流规则不能选择物流模板">
-      <created>1614080544415</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1614080544415</updated>
-    </task>
-    <task id="LOCAL-00005" summary="修改查询条件样式">
-      <created>1614143298555</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1614143298555</updated>
-    </task>
-    <task id="LOCAL-00006" summary="修改样式">
-      <created>1614143902874</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1614143902874</updated>
-    </task>
-    <task id="LOCAL-00007" summary="修改更新时间为NAN">
-      <created>1614144541858</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1614144541858</updated>
-    </task>
-    <task id="LOCAL-00008" summary="修复app版本无法添加和修改">
-      <created>1614230386509</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1614230386509</updated>
-    </task>
-    <task id="LOCAL-00009" summary="去掉打印">
-      <created>1614230407722</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1614230407722</updated>
-    </task>
-    <task id="LOCAL-00010" summary="去掉多选">
-      <created>1614230544808</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1614230544808</updated>
-    </task>
-    <task id="LOCAL-00011" summary="修改消息标题宽度">
-      <created>1614230627881</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1614230627881</updated>
-    </task>
-    <task id="LOCAL-00012" summary="店铺相关js提交">
-      <created>1614231645143</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1614231645143</updated>
-    </task>
-    <task id="LOCAL-00013" summary="店铺修改">
-      <created>1614231785359</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1614231785359</updated>
-    </task>
-    <task id="LOCAL-00014" summary="优化页面">
-      <created>1614249105672</created>
-      <option name="number" value="00014" />
-      <option name="presentableId" value="LOCAL-00014" />
-      <option name="project" value="LOCAL" />
-      <updated>1614249105672</updated>
-    </task>
-    <task id="LOCAL-00015" summary="页面优化">
-      <created>1614258980903</created>
-      <option name="number" value="00015" />
-      <option name="presentableId" value="LOCAL-00015" />
-      <option name="project" value="LOCAL" />
-      <updated>1614258980903</updated>
-    </task>
-    <task id="LOCAL-00016" summary="页面优化">
-      <created>1614259068248</created>
-      <option name="number" value="00016" />
-      <option name="presentableId" value="LOCAL-00016" />
-      <option name="project" value="LOCAL" />
-      <updated>1614259068248</updated>
-    </task>
-    <task id="LOCAL-00017" summary="页面优化">
-      <created>1614313690732</created>
-      <option name="number" value="00017" />
-      <option name="presentableId" value="LOCAL-00017" />
-      <option name="project" value="LOCAL" />
-      <updated>1614313690732</updated>
-    </task>
-    <option name="localTasksCounter" value="18" />
-    <servers />
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="Vcs.Log.History.Properties">
-    <option name="COLUMN_ID_ORDER">
-      <list>
-        <option value="Default.Root" />
-        <option value="Default.Author" />
-        <option value="Default.Date" />
-        <option value="Default.Subject" />
-      </list>
-    </option>
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="1">
-          <value>
-            <State>
-              <option name="SHOW_ONLY_AFFECTED_CHANGES" value="true" />
-              <option name="FILTERS">
-                <map>
-                  <entry key="branch">
-                    <value>
-                      <list>
-                        <option value="HEAD" />
-                      </list>
-                    </value>
-                  </entry>
-                  <entry key="structure">
-                    <value>
-                      <list>
-                        <option value="dir:/Users/liushuai/Documents/workspace/lili-shop-ui/seller/src/router" />
-                      </list>
-                    </value>
-                  </entry>
-                </map>
-              </option>
-            </State>
-          </value>
-        </entry>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="COLUMN_ORDER" />
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="店铺设置" />
-    <MESSAGE value="文件排序问题处理" />
-    <MESSAGE value="管理端页面优化" />
-    <MESSAGE value="修复修改商家地址报错问题" />
-    <MESSAGE value="去掉id" />
-    <MESSAGE value="选择物流规则不能选择物流模板" />
-    <MESSAGE value="修改查询条件样式" />
-    <MESSAGE value="修改样式" />
-    <MESSAGE value="修改更新时间为NAN" />
-    <MESSAGE value="修复app版本无法添加和修改" />
-    <MESSAGE value="去掉打印" />
-    <MESSAGE value="去掉多选" />
-    <MESSAGE value="修改消息标题宽度" />
-    <MESSAGE value="店铺相关js提交" />
-    <MESSAGE value="店铺修改" />
-    <MESSAGE value="优化页面" />
-    <MESSAGE value="页面优化" />
-    <option name="LAST_COMMIT_MESSAGE" value="页面优化" />
-  </component>
-  <component name="WindowStateProjectService">
-    <state x="2074" y="292" key="CommitChangelistDialog2" timestamp="1614313690605">
-      <screen x="0" y="23" width="3440" height="1333" />
-    </state>
-    <state x="2074" y="292" key="CommitChangelistDialog2/0.23.3440.1333@0.23.3440.1333" timestamp="1614313690605" />
-    <state x="1660" y="123" width="1572" height="1133" key="DiffContextDialog" timestamp="1614231764977">
-      <screen x="0" y="23" width="3440" height="1333" />
-    </state>
-    <state x="1660" y="123" width="1572" height="1133" key="DiffContextDialog/0.23.3440.1333@0.23.3440.1333" timestamp="1614231764977" />
-    <state x="2046" y="418" key="Vcs.Push.Dialog.v2" timestamp="1614313692405">
-      <screen x="0" y="23" width="3440" height="1333" />
-    </state>
-    <state x="2046" y="418" key="Vcs.Push.Dialog.v2/0.23.3440.1333@0.23.3440.1333" timestamp="1614313692405" />
-    <state x="2055" y="414" width="782" height="550" key="find.popup" timestamp="1614256597933">
-      <screen x="0" y="23" width="3440" height="1333" />
-    </state>
-    <state x="2055" y="414" width="782" height="550" key="find.popup/0.23.3440.1333@0.23.3440.1333" timestamp="1614256597933" />
-    <state x="2111" y="325" key="run.anything.popup" timestamp="1613991372498">
-      <screen x="0" y="23" width="3440" height="1333" />
-    </state>
-    <state x="2111" y="325" key="run.anything.popup/0.23.3440.1333@0.23.3440.1333" timestamp="1613991372498" />
-    <state x="2111" y="327" width="670" height="676" key="search.everywhere.popup" timestamp="1614254687317">
-      <screen x="0" y="23" width="3440" height="1333" />
-    </state>
-    <state x="2111" y="327" width="670" height="676" key="search.everywhere.popup/0.23.3440.1333@0.23.3440.1333" timestamp="1614254687317" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/manager/src/views/sys/monitor/monitor.vue</url>
-          <line>5</line>
-          <option name="timeStamp" value="2" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-</project>
--- a/143
+++ b/143
@@ -1,5 +1,5 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007

 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
@@ -7,17 +7,15 @@

                            Preamble

-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.

  The licenses for most software and other practical works are designed
 to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
+our General Public Licenses are intended to guarantee your freedom to
 share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
+software for all its users.

  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
@@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you
 want it, that you can change the software or use pieces of it in new
 free programs, and that you know you can do these things.

-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.

-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.

-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.

-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.

  The precise terms and conditions for copying, distribution and
 modification follow.
@@ -72,7 +60,7 @@ modification follow.

  0. Definitions.

-  "This License" refers to version 3 of the GNU General Public License.
+  "This License" refers to version 3 of the GNU Affero General Public License.

  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
@@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey
 the Program, the only way you could satisfy both those terms and this
 License would be to refrain entirely from conveying the Program.

-  13. Use with the GNU Affero General Public License.
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.

  Notwithstanding any other provision of this License, you have
 permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
+under version 3 of the GNU General Public License into a single
 combined work, and to convey the resulting work.  The terms of this
 License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.

  14. Revised Versions of this License.

  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.

  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
+Program specifies that a certain numbered version of the GNU Affero General
 Public License "or any later version" applies to it, you have the
 option of following the terms and conditions either of that numbered
 version or of any later version published by the Free Software
 Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
+GNU Affero General Public License, you may choose any version ever published
 by the Free Software Foundation.

  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
+versions of the GNU Affero General Public License can be used, that proxy's
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.

@@ -635,40 +633,29 @@ the "copyright" line and a pointer to where the full notice is found.
    Copyright (C) <year>  <name of author>

    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    GNU Affero General Public License for more details.

-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU Affero General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.

  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
+For more information on this, and how to apply and follow the GNU AGPL, see
 <http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/README.md
+++ b/README.md
@@ -1,96 +1,159 @@
 ## Lilishop B2B2C商城系统

-##### 官方公众号 & 开源不易，如有帮助请点Star
-![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)
+
+#### PS： **演示站点所有环境均部署master分支。如果有演示站点问题，可以反馈，如果演示站点没问题本地运行有问题，需自行处理** 
+
+-   **[在线客服](https://work.weixin.qq.com/kfid/kfc4d8dc24a73c15f44)**
+-   **微信交流1群（已满）**
+-   **微信交流2群**:
+    ![微信群](https://lilishop-wechat.oss-cn-beijing.aliyuncs.com/wechat.jpg)
+
+##### 体验 公众号/小程序/APP 体验，扫描二维码
+
+![image-20210511171611793](https://static.pickmall.cn/images/h5-qrcode.png)

 [![star](https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark)](https://gitee.com/beijing_hongye_huicheng/lilishop/stargazers)
+&nbsp;&nbsp;![github](https://img.shields.io/github/stars/hongyehuicheng/lilishop.svg?style=social&logo=#181717)
+
+## 2025-10-10日更新
+兼容更高的node版本16
+
+这里我用的是node版本 v16.20.2
+
+npm版本 8.19.4
+
+使用yarn install 然后执行 yarn dev
+
+yarn 安装/启动
+```
+// 如果没有 yarn 安装yarn
+npm install yarn -g
+
+// 切换源
+yarn config set registry https://registry.npmmirror.com
+
+// 以buyer项目为例
+cd buyer
+
+yarn install
+
+yarn dev
+```


-### 介绍
+
+
+没有二开过的项目直接拉最新代码即可，二开项目可以跟着提交记录一起同步修改 install出现问题检查的话删除 "package-lock.json" 重新install
+
+Q&A 为什么不升级更高的node版本？ :因为高node版本 OpenSSL 改动 导致旧版本 Webpack 插件会失效 试了好几次如果兼容的话 需要升级Webpack5以及其他的插件 升级内容较多 为了更稳定的还是尽量少动为主
+
+****
+
+
+## 如何在本地环境运行lilishop-ui部署视频
+https://www.bilibili.com/video/BV1B28EeJEnP/
+
+## 如何在服务器上部署lilishop-ui
+https://www.bilibili.com/video/BV1WD87eoE9F/
+
+
+## 开发项目
+
+#### 安装Node.js
+
+保证`node`版本`14`,推荐 14.17.0
+
+2025-10-10日拉的代码之后不限制于node版本为14，这里只是以14版本为例子
+
+可以使用 `yarn` 或者 `npm` 进行安装
+
+#### yarn 安装/启动
+```
+// 如果没有 yarn 安装yarn
+npm install yarn -g
+
+// 切换源
+yarn config set registry https://registry.npmmirror.com
+
+// 以buyer项目为例
+cd buyer
+
+yarn install
+
+yarn dev
+```
+
+
+#### FAQ
+
+##### npmmirror镜像源报错 451 Unavailable For Legal Reasons
+```
+//切换其他的镜像源
+
+// npm
+npm config set registry http://mirrors.cloud.tencent.com/npm/
+
+// yarn
+yarn config set registry http://mirrors.cloud.tencent.com/npm/
+```
+
+##### 安装不上去
+
+可以按照这个思路排查一下
+
+```
+1. 看下Node.js 是否是14.17.0
+2. 项目目录下是否有 package-lock.json 或者 .npmrc 或者 .yarnrc 设置了镜像源， 如果有可以删除重新install
+3. 切换当前 npm 或者 yarn 镜像源重试
+```
+
+
+### 商城介绍
 **官网**：https://pickmall.cn

-Lilishop 是一款Java开发，基于SpringBoot研发的B2B2C多用户商城，前端使用 Vue、uniapp开发 **系统全端全部代码开源**
+Lilishop商城系统支持商家入驻，后端基于SpringBoot 研发，前端使用 Vue、uniapp开发， **系统全端全部代码开源**

-产品前后端分离、支持分布式部署。
+前后端分离，支持分布式部署，支持Docker，各个API独立，并且有独立的消费者。

-商城展示端包含 PC、H5、微信小程序、APP。
+### 商城 API/消费者 聚合版
+api不需要单独部署，只需启动一个jar包就可以正常运转 如有需要，可以点击跳转
+https://gitee.com/beijing_hongye_huicheng/lilishop-simplify

-商城包含 会员模块、**第三方登录模块**、**第三方支付模块**、**楼层装修模块**、订单模块、分销模块、文章模块、系统设置模块、流量分析模块
+### 开发/使用/常见问题 帮助文档

-系统包含各种中间件、搜索引擎、多级缓存、分布式事务、分布式任务调度等，支持Docker，支持k8s。是一款高性能，支持高并发等商城系统。
+https://docs.pickmall.cn

-开箱即用，简单配置即可部署一套属于您的系统。
+### 项目地址

-### 文档
+gitee : https://gitee.com/beijing_hongye_huicheng

-**产品文档**（需求、架构、使用、部署、开发）：https://docs.pickmall.cn
+github 镜像: https://github.com/lilishop?tab=repositories

+商城UI 项目下3个文件夹 
+buyer：买家PC端，seller：商家端，manager：后台管理端

-### 项目链接(gitee)
-
-**Java后台**：https://gitee.com/beijing_hongye_huicheng/lilishop.git
-
-**Vue后台前端**： https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git
-
-**Uni-app**：https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git
-
-**docker一键部署**：https://gitee.com/beijing_hongye_huicheng/docker.git
-
-### 项目链接(github)
-
-**Java后台**：https://github.com/hongyehuicheng/lilishop.git
-
-**Vue后台前端**： https://github.com/hongyehuicheng/lilishop-ui.git
-
-**Uni-app**：https://github.com/hongyehuicheng/lilishop-uniapp.git
-
-**docker一键部署**：https://github.com/hongyehuicheng/docker.git

 ### 演示地址
+PS：手机验证码为 ‘111111’

-**运营后台**：https://admin-b2b2c.pickmall.cn 账号：admin/123456
+**平台管理端**：https://admin-b2b2c.pickmall.cn 账号：admin/123456

-**店铺后台**：https://store-b2b2c.pickmall.cn 账号：13011111111/111111
+**店铺管理端**：https://store-b2b2c.pickmall.cn 账号：13011111111/111111

-**用户前台**：https://pc-b2b2c.pickmall.cn
+**商城PC页面**：https://pc-b2b2c.pickmall.cn

-**移动端**：https://m-b2b2c.pickmall.cn
+**商城 小程序/公众号/APP**：扫描二维码

-![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)
+![image-20210511171611793](https://static.pickmall.cn/images/h5-qrcode.png)

-### 3行命令搭建本地环境
+### 快速本地部署

-温馨提示：由于服务较多，如果笔记本环境启动内存没有32g可能无法启动成功（macbookpro 2020 16g内存启动无法成功），台式机在16g内存、AMD 3700x 的ubuntu系统成功运行。
-
-##### 下载docker脚本
-`git clone https://gitee.com/beijing_hongye_huicheng/docker.git `
-##### 部署基础环境
-`docker-compose up -d`
-
-##### 部署应用
-`docker-compose -f docker-compose-application.yml up -d`
-
-
-
-PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql
-
-##### 各个地址
-
-| API           | 地址            |
-| -------------- | --------------- |
-| 买家API    | http://127.0.0.1:8888     |
-| 商家API     | http://127.0.0.1:8889      |
-| 管理端API       | http://127.0.0.1:8887   |
-| 通用API    | http://127.0.0.1:8890     |
-
-| 前端演示         | 地址            |
-| -------------- | --------------- |
-| PC       | http://127.0.0.1:10000     |
-| WAP        | http://127.0.0.1:10001      |
-| 商家       | http://127.0.0.1:10002   |
-| 管理端       | http://127.0.0.1:10003     |
+[点击跳转](https://docs.pickmall.cn/deploy/%E8%BF%90%E8%A1%8C%E7%8E%AF%E5%A2%83%E5%87%86%E5%A4%87.html)

+**商城数据库**
+使用docker-compose部署数据库，自动初始化数据库，不需要手动下载等操作

+如果手动部署，才需要获取sql [点击跳转](https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql) （PS：这里有与tag版本一致的sql，如果是历史版本，则docker项目也切换至历史版本获取sql即可，历史版本升级则根据java相聚的根目录DB目录下的升级sql，按需执行）。



@@ -98,44 +161,35 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_



-#### 平台功能
+#### 平台管理端功能

-![平台功能](https://pickmall.cn/assets/imgs/other/managerList.jpg)
+![平台管理端功能](https://static.pickmall.cn/images/other/managerList1.jpg)



-#### 商家端功能
+#### 卖家功能

-![商家端功能](https://pickmall.cn/assets/imgs/other/storeList.jpg)
+![商家端功能](https://static.pickmall.cn/images/other/storeList.jpg)


+### 商城前端功能展示

+#### 商城移动端

+<img src="https://static.pickmall.cn/images/other/app.gif" alt="移动端功能展示" style="zoom:50%;" />

-### 功能展示
+#### 平台管理端

-
-
-#### 移动端
-
-<img src="https://pickmall.cn/assets/imgs/other/app.gif" alt="管理端功能展示" style="zoom:50%;" />
-
-<img src="https://pickmall.cn/assets/imgs/other/app.gif" alt="移动端功能展示" style="zoom:50%;" />
-
-
-
-#### 管理端
-
-![管理端功能展示](https://pickmall.cn/assets/imgs/other/manager.gif)
+![管理端功能展示](https://static.pickmall.cn/images/other/manager.gif)


 ### 技术选型

 #### 架构图

-![架构](https://lili-system.oss-cn-beijing.aliyuncs.com/docs/%E6%9E%B6%E6%9E%84.png)
+![技术选型](https://lili-system.oss-cn-beijing.aliyuncs.com/docs/%E6%9E%B6%E6%9E%84.png)

-##### Java后台
+##### 后台技术选型

 | 说明           | 框架            | 说明           |               |
 | -------------- | --------------- | -------------- | ------------- |
@@ -166,102 +220,21 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_
 | 基础UI库  | uViewui | 基础框架 | uni-app |
 | CSS预处理 | scss    | 地图引擎 | amap    |

-### 升级计划
-
-#### 计划每个月发布一个版本，具体时间可能有出入
-
-时间：2021年6月15日
-
-```
-新增功能：
-1.微信小程序直播
-2.优惠券活动
-3.新人赠券
-4.准确发券
-5.用户等级
-6.数据导出
-7.订单批量
-8.APP版本升级检测
-9.积分商城
-
-功能优化：
-1.优惠券有效期增加类型：设置领取后*内有效。
-2.秒杀活动设置为每天开启，需设置秒杀活动开启时间。
-3.店铺配送模板，配送地区如果选择省份则下方的市级地址不展示。
-4.店铺配送模板支持，店铺包邮。
-5.普通商品设置去除卖家承担运费。
-
-```
-
-时间：2021年7月15日
-
-```
-新增功能：
-1.会员权益
-2.支持用户升级会员
-3.供求单
-4.IM：腾讯云智服
-5.服务商品
-6.店铺支持订单核销
-7.店铺自提点
-功能优化：
-1.用户分享商城、关注店铺、邀请新用户可获取积分、经验值。
-```
-
-时间：2021年8月16日
-
-```
-新增功能：
-1.微淘功能
-2.店铺移动端
-3.店铺发货单
-```
-
-时间：2021年9月15日
-
-```
-新增功能：
-增加供应商功能
-```
-
 ### 版本升级

 ```
-后续会持续版本升级，修复bug，完善功能，覆盖更多业务场景 o2o/b2b/s2b2b2c/跨境电商
-
-后续会考虑推出微服务/中台等 企业级版本
+系统后续会提供多场景解决方案。
+更多架构：微服务、Saas、中台等，都会支持。 支持差价升级商业授权
 ```

-### 技术亮点
+### 商业授权
+商业版本与开源版本代码一致，没有区分

+商业使用需要授权，授权方式可选择联系官网客服，或者qq群联系群主。

-    1.后端框架基于Springboot，构建基于maven，持久层使用MyBatisPlus。使用elasticsearch、redis、mongodb、rocketmq 等各种中间健。都是主流架构，轻松应对各种环境。
-    
-    2.支持集群、分布式，支持docker 轻松部署，解决各种复杂场景！
-    
-    3.代码模块清晰，主要分为三端api（买家、卖家、管理），各端API互相隔离，自己鉴权，自己操作业务。
-    
-    4.使用阿里开源的RocketMQ，基于mq解决各种并发场景，解决事务一致性，解决搞并发延迟场景问题。
-    
-    5.项目使用多级缓存，应用不同场景，redis缓存业务数据、mongodb缓存关系型多对多关系问题、nginx缓存高频访问低频修改的页面。
-    
-    6.支持各种联合登陆，支持各种客户端的支付问题，灵活配置灵活开启。
-    
-    7.内置完善的楼层装修机制，各种拖拉拽，维护跳转页面或外网，即便是一个什么都不懂的运营也可以轻松掌握。
-    
-    8.内置阿里短信接口，可以在线申请短信模版。内置阿里oss系统，可以对文件执行各种操作。oss商家端资源相互隔离。
-    
-    10.强大的统计报表，统计效果，可以实现各个场景，包含在线人数，历史在线人数，活跃人数等信息。
-    
-    11.标准Api接口、提供swagger文档，快速二开。
-    
-    12.分布式调度任务中心，解决分布式定时任务多次执行问题。
-    
-    13.代码注释完善，快速上手。
-    
-    14.非移动端采用IView框架，各种自定义插件、选择器实现。移动端采用uniapp，一次编写，全端使用
-    
-    15.已经对接好各种第三方插件，支持各种复杂等联合登陆，联合支付等场景。
+商业授权模式为永久授权，支持永久升级。
+
+商业案例由于涉及部分多层二开关系，如需了解可以咨询销售。


 ### 开源须知
@@ -269,9 +242,13 @@ PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_

 2.禁止将本开源的代码和资源进行任何形式任何名义的出售.

-3.限制商用，如果需要商业使用请联系我们。QQ3409056806.
+3.软件受国家计算机软件著作权保护（登记号：2021SR0805085）。

-### 交流群
+4.限制商用，如果需要商业使用请联系我们。QQ3409056806.或者加入qq群联系群主。

-**QQ群**：961316482
+### 附录
+有人有自己的学习视频、学习记录文档、希望宣传关联开源项目等均可以私聊仓库所有者。

+类似：
+
+清晨敲代码同学的分析: https://blog.csdn.net/vaevaevae233/category_12103567.html
--- a/build.sh
+++ b/build.sh
@@ -0,0 +1,19 @@
+#代码目录
+code_path=$PWD
+
+git pull
+
+cd ${code_path}/manager
+rm -rf ./dist
+yarn install
+yarn build
+
+cd ${code_path}/seller
+rm -rf ./dist
+yarn install
+yarn build
+
+cd ${code_path}/buyer
+rm -rf ./dist
+yarn install
+yarn build
--- a/buyer/.gitignore
+++ b/buyer/.gitignore
@@ -12,4 +12,3 @@ yarn-error.log*
 *.ntvs*
 *.njsproj
 *.sln
-package-lock.json
--- a/buyer/.npmrc
+++ b/buyer/.npmrc
@@ -0,0 +1 @@
+engine-strict=false
--- a/buyer/.postcssrc.js
+++ b/buyer/.postcssrc.js
@@ -1,10 +0,0 @@
-// https://github.com/michael-ciniawsky/postcss-load-config
-
-module.exports = {
-  "plugins": {
-    "postcss-import": {},
-    "postcss-url": {},
-    // to  target browsers: use "browserslist" field in package.json
-    "autoprefixer": {}
-  }
-}
--- a/buyer/.yarnrc
+++ b/buyer/.yarnrc
@@ -0,0 +1 @@
+--ignore-engines true
--- a/buyer/Dockerfile
+++ b/buyer/Dockerfile
@@ -1,8 +1,13 @@
-FROM nginx:alpine
+FROM node:10.19.0 as build-stage
+WORKDIR /app
+COPY package*.json ./
+RUN npm install
+COPY . .
+RUN npm run build

-RUN mkdir -p /app/
-COPY ./dist /app/
+# production stage
+FROM nginx:stable-alpine as production-stage
+COPY --from=build-stage /app/dist /usr/share/nginx/html
 COPY ./nginx.conf /etc/nginx/nginx.conf
-
-
 EXPOSE 80
+CMD ["nginx", "-g", "daemon off;"]k 
--- a/buyer/README.md
+++ b/buyer/README.md
@@ -1,25 +0,0 @@
-### 全局css src/assets/styles
-
-### 工具类 src/plugins
-
-### 顶部广告页 src/components/advertising
-
-### 全部商品分类  components/nav
-
-### 底部导航栏   components/footer
-
-### 发票模态框  components/invoiceModal
-
-### 商品详情   pages/GoodsDetail.vue
-
-#### 商品详情组件  components/goodsDetail
-
-### 全部商品分类  pages/AllCategories.vue
-
-### 意见反馈 pages/Feedback.vue
-
-### 卡片的封装  components/card
-
-### 购物车    pages/Cart.vue
-
-
--- a/buyer/babel.config.js
+++ b/buyer/babel.config.js
@@ -0,0 +1,5 @@
+module.exports = {
+  presets: [
+    '@vue/cli-plugin-babel/preset'
+  ]
+}
--- a/buyer/build/build.js
+++ b/buyer/build/build.js
@@ -1,41 +0,0 @@
-'use strict'
-require('./check-versions')()
-
-process.env.NODE_ENV = 'production'
-
-const ora = require('ora')
-const rm = require('rimraf')
-const path = require('path')
-const chalk = require('chalk')
-const webpack = require('webpack')
-const config = require('../config')
-const webpackConfig = require('./webpack.prod.conf')
-
-const spinner = ora('building for production...')
-spinner.start()
-
-rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => {
-  if (err) throw err
-  webpack(webpackConfig, (err, stats) => {
-    spinner.stop()
-    if (err) throw err
-    process.stdout.write(stats.toString({
-      colors: true,
-      modules: false,
-      children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build.
-      chunks: false,
-      chunkModules: false
-    }) + '\n\n')
-
-    if (stats.hasErrors()) {
-      console.log(chalk.red('  Build failed with errors.\n'))
-      process.exit(1)
-    }
-
-    console.log(chalk.cyan('  Build complete.\n'))
-    console.log(chalk.yellow(
-      '  Tip: built files are meant to be served over an HTTP server.\n' +
-      '  Opening index.html over file:// won\'t work.\n'
-    ))
-  })
-})
--- a/buyer/build/check-versions.js
+++ b/buyer/build/check-versions.js
@@ -1,54 +0,0 @@
-'use strict'
-const chalk = require('chalk')
-const semver = require('semver')
-const packageConfig = require('../package.json')
-const shell = require('shelljs')
-
-function exec (cmd) {
-  return require('child_process').execSync(cmd).toString().trim()
-}
-
-const versionRequirements = [
-  {
-    name: 'node',
-    currentVersion: semver.clean(process.version),
-    versionRequirement: packageConfig.engines.node
-  }
-]
-
-if (shell.which('npm')) {
-  versionRequirements.push({
-    name: 'npm',
-    currentVersion: exec('npm --version'),
-    versionRequirement: packageConfig.engines.npm
-  })
-}
-
-module.exports = function () {
-  const warnings = []
-
-  for (let i = 0; i < versionRequirements.length; i++) {
-    const mod = versionRequirements[i]
-
-    if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
-      warnings.push(mod.name + ': ' +
-        chalk.red(mod.currentVersion) + ' should be ' +
-        chalk.green(mod.versionRequirement)
-      )
-    }
-  }
-
-  if (warnings.length) {
-    console.log('')
-    console.log(chalk.yellow('To use this template, you must update following to modules:'))
-    console.log()
-
-    for (let i = 0; i < warnings.length; i++) {
-      const warning = warnings[i]
-      console.log('  ' + warning)
-    }
-
-    console.log()
-    process.exit(1)
-  }
-}
--- a/buyer/build/utils.js
+++ b/buyer/build/utils.js
@@ -1,110 +0,0 @@
-'use strict'
-const path = require('path')
-const config = require('../config')
-const ExtractTextPlugin = require('extract-text-webpack-plugin')
-const packageConfig = require('../package.json')
-
-exports.assetsPath = function (_path) {
-  const assetsSubDirectory = process.env.NODE_ENV === 'production'
-    ? config.build.assetsSubDirectory
-    : config.dev.assetsSubDirectory
-
-  return path.posix.join(assetsSubDirectory, _path)
-}
-
-exports.cssLoaders = function (options) {
-  options = options || {}
-
-  const cssLoader = {
-    loader: 'css-loader',
-    options: {
-      sourceMap: options.sourceMap
-    }
-  }
-
-  const postcssLoader = {
-    loader: 'postcss-loader',
-    options: {
-      sourceMap: options.sourceMap
-    }
-  }
-
-  // generate loader string to be used with extract text plugin
-  function generateLoaders (loader, loaderOptions) {
-    const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
-
-    if (loader) {
-      loaders.push({
-        loader: loader + '-loader',
-        options: Object.assign({}, loaderOptions, {
-          sourceMap: options.sourceMap
-        })
-      })
-    }
-
-    // Extract CSS when that option is specified
-    // (which is the case during production build)
-    if (options.extract) {
-      return ExtractTextPlugin.extract({
-        use: loaders,
-        fallback: 'vue-style-loader',
-        publicPath: '../../'
-      })
-    } else {
-      return ['vue-style-loader'].concat(loaders)
-    }
-  }
-
-  // https://vue-loader.vuejs.org/en/configurations/extract-css.html
-  return {
-    css: generateLoaders(),
-    postcss: generateLoaders(),
-    less: generateLoaders('less' , { javascriptEnabled : true }),
-    sass: generateLoaders('sass', { indentedSyntax: true }),
-    scss: generateLoaders('sass').concat(
-      {
-        loader: 'sass-resources-loader',
-        options: {
-            //你自己的scss全局文件的路径
-          resources: path.resolve(__dirname, '../src/assets/styles/global.scss')
-        }
-      }
-    ),
-    stylus: generateLoaders('stylus'),
-    styl: generateLoaders('stylus')
-  }
-}
-
-// Generate loaders for standalone style files (outside of .vue)
-exports.styleLoaders = function (options) {
-  const output = []
-  const loaders = exports.cssLoaders(options)
-
-  for (const extension in loaders) {
-    const loader = loaders[extension]
-    output.push({
-      test: new RegExp('\\.' + extension + '$'),
-      use: loader
-    })
-  }
-
-  return output
-}
-
-exports.createNotifierCallback = () => {
-  const notifier = require('node-notifier')
-
-  return (severity, errors) => {
-    if (severity !== 'error') return
-
-    const error = errors[0]
-    const filename = error.file && error.file.split('!').pop()
-
-    notifier.notify({
-      title: packageConfig.name,
-      message: severity + ': ' + error.name,
-      subtitle: filename || '',
-      icon: path.join(__dirname, 'logo.png')
-    })
-  }
-}
--- a/buyer/build/vue-loader.conf.js
+++ b/buyer/build/vue-loader.conf.js
@@ -1,22 +0,0 @@
-'use strict'
-const utils = require('./utils')
-const config = require('../config')
-const isProduction = process.env.NODE_ENV === 'production'
-const sourceMapEnabled = isProduction
-  ? config.build.productionSourceMap
-  : config.dev.cssSourceMap
-
-module.exports = {
-  loaders: utils.cssLoaders({
-    sourceMap: sourceMapEnabled,
-    extract: isProduction
-  }),
-  cssSourceMap: sourceMapEnabled,
-  cacheBusting: config.dev.cacheBusting,
-  transformToRequire: {
-    video: ['src', 'poster'],
-    source: 'src',
-    img: 'src',
-    image: 'xlink:href'
-  }
-}
--- a/buyer/build/webpack.base.conf.js
+++ b/buyer/build/webpack.base.conf.js
@@ -1,111 +0,0 @@
-'use strict'
-const path = require('path')
-const utils = require('./utils')
-const config = require('../config')
-const vueLoaderConfig = require('./vue-loader.conf')
-
-function resolve (dir) {
-  return path.join(__dirname, '..', dir)
-}
-
-const createLintingRule = () => ({
-  test: /\.(js|vue)$/,
-  loader: 'eslint-loader',
-  enforce: 'pre',
-  include: [resolve('src'), resolve('test')],
-  options: {
-    formatter: require('eslint-friendly-formatter'),
-    emitWarning: !config.dev.showEslintErrorsInOverlay
-  }
-})
-
-module.exports = {
-  context: path.resolve(__dirname, '../'),
-  entry: {
-    app: './src/main.js'
-  },
-  output: {
-    path: config.build.assetsRoot,
-    filename: '[name].js',
-    publicPath: process.env.NODE_ENV === 'production'
-      ? config.build.assetsPublicPath
-      : config.dev.assetsPublicPath
-  },
-  resolve: {
-    extensions: ['.js', '.vue', '.json'],
-    alias: {
-      'vue$': 'vue/dist/vue.esm.js',
-      '@': resolve('src'),
-    }
-  },
-  module: {
-    rules: [
-      // ...(config.dev.useEslint ? [createLintingRule()] : []),
-      {
-        test: /\.vue$/,
-        loader: 'vue-loader',
-        options: vueLoaderConfig
-      },
-      {
-        test: /\.scss$/,
-        loaders: ['style', 'css', 'sass']
-      },
-      // {
-
-      //   test: /\.less$/,
-        
-      //   loader: "style-loader!css-loader!less-loader",
-        
-      //   },
-      {
-        test: /\.js$/,
-        loader: 'babel-loader',
-        include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
-      },
-      {
-        test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('img/[name].[hash:7].[ext]')
-        }
-      },
-      {
-        test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('media/[name].[hash:7].[ext]')
-        }
-      },
-      {
-        test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
-        }
-      },
-      {
-        test: /\.(cur)(\?.*)?$/,
-        loader: 'url-loader',
-        options: {
-          limit: 10000,
-          name: utils.assetsPath('cur/[name].[hash:7].[ext]')
-        }
-      }
-    ]
-  },
-  node: {
-    // prevent webpack from injecting useless setImmediate polyfill because Vue
-    // source contains it (although only uses it if it's native).
-    setImmediate: false,
-    // prevent webpack from injecting mocks to Node native modules
-    // that does not make sense for the client
-    dgram: 'empty',
-    fs: 'empty',
-    net: 'empty',
-    tls: 'empty',
-    child_process: 'empty'
-  }
-}
--- a/buyer/build/webpack.dev.conf.js
+++ b/buyer/build/webpack.dev.conf.js
@@ -1,95 +0,0 @@
-'use strict'
-const utils = require('./utils')
-const webpack = require('webpack')
-const config = require('../config')
-const merge = require('webpack-merge')
-const path = require('path')
-const baseWebpackConfig = require('./webpack.base.conf')
-const CopyWebpackPlugin = require('copy-webpack-plugin')
-const HtmlWebpackPlugin = require('html-webpack-plugin')
-const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
-const portfinder = require('portfinder')
-
-const HOST = process.env.HOST
-const PORT = process.env.PORT && Number(process.env.PORT)
-
-const devWebpackConfig = merge(baseWebpackConfig, {
-  module: {
-    rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true })
-  },
-  // cheap-module-eval-source-map is faster for development
-  devtool: config.dev.devtool,
-
-  // these devServer options should be customized in /config/index.js
-  devServer: {
-    clientLogLevel: 'warning',
-    historyApiFallback: {
-      rewrites: [
-        { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') },
-      ],
-    },
-    hot: true,
-    contentBase: false, // since we use CopyWebpackPlugin.
-    compress: true,
-    host: HOST || config.dev.host,
-    port: PORT || config.dev.port,
-    open: config.dev.autoOpenBrowser,
-    overlay: config.dev.errorOverlay
-      ? { warnings: false, errors: true }
-      : false,
-    publicPath: config.dev.assetsPublicPath,
-    proxy: config.dev.proxyTable,
-    quiet: true, // necessary for FriendlyErrorsPlugin
-    watchOptions: {
-      poll: config.dev.poll,
-    }
-  },
-  plugins: [
-    new webpack.DefinePlugin({
-      'process.env': require('../config/dev.env')
-    }),
-    new webpack.HotModuleReplacementPlugin(),
-    new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update.
-    new webpack.NoEmitOnErrorsPlugin(),
-    // https://github.com/ampedandwired/html-webpack-plugin
-    new HtmlWebpackPlugin({
-      filename: 'index.html',
-      template: 'index.html',
-      inject: true
-    }),
-    // copy custom static assets
-    new CopyWebpackPlugin([
-      {
-        from: path.resolve(__dirname, '../static'),
-        to: config.dev.assetsSubDirectory,
-        ignore: ['.*']
-      }
-    ])
-  ]
-})
-
-module.exports = new Promise((resolve, reject) => {
-  portfinder.basePort = process.env.PORT || config.dev.port
-  portfinder.getPort((err, port) => {
-    if (err) {
-      reject(err)
-    } else {
-      // publish the new Port, necessary for e2e tests
-      process.env.PORT = port
-      // add port to devServer config
-      devWebpackConfig.devServer.port = port
-
-      // Add FriendlyErrorsPlugin
-      devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({
-        compilationSuccessInfo: {
-          messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`],
-        },
-        onErrors: config.dev.notifyOnErrors
-        ? utils.createNotifierCallback()
-        : undefined
-      }))
-
-      resolve(devWebpackConfig)
-    }
-  })
-})
--- a/buyer/build/webpack.prod.conf.js
+++ b/buyer/build/webpack.prod.conf.js
@@ -1,145 +0,0 @@
-'use strict'
-const path = require('path')
-const utils = require('./utils')
-const webpack = require('webpack')
-const config = require('../config')
-const merge = require('webpack-merge')
-const baseWebpackConfig = require('./webpack.base.conf')
-const CopyWebpackPlugin = require('copy-webpack-plugin')
-const HtmlWebpackPlugin = require('html-webpack-plugin')
-const ExtractTextPlugin = require('extract-text-webpack-plugin')
-const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
-
-const env = require('../config/prod.env')
-
-const webpackConfig = merge(baseWebpackConfig, {
-  module: {
-    rules: utils.styleLoaders({
-      sourceMap: config.build.productionSourceMap,
-      extract: false,
-      usePostCSS: true
-    })
-  },
-  devtool: config.build.productionSourceMap ? config.build.devtool : false,
-  output: {
-    path: config.build.assetsRoot,
-    filename: utils.assetsPath('js/[name].[chunkhash].js'),
-    chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
-  },
-  plugins: [
-    // http://vuejs.github.io/vue-loader/en/workflow/production.html
-    new webpack.DefinePlugin({
-      'process.env': env
-    }),
-    new UglifyJsPlugin({
-      uglifyOptions: {
-        compress: {
-          warnings: false
-        }
-      },
-      sourceMap: config.build.productionSourceMap,
-      parallel: true
-    }),
-    // extract css into its own file
-    new ExtractTextPlugin({
-      filename: utils.assetsPath('css/[name].[contenthash].css'),
-      // Setting the following option to `false` will not extract CSS from codesplit chunks.
-      // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
-      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`,
-      // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
-      allChunks: true,
-    }),
-    // Compress extracted CSS. We are using this plugin so that possible
-    // duplicated CSS from different components can be deduped.
-    new OptimizeCSSPlugin({
-      cssProcessorOptions: config.build.productionSourceMap
-        ? { safe: true, map: { inline: false } }
-        : { safe: true }
-    }),
-    // generate dist index.html with correct asset hash for caching.
-    // you can customize output by editing /index.html
-    // see https://github.com/ampedandwired/html-webpack-plugin
-    new HtmlWebpackPlugin({
-      filename: config.build.index,
-      template: 'index.html',
-      inject: true,
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeAttributeQuotes: true
-        // more options:
-        // https://github.com/kangax/html-minifier#options-quick-reference
-      },
-      // necessary to consistently work with multiple chunks via CommonsChunkPlugin
-      chunksSortMode: 'dependency'
-    }),
-    // keep module.id stable when vendor modules does not change
-    new webpack.HashedModuleIdsPlugin(),
-    // enable scope hoisting
-    new webpack.optimize.ModuleConcatenationPlugin(),
-    // split vendor js into its own file
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'vendor',
-      minChunks (module) {
-        // any required modules inside node_modules are extracted to vendor
-        return (
-          module.resource &&
-          /\.js$/.test(module.resource) &&
-          module.resource.indexOf(
-            path.join(__dirname, '../node_modules')
-          ) === 0
-        )
-      }
-    }),
-    // extract webpack runtime and module manifest to its own file in order to
-    // prevent vendor hash from being updated whenever app bundle is updated
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'manifest',
-      minChunks: Infinity
-    }),
-    // This instance extracts shared chunks from code splitted chunks and bundles them
-    // in a separate chunk, similar to the vendor chunk
-    // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'app',
-      async: 'vendor-async',
-      children: true,
-      minChunks: 3
-    }),
-
-    // copy custom static assets
-    new CopyWebpackPlugin([
-      {
-        from: path.resolve(__dirname, '../static'),
-        to: config.build.assetsSubDirectory,
-        ignore: ['.*']
-      }
-    ])
-  ]
-})
-
-if (config.build.productionGzip) {
-  const CompressionWebpackPlugin = require('compression-webpack-plugin')
-
-  webpackConfig.plugins.push(
-    new CompressionWebpackPlugin({
-      asset: '[path].gz[query]',
-      algorithm: 'gzip',
-      test: new RegExp(
-        '\\.(' +
-        config.build.productionGzipExtensions.join('|') +
-        ')$'
-      ),
-      threshold: 10240,
-      minRatio: 0.8
-    })
-  )
-}
-
-if (config.build.bundleAnalyzerReport) {
-  const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
-  webpackConfig.plugins.push(new BundleAnalyzerPlugin())
-}
-
-module.exports = webpackConfig
--- a/buyer/config/dev.env.js
+++ b/buyer/config/dev.env.js
@@ -1,8 +0,0 @@
-'use strict'
-const merge = require('webpack-merge')
-const prodEnv = require('./prod.env')
-
-module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"',
-  BASE_URL:''
-})
--- a/buyer/config/index.js
+++ b/buyer/config/index.js
@@ -1,84 +0,0 @@
-'use strict'
-// Template version: 1.3.1
-// see http://vuejs-templates.github.io/webpack for documentation.
-
-const path = require('path')
-// const api = 'http://www.baidu.com'
-module.exports = {
-  dev: {
-
-    // Paths
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
-    proxyTable: {
-      // '/api': {
-      //   target:api,
-      //   changeOrigin:true,
-      //   pathRewrite:{
-      //     '^/api':''
-      //   }
-      // }
-    },
-
-    // Various Dev Server settings
-    host: '0.0.0.0', // can be overwritten by process.env.HOST
-    port: 10000, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: false,
-    errorOverlay: true,
-    notifyOnErrors: true,
-    poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
-
-    // Use Eslint Loader?
-    // If true, your code will be linted during bundling and
-    // linting errors and warnings will be shown in the console.
-    useEslint: false,
-    // If true, eslint errors and warnings will also be shown in the error overlay
-    // in the browser.
-    showEslintErrorsInOverlay: false,
-
-    /**
-     * Source Maps
-     */
-
-    // https://webpack.js.org/configuration/devtool/#development
-    devtool: 'cheap-module-eval-source-map',
-
-    // If you have problems debugging vue-files in devtools,
-    // set this to false - it *may* help
-    // https://vue-loader.vuejs.org/en/options.html#cachebusting
-    cacheBusting: true,
-
-    cssSourceMap: true
-  },
-
-  build: {
-    // Template for index.html
-    index: path.resolve(__dirname, '../dist/index.html'),
-
-    // Paths
-    assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
-
-    /**
-     * Source Maps
-     */
-
-    productionSourceMap: true,
-    // https://webpack.js.org/configuration/devtool/#production
-    devtool: '#source-map',
-
-    // Gzip off by default as many popular static hosts such as
-    // Surge or Netlify already gzip all static assets for you.
-    // Before setting to `true`, make sure to:
-    // npm install --save-dev compression-webpack-plugin
-    productionGzip: false,
-    productionGzipExtensions: ['js', 'css'],
-
-    // Run the build command with an extra argument to
-    // View the bundle analyzer report after build finishes:
-    // `npm run build --report`
-    // Set to `true` or `false` to always turn it on or off
-    bundleAnalyzerReport: process.env.npm_config_report
-  }
-}
--- a/buyer/config/prod.env.js
+++ b/buyer/config/prod.env.js
@@ -1,5 +0,0 @@
-'use strict'
-module.exports = {
-  NODE_ENV: '"production"',
-  BASE_URL:'http://www.baidu.com'
-}
--- a/buyer/docker.sh
+++ b/buyer/docker.sh
@@ -1 +1 @@
-docker build -t registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-1.0.1:0.0.4 .
+docker build -t registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui:4.2.4.1 .
--- a/buyer/index.html
+++ b/buyer/index.html
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="./static/logo.ico" type="image/x-icon">
-    <script src="https://yzf.qq.com/xv/web/static/chat_sdk/yzf_chat.min.js"></script>
-    <title>LILI</title>
-  </head>
-  <body>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>
--- a/buyer/static/logo.ico
+++ b/buyer/static/logo.ico
--- a/buyer/nginx.conf
+++ b/buyer/nginx.conf
@@ -1,51 +1,46 @@
 #这个文件给docker用的
 #user  nobody;
-worker_processes  1;
+worker_processes 1;

 #error_log  logs/error.log;
 #error_log  logs/error.log  notice;
 #error_log  logs/error.log  info;

 #pid        logs/nginx.pid;
-
-
 events {
-    worker_connections  1024;
+    worker_connections 1024;
 }

-
 http {
-    include       mime.types;
-    default_type  application/octet-stream;
+    include mime.types;
+    default_type application/octet-stream;

    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
    #                  '$status $body_bytes_sent "$http_referer" '
    #                  '"$http_user_agent" "$http_x_forwarded_for"';

    #access_log  logs/access.log  main;
-
-    sendfile        on;
+    sendfile on;
    #tcp_nopush     on;

    #keepalive_timeout  0;
-    keepalive_timeout  65;
+    keepalive_timeout 65;
    client_max_body_size 10m;
    gzip on;
-    gzip_min_length  5k;
-    gzip_buffers     4 16k;
+    gzip_min_length 5k;
+    gzip_buffers 4 16k;
    gzip_http_version 1.0;
    gzip_comp_level 4;
-    gzip_types       text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
+    gzip_types text/plain application/x-javascript application/javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png;
    gzip_vary on;

    server {
-        listen       10000;
-        server_name  localhost;
+        listen 10000;

        location / {
            root /app;
            try_files $uri $uri/ /index.html $uri/ =404;
-            index  index.html index.htm;
+            index index.html index.htm;
        }
    }
 }
--- a/buyer/package.json
+++ b/buyer/package.json
@@ -1,91 +1,51 @@
 {
-  "name": "lilishop-vue",
+  "name": "lilishop",
  "version": "1.0.0",
  "private": true,
  "scripts": {
-    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
-    "start": "npm run dev",
-    "lint": "eslint --ext .js,.vue src",
-    "build": "node build/build.js"
+    "serve": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "dev": "vue-cli-service serve"
+  },
+  "engines": {
+    "node": ">=14"
  },
  "dependencies": {
    "@amap/amap-jsapi-loader": "0.0.7",
    "axios": "^0.19.2",
+    "dplayer": "^1.27.1",
    "js-cookie": "^2.2.1",
-    "less": "^3.12.2",
+    "less": "^2.7.0",
    "less-loader": "^5.0.0",
    "mv-count-down": "^0.1.15",
+    "sass": "^1.63.6",
+    "postcss-loader": "^4.3.0",
    "psl": "^1.8.0",
    "qs": "^6.9.4",
-    "swiper": "^5.2.0",
    "uuid": "^8.3.2",
-    "v-distpicker": "^1.0.17",
    "view-design": "^4.3.2",
-    "vue": "^2.5.2",
-    "vue-awesome": "^4.0.2",
-    "vue-awesome-swiper": "^4.1.1",
+    "vue": "^2.6.11",
+    "vue-awesome-swiper": "^3.1.3",
    "vue-piczoom": "^1.0.6",
    "vue-qr": "^2.3.0",
    "vue-router": "^3.0.1",
    "vuex": "^3.0.1"
  },
  "devDependencies": {
-    "autoprefixer": "^7.1.2",
-    "babel-core": "^6.22.1",
-    "babel-eslint": "^8.2.1",
-    "babel-helper-vue-jsx-merge-props": "^2.0.3",
-    "babel-loader": "^7.1.1",
-    "babel-plugin-syntax-jsx": "^6.18.0",
-    "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-plugin-transform-vue-jsx": "^3.5.0",
-    "babel-preset-env": "^1.3.2",
-    "babel-preset-stage-2": "^6.22.0",
-    "chalk": "^2.0.1",
-    "copy-webpack-plugin": "^4.0.1",
-    "css-loader": "^0.28.0",
-    "eslint": "^4.15.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-friendly-formatter": "^3.0.0",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "eslint-plugin-vue": "^4.0.0",
-    "extract-text-webpack-plugin": "^3.0.0",
-    "file-loader": "^1.1.4",
-    "friendly-errors-webpack-plugin": "^1.6.1",
-    "html-webpack-plugin": "^2.30.1",
-    "node-notifier": "^5.1.2",
-    "node-sass": "^4.14.1",
-    "optimize-css-assets-webpack-plugin": "^3.2.0",
-    "ora": "^1.2.0",
-    "portfinder": "^1.0.13",
-    "postcss-import": "^11.0.0",
-    "postcss-loader": "^2.0.8",
-    "postcss-url": "^7.2.1",
-    "rimraf": "^2.6.0",
-    "sass-loader": "^7.3.1",
-    "sass-resources-loader": "^2.0.3",
-    "semver": "^5.3.0",
-    "shelljs": "^0.7.6",
-    "uglifyjs-webpack-plugin": "^1.1.1",
-    "url-loader": "^0.5.8",
-    "vue-loader": "^13.3.0",
-    "vue-style-loader": "^3.0.1",
-    "vue-template-compiler": "^2.5.2",
-    "webpack": "^3.6.0",
-    "webpack-bundle-analyzer": "^2.9.0",
-    "webpack-dev-server": "^2.9.1",
-    "webpack-merge": "^4.1.0"
-  },
-  "engines": {
-    "node": ">= 6.0.0",
-    "npm": ">= 3.0.0"
+    "@vue/cli-service": "~4.5.0",
+    "compression-webpack-plugin": "^5.0.0",
+    "sass-loader": "^10.4.1",
+    "uglifyjs-webpack-plugin": "^2.2.0",
+    "vue-template-compiler": "^2.6.11"
  },
  "browserslist": [
    "> 1%",
    "last 2 versions",
-    "not ie <= 8"
-  ]
+    "not dead"
+  ],
+  "resolutions": {
+    "minimatch": "^3.1.2",
+    "node-sass": "npm:sass@^1.63.6",
+    "@achrinza/node-ipc": "9.2.2"
+  }
 }
--- a/buyer/public/config.js
+++ b/buyer/public/config.js
@@ -0,0 +1,17 @@
+var BASE = {
+  /**
+   * @description api请求基础路径
+   */
+  API_DEV: {
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn"
+  },
+  API_PROD: {
+    common: "https://common-api.pickmall.cn",
+    buyer: "https://buyer-api.pickmall.cn",
+    seller: "https://store-api.pickmall.cn",
+    manager: "https://admin-api.pickmall.cn"
+  },
+};
--- a/buyer/public/index.html
+++ b/buyer/public/index.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html lang="">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name='description' content='在线购物平台'>
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="icon" href="<%= BASE_URL %>logo.ico">
+    <title><%= htmlWebpackPlugin.options.title %></title>
+    <% for(var css of htmlWebpackPlugin.options.cdn.css) { %>
+      <link rel="stylesheet" href="<%=css%>" />
+      <% } %>
+  </head>
+  <body>
+    <% for(var js of htmlWebpackPlugin.options.cdn.js) { %>
+      <script src="<%=js%>"></script>
+      <% } %>
+      <script src="/config.js"></script>
+    <noscript>
+
+      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <!-- built files will be auto injected -->
+  </body>
+</html>
--- a/buyer/public/logo.ico
+++ b/buyer/public/logo.ico
--- a/buyer/src/App.vue
+++ b/buyer/src/App.vue
@@ -1,37 +1,66 @@
 <template>
  <div id="app">
-    <router-view/>
+    <router-view />
  </div>
 </template>

 <script>
-import {v4 as uuidv4} from 'uuid';
-import storage from '@/plugins/storage';
-import {getLogo} from '@/api/common.js';
+import storage from "@/plugins/storage";
+import { getBaseSite } from "@/api/common.js";
 export default {
-  name: 'App',
-  mounted () {
-    let uuid = storage.getItem('uuid');
-    if (!uuid) {
-      uuid = uuidv4();
-      storage.setItem('uuid', uuid);
-    }
-    if (!this.Cookies.getItem('logo')) {
-      setTimeout(() => {
-        getLogo().then(res => {
-          if (res.success) {
-            let logoObj = JSON.parse(res.result.settingValue)
-            this.Cookies.setItem('logo', logoObj.buyerSideLogo)
-          }
-        })
-      }, 1000)
+  name: "App",
+  mounted() {
+    this.init();
+  },
+  methods:{
+    init(){
+      if(!storage.getItem("siteName")||!storage.getItem("logoImg")||!storage.getItem("sitelogo_expiration_time")) {
+        this.getSite();
+      }else{
+        // 如果缓存过期，则获取最新的信息
+        if (new Date() > storage.getItem("sitelogo_expiration_time")) {
+          this.getSite();
+          return;
+        }else{
+          window.document.title = storage.getItem("siteName");
+          //动态获取icon
+          let link =document.querySelector("link[rel*='icon']") ||document.createElement("link");
+            link.type = "image/x-icon";
+            link.href = storage.getItem("siteIcon");
+            link.rel = "shortcut icon";
+            document.getElementsByTagName("head")[0].appendChild(link);
+        }
+      }
+      
+    },
+    getSite(){
+      //获取基本站点信息
+      getBaseSite().then((res) => {
+        if (res.success && res.result.settingValue) {
+          let data = JSON.parse(res.result.settingValue);
+          // 过期时间
+          var expirationTime = new Date().setHours(new Date().getHours() + 1);
+          // 存放过期时间
+          storage.setItem("sitelogo_expiration_time", expirationTime);
+          // 存放信息
+          storage.setItem('siteName', data.siteName);
+          storage.setItem('logoImg', data.buyerSideLogo);
+          storage.setItem("siteIcon",data.buyerSideIcon);
+          window.document.title = data.siteName;
+          //动态获取icon
+          let link =document.querySelector("link[rel*='icon']") ||document.createElement("link");
+          link.type = "image/x-icon";
+          link.href = data.buyerSideIcon;
+          link.rel = "shortcut icon";
+          document.getElementsByTagName("head")[0].appendChild(link);
+        }
+      });
    }
  }
 };
 </script>
 <style lang="scss">
-#app{
-  min-height: 100%;
+#app {
  @include background_color($light_background_color);
 }
 </style>
--- a/buyer/src/api/account.js
+++ b/buyer/src/api/account.js
@@ -11,7 +11,7 @@ import request, {Method} from '@/plugins/request.js'
 // 获取密码状态
 export function getPwdStatus (params) {
  return request({
-    url: '/buyer/members/wallet/check',
+    url: '/buyer/passport/member/wallet/check',
    method: Method.GET,
    needToken: true,
    params
@@ -21,7 +21,7 @@ export function getPwdStatus (params) {
 // 设置密码
 export function setPwd (params) {
  return request({
-    url: '/buyer/members/wallet/set-password',
+    url: '/buyer/passport/member/wallet/set-password',
    method: Method.POST,
    needToken: true,
    data: params
@@ -31,7 +31,7 @@ export function setPwd (params) {
 // 设置支付密码
 export function setUpdatePwdOrdinary (params) {
  return request({
-    url: '/buyer/members/wallet/update-password/ordinary',
+    url: '/buyer/passport/member/wallet/update-password/ordinary',
    method: Method.GET,
    needToken: true,
    data: params
@@ -41,7 +41,7 @@ export function setUpdatePwdOrdinary (params) {
 // 修改会员资料
 export function editMemberInfo (params) {
  return request({
-    url: '/buyer/members/editOwn',
+    url: '/buyer/passport/member/editOwn',
    method: Method.PUT,
    needToken: true,
    data: params
@@ -51,9 +51,18 @@ export function editMemberInfo (params) {
 // 修改密码
 export function editPwd (params) {
  return request({
-    url: `/buyer/members/modifyPass`,
+    url: `/buyer/passport/member/modifyPass`,
    method: Method.PUT,
    needToken: true,
    data: params
  })
 }
+
+// 获取密码状态
+export function logout () {
+  return request({
+    url: '/buyer/passport/member/logout',
+    method: Method.POST,
+    needToken: true
+  })
+}
--- a/buyer/src/api/address.js
+++ b/buyer/src/api/address.js
@@ -5,7 +5,7 @@ import request, {
 // 会员收货地址列表
 export function memberAddress () {
  return request({
-    url: '/buyer/memberAddress',
+    url: '/buyer/member/address',
    needToken: true,
    method: Method.GET
  });
@@ -14,7 +14,7 @@ export function memberAddress () {
 // 添加收货地址
 export function newMemberAddress (params) {
  return request({
-    url: '/buyer/memberAddress',
+    url: '/buyer/member/address',
    needToken: true,
    method: Method.POST,
    data: params
@@ -24,7 +24,7 @@ export function newMemberAddress (params) {
 // 编辑收货地址
 export function editMemberAddress (params) {
  return request({
-    url: '/buyer/memberAddress',
+    url: '/buyer/member/address',
    needToken: true,
    method: Method.PUT,
    params
@@ -34,7 +34,7 @@ export function editMemberAddress (params) {
 // 删除收货地址
 export function delMemberAddress (id) {
  return request({
-    url: `/buyer/memberAddress/delById/${id}`,
+    url: `/buyer/member/address/delById/${id}`,
    needToken: true,
    method: Method.DELETE
  });
@@ -43,7 +43,7 @@ export function delMemberAddress (id) {
 // 根据id获取会员地址详情
 export function getAddrDetail (id) {
  return request({
-    url: `/buyer/memberAddress/get/${id}`,
+    url: `/buyer/member/address/get/${id}`,
    needToken: true,
    method: Method.GET
  });
@@ -52,7 +52,7 @@ export function getAddrDetail (id) {
 // 传给后台citycode 获取城市街道等id
 export function handleRegion (params) {
  return request({
-    url: `${commonUrl}/common/region/region`,
+    url: `${commonUrl}/common/common/region/region`,
    needToken: true,
    method: Method.GET,
    params
--- a/buyer/src/api/cart.js
+++ b/buyer/src/api/cart.js
@@ -212,3 +212,52 @@ export function receiptSelect (params) {
    params
  });
 }
+
+/**
+ * 获取全部配送方式
+ */
+ export function shippingMethodList(params) {
+  return request({
+    url: `/buyer/trade/carts/shippingMethodList`,
+    method: Method.GET,
+    needToken: true,
+    params: params,
+  });
+}
+
+/**
+ * 获取全部配送方式
+ */
+ export function storeAddressList(params) {
+  return request({
+    url: `/buyer/store/address/shippingMethodList`,
+    method: Method.GET,
+    needToken: true,
+    params: params,
+  });
+}
+
+/**
+ * 设置自提地址ID
+ * @param addressId
+ */
+ export function setStoreAddressId(storeAddressId,way) {
+  return request({
+    url: `/buyer/trade/carts/storeAddress?storeAddressId=${storeAddressId}&way=${way}`,
+    method: Method.GET,
+    needToken: true,
+  });
+}
+
+/**
+ * 提交配送方式
+ * @param params
+ */
+ export function setShipMethod(params) {
+  return request({
+    url: "/buyer/trade/carts/shippingMethod",
+    method: Method.PUT,
+    needToken: true,
+    params,
+  });
+}
--- a/buyer/src/api/common.js
+++ b/buyer/src/api/common.js
@@ -5,7 +5,7 @@ import request, {Method, commonUrl} from '@/plugins/request.js';
 */
 export function getVerifyImg (verificationEnums) {
  return request({
-    url: `${commonUrl}/common/slider/${verificationEnums}`,
+    url: `${commonUrl}/common/common/slider/${verificationEnums}`,
    method: Method.GET,
    needToken: false
  });
@@ -15,7 +15,7 @@ export function getVerifyImg (verificationEnums) {
 */
 export function postVerifyImg (params) {
  return request({
-    url: `${commonUrl}/common/slider/${params.verificationEnums}`,
+    url: `${commonUrl}/common/common/slider/${params.verificationEnums}`,
    method: Method.POST,
    needToken: false,
    params
@@ -26,26 +26,17 @@ export function postVerifyImg (params) {
 */
 export function sendSms (params) {
  return request({
-    url: `${commonUrl}/common/sms/${params.verificationEnums}/${params.mobile}`,
+    url: `${commonUrl}/common/common/sms/${params.verificationEnums}/${params.mobile}`,
    method: Method.GET,
    needToken: false,
    params
  });
 }
-/**
- * 发送短信验证码
- */
-export function getLogo () {
-  return request({
-    url: `${commonUrl}/common/logo`,
-    method: Method.GET,
-    needToken: false
-  });
-}
+
 // 地区数据，用于三级联动
 export function getRegion (id) {
  return request({
-    url: `${commonUrl}/common/region/item/${id}`,
+    url: `${commonUrl}/common/common/region/item/${id}`,
    needToken: true,
    method: Method.GET
  });
@@ -57,7 +48,7 @@ export function getRegion (id) {
 */
 export function articleList (params) {
  return request({
-    url: `/buyer/article`,
+    url: `/buyer/other/article`,
    method: Method.GET,
    params
  });
@@ -69,7 +60,7 @@ export function articleList (params) {
 */
 export function articleCateList () {
  return request({
-    url: `/buyer/article/articleCategory/list`,
+    url: `/buyer/other/article/articleCategory/list`,
    method: Method.GET
  });
 }
@@ -77,7 +68,28 @@ export function articleCateList () {
 // 通过id获取文章
 export function articleDetail (id) {
  return request({
-    url: `/buyer/article/get/${id}`,
+    url: `/buyer/other/article/get/${id}`,
    method: Method.GET
  });
 }
+
+
+
+
+// 获取IM接口前缀
+export function getIMDetail () {
+  return request({
+    url: `${commonUrl}/common/common/IM`,
+    method: Method.GET
+  });
+}
+
+
+//获取图片logo
+export function getBaseSite(){
+  return request ({
+    url:`${commonUrl}/common/common/site`,
+    method: Method.GET,
+    needToken: false
+  })
+}
--- a/buyer/src/api/goods.js
+++ b/buyer/src/api/goods.js
@@ -5,7 +5,7 @@ import request, {
 // 商品列表
 export function goodsList (params) {
  return request({
-    url: '/buyer/goods/es',
+    url: '/buyer/goods/goods/es',
    method: Method.GET,
    needToken: false,
    params
@@ -15,7 +15,7 @@ export function goodsList (params) {
 // 商品分类 筛选条件  品牌， 尺寸等
 export function filterList (params) {
  return request({
-    url: '/buyer/goods/es/related',
+    url: '/buyer/goods/goods/es/related',
    method: Method.GET,
    needToken: false,
    params
@@ -25,7 +25,7 @@ export function filterList (params) {
 // id获取商品详情
 export function goodsDetail (goodsId) {
  return request({
-    url: `/buyer/goods/get/${goodsId}`,
+    url: `/buyer/goods/goods/get/${goodsId}`,
    method: Method.GET,
    needToken: false
  });
@@ -34,7 +34,7 @@ export function goodsDetail (goodsId) {
 // id获取商品Sku详情
 export function goodsSkuDetail (params) {
  return request({
-    url: `/buyer/goods/sku/${params.goodsId}/${params.skuId}`,
+    url: `/buyer/goods/goods/sku/${params.goodsId}/${params.skuId}`,
    method: Method.GET,
    needToken: true,
    params
@@ -44,7 +44,7 @@ export function goodsSkuDetail (params) {
 // 获取所有商品分类
 export function getCategory (parentId) {
  return request({
-    url: `/buyer/category/get/${parentId}`,
+    url: `/buyer/goods/category/get/${parentId}`,
    method: Method.GET,
    needToken: false
  });
@@ -60,12 +60,12 @@ export function pintuanMembers (pintuanId) {
 }

 /**
- * @param {Number} start 搜索起始下标
- * @param {Number} end 搜索结束下标
+ * 获取搜索热词
+ * @param {Number} count 获取搜索热词数量
 */
 export function hotWords (params) {
  return request({
-    url: `/buyer/goods/hot-words`,
+    url: `/buyer/goods/goods/hot-words`,
    method: Method.GET,
    needToken: false,
    params
--- a/buyer/src/api/index.js
+++ b/buyer/src/api/index.js
@@ -1,13 +1,44 @@
-import request, {Method} from '@/plugins/request.js'
+import request, { Method } from "@/plugins/request.js";
+
+/**
+ * 获取首页专题数据
+ */
+export function getTopicData(id) {
+  return request({
+    url: `/buyer/other/pageData/get/${id}`,
+    method: Method.GET,
+  });
+}
+

 // 获取首页楼层装修数据
-export function indexData (params) {
+export function indexData(params) {
  return request({
-    url: '/buyer/pageData/getIndex',
+    url: "/buyer/other/pageData/getIndex",
    method: Method.GET,
    needToken: false,
-    params
-  })
+    params,
+  });
+}
+
+// 获取自动发券
+export function getAutoCoup(){
+  return request({
+    url: "/buyer/promotion/coupon/activity",
+    method: Method.GET,
+    needToken: true,
+  });
+}
+
+/**
+ * 获取店铺楼层数据
+ */
+export function getFloorStoreData(params) {
+  return request({
+    url: `/buyer/other/pageData?pageClientType=PC`,
+    method: "get",
+    params,
+  });
 }

 /**
@@ -15,21 +46,33 @@ export function indexData (params) {
 * @param pageClientType 客户端类型,可用值:PC,H5,WECHAT_MP,APP
 * @param pageType 页面类型,可用值:INDEX,STORE,SPECIAL
 */
-export function pageData (params) {
+export function pageData(params) {
  return request({
-    url: `/buyer/pageData`,
+    url: `/buyer/other/pageData`,
    method: Method.GET,
    needToken: false,
-    params
-  })
+    params,
+  });
 }
+
 /**
 * 刷新token
 */
-export function handleRefreshToken (token) {
+export function handleRefreshToken(token) {
  return request({
-    url: `/buyer/members/refresh/${token}`,
+    url: `/buyer/passport/member/refresh/${token}`,
    method: Method.GET,
-    needToken: false
-  })
+    needToken: false,
+  });
 }
+
+// /**
+//  * 获取店铺楼层数据
+//  */
+// export function getFloorStoreData(params) {
+//   return request({
+//     url: `/buyer/other/pageData?pageClientType=PC`,
+//     method: "get",
+//     params,
+//   });
+// }
--- a/buyer/src/api/login.js
+++ b/buyer/src/api/login.js
@@ -6,7 +6,7 @@ import request, {Method, buyerUrl} from '@/plugins/request.js';
 */
 export function regist (params) {
  return request({
-    url: '/buyer/members/register',
+    url: '/buyer/passport/member/register',
    method: Method.POST,
    needToken: false,
    data: params
@@ -18,7 +18,7 @@ export function regist (params) {
 */
 export function login (params) {
  return request({
-    url: '/buyer/members/userLogin',
+    url: '/buyer/passport/member/userLogin',
    method: Method.POST,
    needToken: false,
    data: params,
@@ -31,7 +31,7 @@ export function login (params) {
 */
 export function smsLogin (params) {
  return request({
-    url: '/buyer/members/smsLogin',
+    url: '/buyer/passport/member/smsLogin',
    method: Method.POST,
    needToken: false,
    data: params,
@@ -44,7 +44,7 @@ export function smsLogin (params) {
 */
 export function getMemberMsg (params) {
  return request({
-    url: '/buyer/members',
+    url: '/buyer/passport/member',
    method: Method.GET,
    needToken: true,
    params
@@ -55,7 +55,7 @@ export function getMemberMsg (params) {
 * 第三方登录 支付宝，微博，qq,微信
 */
 export function webLogin (type) {
-  window.open(`${buyerUrl}/buyer/connect/login/web/${type}`, 'blank');
+  window.open(`${buyerUrl}/buyer/passport/connect/connect/login/web/${type}`, 'blank');
 }

 /**
@@ -63,7 +63,7 @@ export function webLogin (type) {
 */
 export function loginCallback (uuid) {
  return request({
-    url: `/buyer/connect/result?state=${uuid}`,
+    url: `/buyer/passport/connect/connect/result?state=${uuid}`,
    method: Method.GET,
    needToken: false
  });
@@ -74,7 +74,7 @@ export function loginCallback (uuid) {
 */
 export function validateCode (params) {
  return request({
-    url: `/buyer/members/resetByMobile`,
+    url: `/buyer/passport/member/resetByMobile`,
    method: Method.POST,
    needToken: false,
    params
@@ -86,7 +86,24 @@ export function validateCode (params) {
 */
 export function resetPassword (params) {
  return request({
-    url: `/buyer/members/resetPassword`,
+    url: `/buyer/passport/member/resetPassword`,
+    method: Method.POST,
+    needToken: false,
+    params
+  });
+}
+
+export function getSCLoginCode(params) {
+  return request({
+    url: `/buyer/passport/member/pc_session`,
+    method: Method.POST,
+    needToken: false,
+    params
+  });
+}
+export function sCLogin(token,params) {
+  return request({
+    url: `/buyer/passport/member/session_login/`+token,
    method: Method.POST,
    needToken: false,
    params
--- a/buyer/src/api/member.js
+++ b/buyer/src/api/member.js
@@ -3,7 +3,7 @@ import request, {Method} from '@/plugins/request.js';
 // 查询账户余额
 export function getMembersWallet () {
  return request({
-    url: '/buyer/members/wallet',
+    url: '/buyer/wallet/wallet',
    method: Method.GET,
    needToken: true
  });
@@ -22,7 +22,7 @@ export function getDepositLog (params) {
 // 查询充值记录
 export function getRecharge (params) {
  return request({
-    url: '/buyer/member/recharge',
+    url: '/buyer/wallet/recharge',
    method: Method.GET,
    needToken: true,
    params
@@ -52,14 +52,14 @@ export function recharge (params) {
 // 提现
 export function withdrawalApply (params) {
  return request({
-    url: '/buyer/members/wallet/withdrawal',
+    url: '/buyer/wallet/wallet/withdrawal',
    method: Method.POST,
    needToken: true,
    data: params
  });
 }

-// 收藏商品、店铺
+// 收藏商品
 export function collectGoods (type, id) {
  return request({
    url: `/buyer/member/collection/add/${type}/${id}`,
@@ -68,7 +68,16 @@ export function collectGoods (type, id) {
  });
 }

-// 取消 收藏商品、店铺
+// 收藏店铺
+export function collectStore (type, id) {
+  return request({
+    url: `/buyer/member/storeCollection/add/${type}/${id}`,
+    method: Method.POST,
+    needToken: true
+  });
+}
+
+// 取消 收藏商品
 export function cancelCollect (type, id) {
  return request({
    url: `/buyer/member/collection/delete/${type}/${id}`,
@@ -77,7 +86,16 @@ export function cancelCollect (type, id) {
  });
 }

-// 查看是否收藏
+// 取消 收藏店铺
+export function cancelStoreCollect (type, id) {
+  return request({
+    url: `/buyer/member/storeCollection/delete/${type}/${id}`,
+    method: Method.DELETE,
+    needToken: true
+  });
+}
+
+// 查看是否收藏商品
 export function isCollection (type, goodsId) {
  return request({
    url: `/buyer/member/collection/isCollection/${type}/${goodsId}`,
@@ -86,7 +104,16 @@ export function isCollection (type, goodsId) {
  });
 }

-// 会员收藏列表
+// 查看是否收藏店铺
+export function isStoreCollection (type, goodsId) {
+  return request({
+    url: `/buyer/member/storeCollection/isCollection/${type}/${goodsId}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
+
+// 会员收藏商品列表
 export function collectList (params) {
  return request({
    url: `/buyer/member/collection/${params.type}`,
@@ -96,10 +123,20 @@ export function collectList (params) {
  });
 }

+// 会员收藏店铺列表
+export function storeCollectList (params) {
+  return request({
+    url: `/buyer/member/storeCollection/${params.type}`,
+    method: Method.GET,
+    needToken: true,
+    params
+  });
+}
+
 // 单个商品评价
 export function goodsComment (params) {
  return request({
-    url: `/buyer/memberEvaluation/${params.goodsId}/goodsEvaluation`,
+    url: `/buyer/member/evaluation/${params.goodsId}/goodsEvaluation`,
    method: Method.GET,
    needToken: false,
    params
@@ -109,7 +146,7 @@ export function goodsComment (params) {
 // 商品各评价类别数量
 export function goodsCommentNum (goodsId) {
  return request({
-    url: `/buyer/memberEvaluation/${goodsId}/evaluationNumber`,
+    url: `/buyer/member/evaluation/${goodsId}/evaluationNumber`,
    method: Method.GET,
    needToken: false
  });
@@ -118,7 +155,7 @@ export function goodsCommentNum (goodsId) {
 // 添加会员评价
 export function addEvaluation (params) {
  return request({
-    url: `/buyer/memberEvaluation`,
+    url: `/buyer/member/evaluation`,
    method: Method.POST,
    needToken: true,
    params
@@ -128,7 +165,7 @@ export function addEvaluation (params) {
 // 会员评价详情
 export function evaluationDetail (id) {
  return request({
-    url: `/buyer/memberEvaluation/get/${id}`,
+    url: `/buyer/member/evaluation/get/${id}`,
    method: Method.GET,
    needToken: true
  });
@@ -195,7 +232,7 @@ export function receiveCoupon (couponId) {
 // 获取申请售后列表
 export function afterSaleList (params) {
  return request({
-    url: `/buyer/afterSale/page`,
+    url: `/buyer/order/afterSale/page`,
    method: Method.GET,
    needToken: true,
    params
@@ -205,7 +242,7 @@ export function afterSaleList (params) {
 // 获取申请售后页面信息
 export function afterSaleInfo (sn) {
  return request({
-    url: `/buyer/afterSale/applyAfterSaleInfo/${sn}`,
+    url: `/buyer/order/afterSale/applyAfterSaleInfo/${sn}`,
    method: Method.GET,
    needToken: true
  });
@@ -214,7 +251,7 @@ export function afterSaleInfo (sn) {
 // 获取申请售后、投诉原因
 export function afterSaleReason (serviceType) {
  return request({
-    url: `/buyer/afterSale/get/afterSaleReason/${serviceType}`,
+    url: `/buyer/order/afterSale/get/afterSaleReason/${serviceType}`,
    method: Method.GET,
    needToken: true
  });
@@ -222,7 +259,7 @@ export function afterSaleReason (serviceType) {
 // 获取申请售后详情
 export function afterSaleDetail (sn) {
  return request({
-    url: `/buyer/afterSale/get/${sn}`,
+    url: `/buyer/order/afterSale/get/${sn}`,
    method: Method.GET,
    needToken: true
  });
@@ -230,7 +267,7 @@ export function afterSaleDetail (sn) {
 // 售后日志
 export function afterSaleLog (sn) {
  return request({
-    url: `/buyer/afterSale/get/getAfterSaleLog/${sn}`,
+    url: `/buyer/order/afterSale/get/getAfterSaleLog/${sn}`,
    method: Method.GET,
    needToken: true
  });
@@ -239,7 +276,7 @@ export function afterSaleLog (sn) {
 // 申请售后
 export function applyAfterSale (params) {
  return request({
-    url: `/buyer/afterSale/save/${params.orderItemSn}`,
+    url: `/buyer/order/afterSale/save/${params.orderItemSn}`,
    method: Method.POST,
    needToken: true,
    params
@@ -249,7 +286,7 @@ export function applyAfterSale (params) {
 // 取消售后申请
 export function cancelAfterSale (afterSaleSn) {
  return request({
-    url: `/buyer/afterSale/cancel/${afterSaleSn}`,
+    url: `/buyer/order/afterSale/cancel/${afterSaleSn}`,
    method: Method.POST,
    needToken: true
  });
@@ -258,7 +295,7 @@ export function cancelAfterSale (afterSaleSn) {
 // 投诉商品
 export function handleComplain (data) {
  return request({
-    url: `/buyer/complain`,
+    url: `/buyer/order/complain`,
    method: Method.POST,
    needToken: true,
    data
@@ -267,7 +304,7 @@ export function handleComplain (data) {
 // 分页获取我的投诉列表
 export function complainList (params) {
  return request({
-    url: `/buyer/complain`,
+    url: `/buyer/order/complain`,
    method: Method.GET,
    needToken: true,
    params
@@ -279,7 +316,7 @@ export function complainList (params) {
 */
 export function getComplainDetail (id) {
  return request({
-    url: `/buyer/complain/${id}`,
+    url: `/buyer/order/complain/${id}`,
    method: Method.GET,
    needToken: true
  });
@@ -290,7 +327,7 @@ export function getComplainDetail (id) {
 */
 export function clearComplain (id) {
  return request({
-    url: `/buyer/complain/status/${id}`,
+    url: `/buyer/order/complain/status/${id}`,
    method: Method.PUT,
    needToken: true
  });
@@ -301,7 +338,7 @@ export function clearComplain (id) {
 */
 export function distribution () {
  return request({
-    url: `/buyer/distribution`,
+    url: `/buyer/distribution/distribution`,
    method: Method.GET,
    needToken: true
  });
@@ -314,7 +351,7 @@ export function distribution () {
 */
 export function applyDistribution (params) {
  return request({
-    url: `/buyer/distribution`,
+    url: `/buyer/distribution/distribution`,
    method: Method.POST,
    needToken: true,
    params
@@ -326,7 +363,7 @@ export function applyDistribution (params) {
 */
 export function getDistOrderList (params) {
  return request({
-    url: `/buyer/distribution/distributionOrder`,
+    url: `/buyer/distribution/order`,
    method: Method.GET,
    needToken: true,
    params
@@ -338,7 +375,7 @@ export function getDistOrderList (params) {
 */
 export function getDistGoodsList (params) {
  return request({
-    url: `/buyer/distributionGoods`,
+    url: `/buyer/distribution/goods`,
    method: Method.GET,
    needToken: true,
    params
@@ -346,14 +383,16 @@ export function getDistGoodsList (params) {
 }

 /**
- * 选择分销商品
+ * 绑定、解绑分销商品
 * @param distributionGoodsId 分销商品id
+ * @param checked 分销商品id,true为绑定，false为解绑
 */
-export function selectDistGoods (distributionGoodsId) {
+export function selectDistGoods (params) {
  return request({
-    url: `/buyer/distributionGoods/checked/${distributionGoodsId}`,
+    url: `/buyer/distribution/goods/checked/${params.distributionGoodsId}`,
    method: Method.GET,
-    needToken: true
+    needToken: true,
+    params
  });
 }

@@ -388,7 +427,7 @@ export function distCash (params) {
 */
 export function tracksList (params) {
  return request({
-    url: `/buyer/footprint`,
+    url: `/buyer/member/footprint`,
    method: Method.GET,
    needToken: true,
    params
@@ -400,7 +439,7 @@ export function tracksList (params) {
 */
 export function clearTracks () {
  return request({
-    url: `/buyer/footprint`,
+    url: `/buyer/member/footprint`,
    method: Method.DELETE,
    needToken: true
  });
@@ -412,7 +451,7 @@ export function clearTracks () {
 */
 export function clearTracksById (ids) {
  return request({
-    url: `/buyer/footprint/delByIds/${ids}`,
+    url: `/buyer/member/footprint/delByIds/${ids}`,
    method: Method.DELETE,
    needToken: true
  });
@@ -447,7 +486,7 @@ export function memberPointHistory (params) {
 */
 export function memberMsgList (params) {
  return request({
-    url: `/buyer/member/message`,
+    url: `/buyer/message/member`,
    method: Method.GET,
    needToken: true,
    params
@@ -457,9 +496,10 @@ export function memberMsgList (params) {
 * 设置消息为已读
 * @param {String} messageId 消息id
 */
- export function readMemberMsg (id) {
+
+export function readMemberMsg (id) {
  return request({
-    url: `/buyer/member/message/${id}`,
+    url: `/buyer/message/member/${id}`,
    method: Method.PUT,
    needToken: true
  });
@@ -468,10 +508,22 @@ export function memberMsgList (params) {
 * 删除会员消息
 * @param {String} messageId 消息id
 */
- export function delMemberMsg (id) {
+export function delMemberMsg (id) {
  return request({
-    url: `/buyer/member/message/${id}`,
+    url: `/buyer/message/member/${id}`,
    method: Method.DELETE,
    needToken: true
  });
 }
+
+/**
+ * 绑定分销
+ * @param distributionId 商品分销ID
+ */
+export function getGoodsDistribution (distributionId) {
+  return request({
+    url: `/buyer/distribution/distribution/bindingDistribution/${distributionId}`,
+    method: Method.GET,
+    needToken: true
+  });
+}
--- a/buyer/src/api/order.js
+++ b/buyer/src/api/order.js
@@ -5,7 +5,7 @@ import request, {
 // 查询会员订单列表
 export function getOrderList (params) {
  return request({
-    url: `/buyer/orders`,
+    url: `/buyer/order/order`,
    method: Method.GET,
    needToken: true,
    params
@@ -18,7 +18,7 @@ export function getOrderList (params) {
 */
 export function orderDetail (orderSn) {
  return request({
-    url: `/buyer/orders/${orderSn}`,
+    url: `/buyer/order/order/${orderSn}`,
    method: Method.GET,
    needToken: true
  });
@@ -31,7 +31,7 @@ export function orderDetail (orderSn) {
 */
 export function cancelOrder (params) {
  return request({
-    url: `/buyer/orders/${params.orderSn}/cancel`,
+    url: `/buyer/order/order/${params.orderSn}/cancel`,
    method: Method.POST,
    needToken: true,
    params
@@ -44,7 +44,7 @@ export function cancelOrder (params) {
 */
 export function delOrder (orderSn) {
  return request({
-    url: `/buyer/orders/${orderSn}`,
+    url: `/buyer/order/order/${orderSn}`,
    method: Method.DELETE,
    needToken: true
  });
@@ -56,7 +56,7 @@ export function delOrder (orderSn) {
 */
 export function sureReceived (orderSn) {
  return request({
-    url: `/buyer/orders/${orderSn}/receiving`,
+    url: `/buyer/order/order/${orderSn}/receiving`,
    method: Method.POST,
    needToken: true
  });
@@ -68,7 +68,7 @@ export function sureReceived (orderSn) {
 */
 export function getTraces (orderSn) {
  return request({
-    url: `/buyer/orders/getTraces/${orderSn}`,
+    url: `/buyer/order/order/getTraces/${orderSn}`,
    method: Method.POST,
    needToken: true
  });
@@ -80,7 +80,7 @@ export function getTraces (orderSn) {
 */
 export function evolutionList (params) {
  return request({
-    url: `/buyer/memberEvaluation`,
+    url: `/buyer/member/evaluation`,
    method: Method.GET,
    needToken: true,
    params
@@ -90,9 +90,46 @@ export function evolutionList (params) {
 // 添加交易投诉对话
 export function communication (params) {
  return request({
-    url: `/buyer/complain/communication`,
+    url: `/buyer/order/complain/communication`,
    method: Method.POST,
    needToken: true,
    params
  });
 }
+
+// 退换货服务 提交物流
+export function afterSaleDelivery (params) {
+  return request({
+    url: `/buyer/order/afterSale/delivery/${params.afterSaleSn}`,
+    method: Method.POST,
+    needToken: true,
+    params
+  });
+}
+// 获取退货可选物流公司
+export function getLogisticsCompany () {
+  return request({
+    url: `/buyer/other/logistics`,
+    method: Method.GET,
+    needToken: true,
+    params: { pageNumber: 1, pageSize: 200, disabled: 'OPEN' }
+  });
+}
+
+//查询包裹列表
+export const getPackage = (sn) => {
+  return request({
+    url: `/buyer/order/order/getPackage/${sn}`,
+    method: Method.GET,
+    needToken: true,
+  })
+}
+
+//查询物流
+export const getTracesList = (sn, params) => {
+  return request({
+    url: `/buyer/order/order/getTracesList/${sn}`,
+    method: Method.GET,
+    needToken: true,
+  })
+};
--- a/buyer/src/api/pay.js
+++ b/buyer/src/api/pay.js
@@ -10,7 +10,7 @@ import request, {
 */
 export function tradeDetail (params) {
  return request({
-    url: '/buyer/cashier/tradeDetail',
+    url: '/buyer/payment/cashier/tradeDetail',
    needToken: true,
    method: Method.GET,
    params
@@ -26,7 +26,7 @@ export function tradeDetail (params) {
 */
 export function pay (params) {
  return request({
-    url: `/buyer/cashier/pay/${params.paymentMethod}/${params.paymentClient}`,
+    url: `/buyer/payment/cashier/pay/${params.paymentMethod}/${params.paymentClient}`,
    needToken: true,
    method: Method.GET,
    params
@@ -40,7 +40,21 @@ export function pay (params) {
 */
 export function payCallback (params) {
  return request({
-    url: `/buyer/cashier/result`,
+    url: `/buyer/payment/cashier/result`,
+    needToken: true,
+    method: Method.GET,
+    params
+  });
+}
+
+/**
+ * 支付结果查询
+ * @param orderType 交易类型,可用值:TRADE,ORDER,RECHARGE
+ * @param sn   订单编号
+ */
+export function withdrawalSettingVO (params) {
+  return request({
+    url: `/buyer/wallet/wallet/withdrawalSettingVO`,
    needToken: true,
    method: Method.GET,
    params
--- a/buyer/src/api/promotion.js
+++ b/buyer/src/api/promotion.js
@@ -46,3 +46,14 @@ export function pointGoods (params) {
    params
  });
 }
+/**
+ * 获取积分商品详情
+ */
+export function pointGoodsDetail (id) {
+  return request({
+    url: `/buyer/promotion/pointsGoods/${id}`,
+    method: Method.GET,
+    needToken: true,
+    id
+  });
+}
--- a/buyer/src/api/shopentry.js
+++ b/buyer/src/api/shopentry.js
@@ -5,7 +5,7 @@ import request, {
 // 店铺分页列表
 export function shopList (params) {
  return request({
-    url: '/buyer/store',
+    url: '/buyer/store/store',
    needToken: true,
    method: Method.GET,
    params
@@ -15,7 +15,7 @@ export function shopList (params) {
 // 申请店铺第一步-填写企业信息
 export function applyFirst (params) {
  return request({
-    url: '/buyer/store/apply/first',
+    url: '/buyer/store/store/apply/first',
    needToken: true,
    method: Method.PUT,
    params
@@ -25,7 +25,7 @@ export function applyFirst (params) {
 // 申请店铺第一步-填写企业信息
 export function applySecond (params) {
  return request({
-    url: '/buyer/store/apply/second',
+    url: '/buyer/store/store/apply/second',
    needToken: true,
    method: Method.PUT,
    params
@@ -35,7 +35,7 @@ export function applySecond (params) {
 // 申请店铺第一步-填写企业信息
 export function applyThird (params) {
  return request({
-    url: '/buyer/store/apply/third',
+    url: '/buyer/store/store/apply/third',
    needToken: true,
    method: Method.PUT,
    params
@@ -45,7 +45,7 @@ export function applyThird (params) {
 // 店铺详情
 export function getDetailById (id) {
  return request({
-    url: `/buyer/store/get/detail/${id}`,
+    url: `/buyer/store/store/get/detail/${id}`,
    needToken: true,
    method: Method.GET
  })
@@ -53,7 +53,7 @@ export function getDetailById (id) {
 // 店铺分类
 export function getCateById (id) {
  return request({
-    url: `/buyer/store/label/get/${id}`,
+    url: `/buyer/store/store/label/get/${id}`,
    needToken: true,
    method: Method.GET
  })
@@ -61,7 +61,7 @@ export function getCateById (id) {
 //  店铺入驻协议
 export function agreement () {
  return request({
-    url: `/buyer/article/type/STORE_REGISTER`,
+    url: `/buyer/other/article/type/STORE_REGISTER`,
    needToken: true,
    method: Method.GET
  })
@@ -70,8 +70,20 @@ export function agreement () {
 //  获取当前登录会员的店铺信息
 export function applyStatus () {
  return request({
-    url: `/buyer/store/apply`,
+    url: `/buyer/store/store/apply`,
    needToken: true,
    method: Method.GET
  })
 }
+
+/**
+ * 获取自提点信息
+ * @param storeId
+ */
+ export function getStoreAddress(storeId,params) {
+  return request({
+    url: `/buyer/store/address/page/${storeId}`,
+    method: Method.GET,
+    params
+  });
+}
--- a/buyer/src/assets/iconfont/back.png
+++ b/buyer/src/assets/iconfont/back.png
--- a/buyer/src/assets/iconfont/carts.png
+++ b/buyer/src/assets/iconfont/carts.png
--- a/buyer/src/assets/iconfont/collage.png
+++ b/buyer/src/assets/iconfont/collage.png
--- a/buyer/src/assets/iconfont/consumer.png
+++ b/buyer/src/assets/iconfont/consumer.png
--- a/buyer/src/assets/iconfont/feedback.png
+++ b/buyer/src/assets/iconfont/feedback.png
--- a/buyer/src/assets/iconfont/notice.png
+++ b/buyer/src/assets/iconfont/notice.png
--- a/buyer/src/assets/iconfont/notification.png
+++ b/buyer/src/assets/iconfont/notification.png
--- a/buyer/src/assets/iconfont/play.svg
+++ b/buyer/src/assets/iconfont/play.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg width="24" height="24" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z" fill="none" stroke="#333" stroke-width="4" stroke-linejoin="round"/><path d="M20 24V17.0718L26 20.5359L32 24L26 27.4641L20 30.9282V24Z" fill="none" stroke="#333" stroke-width="4" stroke-linejoin="round"/></svg>
--- a/buyer/src/assets/iconfont/shop.png
+++ b/buyer/src/assets/iconfont/shop.png
--- a/buyer/src/assets/iconfont/story.png
+++ b/buyer/src/assets/iconfont/story.png
--- a/buyer/src/assets/iconfont/support.png
+++ b/buyer/src/assets/iconfont/support.png
--- a/buyer/src/assets/iconfont/user.png
+++ b/buyer/src/assets/iconfont/user.png
--- a/buyer/src/assets/images/R168dc76973e0ae1cb3f6235b5a8cc0da.png
+++ b/buyer/src/assets/images/R168dc76973e0ae1cb3f6235b5a8cc0da.png
--- a/buyer/src/assets/images/decorate.png
+++ b/buyer/src/assets/images/decorate.png
--- a/buyer/src/assets/images/default.png
+++ b/buyer/src/assets/images/default.png
--- a/buyer/src/assets/images/feedback.png
+++ b/buyer/src/assets/images/feedback.png
--- a/buyer/src/assets/images/jinghui.png
+++ b/buyer/src/assets/images/jinghui.png
--- a/buyer/src/assets/images/logo1.png
+++ b/buyer/src/assets/images/logo1.png
--- a/buyer/src/assets/images/logo2.png
+++ b/buyer/src/assets/images/logo2.png
--- a/buyer/src/assets/images/sprite@2x.png
+++ b/buyer/src/assets/images/sprite@2x.png
--- a/buyer/src/assets/images/zhizhao.jpg
+++ b/buyer/src/assets/images/zhizhao.jpg
--- a/buyer/src/assets/styles/coupon.scss
+++ b/buyer/src/assets/styles/coupon.scss
@@ -1,92 +1,91 @@
+
+// coupon
 .coupon-list {
-  display: flex;
-  flex-wrap: wrap;
+    display: flex;
+    flex-wrap: wrap;
 }
 .coupon-item {
-  width: 380px;
-  height: 145px;
-  margin-bottom: 20px;
-  margin-right: 10px;
-  margin-left: 10px;
-  position: relative;
-  border: 1px solid #eee;
-  .c-left {
-    width: 100%;
-    padding: 20px;
-    >div, > p {
-      margin-bottom: 10px;
-    }
-    >div {
-      .price{
-        color: $theme_color;
-        font-size: 20px;
-      }
-      .describe{
-        background-color: #fff4ec;
-        color: $theme_color;
-        padding: 0 5px;
-        margin-left: 10px;
-        font-size: 13px;
-      }
-    }
-    p:nth-of-type(1){
-      font-weight: bold;
-    }
-    p:nth-of-type(2){
-      color: #999;
-    }
-  }
-  b{
-    position: absolute;
-    z-index: 2;
-    top: 0;
-    right: 50px;
-    display: block;
-    width: 3px;
-    height: 100%;
-  }
-  .c-right {
-    position: absolute;
-    right: 0;
-    top: 0;
-    width: 52px;
-    height: 100%;
-    background-color: $theme_color;
-    color: #fff;
-    font-size: 16px;
-    padding: 20px;
-    &:hover{
-      font-weight: bold;
-    }
-  }
-  i{
-    position: absolute;
-    width: 20px;
-    height: 20px;
-    right: 42px;
+    width: 380px;
+    height: 145px;
+    margin-bottom: 20px;
+    margin-right: 10px;
+    margin-left: 10px;
+    position: relative;
    border: 1px solid #eee;
-    background-color: #fff;
-    border-radius: 20px;
-    &:after{
-      content: '';
-      position: absolute;
-      width: 25px;
-      height: 20px;
-      left: -2px;
-      background-color: #fff;
-
+    .c-left {
+        width: 100%;
+        padding: 20px;
+        > div,
+        > p {
+            margin-bottom: 10px;
+        }
+        > div {
+            .price {
+                color: $theme_color;
+                font-size: 20px;
+            }
+            .describe {
+                background-color: #fff4ec;
+                color: $theme_color;
+                padding: 0 5px;
+                margin-left: 10px;
+                font-size: 13px;
+            }
+        }
+        p:nth-of-type(1) {
+            font-weight: bold;
+        }
+        p:nth-of-type(2) {
+            color: #999;
+        }
    }
-  }
-  i.circle-top{
-    top: -10px;
-    &::after{
-      top: -11px;
+    b {
+        position: absolute;
+        z-index: 2;
+        top: 0;
+        right: 50px;
+        display: block;
+        width: 3px;
+        height: 100%;
    }
-  }
-  i.circle-bottom{
-    bottom: -10px;
-    &::after{
-      bottom: -11px;
+    .c-right {
+        position: absolute;
+        right: 0;
+        top: 0;
+        width: 52px;
+        height: 100%;
+        background-color: $theme_color;
+        color: #fff;
+        font-size: 16px;
+        padding: 20px;
    }
-  }
-}
+    i {
+        position: absolute;
+        width: 20px;
+        height: 20px;
+        right: 42px;
+        border: 1px solid #eee;
+        background-color: #fff;
+        border-radius: 20px;
+        &:after {
+            content: "";
+            position: absolute;
+            width: 25px;
+            height: 20px;
+            left: -2px;
+            background-color: #fff;
+        }
+    }
+    i.circle-top {
+        top: -10px;
+        &::after {
+            top: -11px;
+        }
+    }
+    i.circle-bottom {
+        bottom: -10px;
+        &::after {
+            bottom: -11px;
+        }
+    }
+}
--- a/buyer/src/assets/styles/global.scss
+++ b/buyer/src/assets/styles/global.scss
@@ -1,18 +1,120 @@
-/*
- * @Author: LMR
- * @Date: 2020-08-11 10:12:34
- * @Last Modified by: LMR
- * @Last Modified time: 2020-08-18 16:00:10
- */
-
 //引入主题色
-@import "./theme.scss";

-.global_color{
-  color: $theme_color;
+
+// 明亮主题颜色
+$primary_color: #2d8cf0;
+$primary_light_color: #0f1011;
+$primary_dark_color: #2b85e4;
+$success_color: #19be6b;
+$warning_color: #ff9900;
+$error_color: #ed3f14;
+$handle-btn-color: #438cde;
+
+$theme_color: #F31947;
+
+$border_color: #dddee1;
+$title_color: #8c8c8c;
+$light_title_color: #1c2438;
+$light_content_color: #495060;
+$light_sub_color: #80848f;
+$light_background_color: #F5F5F7;
+$light_white_background_color: #fff;
+// 暗黑主题颜色
+$dark_background_color: #141414;
+$dark_sub_background_color: #1d1d1d; //稍微浅一点的
+$dark_content_color: #d5d5d5;
+
+
+.wes-2 {
+	/* 适用于webkit内核和移动端 */
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
 }
-.global_background_color{
-  background-color: $theme_color;
+/***** 封装一些方法可用于 黑暗主题 ，明亮主题 *****/
+
+// 背景颜色
+@mixin background_color($color) {
+    /*通过该函数设置字体颜色，后期方便统一管理；*/
+    background-color: $color;
+    transition: 0.35s;
+    [data-theme="dark"] & {
+        background-color: $dark_background_color;
+    }
+    [data-theme="light"] & {
+        background-color: $light_background_color;
+    }
+}
+// 辅助背景颜色
+@mixin sub_background_color($color) {
+    /*通过该函数设置字体颜色，后期方便统一管理；*/
+    background-color: $color;
+    transition: 0.35s;
+    [data-theme="dark"] & {
+        background-color: $dark_sub_background_color;
+    }
+    [data-theme="light"] & {
+        background-color: $light_background_color;
+    }
+}
+
+@mixin white_background_color() {
+    /*通过该函数设置字体颜色，后期方便统一管理；*/
+    background-color: $light_white_background_color;
+    transition: 0.35s;
+    [data-theme="dark"] & {
+        background-color: $dark_sub_background_color;
+    }
+    [data-theme="light"] & {
+        background-color: $light_white_background_color;
+    }
+}
+
+// 正文颜色
+@mixin content_color($color) {
+    /*通过该函数设置字体颜色，后期方便统一管理；*/
+    color: $color;
+    [data-theme="dark"] & {
+        color: $dark_content_color;
+    }
+    [data-theme="light"] & {
+        color: $light_content_color;
+    }
+}
+
+// 辅助颜色
+@mixin sub_color($color) {
+    /*通过该函数设置字体颜色，后期方便统一管理；*/
+    color: $color;
+    [data-theme="dark"] & {
+        color: $dark_content_color;
+    }
+    [data-theme="light"] & {
+        color: $light_sub_color;
+    }
+}
+
+// 标题颜色
+@mixin title_color($color) {
+    /*通过该函数设置字体颜色，后期方便统一管理；*/
+    color: $color;
+    [data-theme="dark"] & {
+        color: $dark_content_color;
+    }
+    [data-theme="light"] & {
+        color: $light_title_color;
+    }
+}
+
+
+
+// 全局变量
+.global_color {
+    color: $theme_color;
+}
+.global_background_color {
+    background-color: $theme_color;
 }
 .global_text_left {
    text-align: left;
@@ -26,44 +128,109 @@
 .global_float_right {
    float: right;
 }
-.clearfix::after{
-    content: '';
+.clearfix::after {
+    content: "";
    display: block;
    clear: both;
 }
-.width_1200{width: 1200px;}
-.width_800{width: 800px;}
-.width_400{width: 400px;}
-.width_300{width: 300px;}
-.width_200{width: 200px;}
-.width_100{width: 100px;}
+.width_1200 {
+    width: 1200px;
+}
+.width_800 {
+    width: 800px;
+}
+.width_400 {
+    width: 400px;
+}
+.width_300 {
+    width: 300px;
+}
+.width_200 {
+    width: 200px;
+}
+.width_100 {
+    width: 100px;
+}

-.fontsize_12{font-size: 12px;}
-.fontsize_14{font-size: 14px;}
-.fontsize_16{font-size: 16px;}
-.fontsize_18{font-size: 18px;}
+.fontsize_12 {
+    font-size: 12px;
+}
+.fontsize_14 {
+    font-size: 14px;
+}
+.fontsize_16 {
+    font-size: 16px;
+}
+.fontsize_18 {
+    font-size: 18px;
+}

-.mb_20{margin-bottom: 20px;}
-.mt_20{margin-top: 20px;}
-.ml_20{margin-left: 20px;}
-.mr_20{margin-right: 20px;}
+.mb_20 {
+    margin-bottom: 20px;
+}
+.mt_20 {
+    margin-top: 20px;
+}
+.ml_20 {
+    margin-left: 20px;
+}
+.mr_20 {
+    margin-right: 20px;
+}

-.mb_10{margin-bottom: 10px;}
-.mt_10{margin-top: 10px;}
-.ml_10{margin-left: 10px;}
-.mr_10{margin-right: 10px;}
+.mb_24 {
+    margin-bottom: 24px;
+}
+.mt_24 {
+    margin-top: 24px;
+}
+.ml_24 {
+    margin-left: 24px;
+}
+.mr_24 {
+    margin-right: 24px;
+}

-.pb_20{padding-bottom: 20px;}
-.pt_20{padding-top: 20px;}
-.pl_20{padding-left: 20px;}
-.pr_20{padding-right: 20px;}
+.mb_10 {
+    margin-bottom: 10px;
+}
+.mt_10 {
+    margin-top: 10px;
+}
+.ml_10 {
+    margin-left: 10px;
+}
+.mr_10 {
+    margin-right: 10px;
+}

-.pb_10{padding-bottom: 10px;}
-.pt_10{padding-top: 10px;}
-.pl_10{padding-left: 10px;}
-.pr_10{padding-right: 10px;}
+.pb_20 {
+    padding-bottom: 20px;
+}
+.pt_20 {
+    padding-top: 20px;
+}
+.pl_20 {
+    padding-left: 20px;
+}
+.pr_20 {
+    padding-right: 20px;
+}

-.color999{
+.pb_10 {
+    padding-bottom: 10px;
+}
+.pt_10 {
+    padding-top: 10px;
+}
+.pl_10 {
+    padding-left: 10px;
+}
+.pr_10 {
+    padding-right: 10px;
+}
+
+.color999 {
    color: #999;
 }

@@ -71,55 +238,137 @@ html,
 body {
    height: 100%;
    width: 100%;
-    font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
+    font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial,
+        sans-serif;
    // overflow: hidden;
    margin: 0;
    padding: 0;
-
 }
-li{
+li {
    list-style: none;
 }
-.hover-color:hover{
-    color: $theme_color!important;
+.hover-color:hover {
+    color: $theme_color !important;
    cursor: pointer;
 }
-.hover-pointer{
+.hover-pointer {
    cursor: pointer;
 }
-.center{
+.center {
    margin: 0 auto;
 }
-.relative{
+.relative {
    position: relative;
 }
-.ellipsis{
+.ellipsis {
    overflow: hidden;
-    text-overflow:ellipsis;
+    text-overflow: ellipsis;
    white-space: nowrap;
 }
-.promotion-decorate{
+.promotion-decorate {
    width: 200px;
    text-align: center;
    font-size: 25px;
    position: relative;
    font-weight: bold;
    margin: 30px auto 30px;
-    &::before,&::after{
-      content: '';
-      display: inline-block;
-      width: 25px;
-      height: 20px;
-      background-size: 50px 20px;
-      background-repeat: no-repeat;
-      background-position: 0 0;
-      position: absolute;
-      top: 10px;
-      left: -3px;
+    &::before,
+    &::after {
+        content: "";
+        display: inline-block;
+        width: 25px;
+        height: 20px;
+        background-size: 50px 20px;
+        background-repeat: no-repeat;
+        background-position: 0 0;
+        position: absolute;
+        top: 10px;
+        left: -3px;
    }
-    &::after{
-      background-position: -24px 0;
-      right: -3px;
-      left: auto;
+    &::after {
+        background-position: -24px 0;
+        right: -3px;
+        left: auto;
    }
-  }
+}
+.flex{
+  display: flex;
+}
+.flex-a-c{
+  align-items: center;
+}
+.flex-j-sb{
+  justify-content: space-between;
+}
+.flex-j-c{
+  justify-content: center;
+}
+
+.width_1200_auto {
+  width: 1184px;
+  margin: 0 auto;
+
+}
+
+
+
+//  goodsList
+
+.text-danger {
+    color: $theme_color;
+  }
+  .seckill-price{
+    margin-right: 5px;
+    font-size: 25px;
+    font-weight: bold;
+  }
+  .goods-list {
+    display: flex;
+    flex-wrap: wrap;
+    width: 1200px;
+    margin: 0 auto;
+  }
+  .goods-show-info {
+    width: 235px;
+    padding: 6px;
+    margin: 10px 0px;
+    margin-left: 5px;
+    position: relative;
+    border: 1px solid #fff;
+    cursor: pointer;
+    background-color: #fff;
+  }
+  .goods-show-info:hover {
+    border: 1px solid #ccc;
+    box-shadow: 0px 0px 15px #ccc;
+  }
+  .goods-show-price {
+    margin-top: 6px;
+  }
+  .goods-show-detail {
+    font-size: 12px;
+    margin: 6px 0px;
+  }
+  .goods-show-num {
+    font-size: 12px;
+    margin-bottom: 6px;
+    color: #666;
+  }
+  .goods-show-num {
+    font-size: 12px;
+    margin-bottom: 6px;
+    color: #009688;
+  }
+  .goods-show-num span {
+    color: #005aa0;
+    font-weight: bold;
+  }
+  .goods-show-seller {
+    font-size: 12px;
+    color: $theme_color;
+  }
+  .goods-page {
+    margin:10px auto ;
+    text-align: right;
+    width: 1200px;
+  }
--- a/buyer/src/assets/styles/goodsList.scss
+++ b/buyer/src/assets/styles/goodsList.scss
@@ -30,8 +30,18 @@
  margin-top: 6px;
 }
 .goods-show-detail {
+  height: 36px;
  font-size: 12px;
  margin: 6px 0px;
+  overflow:hidden;
+  text-overflow: ellipsis;
+  display:-webkit-box;
+  -webkit-line-clamp:2;
+  -webkit-box-orient:vertical;
+  color:#808080;
+}
+.goods-show-detail :hover{
+  color:#E23A3A;
 }
 .goods-show-num {
  font-size: 12px;
--- a/buyer/src/assets/styles/theme.less
+++ b/buyer/src/assets/styles/theme.less
@@ -1,84 +1,19 @@
-@import '~view-design/src/styles/index.less';
+@import "~view-design/src/styles/index.less";
+// iview 自定义样式

-@primary-color: #ed3f14;
+@primary-color: #ff5c58;
+@info-color: #fa6419;
+@success-color: #68cabe;
+@error-color: #ff3c2a;
+@table-thead-bg: #f8f8f9;
+@table-td-stripe-bg: #f8f8f9;
+@table-td-hover-bg: #ededed;
+@table-td-highlight-bg: #ededed;
+@font-size-base: 12px;

+.ivu-drawer,
+.drawer,
+.ivu-drawer-wrap {
+  z-index: 2600 !important;
+}

-@table-thead-bg               : #f8f8f9;
-@table-td-stripe-bg           : #f8f8f9;
-@table-td-hover-bg            : #ededed;
-@table-td-highlight-bg        : #ededed;
-
-
-
-//
-//.colorPaletteMixin() {
-//  @functions: ~`(function() {
-//  var hueStep = 2;
-//  var saturationStep = 0.16;
-//  var saturationStep2 = 0.05;
-//  var brightnessStep1 = 0.05;
-//  var brightnessStep2 = 0.15;
-//  var lightColorCount = 5;
-//  var darkColorCount = 4;
-//
-//  var getHue = function(hsv, i, isLight) {
-//    var hue;
-//    if (hsv.h >= 60 && hsv.h <= 240) {
-//      hue = isLight ? hsv.h - hueStep * i : hsv.h + hueStep * i;
-//    } else {
-//      hue = isLight ? hsv.h + hueStep * i : hsv.h - hueStep * i;
-//    }
-//    if (hue < 0) {
-//      hue += 360;
-//    } else if (hue >= 360) {
-//      hue -= 360;
-//    }
-//    return Math.round(hue);
-//  };
-//  var getSaturation = function(hsv, i, isLight) {
-//    var saturation;
-//    if (isLight) {
-//      saturation = hsv.s - saturationStep * i;
-//    } else if (i === darkColorCount) {
-//      saturation = hsv.s + saturationStep;
-//    } else {
-//      saturation = hsv.s + saturationStep2 * i;
-//    }
-//    if (saturation > 1) {
-//      saturation = 1;
-//    }
-//    if (isLight && i === lightColorCount && saturation > 0.1) {
-//      saturation = 0.1;
-//    }
-//    if (saturation < 0.06) {
-//      saturation = 0.06;
-//    }
-//    return Number(saturation.toFixed(2));
-//  };
-//  var getValue = function(hsv, i, isLight) {
-//    var value;
-//    if (isLight) {
-//      value = hsv.v + brightnessStep1 * i;
-//    }else{
-//      value = hsv.v - brightnessStep2 * i
-//    }
-//    if (value > 1) {
-//      value = 1;
-//    }
-//    return Number(value.toFixed(2))
-//  };
-//
-//  this.colorPalette = function(color, index) {
-//    var isLight = index <= 6;
-//    var hsv = tinycolor(color).toHsv();
-//    var i = isLight ? lightColorCount + 1 - index : index - lightColorCount - 1;
-//    return tinycolor({
-//      h: getHue(hsv, i, isLight),
-//      s: getSaturation(hsv, i, isLight),
-//      v: getValue(hsv, i, isLight),
-//    }).toHexString();
-//  };
-//})()`;
-//}
-
-//.colorPaletteMixin();
--- a/buyer/src/assets/styles/theme.scss
+++ b/buyer/src/assets/styles/theme.scss
@@ -1,114 +0,0 @@
-/*
- * @Author: LMR
- * @Date: 2020-08-14 11:04:12
- * @Last Modified by: LMR
- * @Last Modified time: 2020-08-18 14:21:41
- */
-
-
-// 主题颜色
-
-// 明亮主题颜色
-$primary_color: #2d8cf0;
-$primary_light_color: #0f1011;
-$primary_dark_color: #2b85e4;
-$success_color: #19be6b;
-$warning_color: #ff9900;
-$error_color: #ed3f14;
-$handle-btn-color: #438cde;
-
-$theme_color: #ed3f14;
-
-$border_color: #dddee1;
-$title_color: #8c8c8c;
-$light_title_color: #1c2438;
-$light_content_color: #495060;
-$light_sub_color: #80848f;
-$light_background_color: #f8f8f9;
-$light_white_background_color :#fff;
-// 暗黑主题颜色
-$dark_background_color: #141414;
-$dark_sub_background_color: #1d1d1d; //稍微浅一点的
-$dark_content_color: #d5d5d5;
-
-
-
-/***** 封装一些方法可用于 黑暗主题 ，明亮主题 *****/
-
-
-// 背景颜色
-@mixin background_color($color) {
-  /*通过该函数设置字体颜色，后期方便统一管理；*/
-  background-color: $color;
-  transition: 0.35s;
-  [data-theme="dark"] & {
-    background-color: $dark_background_color;
-  }
-  [data-theme="light"] & {
-    background-color: $light_background_color;
-  }
-}
-// 辅助背景颜色
-@mixin sub_background_color($color) {
-  /*通过该函数设置字体颜色，后期方便统一管理；*/
-  background-color: $color;
-  transition: 0.35s;
-  [data-theme="dark"] & {
-    background-color: $dark_sub_background_color;
-  }
-  [data-theme="light"] & {
-    background-color: $light_background_color;
-  }
-}
-
-
-@mixin white_background_color() {
-  /*通过该函数设置字体颜色，后期方便统一管理；*/
-  background-color: $light_white_background_color;
-  transition: 0.35s;
-  [data-theme="dark"] & {
-    background-color: $dark_sub_background_color;
-  }
-  [data-theme="light"] & {
-    background-color: $light_white_background_color;
-  }
-}
-
-
-// 正文颜色
-@mixin content_color($color) {
-  /*通过该函数设置字体颜色，后期方便统一管理；*/
-  color: $color;
-  [data-theme="dark"] & {
-    color: $dark_content_color;
-  }
-  [data-theme="light"] & {
-    color: $light_content_color;
-  }
-}
-
-// 辅助颜色
-@mixin sub_color($color) {
-  /*通过该函数设置字体颜色，后期方便统一管理；*/
-  color: $color;
-  [data-theme="dark"] & {
-    color: $dark_content_color;
-  }
-  [data-theme="light"] & {
-    color: $light_sub_color;
-  }
-}
-
-// 标题颜色
-@mixin title_color($color) {
-  /*通过该函数设置字体颜色，后期方便统一管理；*/
-  color: $color;
-  [data-theme="dark"] & {
-    color: $dark_content_color;
-  }
-  [data-theme="light"] & {
-    color: $light_title_color;
-  }
-}
-
-
--- a/buyer/src/components/Search.vue
+++ b/buyer/src/components/Search.vue
@@ -1,44 +1,52 @@
 <template>
-  <div>
-    <div class="container">
+  <div class="navbar" :class="{'small-search-box':useClass == 'fixed-show'}">
+    <div class="container width_1200_auto flex flex-a-c">
      <img
-        :src="logoImg"
+        :src="$store.state.logoImg"
        v-if="showLogo"
        class="logo-img"
        alt=""
        @click="$router.push('/')"
      />
-      <i-input
-        v-model="searchData"
-        size="large"
-        class="search"
-        placeholder="输入你想查找的商品"
-        @keyup.enter.native="search"
-      >
-        <Button v-if="!store"  slot="append" @click="search">搜索</Button>
-      </i-input>
-      <div v-if="store" class="btn-div">
-        <Button class="store-search" type="warning" @click="searchStore">搜本店</Button>
-        <Button class="store-search" type="primary" @click="search">搜全站</Button>
+      <div :class="{'small-search-box':useClass == 'fixed-show'}" class="search-box">
+        <i-input
+          v-model="searchData"
+          size="large"
+          class="search "
+          placeholder="输入你想查找的商品"
+          @keyup.enter.native="search"
+        >
+
+          <div class="search-icon" slot="append" @click="search">
+            <Icon type="ios-search" size="21"/>
+          </div>
+        </i-input>
+        <template v-if="showTag">
+          <div class="only-store" v-if="storeId" @click="research()">
+            切换为{{!onlyStore ? '店铺内' : '平台'}}搜索
+
+          </div>
+          <div v-if="promotionTags.length === 0"></div>
+          <div v-else class="history-list flex">
+            <div
+              v-for="(item, index) in promotionTags"
+              :key="index"
+              class="mr_10"
+            >
+              <span class="history-item" @click="selectTags(item)">{{ item }}</span>
+            </div>
+          </div>
+        </template>
      </div>
-      <template v-if="showTag">
-        <div style="height:12px" v-if="promotionTags.length === 0"></div>
-        <div v-else>
-          <Tag
-            v-for="(item, index) in promotionTags"
-            :key="index"
-          >
-            <span class="hover-color" @click="selectTags(item)">{{ item }}</span>
-          </Tag>
-        </div>
-      </template>
    </div>
+
  </div>
 </template>

 <script>
-import {getLogo} from '@/api/common.js'
+import storage from '@/plugins/storage.js'
 import {hotWords} from '@/api/goods.js'
+
 export default {
  name: 'search',
  props: {
@@ -50,75 +58,153 @@ export default {
      type: Boolean,
      default: true
    },
-    store: { // 是否为店铺页面
+    storeId: { // 是否为店铺页面
+      type: String,
+      default: ""
+    },
+    hover: {
      type: Boolean,
      default: false
+    },
+    useClass:{
+      type:null,
+      default:''
    }
  },
-  data () {
+  watch:{
+    storeId(val){
+      this.onlyStore = val ? true : false
+    }
+  },
+  data() {
    return {
      searchData: '', // 搜索内容
-      logoImg: '', // pc端展示logo
-      promotionTags: [] // 热门搜索列表
+      onlyStore:false,
    };
  },
  methods: {
-    selectTags (item) { // 选择热门标签
+    selectTags(item) { // 选择热门标签
      this.searchData = item;
      this.search();
    },
-    search () { // 全平台搜索商品
-      this.$router.push({
-        path: '/goodsList',
-        query: { keyword: this.searchData }
-      });
+    research(){
+      this.onlyStore = !this.onlyStore
    },
-    searchStore () { // 店铺搜索商品
+    search () { // 全平台搜索商品
+      const url = this.$route.path;
+      if(url == '/goodsList'){
+        this.$emit('search', this.searchData)
+      }else{
+        const pushData = {
+          path:'/goodsList',
+          query: { keyword: this.searchData },
+        }
+        if(this.storeId && this.onlyStore) pushData.query.storeId = this.storeId
+
+
+        this.$router.push(pushData);
+      }
+    },
+    searchStore() { // 店铺搜索商品
      this.$emit('search', this.searchData)
    }
  },
-  mounted () {
-    if (!this.Cookies.getItem('logo')) {
-      getLogo().then(res => {
-        if (res.success) {
-          let logoObj = JSON.parse(res.result.settingValue)
-          this.Cookies.setItem('logo', logoObj.buyerSideLogo)
-          this.logoImg = logoObj.buyerSideLogo
-        }
-      })
-    } else {
-      this.logoImg = this.Cookies.getItem('logo')
+  computed: {
+    promotionTags() {
+      if (this.$store.state.hotWordsList) {
+        return JSON.parse(this.$store.state.hotWordsList)
+      } else {
+        return []
+      }
    }
+  },
+  created() {
    this.searchData = this.$route.query.keyword
-    hotWords({start: 1, end: 5}).then(res => {
-      if (res.success) this.promotionTags = res.result
-    })
+
+    if (!this.hover) { // 首页顶部固定搜索栏不调用热词接口
+      // 搜索热词每5分钟请求一次
+      const reloadTime = storage.getItem('hotWordsReloadTime')
+      const time = new Date().getTime() - 5 * 60 * 1000
+      if (!reloadTime) {
+        hotWords({count: 5}).then(res => {
+          if (res.success && res.result) storage.setItem('hotWordsList', res.result)
+        })
+        storage.setItem('hotWordsReloadTime', new Date().getTime())
+      } else if (reloadTime && time > reloadTime) {
+        hotWords({count: 5}).then(res => {
+          if (res.success && res.result) storage.setItem('hotWordsList', res.result)
+        })
+        storage.setItem('hotWordsReloadTime', new Date().getTime())
+      }
+    }
  }
 };
 </script>
-
 <style scoped lang="scss">
-.container {
-  margin: 30px auto;
-  width: 460px;
-  position: relative;
+.only-store{
+  text-align: right;
+  color:$theme_color;
+  cursor: pointer;
 }
+.navbar {
+  height: 113px;
+  background: #fff;
+}
+.search-icon{
+  width: 100%;
+  height: 100%;
+}
+.small-search-box{
+  height: 60px;
+
+  margin: 0 !important;
+}
+
+.container {
+  position: relative;
+
+  height: 100%;
+}
+
 .search {
+  width: 778.4px;
  margin: 10px 0px 5px 0;
-  /deep/ .ivu-input.ivu-input-large {
-    border: 2px solid $theme_color;
-    font-size: 12px;
-    height: 34px;
+
+  border-radius: 18.9px;
+
+
+  ::v-deep .ivu-input.ivu-input-large {
+    border: 1.4px solid $theme_color;
+    box-sizing: border-box;
+    border-radius: 19.6px;
+    position: relative;
+    padding-left: 26px;
+    font-size: 14px;
+    font-weight: normal;
+    height: 37.8px;
+    color: #999;
    &:focus {
      box-shadow: none;
    }
  }
-  /deep/ .ivu-input-group-append {
-    border: 1px solid $theme_color;
-    border-left: none;
-    height: 30px;
+
+  ::v-deep .ivu-input-group-append {
+    border-radius: 19.6px !important;
+    cursor: pointer;
+    box-sizing: border-box;
+    border: 1.4px solid $theme_color;
+    width: 67.2px;
+    height: 37.8px;
+    position: absolute;
+    right: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    top: 0;
+    z-index: 99;
    background-color: $theme_color;
    color: #ffffff;
+
    button {
      font-size: 14px;
      font-weight: 600;
@@ -126,24 +212,46 @@ export default {
    }
  }
 }
+.search-box{
+  margin-left: 28px;
+}
 .logo-img {
-  position: absolute;
-  left: -360px;
-  top: -9px;
-  width: 150px;
+  max-width: 150px;
  cursor: pointer;
 }
-.store-search{
+
+.store-search {
+  width: 55.6px;
  padding: 0 9px;
  border-radius: 0;
-  &:nth-child(2){
-    margin-left: -5px;
+  border-radius: 3px;
+
+  &:nth-child(2) {
+    width: 55px;
+    margin-left: -2px;
+    border-radius: 3px;
  }
 }
-.btn-div{
+
+.btn-div {
  position: relative;
  height: 0px;
  top: -38px;
-  left: 336px;
+  left: 352px;
+}
+
+.history-list {
+
+  margin-left: 28px;
+}
+
+.history-item {
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 16px;
+  letter-spacing: 0px;
+  margin-right: 17px;
+  color: #666666;
+  cursor: pointer;
 }
 </style>
--- a/buyer/src/components/addressManage/index.vue
+++ b/buyer/src/components/addressManage/index.vue
@@ -12,12 +12,8 @@
          <i-input v-model="formData.name" style="width: 600px"></i-input>
        </FormItem>
        <FormItem label="收件地区" prop="address">
-          <i-input
-            v-model="formData.address"
-            disabled
-            style="width: 600px"
-          ></i-input>
-          <Button type="primary" size="small" @click="$refs.map.showMap = true">选择</Button>
+          {{ formData.address || '暂无地址' }}
+          <Button type="primary" style="margin-left: 10px;" size="small" @click="$refs.map.open()">选择</Button>
        </FormItem>
        <FormItem label="详细地址" prop="detail">
          <i-input v-model="formData.detail" style="width: 600px"></i-input>
@@ -43,12 +39,12 @@
        <Button type="primary" class="mr_10" :loading="loading" @click="save">保存收货地址</Button>
      </div>
    </Modal>
-    <lili-map ref="map" @getAddress="getAddress"></lili-map>
+    <multipleMap ref="map" @callback="getAddress"></multipleMap>
  </div>
 </template>

 <script>
-import liliMap from '@/components/map';
+import multipleMap from "@/components/map/multiple-map";
 import {
  newMemberAddress,
  editMemberAddress,
@@ -129,14 +125,24 @@ export default {
        }
      });
    },
-    getAddress (item) {
-      // 获取地图选择信息
-      this.mapMsg = item;
-      this.$set(this.formData, 'address', item.addr);
-      this.$set(this.formData, 'consigneeAddressIdPath', item.addrId);
-      this.$set(this.formData, 'detail', item.detail);
-      this.formData.lat = item.position.lat;
-      this.formData.lon = item.position.lng;
+    getAddress (val) {
+       // 获取地图选择信息
+       if(val.type === 'select'){
+        const paths = val.data.map(item => item.name).join(',')
+        const ids = val.data.map(item => item.id).join(',')
+        this.$set(this.formData,'address',paths)
+        this.$set(this.formData,'consigneeAddressIdPath',ids)
+        const coord = val.data[val.data.length - 1].center.split(',')
+        this.formData.lat = coord[1]
+        this.formData.lon = coord[0]
+      }else{
+        this.$set(this.formData, "address", val.data.addr);
+        this.$set(this.formData, "consigneeAddressIdPath", val.data.addrId);
+        this.$set(this.formData, "detail", val.data.address);
+        this.formData.lat = val.data.position.lat;
+        this.formData.lon = val.data.position.lng;
+      }
+
    },
    show () { // 地址模态框显示
      this.showAddr = true;
@@ -158,7 +164,7 @@ export default {
    }
  },
  components: {
-    liliMap
+    multipleMap
  }
 };
 </script>
--- a/buyer/src/components/advertising/FixedTop.vue
+++ b/buyer/src/components/advertising/FixedTop.vue
@@ -24,7 +24,7 @@ export default {
 .advertising {
  height: 80px;
  width: 100%;
-  background-color: $theme_color;
+
  text-align: center;
  overflow: hidden;
  position: relative;
--- a/buyer/src/components/card/index.vue
+++ b/buyer/src/components/card/index.vue
@@ -113,12 +113,12 @@ export default {
    }
  }

-  /deep/ .ivu-card, .ivu-card-head, ._Card {
+  ::v-deep .ivu-card, .ivu-card-head, ._Card {
    margin-bottom: 20px;
    @include white_background_color();
  }

-  /deep/ .ivu-card-head {
+  ::v-deep .ivu-card-head {
    position: relative;
    padding: 0 14px;
    height: 50px;
@@ -140,7 +140,7 @@ export default {
    cursor: pointer;
  }

-  /deep/ .ivu-card-body {
+  ::v-deep .ivu-card-body {
    padding: 0 !important;
    display: none;
  }
--- a/buyer/src/components/coupon/Coupon.vue
+++ b/buyer/src/components/coupon/Coupon.vue
@@ -1,110 +0,0 @@
-<template>
-  <div class="wrapper">
-    <empty v-if="list.length==0" />
-    <ul class="coupon-list" v-else>
-      <li v-for="(item, index) in list" class="coupon-item" :key="index">
-        <div class="c-left">
-          <div>
-            <span v-if="item.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{item.price | unitPrice}}</span></span>
-            <span v-if="item.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{item.couponDiscount}}</span>折</span>
-            <span class="describe">满{{item.consumeThreshold}}元可用</span>
-          </div>
-          <p>使用范围：{{useScope(item.scopeType, item.storeName)}}</p>
-          <p>有效期：{{item.endTime}}</p>
-        </div>
-        <b></b>
-        <a class="c-right" @click="go(item)">立即使用</a>
-        <i class="circle-top"></i>
-        <i class="circle-bottom"></i>
-      </li>
-    </ul>
-    <Page :total="total" @on-change="changePageNum"
-      v-if="list.length && total > params.pageNumber"
-      class="pageration"
-      @on-page-size-change="changePageSize"
-      :page-size="params.pageSize"
-      show-sizer>
-    </Page>
-    <Spin v-if="loading" fix></Spin>
-  </div>
-</template>
-
-<script>
-import { memberCouponList } from '@/api/member.js';
-export default {
-  data () {
-    return {
-      loading: false, // 列表加载状态
-      params: { // 请求参数
-        pageNumber: 1,
-        pageSize: 10
-      },
-      total: 0, // 优惠券总数
-      list: [] // 优惠券列表
-    };
-  },
-  methods: {
-    getList () { // 获取优惠券列表
-      this.loading = true
-      memberCouponList(this.params).then(res => {
-        this.loading = false
-        if (res.success) {
-          this.list = res.result.records
-          this.total = res.result.total
-        }
-      })
-    },
-
-    go (item) { // 根据使用条件跳转商品列表页面
-      if (item.storeId !== 'platform') {
-        this.$router.push({path: '/merchant', query: {id: item.storeId}})
-      } else {
-        if (item.scopeType === 'PORTION_GOODS_CATEGORY') {
-          this.$router.push({path: '/goodsList', query: {categoryId: item.scopeId}})
-        } else {
-          this.$router.push({path: '/goodsList'})
-        }
-      }
-    },
-
-    changePageNum (val) { // 分页改变页码
-      this.params.pageNumber = val;
-      this.getList()
-    },
-
-    changePageSize (val) { // 分页改变页数
-      this.pageNumber = 1;
-      this.params.pageSize = val;
-      this.getList()
-    },
-
-    useScope (type, storeName) { // 根据字段返回 优惠券适用范围
-      let shop = '平台';
-      let goods = '全部商品'
-      if (storeName !== 'platform') shop = storeName
-      switch (type) {
-        case 'ALL':
-          goods = '全部商品'
-          break;
-        case 'PORTION_GOODS':
-          goods = '部分商品'
-          break;
-        case 'PORTION_GOODS_CATEGORY':
-          goods = '部分分类商品'
-          break;
-      }
-      return `${shop}${goods}可用`
-    }
-  },
-  mounted () {
-    this.getList()
-  }
-};
-</script>
-
-<style scoped lang="scss">
-@import '../../assets/styles/coupon.scss';
-.pageration {
-  text-align: right;
-}
-</style>
--- a/buyer/src/components/drawer/Drawer.vue
+++ b/buyer/src/components/drawer/Drawer.vue
@@ -190,7 +190,7 @@ export default {
              this.$router.push('/home/Coupons')
            },
            onCancel: () => {
-              if (item.storeId !== 'platform') {
+              if (item.storeId !== '0') {
                this.$router.push({path: '/merchant', query: {id: item.storeId}})
              } else {
                if (item.scopeType === 'PORTION_GOODS_CATEGORY') {
@@ -290,7 +290,7 @@ export default {
      }
      this.loading = true
      tracksList(params).then(res => {
-        this.tracksList = res.result
+        this.tracksList = res.result.records
        this.loading = false
      }).catch(() => { this.loading = false })
    }
--- a/buyer/src/components/drawer/Main.vue
+++ b/buyer/src/components/drawer/Main.vue
@@ -36,9 +36,11 @@ export default {
  },
  components: {drawerPage},
  computed: {
+    // 用户信息
    userInfo () {
      return Storage.getItem('userInfo');
    },
+    // 购物车商品数量
    cartNum () {
      return this.$store.state.cartNum
    }
@@ -145,11 +147,11 @@ export default {
    justify-content: center;
    flex-direction: column;
  }
-  /deep/.popup .ivu-drawer-body{
+  ::v-deep.popup .ivu-drawer-body{
    padding: 0!important;
    background-color: #eee;
  }
-  /deep/.popup .ivu-drawer-wrap{
+  ::v-deep.popup .ivu-drawer-wrap{
    z-index: 3001;
  }
 </style>
--- a/buyer/src/components/empty/Main.vue
+++ b/buyer/src/components/empty/Main.vue
@@ -7,6 +7,7 @@
      alt=""
    />
    <p v-if="_Title">{{ _Title }}</p>
+    <slot></slot>
  </div>
 </template>

@@ -35,6 +36,6 @@ export default {
 }
 p {
  cursor: pointer;
-  @include sub_color($light_sub_color);
+
 }
 </style>
--- a/buyer/src/components/fixed/index.vue
+++ b/buyer/src/components/fixed/index.vue
@@ -0,0 +1,119 @@
+<template>
+    <div class="shadow-box">
+        <div class="shadow-item flex flex-a-c flex-j-c" v-for="(item,index) in iconList" @click="handleClickIcon(item)" :key="index">
+          <img class="icon" :src="require(`@/assets/iconfont/${item.icon}.png`)">
+          <div class="shadow-label">{{item.label}}</div>
+          <div class="line" v-if="iconList.length-1 !=index"></div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+  name: "fixed-index",
+  data(){
+    return{
+      iconList:[
+        {
+          icon:"user",
+          label:"会员中心",
+          path:"/home"
+        },
+        {
+          icon:"carts",
+          label:"购物车",
+          path:"/cart"
+        },
+        {
+          icon:"notification",
+          label:"消息",
+          path:"/home/MsgList"
+        },
+        {
+          icon:"collage",
+          label:"收藏",
+          path:"/home/Favorites"
+        },
+        {
+          icon:"back",
+          label:"顶部",
+          path:"back"
+        },
+      ],
+      isScrolling:false,
+      timeoutId:"",
+    }
+  },
+  mounted() {
+    const vm = this
+    // 添加滚轮事件监听器
+    window.addEventListener('wheel', function() {
+      if (vm.isScrolling) {
+        // 如果页面正在滚动，则取消定时器并设置 isScrolling 为 false
+        window.cancelAnimationFrame(vm.timeoutId);
+        vm.isScrolling  = false;
+      }
+    });
+
+
+  },
+  methods:{
+    scrollToTop() {
+      const c = document.documentElement.scrollTop || document.body.scrollTop;
+      if (c > 0) {
+        this.timeoutId = window.requestAnimationFrame(this.scrollToTop);
+        window.scrollTo(0, c - c / 4);
+        this.isScrolling = true;
+      }else {
+        this.isScrolling = false;
+      }
+    },
+    handleClickIcon(val){
+        if(val.path === 'back'){
+          this.scrollToTop()
+        }else{
+          this.$router.push(val.path)
+        }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.shadow-box{
+  width: 64px;
+  height: 354px;
+  border-radius: 10px;
+  opacity: 1;
+
+  background: #FFFFFF;
+
+  box-shadow: 0px 1px 10px 0px rgba(154, 154, 154, 0.5);
+}
+.shadow-label{
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 16px;
+  text-align: center;
+  letter-spacing: 0px;
+  color: #666666;
+}
+.icon{
+  margin-top: 15px;
+  width: 20px;
+  height: 20px;
+  margin-bottom: 5px;
+}
+.shadow-item{
+  cursor: pointer;
+  flex-direction: column;
+  height: 70px;
+  >.line{
+    width: 34px;
+    height: 1px;
+    opacity: 1;
+    margin-top: 17px;
+    border: 0.7px solid #EAEAEA;
+  }
+}
+</style>
--- a/buyer/src/components/footer/Footer.vue
+++ b/buyer/src/components/footer/Footer.vue
@@ -3,20 +3,20 @@
    <footer class="footer">
      <div class="clearfix"></div>
      <div class="icon-row">
-        <div class="footer-icon">
-          <h5 class="footer-icon-child"></h5>
+        <div class="footer-icon flex flex-a-c">
+          <h5 class="footer-icon-child">多</h5>
          <span class="footer-icon-text">品类齐全，轻松购物</span>
        </div>
-        <div class="footer-icon">
-          <h5 class="footer-icon-child footer-icon-child-2"></h5>
+        <div class="footer-icon flex flex-a-c">
+          <h5 class="footer-icon-child footer-icon-child-2">快</h5>
          <span class="footer-icon-text">多仓直发，极速配送</span>
        </div>
-        <div class="footer-icon">
-          <h5 class="footer-icon-child footer-icon-child-3"></h5>
+        <div class="footer-icon flex flex-a-c">
+          <h5 class="footer-icon-child footer-icon-child-3">好</h5>
          <span class="footer-icon-text">正品行货，精致服务</span>
        </div>
-        <div class="footer-icon">
-          <h5 class="footer-icon-child footer-icon-child-4"></h5>
+        <div class="footer-icon flex flex-a-c">
+          <h5 class="footer-icon-child footer-icon-child-4">省</h5>
          <span class="footer-icon-text">天天低价，畅选无忧</span>
        </div>
      </div>
@@ -29,18 +29,39 @@
          </div>
        </div>
        <div class="clearfix"></div>
-        <div class="friend-link">
+        <div class="friend-link flex">
          <div class="friend-link-item">
            <ul>
              <li v-for="(link, index) in moreLink" :key="index" @click="goArticle">
                <span class="link-item" :class="{'link-last-item': index === 4}">{{link}}</span>
              </li>
+
            </ul>
+
          </div>
+
+          </div>
+        <div class="information footer-bottmom">
+          <div class="icp">
+            <li v-if="config.icpCard">
+              <a :href='"https://tsm.miit.gov.cn/dxxzsp/xkz/xkzgl/resource/qiyesearch.jsp?num="+config.icpCard+"&type=xuke"' target="_blank">
+                {{config.icpCard}}
+              </a>
+            </li>
+            <li v-if="config.icpMessage" class="footer-bottmom">
+              <a href="https://beian.miit.gov.cn/" target="_blank">
+                {{config.icpMessage}}
+              </a>
+            </li>
+          </div>
+          <a class="flex " :href="config.company.href">
+            <img class="zhizhao" src="@/assets/images/zhizhao.jpg" mode="" />{{config.company.name}}
+          </a>
        </div>
+
        <div class="clearfix"></div>
        <div class="copyright">
-          <p>Copyright © LILI</p>
+          <p>Copyright © {{year}} {{config.title}}</p>
        </div>
      </div>
    </footer>
@@ -48,27 +69,32 @@
 </template>

 <script>
+
 export default {
-  name: 'Footer',
-  data () {
+  name: "Footer",
+  data() {
    return {
-      guideArr: [ // 导航链接
-        [ '购物指南', '购物流程', '会员介绍', '生活旅行', '常见问题', '大家电', '联系客服' ],
-        [ '配送方式', '上门自提', '211限时达', '配送服务查询', '收取标准', '海外配送' ],
-        [ '支付方式', '货到付款', '在线支付', '分期付款', '邮局汇款', '公司转账' ],
-        [ '售后服务', '售后政策', '价格保护', '退款说明', '返修/退换货', '取消订单' ]
+      config:require('@/config'),
+      guideArr: [
+        // 导航链接
+        ["购物指南", "购物流程", "会员介绍", "生活旅行", "常见问题"],
+        ["配送方式", "上门自提", "配送查询", "收取标准", "物流规则"],
+        ["支付方式", "在线支付", "公司转账", "余额支付", "积分支付"],
+        ["售后服务", "售后政策", "退款说明", "返修/退货", "取消订单"],
      ],
-      moreLink: ['关于我们', '联系我们', '联系客服', '商家帮助', '隐私政策'] // 更多链接
+      moreLink: ["关于我们", "联系我们", "联系客服", "商家帮助", "隐私政策"], // 更多链接
+      year: new Date().getFullYear(), // 当前年份
    };
  },
  methods: {
-    goArticle () { // 跳转文章页
+    goArticle() {
+      // 跳转文章页
      let routeUrl = this.$router.resolve({
-        path: '/article'
-      })
-      window.open(routeUrl.href, '_blank')
-    }
-  }
+        path: "/article",
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+  },
 };
 </script>

@@ -76,84 +102,117 @@ export default {
 /*****************************底 部 开 始*****************************/
 .footer {
  width: 100%;
-  height: 450px;
-  padding-top: 30px;
-
-  @include background_color($light_background_color);
-
+  height: 370px;
+  background: #FFFFFF;
 }
 .icon-row {
-  margin: 15px auto;
-  padding-top: 8px;
-  width: 1000px;
-  height: 64px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 1056px;
+  height: 71px;
+  margin: 0 auto;
 }
 .footer-icon {
-  margin-left: 17px;
-  margin-right: 17px;
  float: left;
 }
 .footer-icon-child {
-  margin-top: 10px;
  overflow: hidden;
-  position: absolute;
-  width: 36px;
-  height: 42px;
-  background-image: url("../../assets/images/footer/ico_service.png");
-  text-indent: -999px;
+  width: 36.4px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 18.2px;
+  font-weight: normal;
+  color: #333;
+  height: 36.4px;
+  border: 1.4px solid #CECECE;
+  border-radius: 50%;
 }
-.footer-icon-child-2 {
-  background-position: 0 -43px;
+
+.icp {
+  margin-right: 30px !important;
+  >*{
+    margin: 0 4px;
+  }
+  flex-direction: column;
 }
-.footer-icon-child-3 {
-  background-position: 0 -86px;
+.flex{
+  display: flex;
+  align-items: center;
+  >img{
+    margin-right: 4px;
+  }
 }
-.footer-icon-child-4 {
-  background-position: 0 -129px;
-}
- .footer-icon-text{
-  margin-left: 45px;
-  font-size: 18px;
-  font-weight: bold;
-  line-height: 64px;
+.footer-icon-text {
+  margin-left: 11px;
+  font-size: 16px;
+
+  font-weight: normal;
+
+  text-align: center;
 }
 .service-intro {
  width: 100%;
  border-top: 1px solid $border_color;
 }
 .servece-type {
-  margin: 15px auto;
-  height: 200px;
-  width: 800px;
+  width: 952px;
+  margin: 22px auto 10px auto;
  display: flex;
  flex-direction: row;
  justify-content: space-between;
-}

+}
+.servece-type-info{
+
+}
 .servece-type-info ul {
  list-style: none;
 }
 .servece-type-info li {
-  font-size: 14px;
+  font-size: 12px;
  cursor: pointer;
-  line-height: 26px;
+  font-weight: normal;
+  line-height: 15px;
+  text-align: center;
+  margin-bottom: 13px;
+  color: #333;
 }
+
 .servece-type-info li:first-child {
-  font-size: 16px;
-  line-height: 28px;
-  font-weight: bold;
+  font-size: 14.82px;
+  font-weight: normal;
+  line-height: 18px;
+
+  letter-spacing: 0px;
+  margin-bottom: 17px;
+  color: #333333;
 }

 .friend-link {
  display: flex;
-  align-items: center;
+  align-items: flex-start;
+  justify-content: center;
  width: 908px;
-  height: 30px;
+  padding: 10px 0;
  margin: 0px auto;
  border-top: 1px solid $border_color;
 }
-.friend-link-item {
-  margin: 0px auto;
+.information {
+  margin-top: 23px;
+  margin-bottom: 21px;
+  display: flex;
+  justify-content: center;
+
+}
+a{
+  color: #3457FF;
+}
+.zhizhao {
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
 }
 .friend-link-item ul {
  list-style: none;
@@ -161,29 +220,45 @@ export default {
 .friend-link-item li {
  padding: 5px 0px;
  float: left;
+  margin-right: 59px;
+  font-weight: normal;
+  line-height: 13px;
+  color: #333333;
 }
+
+
+
 .link-item {
  padding: 0px 8px;
  cursor: pointer;
-  border-right: 1px solid $border_color;
+
 }
 .link-last-item {
  border: none;
 }
 .copyright {
  width: 100%;
-  line-height: 30px;
+  cursor: pointer;
  text-align: center;
+  height:25px;
+  opacity: 1;
+  margin-bottom: 12px;
+  font-size: 12px;
+  font-weight: normal;
+  line-height: 13px;
+
+  letter-spacing: 0px;
+
+  color: #959595;
 }
-.copyright a{
-  color: #232323;
-  font-size: 20px;
+
+.footer-icon-text {
+  @include title_color($light_title_color);
 }
-.footer-icon-text{
-  @include title_color($light_title_color)
-}
-.copyright,.friend-link,.servece-type-info {
-  @include sub_color($light_sub_color)
+.copyright,
+.friend-link,
+.servece-type-info {
+  @include sub_color($light_sub_color);
 }
 /*****************************底 部 结 束*****************************/
 </style>
--- a/buyer/src/components/global.js
+++ b/buyer/src/components/global.js
@@ -7,7 +7,7 @@ import FixedTopPage from '@/components/advertising/FixedTop'; // 顶部广告
 import Footer from '@/components/footer/Footer'; // 底部栏
 import Search from '@/components/Search' // 搜索框
 import card from '@/components/card' // 个人中心 卡片
-import cateNav from '@/components/nav/cateNav' // 个人中心 卡片
+import cateNav from '@/components/nav/CateNav' // 个人中心 卡片

 empty.install = function (Vue) {
  Vue.component('empty', empty);
--- a/buyer/src/components/goodsDetail/Promotion.vue
+++ b/buyer/src/components/goodsDetail/Promotion.vue
@@ -8,7 +8,7 @@
      <div v-else>{{end}}</div>
    </div>
    <span v-else class="cart-promotion">
-      <span v-if="end === ''">据活动结束：<span>{{ hours }}</span> : <span>{{ minutes }}</span> : <span>{{ seconds }}</span></span>
+      <span v-if="end === ''">距活动结束：<span>{{ hours }}</span> : <span>{{ minutes }}</span> : <span>{{ seconds }}</span></span>
      <span v-else>活动已结束</span>
    </span>
  </div>
--- a/buyer/src/components/goodsDetail/ShowGoods.vue
+++ b/buyer/src/components/goodsDetail/ShowGoods.vue
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -1,29 +1,12 @@
 <template>
-  <div>
+  <div style="height:auto;">
    <div class="item-intro-show">
-      <!-- <div class="item-intro-recommend">
-        <div class="item-recommend-title">
-          <p>店铺热销</p>
-        </div>
-        <div class="item-intro-recommend-column">
-          <div class="item-recommend-column" v-for="(item, index) in hotList" :key="index">
-            <div class="item-recommend-img">
-              <img :src="item.img" alt="">
-            </div>
-            <div class="item-recommend-intro">
-              <span>
-                <span class="item-recommend-top-num">{{index + 1}}</span> 热销{{item.sale}}件</span>
-              <span class="item-recommend-price">￥{{item.price | unitPrice}}</span>
-            </div>
-          </div>
-        </div>
-      </div> -->
      <div class="item-intro-detail" ref="itemIntroDetail">
        <div class="item-intro-nav item-tabs">
          <Tabs :animated="false" @on-click="tabClick">
            <TabPane label="商品介绍">
              <div class="item-intro-img" ref="itemIntroGoods">
-                <div v-html="skuDetail.intro" v-if="skuDetail.intro"></div>
+                <div class="item-intro" v-html="skuDetail.intro" v-if="skuDetail.intro"></div>
                <div v-else style="margin:20px;">暂无商品介绍</div>
              </div>
            </TabPane>
@@ -31,8 +14,8 @@
              <div class="remarks-container" ref="itemGoodsComment">
                <div class="remarks-analyse-box">
                  <div class="remarks-analyse-goods">
-                    <i-circle :percent="skuDetail.grade || 100" stroke-color="#5cb85c">
-                      <span class="remarks-analyse-num">{{skuDetail.grade || 100}}%</span>
+                    <i-circle :percent="skuDetail.grade" stroke-color="#5cb85c">
+                      <span class="remarks-analyse-num">{{skuDetail.grade}}%</span>
                      <p class="remarks-analyse-title">好评率</p>
                    </i-circle>
                  </div>
@@ -64,6 +47,7 @@
                        <img :src="img" alt="">
                      </div>
                    </div>
+
                    <div class="preview-img"  v-if="item.previewImg"  @click.prevent="hidePreviewImg(item)">
                      <div>
                        <span @click.stop="rotatePreviewImg(0, item)"><Icon type="md-refresh" />左转</span>
@@ -75,6 +59,22 @@
                      <span class="remarks-item">{{item.goodsName}}</span>
                      <span class="remarks-time">{{item.createTime}}</span>
                    </p>
+
+                    <!-- 商家回复 -->
+                    <div class="reply" v-if="item.reply">
+                      <p>商家回复</p>
+                      <div>
+                        <p class="remarks-content">{{ item.reply }}</p>
+                        <div>
+                          <div class="comment-img" v-if="item.replyImage">
+                            <div v-for="(img, imgIndex) in item.replyImage.split(',')"  @click="$previewImage(img)" :key="imgIndex">
+                              <img :src="img" alt="">
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+
                  </div>
                </div>
                <div class="remarks-page">
@@ -87,12 +87,17 @@
              </div>
            </TabPane>
            <TabPane label="商品参数">
-              <table class="mt_10" border="1" cellpadding='0' cellspacing="0" v-if="skuDetail.goodsParamsList && skuDetail.length">
-                <tr v-for="param in skuDetail.goodsParamsList" :key="param">
-                  <td>{{param.paramName}}</td><td>{{param.paramValue}}</td>
-                </tr>
-              </table>
-              <!-- <div v-else>暂无商品参数</div> -->
+              <template v-if="detail.goodsParamsDTOList && detail.goodsParamsDTOList.length">
+                <div class="goods-params" style="height:inherit;" v-for="item in detail.goodsParamsDTOList" :key="item.groupId">
+                  <span class="ml_10">{{item.groupName}}</span>
+                  <table class="mb_10" cellpadding='0' cellspacing="0" >
+                    <tr v-for="param in item.goodsParamsItemDTOList" :key="param.paramId">
+                      <td style="text-align: center">{{param.paramName}}</td><td>{{param.paramValue}}</td>
+                    </tr>
+                  </table>
+                </div>
+              </template>
+              <div v-else>暂无商品参数</div>
            </TabPane>
          </Tabs>
        </div>
@@ -126,12 +131,13 @@ export default {
    };
  },
  computed: {
-    skuDetail () { // skuId
+    // 商品详情
+    skuDetail () {
      return this.detail.data;
    }
  },
  methods: {
-    changeHeight (name) {  // 设置商品详情高度
+    changeHeight (name) { // 设置商品详情高度
      let heightCss = window.getComputedStyle(this.$refs[name]).height;
      heightCss = parseInt(heightCss.substr(0, heightCss.length - 2)) + 89;
      this.$refs.itemIntroDetail.style.height = heightCss + 'px';
@@ -217,17 +223,26 @@ export default {
    });
    window.addEventListener('scroll', this.handleScroll)
    this.getList();
-  },
+    if (this.skuDetail.grade === null || this.skuDetail.grade === undefined) {
+      this.skuDetail.grade = 100
+    }
+  }
 };
 </script>

 <style scoped lang="scss">
+.item-intro{
+  >img{
+    display:block;
+  }
+}
 /***************商品详情介绍和推荐侧边栏开始***************/
 .item-intro-show{

  width: 1200px;
  margin: 15px auto;
  display: flex;
+  overflow-x: hidden;
  flex-direction: row;

 }
@@ -311,6 +326,9 @@ export default {
 .item-intro-img {
  width: 100%;
  min-height: 300px;
+  ::v-deep img{
+    margin:0 auto;
+  }
 }
 .item-intro-img img{
  max-width: 1000px;
@@ -401,7 +419,8 @@ export default {
      margin-right: 5px;
      width: 50px;
      height: 50px;
-      img{width: 100%;}
+      overflow: hidden;
+      img{width: 100%;height: 100%;}
    }
  }
  .preview-img{
@@ -428,9 +447,6 @@ export default {
      }
    }

-    img:hover{
-      cursor: url(require('../../../static/small.cur')),auto;
-    }
  }
 }

@@ -456,7 +472,7 @@ export default {
 .ivu-tabs-ink-bar {
  background-color: $theme_color !important;
 }
-/deep/.ivu-tabs-bar{
+::v-deep.ivu-tabs-bar{
  border: none;
 }
 .item-tabs > .ivu-tabs > .ivu-tabs-bar .ivu-tabs-tab{
@@ -484,17 +500,33 @@ export default {
  color: $theme_color;
 }
 table{
-  border-color: #eee;
+  border-color:#efefef;
  color: #999;
-  width: 70%;
-  margin-left: 10px;
+  min-width: 30%;
+  margin-left: 30px;
+  font-size: 12px;
  tr{
    td:nth-child(1){
-      width: 200px;
+      width: 100px;
+    }
+    td:nth-child(2){
+      padding-left: 20px;
    }
  }
  td{
-    padding: 5px;
+    padding: 6px;
  }
 }
+.goods-params {
+  display: flex;
+  border-bottom: 1px solid #eee;
+  margin-left: 30px;
+  span{color:#999}
+}
+.reply{
+  >*{
+    margin: 4px;
+  }
+
+}
 </style>
--- a/buyer/src/components/header/Header.vue
+++ b/buyer/src/components/header/Header.vue
@@ -1,56 +1,54 @@
 <template>
  <div class="box">
-    <div class="nav">
-      <ul class="location">
-        <li>
-          <router-link to="/" v-if="$route.path !== '/'" class="home-page">
-            <Icon type="md-home" />首页
-          </router-link>
+    <div class="nav width_1200_auto">
+      <ul class="location flex">
+        <li v-if="$route.path.includes('home')" style="margin-left:10px">
+          <router-link to="/">首页</router-link>
        </li>
+        <ul class="flex">
+          <li>Hi，欢迎来到{{ config.title }}</li>
+          <li class="first" v-show="!userInfo.username">
+            <router-link :to="`/signUp`" class="nav-item">
+              <span>立即注册</span>
+            </router-link>
+          </li>
+          <li v-show="!userInfo.username">
+            <router-link class="nav-item" :to="`/login?rePath=${$route.path}&query=${JSON.stringify($route.query)}`">
+              <span>请登录</span>
+            </router-link>
+          </li>
+        </ul>
      </ul>
-      <ul class="detail">
-        <li class="first" v-show="!userInfo.username">
-          <router-link :to="`/login?rePath=${$route.path}&query=${JSON.stringify($route.query)}`">
-            <span style="border:none" class="tipsLogin">请登录</span>
-          </router-link>
-        </li>
+      <ul class="detail flex">
        <li v-show="!!userInfo.username">
-          <Dropdown>
-            <p class="username-p">
-              <Avatar class="person-icon" :src="userInfo.face" icon="person" size="small" />
-              <span class="username">{{ userInfo.nickName? userInfo.nickName : userInfo.username | secrecyMobile }}</span>
-            </p>
-            <DropdownMenu slot="list">
-              <div class="my-page">
-                <div class="my-info" @click="myInfo">
-                  <Icon type="md-home"></Icon>
-                  <p>我的主页</p>
-                </div>
-                <div class="sign-out" @click="signOutFun">
-                  <Icon type="md-exit"></Icon>
-                  <p>退出登录</p>
-                </div>
-              </div>
-            </DropdownMenu>
-          </Dropdown>
+          <div class="username-p">
+            <div>
+              <Avatar class="person-icon" :src="userInfo.face" icon="person" size="small"/>
+              <span class="username">{{
+                  userInfo.nickName ? userInfo.nickName : userInfo.username | secrecyMobile
+                }}</span>
+            </div>
+            <transition name='fade'>
+              <ul class="drop-items">
+                <li @click="goUserCenter('/home')">我的主页</li>
+                <li @click="goUserCenter('/home/Coupons')">优惠券</li>
+                <li @click="goUserCenter('/home/Favorites')">我的收藏</li>
+                <li @click="signOutFun">退出登录</li>
+              </ul>
+            </transition>
+          </div>
        </li>
-        <li @click="goUserCenter('/home/MyOrder')"><span class="nav-item hover-color">我的订单</span></li>
-        <li @click="goUserCenter('/home/MyTracks')"><span class="nav-item hover-color">我的足迹</span></li>
-        <li @click="goUserCenter('/home/MsgList')"><span class="nav-item hover-color">我的消息</span></li>
+        <li @click="goUserCenter('/home/MyOrder')"><span class="nav-item">我的订单</span></li>
+        <li @click="goUserCenter('/home/MyTracks')"><span class="nav-item">我的足迹</span></li>
+        <li @click="goUserCenter('/home/MsgList')"><span class="nav-item">我的消息</span></li>
        <li v-if="$route.name !== 'Cart'" style="position:relative;">
-          <i class="cart-badge" v-show="Number(cartNum)">{{cartNum < 100 ? cartNum : '99'}}</i>
          <Dropdown placement="bottom-start">
            <router-link to="/cart" target="_blank">
-              <span @mouseenter="getCartList">
-                <Icon
-                  size="18"
-                  type="ios-cart-outline"
-                ></Icon>
-                购物车
+              <span class="nav-item" @mouseenter="getCartList">
+                <Icon size="18" type="ios-cart-outline"></Icon>
+                购物车（{{ cartNum < 100 ? cartNum : '99' }}）
              </span>
-
            </router-link>
-
            <DropdownMenu slot="list">
              <div class="shopping-cart-null" style="width:200px" v-show="shoppingCart.length <= 0">
                <Icon type="ios-cart-outline" class="cart-null-icon"></Icon>
@@ -60,25 +58,25 @@
              <div class="shopping-cart-list" v-show="shoppingCart.length > 0">
                <div class="shopping-cart-box" v-for="(item, index) in shoppingCart" @click="goToPay" :key="index">
                  <div class="shopping-cart-img">
-                    <img :src="item.goodsSku.thumbnail" class="hover-pointer" />
+                    <img :src="item.goodsSku.thumbnail" class="hover-pointer"/>
                  </div>
                  <div class="shopping-cart-info">
                    <div class="shopping-cart-title ">
                      <p class="hover-pointer goods-title ellipsis">{{ item.goodsSku.goodsName }}</p>
                    </div>
                    <div class="shopping-cart-detail">
-                      <p>
+                      <div>
                        数量:
                        <span class="shopping-cart-text">{{ item.num }}</span>
-                        价钱:
-                        <span class="shopping-cart-text">{{ item.purchasePrice | unitPrice('￥') }}</span>
-                      </p>
+
+                      </div>
+                      <div class="shopping-price">
+                        {{ item.purchasePrice | unitPrice('￥') }}
+                      </div>
                    </div>
                  </div>
                </div>
-                <div class="go-to-buy">
-                  <Button type="error" size="small" @click="goToPay">去结账</Button>
-                </div>
+
              </div>
            </DropdownMenu>
          </Dropdown>
@@ -86,94 +84,94 @@
        <li>
          <span class="nav-item" @click="shopEntry">店铺入驻</span>
        </li>
-        <!-- <li>
-          <router-link to="/feedback">意见反馈</router-link>
-        </li>-->
+
      </ul>
    </div>
  </div>
 </template>

 <script>
-import storage from "@/plugins/storage.js";
-import { cartGoodsAll } from "@/api/cart.js";
+import storage from '@/plugins/storage.js';
+import {cartGoodsAll} from '@/api/cart.js';
+import {logout} from '@/api/account.js';
+
+
 export default {
-  name: "M-Header",
+  name: 'M-Header',
  created() {
-    if (storage.getItem("userInfo")) {
-      this.userInfo = JSON.parse(storage.getItem("userInfo"));
+    if (storage.getItem('userInfo')) {
+      this.userInfo = JSON.parse(storage.getItem('userInfo'));
    }
  },

  data() {
    return {
-      // 主题颜色切换
-      themeType: "light",
+      config: require('@/config'),
      userInfo: {}, // 用户信息
-      shoppingCart: [], // 购物车
+      shoppingCart: [] // 购物车
    };
  },
  computed: {
+    // 购物车商品数量
    cartNum() {
      return this.$store.state.cartNum;
-    },
+    }
  },
  methods: {
-    changeCity (city) { // 选择所在城市
-      this.city = city;
-    },
-    goToPay () { // 跳转购物车
+    goToPay() { // 跳转购物车
      let url = this.$router.resolve({
-        path: "/cart",
+        path: '/cart'
      });
-      window.open(url.href, "_blank");
+      window.open(url.href, '_blank');
    },
-    myInfo () { // 跳转会员中心
+    myInfo() { // 跳转会员中心
      let url = this.$router.resolve({
-        path: "/home",
+        path: '/home'
      });
-      window.open(url.href, "_blank");
+      window.open(url.href, '_blank');
    },
-    signOutFun () { // 退出登录
-      storage.removeItem('accessToken');
-      storage.removeItem('refreshToken');
-      storage.removeItem('userInfo');
-      storage.removeItem('cartNum');
-      this.$store.commit('SET_CARTNUM', 0)
-      this.$router.push('/login');
+    signOutFun() { // 退出登录
+      logout().then(res => {
+        storage.removeItem('accessToken');
+        storage.removeItem('refreshToken');
+        storage.removeItem('userInfo');
+        storage.removeItem('cartNum');
+        this.$store.commit('SET_CARTNUM', 0)
+        this.$router.push('/login');
+      });
    },
    goUserCenter(path) {
-      // 跳转我的订单，我的足迹
+      // 跳转我的订单，我的足迹、收藏等
      if (this.userInfo.username) {
-        this.$router.push({ path: path });
+        this.$router.push({path: path});
      } else {
        this.$Modal.confirm({
-          title: "请登录",
-          content: "<p>请登录后执行此操作</p>",
-          okText: "立即登录",
-          cancelText: "继续浏览",
+          title: '请登录',
+          content: '<p>请登录后执行此操作</p>',
+          okText: '立即登录',
+          cancelText: '继续浏览',
          onOk: () => {
            this.$router.push({
-              path: "/login",
+              path: '/login',
              query: {
                rePath: this.$router.history.current.path,
-                query: JSON.stringify(this.$router.history.current.query),
-              },
+                query: JSON.stringify(this.$router.history.current.query)
+              }
            });
-          },
+          }
        });
      }
    },
    shopEntry() {
      // 店铺入驻
-      if (storage.getItem("accessToken")) {
+      if (storage.getItem('accessToken')) {
        let routeUrl = this.$router.resolve({
-          path: "/shopEntry",
-          query: { id: 1 },
+          path: '/shopEntry',
+          query: {id: 1}
        });
-        window.open(routeUrl.href, "_blank");
+        window.open(routeUrl.href, '_blank');
      } else {
-        this.$router.push("login");
+        this.$router.push('login');
      }
    },
    getCartList() {
@@ -181,118 +179,98 @@ export default {
      if (this.userInfo.username) {
        cartGoodsAll().then((res) => {
          this.shoppingCart = res.result.skuList;
-          this.$store.commit("SET_CARTNUM", this.shoppingCart.length);
-          this.Cookies.setItem("cartNum", this.shoppingCart.length);
+          this.$store.commit('SET_CARTNUM', this.shoppingCart.length);
+          this.Cookies.setItem('cartNum', this.shoppingCart.length);
        });
      }
-    },
-  },
+    }
+  }
 };
 </script>

 <style scoped lang="scss">
-.shopping-cart-detail,
-.shopping-cart-text,
-.shopping-cart-info,
-.nav a,
-.location,
-.first,
-.username,
-.shopping-cart-null span {
-  @include sub_color($light_sub_color);
-}
-.tipsLogin {
-  color: $theme_color;
-}

 .box {
  width: 100%;
-  // height: 35px;
-  @include background_color($light_white_background_color);
+  font-size: 12px !important;
+   height: 36px;
+  background: #333;
+  color: #fff;
 }
+
 .nav {
-  margin: 0 auto;
-  width: 1200px;
  display: flex;
  flex-direction: row;
  justify-content: space-between;
+
 }
+
 .nav ul {
  list-style: none;
 }
+
 .nav li {
+  cursor: pointer;
  float: left;
-  font-size: 14px;
-  line-height: 35px;
-  margin-right: 10px;
-  font-weight: bold;
+  line-height: 36px;
+  margin-right: 15px;
+
 }
+
 .nav a,
 .nav-item {
+  font-size: 13px;
+  font-weight: normal;
  text-decoration: none;
-  padding-left: 10px;
-  border-left: 1px solid #ccc;
-  color: #999;
+
  cursor: pointer;
+  color: #fff;
 }
+
+.nav-item {
+  padding-left: 20px;
+}
+
 .location a {
  border-left: none;
 }
-.nav a:hover {
-  color: $theme_color;
-}
+

 .icon {
  color: gray;
  vertical-align: middle;
 }

-.first a:first-child {
-  padding-left: 3px;
-  border-left: none;
-}
 .city {
  padding: 10px 15px;
 }
+
 .city-item {
  font-weight: bold;
  cursor: pointer;
  padding: 5px;
 }
+
 .city-item:hover {
  color: $theme_color;
 }
+
 .person-icon {
  color: $theme_color;
  background-color: #f0cdb2;
 }

-.shopping-cart-list {
-  padding: 10px 15px;
-  box-sizing: border-box;
-  max-height: 300px;
-  overflow: scroll;
-}
-.shopping-cart-box {
-  margin: 8px 0px;
-  margin-top: 15px;
-  padding-bottom: 15px;
-  height: 40px;
-  display: flex;
-  align-items: center;
-  border-bottom: 1px #ccc dotted;
-}
-.shopping-cart-box:first-child {
-  margin-top: 8px;
-}
+
 .shopping-cart-img {
  margin-right: 15px;
  width: 40px;
  height: 40px;
 }
+
 .shopping-cart-img img {
  width: 100%;
 }
+
 .shopping-cart-info {
  display: flex;
  flex-direction: column;
@@ -304,10 +282,7 @@ export default {
  line-height: 20px;
 }

-.go-to-buy {
-  display: flex;
-  justify-content: flex-end;
-}
+
 .shopping-cart-null {
  padding: 15px;
  display: flex;
@@ -315,17 +290,88 @@ export default {
  align-items: center;
  justify-content: center;
 }
+
 .cart-null-icon {
  font-size: 38px;
  margin-bottom: 15px;
 }
+
 .shopping-cart-null span {
  font-size: 12px;
  line-height: 16px;
 }
+
 .username-p {
-  cursor: pointer;
+  position: relative;
+
+  div {
+    cursor: pointer;
+
+    > span {
+      margin-left: 5px;
+    }
+  }
+
+  .drop-items {
+    position: absolute;
+    display: none;
+    top: 45px;
+    left: 0;
+    right: 0;
+    margin: 0 auto;
+    padding: 5px 10px;
+    z-index: 20;
+    height: 150px;
+    background-color: #fff;
+    width: 80px;
+    border: 1px solid #eee;
+    box-shadow: 2px 2px 7px #999;
+
+    li {
+      color: rgb(107, 106, 106);
+      width: 100%;
+      border-bottom: 1px solid rgb(207, 206, 206);
+      font-weight: normal;
+      text-align: center;
+
+      &:last-child {
+        border: none;
+      }
+
+      &:hover {
+        cursor: pointer;
+        color: $theme_color;
+      }
+    }
+
+    &::before {
+      position: absolute;
+      top: -20px;
+      left: 30px;
+      content: '';
+      width: 0;
+      height: 0;
+      border: 10px solid #999;
+      border-color: transparent transparent #fff transparent;
+    }
+
+    &::after {
+      content: '';
+      position: absolute;
+      width: 80px;
+      height: 20px;
+      top: -20px;
+      left: 0;
+    }
+  }
+
+  &:hover {
+    .drop-items {
+      display: block;
+    }
+  }
 }
+
 .my-page {
  padding: 3px 5px;
  width: 180px;
@@ -334,11 +380,13 @@ export default {
  justify-content: center;
  align-items: center;
 }
+
 .my-page a {
  margin: 0px;
  padding: 0px;
  border: none;
 }
+
 .my-info {
  padding: 5px;
  width: 50%;
@@ -346,15 +394,19 @@ export default {
  text-align: center;
  cursor: pointer;
 }
+
 .my-info:hover {
  box-shadow: 0px 0px 5px #ccc;
 }
+
 .my-info i {
  font-size: 28px;
 }
+
 .my-info p {
  font-size: 12px;
 }
+
 .sign-out {
  padding: 5px;
  width: 50%;
@@ -362,18 +414,23 @@ export default {
  text-align: center;
  cursor: pointer;
 }
+
 .sign-out:hover {
  box-shadow: 0px 0px 5px $border_color;
 }
+
 .sign-out i {
  font-size: 28px;
 }
+
 .sign-out p {
  font-size: 12px;
 }
+
 .goods-title:hover {
  color: $theme_color;
 }
+
 .cart-badge {
  position: absolute;
  right: -8px;
@@ -389,4 +446,34 @@ export default {
  z-index: 3;
  top: 3px;
 }
+
+.shopping-cart-box {
+  padding: 8px 0;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  border-bottom: 1px #ccc dotted;
+}
+
+.shopping-cart-list {
+  padding: 10px 10px;
+  box-sizing: border-box;
+  max-height: 300px;
+  overflow-y: scroll;
+  color: #333;
+
+}
+
+.shopping-cart-detail {
+  color: #999;
+  font-size: 12px;
+
+}
+
+.shopping-price {
+  color: $theme_color;
+  font-size: 14px;
+  font-weight: bold;
+}
+
 </style>
--- a/buyer/src/components/header/ShopHeader.vue
+++ b/buyer/src/components/header/ShopHeader.vue
@@ -1,62 +0,0 @@
-<template>
-  <div class="shop-box">
-    <div class="shop-container">
-      <div class="shop-title-content">
-        <img class="hover-pointer" @click="linkTo(`/merchant?id=${storeDetail.storeId}`)" :src="storeDetail.storeLogo" height="40" alt="">
-        <p><router-link :to="`/merchant?id=${storeDetail.storeId}`">{{ storeDetail.storeName }}</router-link></p>
-        <div class="ml_20" v-html="storeDetail.storeDesc"></div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'ShopHeader',
-  props: {
-    detail: {
-      type: Object,
-      default: null
-    }
-  },
-  computed: {
-    storeDetail () { // 店铺详情
-      return this.detail;
-    }
-  }
-};
-</script>
-
-<style scoped>
-/* 店铺介绍 */
-.shop-box {
-  width: 100%;
-  height: 50px;
-  background-color: #484848;
-}
-
-.shop-container {
-  width: 1200px;
-  height: 100%;
-  margin: 0px auto;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  align-items: center;
-  color: #fff;
-}
-
-.shop-title-content {
-  display: flex;
-  align-items: center;
-}
-
-.shop-title-content p {
-  font-size: 20px;
-  margin-left: 20px;
-}
-.shop-title-content a {
-  color: #fff;
-}
-
-</style>
--- a/buyer/src/components/header/hoverSearch.vue
+++ b/buyer/src/components/header/hoverSearch.vue
@@ -1,93 +1,117 @@
 <template>
  <div class="scroll-show">
    <div class="content clearfix">
-      <cateNav class="cate" :showNavBar="false"></cateNav>
-      <Search class="search-con" :showLogo="false" :showTag="false"></Search>
-      <Icon type="ios-cart-outline" @click="goCartList" class="cart-icon"  @mouseenter.native="getCartList" />
-      <i class="cart-badge">{{cartNum < 100 ? cartNum : '99'}}</i>
+      <cateNav class="cate" :hover="true" :showNavBar="false"
+               useClass="fixed-show"></cateNav>
+      <Search
+        class="search-con"
+        :hover="true"
+        ref="search"
+        :showLogo="false"
+        :showTag="false"
+        useClass="fixed-show"
+      ></Search>
+      <div class="flex flex-a-c cart">
+        <Icon
+          type="ios-cart-outline"
+          @click="goCartList"
+          class="cart-icon"
+          @mouseenter.native="getCartList"
+        />
+        <i class="cart-badge">{{ cartNum < 100 ? cartNum : "99" }}</i>
+      </div>
    </div>
+
  </div>
 </template>
 <script>
-import {cartCount} from '@/api/cart.js'
-import storage from '@/plugins/storage.js';
+import { cartCount } from "@/api/cart.js";
+import storage from "@/plugins/storage.js";
 export default {
-  data () {
+  data() {
    return {
-      userInfo: {} // 用户信息
-    }
+      userInfo: {}, // 用户信息
+    };
  },
  computed: {
-    cartNum () { // 购物车数量
-      return this.$store.state.cartNum
-    }
+    cartNum() {
+      // 购物车商品数量
+      return this.$store.state.cartNum;
+    },
  },
  methods: {
-    goCartList () { // 跳转购物车页面
+    goCartList() {
+      // 跳转购物车页面
      let routerUrl = this.$router.resolve({
-        path: '/cart'
-      })
-      window.open(routerUrl.href, '_blank')
+        path: "/cart",
+      });
+      window.open(routerUrl.href, "_blank");
    },
-    getCartList () { // 获取购物车列表
-      if (storage.getItem('userInfo')) {
-        cartCount().then(res => {
-          this.$store.commit('SET_CARTNUM', res.result)
-          this.Cookies.setItem('cartNum', res.result)
-        })
+    getCartList() {
+      // 获取购物车列表
+      if (storage.getItem("userInfo")) {
+        cartCount().then((res) => {
+          this.$store.commit("SET_CARTNUM", res.result);
+          this.Cookies.setItem("cartNum", res.result);
+        });
      }
+    },
+  },
+  mounted() {
+
+    if (storage.getItem("userInfo")) {
+      this.userInfo = JSON.parse(storage.getItem("userInfo"));
    }
  },
-  mounted () {
-    if (storage.getItem('userInfo')) {
-      this.userInfo = JSON.parse(storage.getItem('userInfo'));
-    }
-  }
-}
+};
 </script>
 <style lang="scss" scoped>
-  .content{
-    width: 1200px;
-    height: 40px;
-    margin: 10px auto;
-    position: relative;
-  }
-  .cate {
-    float: left;
-    width: 200px!important;
-  }
-  .search-con{
-    float: left;
-    width: 800px;
-    overflow: hidden;
-    margin-top: -27px;
-  }
-  .cart-icon {
-    width: 30px;
-    float: left;
-    font-size: 25px;
-    margin-top: 8px;
-    color: $theme_color;
-    z-index: 1;
-    position: relative;
-    &:hover{
-      cursor: pointer;
-    }
-  }
-  .cart-badge {
-    position: absolute;
-    font-style: normal;
-    right: 165px;
-    display: block;
-    background-color: $theme_color;
-    color: #fff;
-    font-size: 12px;
-    width: 17px;
-    height: 17px;
-    border-radius: 10px;
-    line-height: 17px;
-    text-align: center;
-    z-index: 5;
-    top: 3px;
+
+.content {
+  width: 1200px;
+  height: 40px;
+  margin: 0 auto;
+  position: relative;
+}
+.cate {
+  float: left;
+  width: 200px !important;
+}
+.search-con {
+  float: left;
+  width: 800px;
+  overflow: hidden;
+  margin-top: -27px;
+}
+.cart{
+  height: 60px;
+}
+.cart-icon {
+  width: 30px;
+  float: left;
+  font-size: 25px;
+
+  color: $theme_color;
+  z-index: 1;
+  position: relative;
+  &:hover {
+    cursor: pointer;
  }
+}
+.cart-badge {
+  position: absolute;
+  font-style: normal;
+  right: 165px;
+  display: block;
+  background-color: $theme_color;
+  color: #fff;
+  font-size: 12px;
+  width: 17px;
+  height: 17px;
+  border-radius: 10px;
+  line-height: 17px;
+  text-align: center;
+  z-index: 5;
+  top: 10px;
+}
 </style>
--- a/buyer/src/components/indexDecorate/ModelForm.vue
+++ b/buyer/src/components/indexDecorate/ModelForm.vue
@@ -14,7 +14,7 @@
  </div>
 </template>
 <script>
-import ModelFormItem from './modelFormItem.vue';
+import ModelFormItem from './ModelFormItem.vue';
 export default {
  name: 'modelForm',
  components: {
@@ -25,9 +25,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .model-content {
-  width: 1200px;
-  margin: 0 auto;
-  background: #fff;
+  width: 100%;
  min-height: 1200px;
 }
 </style>
--- a/buyer/src/components/indexDecorate/ModelFormItem.vue
+++ b/buyer/src/components/indexDecorate/ModelFormItem.vue
@@ -0,0 +1,237 @@
+<template>
+  <div class="model-item" v-if="element && element.key">
+    <!-- 轮播图模块，包括个人信息，快捷导航模块 -->
+    <template v-if="element.type == 'carousel'">
+      <model-carousel
+        :data="element"
+        class="mb_20 width_1200_auto"
+      ></model-carousel>
+    </template>
+    <template v-if="element.type == 'carousel1'">
+      <model-carousel1 :data="element" class="mb_20"></model-carousel1>
+    </template>
+    <template v-if="element.type == 'carousel2'">
+      <model-carousel2
+        :data="element"
+        class="mb_20 width_1200_auto"
+      ></model-carousel2>
+    </template>
+    <!-- 热门广告 -->
+    <template v-if="element.type == 'hotAdvert'">
+      <div class="mb_20 width_1200_auto">
+        <img
+          style="display: block"
+          class="hover-pointer"
+          :src="element.options.list[0].img"
+          @click="linkTo(element.options.list[0].url)"
+          width="1200"
+          alt=""
+        />
+      </div>
+      <ul class="advert-list width_1200_auto">
+        <template v-for="(item, index) in element.options.list">
+          <li
+            v-if="index !== 0"
+            @click="linkTo(item.url)"
+            class="hover-pointer"
+            :key="index"
+          >
+            <img :src="item.img" width="230" height="190" alt="" />
+          </li>
+        </template>
+      </ul>
+    </template>
+    <!-- 限时秒杀 待完善 -->
+    <template v-if="element.type == 'seckill' && element.options.list.length">
+      <seckill :data="element" class="mb_20 width_1200_auto"></seckill>
+    </template>
+    <!-- 折扣广告 -->
+    <template v-if="element.type == 'discountAdvert'">
+      <div
+        class="discountAdvert"
+        :style="{
+          backgroundImage:
+            'url(' + require('@/assets/images/decorate.png') + ')',
+        }"
+      >
+        <img
+          @click="linkTo(item.url)"
+          class="hover-pointer"
+          v-for="(item, index) in element.options.classification"
+          :key="index"
+          :src="item.img"
+          width="190"
+          height="210"
+          alt=""
+        />
+        <img
+          @click="linkTo(item.url)"
+          class="hover-pointer"
+          v-for="(item, index) in element.options.brandList"
+          :key="'discount' + index"
+          :src="item.img"
+          width="240"
+          height="105"
+          alt=""
+        />
+      </div>
+    </template>
+
+    <!-- 好货推荐 -->
+    <template v-if="element.type == 'recommend'">
+      <recommend :data="element" class="mb_20 width_1200_auto"></recommend>
+    </template>
+
+    <!-- 一行三列 -->
+    <template v-if="element.type == 'oneRowThreeColumns'">
+      <oneRowThreeColumns :data="element" class="mb_20 width_1200_auto"></oneRowThreeColumns>
+    </template>
+    <!-- 商品模块 -->
+    <template v-if="element.type == 'goodsType'">
+      <goodsAndType :paramData="element" class="mb_20 width_1200_auto"></goodsAndType>
+    </template>
+    <!-- 商品模块 -->
+    <template v-if="element.type == 'onlyGoodsModel'">
+      <onlyGoodsModel :data="element" class="mb_20 width_1200_auto"></onlyGoodsModel>
+    </template>
+    <!-- 混合模块 -->
+    <template v-if="element.type == 'mixModel'">
+      <mixModel :data="element" class="mb_20 width_1200_auto"></mixModel>
+    </template>
+    <!-- 混合模块 -->
+    <template v-if="element.type == 'forYour'">
+      <forYour :data="element" class="mb_20 width_1200_auto"></forYour>
+    </template>
+    <!-- 新品排行 -->
+    <template v-if="element.type == 'newGoodsSort'">
+      <new-goods-sort
+        :data="element"
+        class="mb_20 width_1200_auto"
+      ></new-goods-sort>
+    </template>
+    <!-- 首页广告 -->
+    <template v-if="element.type == 'firstAdvert'">
+      <first-page-advert
+        :data="element"
+        class="mb_20 width_1200_auto"
+      ></first-page-advert>
+    </template>
+    <!-- 横幅广告 -->
+    <template v-if="element.type == 'bannerAdvert'">
+      <div style="width: 100%; text-align: center">
+        <img
+          width="1200"
+          class="hover-pointer mb_20 bannerAd"
+          @click="linkTo(element.options.url)"
+          :src="element.options.img"
+          alt=""
+        />
+      </div>
+    </template>
+    <template v-if="element.type == 'notEnough'"
+        >
+      <not-enough
+        :data="element"
+        class="mb_20 width_1200_auto"
+      ></not-enough>
+    </template>
+  </div>
+</template>
+
+<script>
+import ModelCarousel from "./modelList/Carousel.vue";
+import ModelCarousel1 from "./modelList/Carousel1.vue";
+import ModelCarousel2 from "./modelList/Carousel2.vue";
+import FirstPageAdvert from "./modelList/FirstPageAdvert.vue";
+import NewGoodsSort from "./modelList/NewGoodsSort.vue";
+import Recommend from "./modelList/Recommend.vue";
+import NotEnough from "./modelList/NotEnough.vue";
+import Seckill from "./modelList/Seckill.vue";
+import oneRowThreeColumns from "./modelList/oneRowThreeColumns.vue";
+import goodsAndType from "./modelList/goodsAndType.vue";
+import onlyGoodsModel from "./modelList/onlyGoodsModel.vue";
+import mixModel from "./modelList/mixModel.vue";
+import forYour from "./modelList/forYour.vue";
+
+
+export default {
+  name: "modelFormItem",
+  props: ["element", "select", "index", "data"],
+  components: {
+    ModelCarousel,
+    ModelCarousel1,
+    ModelCarousel2,
+    Recommend,
+    NewGoodsSort,
+    FirstPageAdvert,
+    NotEnough,
+    Seckill,
+    oneRowThreeColumns,
+    goodsAndType,
+    onlyGoodsModel,
+    mixModel,
+    forYour
+  },
+  data() {
+    return {
+      showModal: false, // 控制模态框显隐
+      selected: {}, // 已选数据
+    };
+  },
+};
+</script>
+<style lang="scss" scoped>
+.model-item {
+  position: relative;
+  margin-bottom: 10px;
+}
+.bannerAd{
+  width: 1183px;
+  height: 166.6px;
+  border-radius: 10px;
+}
+/** 热门广告 */
+.advert-list {
+  background: $theme_color;
+  height: 200px;
+  display: flex;
+  justify-content: space-around;
+  padding: 3px 10px;
+  > li {
+    img {
+      cursor: pointer;
+      border-radius: 10px;
+      transition: all 150ms ease-in-out;
+      &:hover {
+        transform: translateY(-3px);
+        box-shadow: rgba(0, 0, 0, 0.4) 0px 5px 20px 0px;
+      }
+    }
+  }
+}
+
+/** 折扣广告 */
+.discountAdvert {
+  width: 1300px;
+  height: 566px;
+  margin: 0 auto;
+  margin-bottom: 20px;
+  background-repeat: no-repeat;
+  position: relative;
+  left: -47px;
+  padding-left: 295px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-start;
+  img {
+    margin-top: 10px;
+    margin-right: 10px;
+    transition: all 150ms ease-in-out;
+    &:hover {
+      box-shadow: 0 5px 12px 0 rgba(0, 0, 0, 0.4);
+      transform: translateY(-2px);
+    }
+  }
+}
+
+</style>
--- a/buyer/src/components/indexDecorate/modelFormItem.vue
+++ b/buyer/src/components/indexDecorate/modelFormItem.vue
@@ -1,302 +0,0 @@
-<template>
-  <div class="model-item" v-if="element && element.key">
-    <!-- 轮播图模块，包括个人信息，快捷导航模块 -->
-    <template v-if="element.type == 'carousel'">
-      <model-carousel :data="element"></model-carousel>
-    </template>
-    <!-- 热门广告 -->
-    <template v-if="element.type == 'hotAdvert'">
-      <div>
-        <img
-          style="display: block"
-          class="hover-pointer"
-          :src="element.options.list[0].img"
-          @click="linkTo(element.options.list[0].url)"
-          width="1200"
-          alt=""
-        />
-      </div>
-      <ul class="advert-list">
-        <template v-for="(item, index) in element.options.list">
-          <li
-            v-if="index !== 0"
-            @click="linkTo(item.url)"
-            class="hover-pointer"
-            :key="index"
-          >
-            <img :src="item.img" width="230" height="190" alt="" />
-          </li>
-        </template>
-      </ul>
-    </template>
-    <!-- 限时秒杀 待完善 -->
-    <!-- <template v-if="element.type == 'seckill'">
-      <seckill :data="element"></seckill>
-    </template> -->
-    <!-- 折扣广告 -->
-    <template v-if="element.type == 'discountAdvert'">
-      <div
-        class="discountAdvert"
-        :style="{
-          'background-image': 'url(' + element.options.bgImg.img + ')',
-        }"
-      >
-        <img
-          @click="linkTo(item.url)"
-          class="hover-pointer"
-          v-for="(item, index) in element.options.classification"
-          :key="index"
-          :src="item.img"
-          width="190"
-          height="210"
-          alt=""
-        />
-        <img
-          @click="linkTo(item.url)"
-          class="hover-pointer"
-          v-for="(item, index) in element.options.brandList"
-          :key="'discount' + index"
-          :src="item.img"
-          width="240"
-          height="105"
-          alt=""
-        />
-      </div>
-    </template>
-
-    <!-- 好货推荐 -->
-    <template v-if="element.type == 'recommend'">
-      <recommend :data="element"></recommend>
-    </template>
-    <!-- 新品排行 -->
-    <template v-if="element.type == 'newGoodsSort'">
-      <new-goods-sort :data="element"></new-goods-sort>
-    </template>
-    <!-- 首页广告 -->
-    <template v-if="element.type == 'firstAdvert'">
-      <first-page-advert :data="element"></first-page-advert>
-    </template>
-    <!-- 横幅广告 -->
-    <template v-if="element.type == 'bannerAdvert'">
-      <img
-        width="1200"
-        class="hover-pointer"
-        @click="linkTo(element.options.url)"
-        :src="element.options.img"
-        alt=""
-      />
-    </template>
-    <template v-if="element.type == 'notEnough'">
-      <not-enough :data="element"></not-enough>
-    </template>
-  </div>
-</template>
-
-<script>
-import ModelCarousel from './modelList/carousel.vue';
-import FirstPageAdvert from './modelList/firstPageAdvert.vue';
-import NewGoodsSort from './modelList/newGoodsSort.vue';
-import Recommend from './modelList/recommend.vue';
-import NotEnough from './modelList/notEnough.vue';
-import Seckill from './modelList/seckill.vue';
-
-export default {
-  name: 'modelFormItem',
-  props: ['element', 'select', 'index', 'data'],
-  components: {
-    ModelCarousel,
-    Recommend,
-    NewGoodsSort,
-    FirstPageAdvert,
-    NotEnough,
-    Seckill
-  },
-  data () {
-    return {
-      showModal: false, // 控制模态框显隐
-      selected: {} // 已选数据
-    };
-  }
-};
-</script>
-<style lang="scss" scoped>
-.model-item {
-  position: relative;
-  margin-bottom: 20px;
-  &:hover {
-    .del-btn {
-      display: block;
-    }
-  }
-}
-.del-btn {
-  width: 100px;
-  height: 100px;
-  display: none;
-  position: absolute;
-  right: -100px;
-  top: 0;
-  &:hover {
-    display: block;
-  }
-}
-
-/** 热门广告 */
-.advert-list {
-  background: $theme_color;
-  height: 200px;
-  display: flex;
-  justify-content: space-around;
-  padding: 3px 10px;
-  > li {
-    img {
-      cursor: pointer;
-      border-radius: 10px;
-      transition: all 150ms ease-in-out;
-      &:hover {
-        transform: translateY(-3px);
-        box-shadow: rgba(0, 0, 0, 0.4) 0px 5px 20px 0px;
-      }
-    }
-  }
-}
-/** 限时秒杀 */
-.limit-img {
-  display: flex;
-  flex-direction: row;
-  img {
-    width: 300px;
-    height: 100px;
-  }
-}
-/** 折扣广告 */
-.discountAdvert {
-  height: 566px;
-  background-repeat: no-repeat;
-  margin-left: -97px;
-  position: relative;
-  padding-left: 295px;
-  display: flex;
-  flex-wrap: wrap;
-  align-items: start;
-  img {
-    margin-top: 10px;
-    margin-right: 10px;
-    transition: all 150ms ease-in-out;
-    &:hover {
-      box-shadow: 0 5px 12px 0 rgba(0, 0, 0, 0.4);
-      transform: translateY(-2px);
-    }
-  }
-}
-/** 首页品牌 */
-.brand {
-  .brand-view {
-    display: flex;
-    margin-top: 10px;
-    .brand-view-content {
-      width: 470px;
-      margin-left: 10px;
-      img {
-        width: 100%;
-        height: 316px;
-      }
-      .brand-view-title {
-        height: 50px;
-        padding: 0 5px;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-      }
-    }
-    .brand-view-content:first-child {
-      width: 240px;
-      margin-left: 0;
-    }
-  }
-  .brand-list {
-    margin-top: 10px;
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    li {
-      width: 121px;
-      height: 112px;
-      position: relative;
-      overflow: hidden;
-      border: 1px solid #f5f5f5;
-      margin: -1px -1px 0 0;
-      &:hover {
-        .brand-mash {
-          display: flex;
-        }
-      }
-      .brand-img {
-        text-align: center;
-        margin-top: 30px;
-        img {
-          width: 100px;
-          height: auto;
-        }
-      }
-      .brand-mash {
-        display: none;
-        position: absolute;
-        top: 0;
-        left: 0;
-        background: rgba(0, 0, 0, 0.5);
-        width: inherit;
-        height: inherit;
-        font-size: 12px;
-        font-weight: bold;
-        .ivu-icon {
-          position: absolute;
-          right: 10px;
-          top: 10px;
-          font-size: 15px;
-        }
-        align-items: center;
-        justify-content: center;
-        flex-direction: column;
-        color: #fff;
-        cursor: pointer;
-        div:last-child {
-          background-color: $theme_color;
-          border-radius: 9px;
-          padding: 0 10px;
-          margin-top: 5px;
-        }
-      }
-    }
-    .refresh {
-      display: flex;
-      align-items: center;
-      flex-direction: column;
-      justify-content: center;
-      .ivu-icon {
-        font-size: 18px;
-        transition: all 0.3s ease-out;
-      }
-      &:hover {
-        background-color: $theme_color;
-        color: #fff;
-        .ivu-icon {
-          transform: rotateZ(360deg);
-        }
-      }
-    }
-  }
-}
-
-/** 装修模态框 内部样式start */
-.modal-top-advert {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  > * {
-    margin-bottom: 10px;
-  }
-}
-</style>
-
--- a/buyer/src/components/indexDecorate/modelList/Carousel.vue
+++ b/buyer/src/components/indexDecorate/modelList/Carousel.vue
@@ -0,0 +1,434 @@
+<template>
+  <div class="model-carousel">
+    <div class="nav-body clearfix">
+      <!-- 侧边导航占位 -->
+      <div class="nav-side"></div>
+      <div class="nav-content">
+        <!-- 轮播图 -->
+<!--        autoplay autoplay-speed="10000"-->
+        <Carousel :height="333.9" autoplay :autoplay-speed="5000">
+          <CarouselItem  v-for="(item, index) in data.options.list" :key="index">
+            <div class="swiper-img" >
+              <img
+                :src="item.img"
+                @click="linkTo(item.url)"
+                class="hover-pointer"
+              />
+            </div>
+          </CarouselItem>
+        </Carousel>
+      </div>
+      <div class="nav-right">
+        <div class="person-msg">
+          <div class="user-box" @click="entryControl({ path: 'home' })">
+            <img class="user-face" :src="userInfo.face || defaultAvatar"  alt />
+            <div class="welcome">
+              Hi, {{
+                userInfo.nickName || `欢迎来到${config.title}` | secrecyMobile
+              }}
+            </div>
+          </div>
+          <div v-if="userInfo.id">
+            <div class="icon-list"></div>
+            <!-- #TODO 后续增加 -->
+            <!-- <div class="icon-list flex flex-j-sb" >
+              <div class="icon-item" :key="index"  @click="entryControl(item)" v-for="(item,index) in recentList">
+                <div class="value">
+                  {{ item.value}}
+                </div>
+                <div class="label">
+                  {{ item.label}}
+                </div>
+              </div>
+            </div> -->
+          </div>
+          <div v-else class="flex flex-a-c ">
+            <div class="btns" @click="$router.push('login')" shape="circle"
+            >登录</div
+            >
+            <div class="btns sign-up" @click="$router.push('signUp')" shape="circle"
+            >注册</div
+            >
+          </div>
+
+          <div class="gray-line"></div>
+          <div class="icon-list flex flex-j-sb" >
+            <div class="icon-item" @click="entryControl(item)" :key="index" v-for="(item, index) in entranceList">
+              <img class="icon" :src="require(`@/assets/iconfont/${item.icon}.png`)">
+              <div>
+                {{ item.label }}
+              </div>
+            </div>
+          </div>
+          <div class="icon-list flex flex-j-sb" >
+            <div class="icon-item" :key="index"  @click="entryControl(item)" v-for="(item, index) in appendList">
+              <img class="icon" :src="require(`@/assets/iconfont/${item.icon}.png`)">
+              <div>
+                {{ item.label }}
+              </div>
+            </div>
+          </div>
+
+
+
+        </div>
+
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import storage from "@/plugins/storage";
+export default {
+  name: "modelCarousel",
+  props: ["data"],
+  data() {
+    return {
+      config: require("@/config"),
+      defaultAvatar: require("@/assets/images/default.png"),
+      userInfo: {}, // 用户信息
+      entranceList: [
+        {
+          icon: "collage",
+          label: "宝贝收藏",
+          path: "/home/Favorites"
+        },
+        {
+          icon: "shop",
+          label: "收藏店铺",
+          path: "/home/Favorites?type=STORE"
+        },
+        {
+          icon: "carts",
+          label: "购物车",
+          path: "/cart"
+        },
+        {
+          icon: "story",
+          label: "我的足迹",
+          path: "/home/MyTracks"
+        },
+      ],
+      appendList: [
+        {
+          icon: "support",
+          label: "帮助中心",
+          path: "/article"
+        },
+        {
+          icon: "feedback",
+          label: "我的评论",
+          path: "/home/CommentList"
+        },
+        {
+          icon: "notice",
+          label: "收货地址",
+          path: "/home/MyAddress"
+        },
+        {
+          icon: "notification",
+          label: "我的消息",
+          path: "/home/MsgList"
+        },
+      ],
+      recentList: [
+        {
+          value: "0",
+          label: "购物车"
+        },
+        {
+          value: "0",
+          label: "待收货"
+        },
+        {
+          value: "0",
+          label: "待发货"
+        },
+        {
+          value: "0",
+          label: "代付款"
+        },
+      ],
+    };
+  },
+  methods: {
+    // 快捷跳转中心
+    entryControl(val) {
+      console.log("val",val)
+      let url = this.$router.resolve(val.path);
+      window.open(url.href, '_blank');
+    },
+  },
+  mounted() {
+    if (storage.getItem("userInfo"))
+      this.userInfo = JSON.parse(storage.getItem("userInfo"));
+
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.label {
+  font-size: 12px;
+  font-weight: normal;
+  line-height: 14px;
+  text-align: center;
+  letter-spacing: 0px;
+
+  color: #666666;
+}
+
+.swiper-img {
+  overflow: hidden;
+  width: 637px;
+  height: 329.9px;
+}
+
+.icon-list {
+  width: 216px
+}
+
+.icon-list:nth-last-of-type(1) {
+  margin-top: 20px;
+}
+
+.hot-box {
+  margin-top: 35px;
+  width: 216px;
+
+}
+
+.hot-tag {
+  margin-right: 6px;
+  width: 36px;
+  height: 18px;
+  border-radius: 4px;
+  opacity: 1;
+  font-size: 12px;
+  border: 1px solid $theme_color;
+  color: $theme_color;
+  text-align: center;
+  line-height: 18px;
+}
+
+.gray-line {
+  width: 216px;
+  height: 1px;
+  border: 1px solid #E5E5E5;
+  margin-bottom: 13px;
+}
+
+.icon {
+  width: 20px !important;
+  height: 20px !important;
+  margin-bottom: 7px;
+}
+
+.icon-item {
+
+  cursor: pointer;
+  text-align: center;
+
+  >div {
+    font-size: 11px;
+    font-weight: normal;
+    line-height: 13px;
+    text-align: center;
+    letter-spacing: 0px;
+
+    color: #666666;
+  }
+
+  >.value {
+    font-size: 14px;
+
+    line-height: 17px;
+    text-align: center;
+    font-weight: 400;
+    letter-spacing: 0px;
+    margin-bottom: 3px;
+    color: $theme_color;
+  }
+
+  >.label {
+    font-weight: 400;
+    font-size: 12px;
+
+    line-height: 14px;
+    text-align: center;
+    letter-spacing: 0px;
+    color: #666666;
+    margin-bottom: 13px;
+  }
+}
+
+.model-carousel {
+  width: 1200px;
+  height: 340px;
+  overflow: hidden;
+}
+
+.hover-pointer {
+  //display: block;
+  //width: 100%;
+  //height: 100%;
+  width: 637px;
+  height: 329.9px;
+  object-fit: cover;
+  border-radius: 10px;
+
+
+}
+
+.welcome {
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 17px;
+  text-align: center;
+  letter-spacing: 0px;
+
+  color: #333333;
+}
+
+.hr {
+  width: 216px;
+  height: 1px;
+  border: 1px solid #E5E5E5;
+}
+
+.btns {
+  margin-top: 21px;
+  margin-bottom: 13px;
+  width: 77px;
+  height: 28px;
+  border-radius: 14px;
+  opacity: 1;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 28px;
+  text-align: center;
+  cursor: pointer;
+  letter-spacing: 0px;
+
+  color: #FFFFFF;
+  background: $theme_color;
+}
+
+.sign-up {
+  background: #F39519;
+  margin-left: 10px;
+}
+
+.avatar {
+  margin-bottom: 13px;
+}
+
+.user-face {
+
+  margin-bottom: 12px;
+  width: 70px;
+  height: 70px;
+  border-radius: 50%;
+
+}
+
+/* 导航主体 */
+.nav-body {
+  width: 1200px;
+  height: 340px;
+  margin: 0px auto;
+}
+
+.nav-side {
+  height: 334px;
+  width: 263.2px;
+  border-bottom-left-radius: 10px;
+  border-bottom-right-radius: 10px;
+  float: left;
+  padding: 0px;
+  color: #fff;
+  // background-color: #6e6568;
+
+
+}
+
+
+/*导航内容*/
+.nav-content {
+  width: 637px;
+  margin-left: 10.8px;
+
+  margin-top: 10px;
+  height: 333.9px;
+
+  float: left;
+  position: relative;
+}
+
+.nav-right {
+  float: left;
+  margin-top: 10px;
+  width: 263.2px;
+  margin-left: 10px;
+
+  border-radius: 10px;
+  background: #FFFFFF;
+
+  .person-msg {
+    cursor: pointer;
+    height: 333px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    padding-top: 28px;
+    padding-bottom: 25px;
+
+    >.user-box{
+      text-align: center;
+    }
+  }
+
+  .shop-msg {
+    div {
+      width: 100%;
+      margin: 10px 27px;
+
+      span {
+        cursor: pointer;
+        text-align: center;
+        font-weight: bold;
+        margin-left: 5px;
+      }
+
+      span:nth-child(1) {
+        @include content_color($theme_color);
+        margin-left: 0;
+      }
+
+      span:nth-child(2) {
+        font-weight: normal;
+      }
+
+      span:nth-child(3):hover {
+        color: $theme_color;
+      }
+    }
+
+    ul {
+      li {
+        cursor: pointer;
+        margin: 5px 0;
+        color: #999395;
+        width: 150px;
+        font-size: 12px;
+
+        &:hover {
+          color: $theme_color;
+        }
+      }
+    }
+  }
+}
+</style>
--- a/buyer/src/components/indexDecorate/modelList/Carousel1.vue
+++ b/buyer/src/components/indexDecorate/modelList/Carousel1.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="model-carousel1" :style="{background: bgColor}">
+    <div class="nav-body clearfix">
+      <!-- 侧边导航 -->
+      <div class="nav-side"></div>
+      <div class="nav-content">
+        <!-- 轮播图 -->
+        <Carousel autoplay @on-change="autoChange">
+          <CarouselItem v-for="(item, index) in data.options.list" :key="index" >
+            <div style="overflow: hidden">
+              <img :src="item.img" width="1200" height="470" />
+            </div>
+          </CarouselItem>
+        </Carousel>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'modelCarousel1',
+  props: ['data'],
+  data () {
+    return {
+      showModal: false, // modal显隐
+      selected: null, // 已选数据
+      picModelFlag: false, // 选择图片modal
+      bgColor: '#fff' // 轮播背景色
+    };
+  },
+  mounted () {
+    this.bgColor = this.data.options.list[0].bgColor
+  },
+  methods: {
+    // 自动切换时改变背景色
+    autoChange (oVal, val) {
+      this.bgColor = this.data.options.list[val].bgColor
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.model-carousel1 {
+  width: 100%;
+  height: 470px;
+  background: #fff;
+}
+
+/*大的导航信息，包含导航，幻灯片等*/
+.nav-body {
+  width: 1200px;
+  height: 470px;
+  margin: 0px auto;
+}
+.nav-side {
+  height: 470px;
+  width: 200px;
+  padding: 0px;
+  color: #fff;
+  line-height: 470px;
+  text-align: center;
+  position: absolute;
+  z-index: 1;
+}
+
+/*导航内容*/
+.nav-content {
+  width: 1200px;
+  height: 470px;
+  overflow: hidden;
+  float: left;
+  position: relative;
+}
+</style>
--- a/buyer/src/components/indexDecorate/modelList/Carousel2.vue
+++ b/buyer/src/components/indexDecorate/modelList/Carousel2.vue
@@ -1,20 +1,30 @@
 <template>
-  <div class="model-carousel">
+  <div class="model-carousel2">
    <div class="nav-body clearfix">
-      <!-- 侧边导航占位 -->
+      <!-- 侧边导航 -->
      <div class="nav-side"></div>
      <div class="nav-content">
        <!-- 轮播图 -->
        <Carousel autoplay>
          <CarouselItem v-for="(item, index) in data.options.list" :key="index">
            <div style="overflow: hidden">
-              <img
-                :src="item.img"
-                width="790"
-                @click="linkTo(item.url)"
-                height="340"
-                class="hover-pointer"
-              />
+              <img :src="item.img" width="590" height="470" />
+            </div>
+          </CarouselItem>
+        </Carousel>
+      </div>
+      <div class="nav-content1">
+        <!-- 轮播图 -->
+        <Carousel autoplay :autoplay-speed="5000">
+          <CarouselItem v-for="(item, index) in data.options.listRight" :key="index">
+            <div class="mb_10">
+              <img :src="item[0].img" width="190" height="150" />
+            </div>
+            <div class="mb_10">
+              <img :src="item[1].img" width="190" height="150" />
+            </div>
+            <div>
+              <img :src="item[2].img" width="190" height="150" />
            </div>
          </CarouselItem>
        </Carousel>
@@ -23,14 +33,12 @@
        <div class="person-msg">
          <img :src="userInfo.face" v-if="userInfo.face" alt />
          <Avatar icon="ios-person" class="mb_10" v-else size="80" />
-          <div>Hi，{{ userInfo.nickName || "欢迎来到LiLi Shop" | secrecyMobile }}</div>
+          <div>Hi，{{ userInfo.nickName || `欢迎来到${config.title}` | secrecyMobile }}</div>
          <div v-if="userInfo.id">
-            <Button type="error" shape="circle" @click="$router.push('home')">会员中心</Button>
+            <Button type="error" shape="circle">会员中心</Button>
          </div>
          <div v-else>
-            <Button type="error" @click="$router.push('login')" shape="circle"
-              >请登录</Button
-            >
+            <Button type="error" shape="circle">请登录</Button>
          </div>
        </div>
        <div class="shop-msg">
@@ -49,18 +57,20 @@
 </template>

 <script>
+
 import {articleList} from '@/api/common.js'
 import storage from '@/plugins/storage';
 export default {
-  name: 'modelCarousel',
+  name: 'modelCarousel2',
  props: ['data'],
  data () {
    return {
+      config:require('@/config'),
      userInfo: {}, // 用户信息
      articleList: [], // 常见问题
      params: { // 请求常见问题参数
        pageNumber: 1,
-        pageSize: 5,
+        pageSize: 10,
        type: 'ANNOUNCEMENT',
        sort: 'sort'
      }
@@ -90,51 +100,74 @@ export default {
 </script>

 <style scoped lang="scss">
-.model-carousel {
+.model-carousel2 {
  width: 1200px;
-  height: 340px;
+  height: 470px;
  overflow: hidden;
 }

-/* 导航主体 */
+.nav-item li {
+  float: left;
+  font-size: 16px;
+  font-weight: bold;
+  margin-left: 30px;
+}
+.nav-item a {
+  text-decoration: none;
+  color: #555555;
+}
+.nav-item a:hover {
+  color: $theme_color;
+}
+/*大的导航信息，包含导航，幻灯片等*/
 .nav-body {
  width: 1200px;
-  height: 340px;
+  height: 470px;
  margin: 0px auto;
 }
-
 .nav-side {
  height: 100%;
  width: 200px;
-  float: left;
  padding: 0px;
  color: #fff;
+  float: left;
  background-color: #6e6568;
+  line-height: 470px;
+  text-align: center;
 }

 /*导航内容*/
-.nav-content {
-  width: 790px;
+.nav-content,.nav-content1 {
+  width: 590px;
+  height: 470px;
  overflow: hidden;
  float: left;
  position: relative;
+  margin-left: 10px;
+}
+.nav-content1{
+  width: 190px;
 }
 .nav-right {
  float: left;
-  width: 210px;
+  width: 190px;
+  margin-left: 10px;
  .person-msg {
    display: flex;
    align-items: center;
    flex-direction: column;
    margin: 20px auto;
+
    button {
      height: 25px !important;
      margin-top: 10px;
    }
+
    .ivu-btn-default {
      color: $theme_color;
      border-color: $theme_color;
    }
+
    img {
      margin-bottom: 10px;
      width: 80px;
--- a/buyer/src/components/indexDecorate/modelList/FirstPageAdvert.vue
+++ b/buyer/src/components/indexDecorate/modelList/FirstPageAdvert.vue
@@ -31,7 +31,7 @@ export default {
    return {
      options: this.data.options // 装修数据
    };
-  },
+  }
 };
 </script>
 <style lang="scss" scoped>
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`<?xml version="1.0" encoding="UTF-8"?><svg width="24" height="24" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M24 44C35.0457 44 44 35.0457 44 24C44 12.9543 35.0457 4 24 4C12.9543 4 4 12.9543 4 24C4 35.0457 12.9543 44 24 44Z" fill="none" stroke="#333" stroke-width="4" stroke-linejoin="round"/><path d="M20 24V17.0718L26 20.5359L32 24L26 27.4641L20 30.9282V24Z" fill="none" stroke="#333" stroke-width="4" stroke-linejoin="round"/></svg>`