feat(manager): 优化定时任务管理、敏感词场景配置与商品选择器多规格匹配

feat(pc-decorate): PC端楼层装修组件体系规范默认行高与各楼层组件重构
feat(buyer): 统一全站页面顶部为现代TopBar与SearchHeader，支持商品/店铺双模搜索与占位词规范
2026-11-07 01:18:54 +08:00 · 2026-10-29 17:06:21 +08:00 · 2026-10-29 17:06:08 +08:00 · 2026-10-29 17:05:53 +08:00 · 2026-10-29 17:00:03 +08:00 · 2026-10-29 14:17:54 +08:00
1680 changed files with 504411 additions and 100891 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,8 @@
 */.vscode/
 /.idea/
 */dist/
 .DS_Store
 node_modules/
 yarn.lock
 package-lock.json
 !seller/yarn.lock
--- 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/695
+++ b/695
@@ -1,674 +1,21 @@
-                    GNU GENERAL PUBLIC LICENSE
+MIT License
-                       Version 3, 29 June 2007
+
-
+Copyright (c) 2020-2026 Beijing Hongye Huicheng Technology Co., Ltd. (北京宏业汇成科技有限公司)
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
- Everyone is permitted to copy and distribute verbatim copies
+Permission is hereby granted, free of charge, to any person obtaining a copy
- of this license document, but changing it is not allowed.
+of this software and associated documentation files (the "Software"), to deal
-
+in the Software without restriction, including without limitation the rights
-                            Preamble
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-
+copies of the Software, and to permit persons to whom the Software is
-  The GNU General Public License is a free, copyleft license for
+furnished to do so, subject to the following conditions:
-software and other kinds of works.
+
-
+The above copyright notice and this permission notice shall be included in all
-  The licenses for most software and other practical works are designed
+copies or substantial portions of the Software.
-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
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-share and change all versions of a program--to make sure it remains free
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-software for all its users.  We, the Free Software Foundation, use the
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-GNU General Public License for most of our software; it applies also to
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-any other work released this way by its authors.  You can apply it to
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-your programs, too.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-
+SOFTWARE.
  When we speak of free software, we are referring to freedom, not
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 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.
  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.
  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.
  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.
  The precise terms and conditions for copying, distribution and
 modification follow.
                       TERMS AND CONDITIONS
  0. Definitions.
  "This License" refers to version 3 of the GNU General Public License.
  "Copyright" also means copyright-like laws that apply to other kinds of
 works, such as semiconductor masks.
  "The Program" refers to any copyrightable work licensed under this
 License.  Each licensee is addressed as "you".  "Licensees" and
 "recipients" may be individuals or organizations.
  To "modify" a work means to copy from or adapt all or part of the work
 in a fashion requiring copyright permission, other than the making of an
 exact copy.  The resulting work is called a "modified version" of the
 earlier work or a work "based on" the earlier work.
  A "covered work" means either the unmodified Program or a work based
 on the Program.
  To "propagate" a work means to do anything with it that, without
 permission, would make you directly or secondarily liable for
 infringement under applicable copyright law, except executing it on a
 computer or modifying a private copy.  Propagation includes copying,
 distribution (with or without modification), making available to the
 public, and in some countries other activities as well.
  To "convey" a work means any kind of propagation that enables other
 parties to make or receive copies.  Mere interaction with a user through
 a computer network, with no transfer of a copy, is not conveying.
  An interactive user interface displays "Appropriate Legal Notices"
 to the extent that it includes a convenient and prominently visible
 feature that (1) displays an appropriate copyright notice, and (2)
 tells the user that there is no warranty for the work (except to the
 extent that warranties are provided), that licensees may convey the
 work under this License, and how to view a copy of this License.  If
 the interface presents a list of user commands or options, such as a
 menu, a prominent item in the list meets this criterion.
  1. Source Code.
  The "source code" for a work means the preferred form of the work
 for making modifications to it.  "Object code" means any non-source
 form of a work.
  A "Standard Interface" means an interface that either is an official
 standard defined by a recognized standards body, or, in the case of
 interfaces specified for a particular programming language, one that
 is widely used among developers working in that language.
  The "System Libraries" of an executable work include anything, other
 than the work as a whole, that (a) is included in the normal form of
 packaging a Major Component, but which is not part of that Major
 Component, and (b) serves only to enable use of the work with that
 Major Component, or to implement a Standard Interface for which an
 implementation is available to the public in source code form.  A
 "Major Component", in this context, means a major essential component
 (kernel, window system, and so on) of the specific operating system
 (if any) on which the executable work runs, or a compiler used to
 produce the work, or an object code interpreter used to run it.
  The "Corresponding Source" for a work in object code form means all
 the source code needed to generate, install, and (for an executable
 work) run the object code and to modify the work, including scripts to
 control those activities.  However, it does not include the work's
 System Libraries, or general-purpose tools or generally available free
 programs which are used unmodified in performing those activities but
 which are not part of the work.  For example, Corresponding Source
 includes interface definition files associated with source files for
 the work, and the source code for shared libraries and dynamically
 linked subprograms that the work is specifically designed to require,
 such as by intimate data communication or control flow between those
 subprograms and other parts of the work.
  The Corresponding Source need not include anything that users
 can regenerate automatically from other parts of the Corresponding
 Source.
  The Corresponding Source for a work in source code form is that
 same work.
  2. Basic Permissions.
  All rights granted under this License are granted for the term of
 copyright on the Program, and are irrevocable provided the stated
 conditions are met.  This License explicitly affirms your unlimited
 permission to run the unmodified Program.  The output from running a
 covered work is covered by this License only if the output, given its
 content, constitutes a covered work.  This License acknowledges your
 rights of fair use or other equivalent, as provided by copyright law.
  You may make, run and propagate covered works that you do not
 convey, without conditions so long as your license otherwise remains
 in force.  You may convey covered works to others for the sole purpose
 of having them make modifications exclusively for you, or provide you
 with facilities for running those works, provided that you comply with
 the terms of this License in conveying all material for which you do
 not control copyright.  Those thus making or running the covered works
 for you must do so exclusively on your behalf, under your direction
 and control, on terms that prohibit them from making any copies of
 your copyrighted material outside their relationship with you.
  Conveying under any other circumstances is permitted solely under
 the conditions stated below.  Sublicensing is not allowed; section 10
 makes it unnecessary.
  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
  No covered work shall be deemed part of an effective technological
 measure under any applicable law fulfilling obligations under article
 11 of the WIPO copyright treaty adopted on 20 December 1996, or
 similar laws prohibiting or restricting circumvention of such
 measures.
  When you convey a covered work, you waive any legal power to forbid
 circumvention of technological measures to the extent such circumvention
 is effected by exercising rights under this License with respect to
 the covered work, and you disclaim any intention to limit operation or
 modification of the work as a means of enforcing, against the work's
 users, your or third parties' legal rights to forbid circumvention of
 technological measures.
  4. Conveying Verbatim Copies.
  You may convey verbatim copies of the Program's source code as you
 receive it, in any medium, provided that you conspicuously and
 appropriately publish on each copy an appropriate copyright notice;
 keep intact all notices stating that this License and any
 non-permissive terms added in accord with section 7 apply to the code;
 keep intact all notices of the absence of any warranty; and give all
 recipients a copy of this License along with the Program.
  You may charge any price or no price for each copy that you convey,
 and you may offer support or warranty protection for a fee.
  5. Conveying Modified Source Versions.
  You may convey a work based on the Program, or the modifications to
 produce it from the Program, in the form of source code under the
 terms of section 4, provided that you also meet all of these conditions:
    a) The work must carry prominent notices stating that you modified
    it, and giving a relevant date.
    b) The work must carry prominent notices stating that it is
    released under this License and any conditions added under section
    7.  This requirement modifies the requirement in section 4 to
    "keep intact all notices".
    c) You must license the entire work, as a whole, under this
    License to anyone who comes into possession of a copy.  This
    License will therefore apply, along with any applicable section 7
    additional terms, to the whole of the work, and all its parts,
    regardless of how they are packaged.  This License gives no
    permission to license the work in any other way, but it does not
    invalidate such permission if you have separately received it.
    d) If the work has interactive user interfaces, each must display
    Appropriate Legal Notices; however, if the Program has interactive
    interfaces that do not display Appropriate Legal Notices, your
    work need not make them do so.
  A compilation of a covered work with other separate and independent
 works, which are not by their nature extensions of the covered work,
 and which are not combined with it such as to form a larger program,
 in or on a volume of a storage or distribution medium, is called an
 "aggregate" if the compilation and its resulting copyright are not
 used to limit the access or legal rights of the compilation's users
 beyond what the individual works permit.  Inclusion of a covered work
 in an aggregate does not cause this License to apply to the other
 parts of the aggregate.
  6. Conveying Non-Source Forms.
  You may convey a covered work in object code form under the terms
 of sections 4 and 5, provided that you also convey the
 machine-readable Corresponding Source under the terms of this License,
 in one of these ways:
    a) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by the
    Corresponding Source fixed on a durable physical medium
    customarily used for software interchange.
    b) Convey the object code in, or embodied in, a physical product
    (including a physical distribution medium), accompanied by a
    written offer, valid for at least three years and valid for as
    long as you offer spare parts or customer support for that product
    model, to give anyone who possesses the object code either (1) a
    copy of the Corresponding Source for all the software in the
    product that is covered by this License, on a durable physical
    medium customarily used for software interchange, for a price no
    more than your reasonable cost of physically performing this
    conveying of source, or (2) access to copy the
    Corresponding Source from a network server at no charge.
    c) Convey individual copies of the object code with a copy of the
    written offer to provide the Corresponding Source.  This
    alternative is allowed only occasionally and noncommercially, and
    only if you received the object code with such an offer, in accord
    with subsection 6b.
    d) Convey the object code by offering access from a designated
    place (gratis or for a charge), and offer equivalent access to the
    Corresponding Source in the same way through the same place at no
    further charge.  You need not require recipients to copy the
    Corresponding Source along with the object code.  If the place to
    copy the object code is a network server, the Corresponding Source
    may be on a different server (operated by you or a third party)
    that supports equivalent copying facilities, provided you maintain
    clear directions next to the object code saying where to find the
    Corresponding Source.  Regardless of what server hosts the
    Corresponding Source, you remain obligated to ensure that it is
    available for as long as needed to satisfy these requirements.
    e) Convey the object code using peer-to-peer transmission, provided
    you inform other peers where the object code and Corresponding
    Source of the work are being offered to the general public at no
    charge under subsection 6d.
  A separable portion of the object code, whose source code is excluded
 from the Corresponding Source as a System Library, need not be
 included in conveying the object code work.
  A "User Product" is either (1) a "consumer product", which means any
 tangible personal property which is normally used for personal, family,
 or household purposes, or (2) anything designed or sold for incorporation
 into a dwelling.  In determining whether a product is a consumer product,
 doubtful cases shall be resolved in favor of coverage.  For a particular
 product received by a particular user, "normally used" refers to a
 typical or common use of that class of product, regardless of the status
 of the particular user or of the way in which the particular user
 actually uses, or expects or is expected to use, the product.  A product
 is a consumer product regardless of whether the product has substantial
 commercial, industrial or non-consumer uses, unless such uses represent
 the only significant mode of use of the product.
  "Installation Information" for a User Product means any methods,
 procedures, authorization keys, or other information required to install
 and execute modified versions of a covered work in that User Product from
 a modified version of its Corresponding Source.  The information must
 suffice to ensure that the continued functioning of the modified object
 code is in no case prevented or interfered with solely because
 modification has been made.
  If you convey an object code work under this section in, or with, or
 specifically for use in, a User Product, and the conveying occurs as
 part of a transaction in which the right of possession and use of the
 User Product is transferred to the recipient in perpetuity or for a
 fixed term (regardless of how the transaction is characterized), the
 Corresponding Source conveyed under this section must be accompanied
 by the Installation Information.  But this requirement does not apply
 if neither you nor any third party retains the ability to install
 modified object code on the User Product (for example, the work has
 been installed in ROM).
  The requirement to provide Installation Information does not include a
 requirement to continue to provide support service, warranty, or updates
 for a work that has been modified or installed by the recipient, or for
 the User Product in which it has been modified or installed.  Access to a
 network may be denied when the modification itself materially and
 adversely affects the operation of the network or violates the rules and
 protocols for communication across the network.
  Corresponding Source conveyed, and Installation Information provided,
 in accord with this section must be in a format that is publicly
 documented (and with an implementation available to the public in
 source code form), and must require no special password or key for
 unpacking, reading or copying.
  7. Additional Terms.
  "Additional permissions" are terms that supplement the terms of this
 License by making exceptions from one or more of its conditions.
 Additional permissions that are applicable to the entire Program shall
 be treated as though they were included in this License, to the extent
 that they are valid under applicable law.  If additional permissions
 apply only to part of the Program, that part may be used separately
 under those permissions, but the entire Program remains governed by
 this License without regard to the additional permissions.
  When you convey a copy of a covered work, you may at your option
 remove any additional permissions from that copy, or from any part of
 it.  (Additional permissions may be written to require their own
 removal in certain cases when you modify the work.)  You may place
 additional permissions on material, added by you to a covered work,
 for which you have or can give appropriate copyright permission.
  Notwithstanding any other provision of this License, for material you
 add to a covered work, you may (if authorized by the copyright holders of
 that material) supplement the terms of this License with terms:
    a) Disclaiming warranty or limiting liability differently from the
    terms of sections 15 and 16 of this License; or
    b) Requiring preservation of specified reasonable legal notices or
    author attributions in that material or in the Appropriate Legal
    Notices displayed by works containing it; or
    c) Prohibiting misrepresentation of the origin of that material, or
    requiring that modified versions of such material be marked in
    reasonable ways as different from the original version; or
    d) Limiting the use for publicity purposes of names of licensors or
    authors of the material; or
    e) Declining to grant rights under trademark law for use of some
    trade names, trademarks, or service marks; or
    f) Requiring indemnification of licensors and authors of that
    material by anyone who conveys the material (or modified versions of
    it) with contractual assumptions of liability to the recipient, for
    any liability that these contractual assumptions directly impose on
    those licensors and authors.
  All other non-permissive additional terms are considered "further
 restrictions" within the meaning of section 10.  If the Program as you
 received it, or any part of it, contains a notice stating that it is
 governed by this License along with a term that is a further
 restriction, you may remove that term.  If a license document contains
 a further restriction but permits relicensing or conveying under this
 License, you may add to a covered work material governed by the terms
 of that license document, provided that the further restriction does
 not survive such relicensing or conveying.
  If you add terms to a covered work in accord with this section, you
 must place, in the relevant source files, a statement of the
 additional terms that apply to those files, or a notice indicating
 where to find the applicable terms.
  Additional terms, permissive or non-permissive, may be stated in the
 form of a separately written license, or stated as exceptions;
 the above requirements apply either way.
  8. Termination.
  You may not propagate or modify a covered work except as expressly
 provided under this License.  Any attempt otherwise to propagate or
 modify it is void, and will automatically terminate your rights under
 this License (including any patent licenses granted under the third
 paragraph of section 11).
  However, if you cease all violation of this License, then your
 license from a particular copyright holder is reinstated (a)
 provisionally, unless and until the copyright holder explicitly and
 finally terminates your license, and (b) permanently, if the copyright
 holder fails to notify you of the violation by some reasonable means
 prior to 60 days after the cessation.
  Moreover, your license from a particular copyright holder is
 reinstated permanently if the copyright holder notifies you of the
 violation by some reasonable means, this is the first time you have
 received notice of violation of this License (for any work) from that
 copyright holder, and you cure the violation prior to 30 days after
 your receipt of the notice.
  Termination of your rights under this section does not terminate the
 licenses of parties who have received copies or rights from you under
 this License.  If your rights have been terminated and not permanently
 reinstated, you do not qualify to receive new licenses for the same
 material under section 10.
  9. Acceptance Not Required for Having Copies.
  You are not required to accept this License in order to receive or
 run a copy of the Program.  Ancillary propagation of a covered work
 occurring solely as a consequence of using peer-to-peer transmission
 to receive a copy likewise does not require acceptance.  However,
 nothing other than this License grants you permission to propagate or
 modify any covered work.  These actions infringe copyright if you do
 not accept this License.  Therefore, by modifying or propagating a
 covered work, you indicate your acceptance of this License to do so.
  10. Automatic Licensing of Downstream Recipients.
  Each time you convey a covered work, the recipient automatically
 receives a license from the original licensors, to run, modify and
 propagate that work, subject to this License.  You are not responsible
 for enforcing compliance by third parties with this License.
  An "entity transaction" is a transaction transferring control of an
 organization, or substantially all assets of one, or subdividing an
 organization, or merging organizations.  If propagation of a covered
 work results from an entity transaction, each party to that
 transaction who receives a copy of the work also receives whatever
 licenses to the work the party's predecessor in interest had or could
 give under the previous paragraph, plus a right to possession of the
 Corresponding Source of the work from the predecessor in interest, if
 the predecessor has it or can get it with reasonable efforts.
  You may not impose any further restrictions on the exercise of the
 rights granted or affirmed under this License.  For example, you may
 not impose a license fee, royalty, or other charge for exercise of
 rights granted under this License, and you may not initiate litigation
 (including a cross-claim or counterclaim in a lawsuit) alleging that
 any patent claim is infringed by making, using, selling, offering for
 sale, or importing the Program or any portion of it.
  11. Patents.
  A "contributor" is a copyright holder who authorizes use under this
 License of the Program or a work on which the Program is based.  The
 work thus licensed is called the contributor's "contributor version".
  A contributor's "essential patent claims" are all patent claims
 owned or controlled by the contributor, whether already acquired or
 hereafter acquired, that would be infringed by some manner, permitted
 by this License, of making, using, or selling its contributor version,
 but do not include claims that would be infringed only as a
 consequence of further modification of the contributor version.  For
 purposes of this definition, "control" includes the right to grant
 patent sublicenses in a manner consistent with the requirements of
 this License.
  Each contributor grants you a non-exclusive, worldwide, royalty-free
 patent license under the contributor's essential patent claims, to
 make, use, sell, offer for sale, import and otherwise run, modify and
 propagate the contents of its contributor version.
  In the following three paragraphs, a "patent license" is any express
 agreement or commitment, however denominated, not to enforce a patent
 (such as an express permission to practice a patent or covenant not to
 sue for patent infringement).  To "grant" such a patent license to a
 party means to make such an agreement or commitment not to enforce a
 patent against the party.
  If you convey a covered work, knowingly relying on a patent license,
 and the Corresponding Source of the work is not available for anyone
 to copy, free of charge and under the terms of this License, through a
 publicly available network server or other readily accessible means,
 then you must either (1) cause the Corresponding Source to be so
 available, or (2) arrange to deprive yourself of the benefit of the
 patent license for this particular work, or (3) arrange, in a manner
 consistent with the requirements of this License, to extend the patent
 license to downstream recipients.  "Knowingly relying" means you have
 actual knowledge that, but for the patent license, your conveying the
 covered work in a country, or your recipient's use of the covered work
 in a country, would infringe one or more identifiable patents in that
 country that you have reason to believe are valid.
  If, pursuant to or in connection with a single transaction or
 arrangement, you convey, or propagate by procuring conveyance of, a
 covered work, and grant a patent license to some of the parties
 receiving the covered work authorizing them to use, propagate, modify
 or convey a specific copy of the covered work, then the patent license
 you grant is automatically extended to all recipients of the covered
 work and works based on it.
  A patent license is "discriminatory" if it does not include within
 the scope of its coverage, prohibits the exercise of, or is
 conditioned on the non-exercise of one or more of the rights that are
 specifically granted under this License.  You may not convey a covered
 work if you are a party to an arrangement with a third party that is
 in the business of distributing software, under which you make payment
 to the third party based on the extent of your activity of conveying
 the work, and under which the third party grants, to any of the
 parties who would receive the covered work from you, a discriminatory
 patent license (a) in connection with copies of the covered work
 conveyed by you (or copies made from those copies), or (b) primarily
 for and in connection with specific products or compilations that
 contain the covered work, unless you entered into that arrangement,
 or that patent license was granted, prior to 28 March 2007.
  Nothing in this License shall be construed as excluding or limiting
 any implied license or other defenses to infringement that may
 otherwise be available to you under applicable patent law.
  12. No Surrender of Others' Freedom.
  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
 excuse you from the conditions of this License.  If you cannot convey a
 covered work so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you may
 not convey it at all.  For example, if you agree to terms that obligate you
 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.
  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
 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.
  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
 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
 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
 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
 public statement of acceptance of a version permanently authorizes you
 to choose that version for the Program.
  Later license versions may give you additional or different
 permissions.  However, no additional obligations are imposed on any
 author or copyright holder as a result of your choosing to follow a
 later version.
  15. Disclaimer of Warranty.
  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
 HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
 OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
 THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
 IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
 ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
  16. Limitation of Liability.
  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
 THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
 GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
 USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
 DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
 PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
 EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGES.
  17. Interpretation of Sections 15 and 16.
  If the disclaimer of warranty and limitation of liability provided
 above cannot be given local legal effect according to their terms,
 reviewing courts shall apply local law that most closely approximates
 an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
                     END OF TERMS AND CONDITIONS
            How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
 free software which everyone can redistribute and change under these terms.
  To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
    <one line to give the program's name and a brief idea of what it does.>
    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
    (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.
    You should have received a copy of the GNU 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".
  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
 <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/MIGRATION-VUE3.md
+++ b/MIGRATION-VUE3.md
@@ -0,0 +1,201 @@
 # Lilishop UI — Vue 3 迁移与上线前检查清单
 四个子项目（buyer / seller / manager / im）已完成 **Vue 3 + Element Plus** 迁移，并完成依赖小版本对齐。本文档供上线前统一回归使用。
 ## 技术栈（四端一致）
 | 类别 | 包 | 版本（package.json） |
 |------|-----|---------------------|
 | 框架 | vue | ^3.5.35 |
 | 编译 | @vue/compiler-sfc | ^3.5.35 |
 | 路由 | vue-router | ^4.6.4 |
 | 状态 | pinia | ^4.0.3（四端已全部从 vuex 迁移完成） |
 | 组件写法 | `<script setup>` | 四端 597 个组件已全部完成 Options API → 组合式 API 迁移；各端 eslint 已启用 `vue/component-api-style: ['warn', ['script-setup']]` 防止回退 |
 | UI | element-plus | ^2.14.1 |
 | 图标 | @element-plus/icons-vue | ^2.3.2 |
 | 请求 | axios | ^1.7.9 |
 | 兼容 | core-js | ^3.49.0 |
 | 构建 | @vue/cli-service | ^5.0.9 |
 > 使用 `^` 范围，实际安装版本以各目录 `yarn.lock` 为准。  
 > 要求 **Node >= 16**，包管理统一 **yarn**。
 ## 本地启动
 ```bash
 # 买家端
 cd buyer && yarn install && yarn dev    # 端口 10000
 # 商家端
 cd seller && yarn install && yarn dev   # 端口 10002
 # 管理端
 cd manager && yarn install && yarn dev  # 端口 10003
 # IM 客服
 cd im && yarn install && yarn dev       # 端口 8000
 ```
 生产构建（上线前必跑）：
 ```bash
 cd buyer   && yarn build
 cd seller  && yarn build
 cd manager && yarn build
 cd im      && yarn build
 ```
 ---
 ## 一、通用检查（四端都要过）
 ### 1. 认证与请求（axios 1.x 重点）
 各端请求封装位置：
 | 端 | 文件 |
 |----|------|
 | buyer | `buyer/src/plugins/request.js` |
 | seller | `seller/src/libs/axios.js` |
 | manager | `manager/src/libs/axios.js` |
 | im | `im/src/utils/request.js` |
 - [ ] **登录**：账号密码登录成功，token 写入正常
 - [ ] **登出**：清除 token，跳转登录页
 - [ ] **401**：token 过期后跳转登录 / 刷新 token（buyer/manager/seller 有刷新逻辑）
 - [ ] **403**：无权限时提示文案正确、不白屏
 - [ ] **400 / 5xx**：接口报错能弹出 `Message` / `ElMessage` / `Notification`
 - [ ] **网络超时**：断网或超时后有错误提示，页面不卡死
 - [ ] **GET 带参**：列表筛选、分页参数序列化正常
 - [ ] **POST JSON**：`Content-Type: application/json` 请求体正确
 - [ ] **POST 表单**：`application/x-www-form-urlencoded` 提交正常（im 等）
 ### 2. Element Plus UI（2.6 → 2.14 重点）
 - [ ] **表格** `el-table`：列展示、排序、空数据、加载态
 - [ ] **分页** `el-pagination`：翻页、每页条数切换
 - [ ] **表单** `el-form`：必填校验、错误提示位置
 - [ ] **弹窗** `el-dialog` / `ElMessageBox`：打开、确认、取消、关闭
 - [ ] **下拉** `el-select` / `el-dropdown`：选项、点击外部关闭
 - [ ] **消息** `ElMessage` / `$Message` 兼容层：success / error / warning
 - [ ] **加载** `ElLoading` / `v-loading`：请求期间遮罩正常消失
 - [ ] **日期** `el-date-picker`：选择、清空、范围选择
 - [ ] **上传** `el-upload`：选文件、进度、成功 / 失败回调
 ### 3. 路由与页面
 - [ ] 浏览器 **刷新** 当前路由不 404（history 模式 + 服务端配置）
 - [ ] **动态路由** 加载正常（seller / manager 菜单权限路由）
 - [ ] 浏览器 **前进 / 后退** 正常
 - [ ] 各端 **404 页** 可回到首页
 ### 4. 构建与部署
 - [ ] 四端 `yarn build` 无 error（warning 可记录，不阻断）
 - [ ] 生产环境 API 地址配置正确（`config` / 环境变量）
 - [ ] 静态资源 `publicPath` 与 Nginx / CDN 路径一致
 - [ ] gzip 压缩包（如有）可正常访问
 ---
 ## 二、分端专项检查
 ### Buyer 买家端（10000）
 详见 [buyer/MIGRATION-VUE3.md](./buyer/MIGRATION-VUE3.md)
 - [ ] 首页装修模块渲染（轮播、商品列表、秒杀区等）
 - [ ] 商品详情：规格选择、加购、收藏、`el-image` 预览
 - [ ] 购物车 → 结算 → 支付流程
 - [ ] 用户中心：订单列表、地址、优惠券、售后
 - [ ] 登录 / 注册 / 忘记密码
 - [ ] 店铺入驻、商户页
 - [ ] 地图（高德 `@amap/amap-jsapi-loader`）定位与选点
 - [ ] 侧边栏 `el-menu`、头部 `el-dropdown`、动态图标 `iconMap.js`
 ### Seller 商家端（10002）
 详见 [seller/MIGRATION-VUE3.md](./seller/MIGRATION-VUE3.md)
 - [ ] 商家登录、店铺信息
 - [ ] 商品发布三步流程（`goodsOperation` 步骤条）
 - [ ] 订单管理：发货、退款、详情
 - [ ] 促销 / 分销 / 统计图表（`@antv/g2`）
 - [ ] 页面装修（wap / modelList，从 manager 同步部分）
 - [ ] 图片懒加载 `vue-lazyload`
 - [ ] Excel 导出 `vue-json-excel`
 ### Manager 管理端（10003）
 详见 [manager/MIGRATION-VUE3.md](./manager/MIGRATION-VUE3.md)
 - [ ] 管理员登录、权限菜单、动态路由
 - [ ] 系统设置（`sys/setting-manage` 各 Tab）
 - [ ] 菜单 / 部门管理
 - [ ] 页面装修（PC + H5）
 - [ ] 文章管理
 - [ ] 商品 / 订单 / 会员 / 促销等核心列表 CRUD
 - [ ] 富文本 TinyMCE 编辑、图片上传
 - [ ] 多语言 `vue-i18n` 切换（如有启用）
 ### IM 客服端（8000）
 详见 [im/MIGRATION-VUE3.md](./im/MIGRATION-VUE3.md)
 - [ ] 带 token 参数进入会话页
 - [ ] 对话列表加载、切换会话、未读数
 - [ ] 发送文字、表情、图片消息
 - [ ] 商品 / 订单卡片链接跳转（`linkToGoods` / `linkToOrders`）
 - [ ] 右键菜单（复制、撤回、删除等）
 - [ ] WebSocket 连接 / 断线重连 / 新消息通知
 - [ ] 最近浏览、订单列表侧栏（商家场景）
 - [ ] 用户名片弹层 `$user()`
 ---
 ## 三、已知可忽略项
 | 项 | 说明 |
 |----|------|
 | `vue-awesome-swiper` peer warning | 历史依赖，Vue 3 下仍有 peer 告警，功能正常可暂忽略 |
 | im 内 `<i class="el-icon-*">` | Element Plus 无字体图标，部分旧图标可能不显示，不影响核心功能 |
 | `vue-prism-editor@2.0.0-alpha.2` | im 代码块编辑器刻意锁定 alpha 版 |
 | 打包体积 warning | chunk-vendors 偏大，属 Element Plus 全量引入，可后续做按需优化 |
 ---
 ## 四、问题记录模板
 上线测试时建议按端记录：
 ```markdown
 ### [端名] 问题标题
 - 页面/路由：
 - 操作步骤：
 - 预期：
 - 实际：
 - 控制台报错：
 - 优先级：P0 / P1 / P2
 ```
 ---
 ## 五、子项目文档索引
 | 端 | 迁移说明 |
 |----|----------|
 | buyer | [buyer/MIGRATION-VUE3.md](./buyer/MIGRATION-VUE3.md) |
 | seller | [seller/MIGRATION-VUE3.md](./seller/MIGRATION-VUE3.md) |
 | manager | [manager/MIGRATION-VUE3.md](./manager/MIGRATION-VUE3.md) |
 | im | [im/MIGRATION-VUE3.md](./im/MIGRATION-VUE3.md) |
 ---
 ## 六、建议上线顺序
 1. **manager**（后台配置源头）
 2. **seller**（商家经营）
 3. **buyer**（C 端流量最大）
 4. **im**（客服，依赖前后端 WebSocket）
 每上一端，至少完成本文 **第一节通用检查** + 对应 **第二节分端检查** 后再切下一端。
--- a/README.en.md
+++ b/README.en.md
@@ -0,0 +1,144 @@
 <div align="center">
  <img src="./manager/src/assets/logo.png" width="180" alt="Lilishop Logo" />
  <h1>Lilishop(PickMall) - Web Frontend (Vue 3)</h1>
  <p>
    <a href="https://github.com/lilishop/lilishop"><img src="https://img.shields.io/github/stars/lilishop/lilishop.svg?style=social&logo=github" alt="GitHub Stars" /></a>
    <a href="https://gitee.com/beijing_hongye_huicheng/lilishop"><img src="https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark" alt="Gitee Stars" /></a>
    <a href="./LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License" /></a>
    <a href="https://vuejs.org/"><img src="https://img.shields.io/badge/Vue-3.5-brightgreen.svg" alt="Vue 3" /></a>
    <a href="https://element-plus.org/"><img src="https://img.shields.io/badge/Element%20Plus-2.x-409EFF.svg" alt="Element Plus" /></a>
    <a href="https://pinia.vuejs.org/"><img src="https://img.shields.io/badge/Pinia-4.x-yellow.svg" alt="Pinia" /></a>
  </p>
  <p>
    <a href="https://pickmall.cn">🏠 Official Website</a> ·
    <a href="https://bdwx2tfwwt.feishu.cn/wiki/space/7675179368632617952?ccm_open_type=lark_wiki_spaceLink&open_tab_from=wiki_home">📖 Product Documentation</a> ·
    <a href="#2-online-demo">💻 Online Demo</a> ·
    <a href="https://github.com/lilishop/lilishop">💻 GitHub</a>
  </p>
  <p>
    <a href="./README.md">简体中文</a> | <b>English</b>
  </p>
 </div>
 > ⭐ **If you like this project, please click `Star` in the top-right corner to support us! Your Star is our greatest motivation for continuous open-source iteration!**
 **LILISHOP** is an open-source e-commerce system built with Spring Boot, Vue 3, and uni-app. It supports B2B2C multi-vendor marketplaces, WeChat Mini Programs, H5, Android/iOS Apps, live-streaming e-commerce, affiliate distribution, and flash sales.
 ### ✨ Why Choose Lilishop
 - 🟢 **True MIT License**: Free for commercial use and private secondary development without licensing concerns.
 - 🚀 **Modern Vue 3 Stack**: Built on `Vue 3.5 + Pinia 4 + Vue Router 4 + Element Plus`, leaving legacy Vue 2 templates behind.
 - 🧩 **4-in-1 Production Suite**: Covers **PC Buyer Mall (`buyer`)**, **Seller Portal (`seller`)**, **Platform Admin Panel (`manager`)**, and **IM Customer Service Web (`im`)**, complete with drag-and-drop visual storefront decoration and rich analytics.
 ---
 ## 1. Overview
 This repository (`lilishop-ui`) is the **Web Frontend Suite** of Lilishop, containing four standalone **Vue 3** web applications: **PC Buyer Mall, Seller Panel, Platform Admin Panel, and IM Customer Service Web**.
 - **Official Website**: <https://pickmall.cn>
 - **Documentation**: [Product Documentation](https://bdwx2tfwwt.feishu.cn/wiki/space/7675179368632617952?ccm_open_type=lark_wiki_spaceLink&open_tab_from=wiki_home)
 - **Gitee Repository**: <https://gitee.com/beijing_hongye_huicheng>
 - **GitHub Main Repository**: <https://github.com/lilishop/lilishop>
 ---
 ## 2. Online Demo
 > **Note**: The verification code for the demo environment is `111111`.
 | Portal | URL | Demo Credentials |
 | :--- | :--- | :--- |
 | **Platform Admin Panel (`manager`)** | <https://admin-b2b2c.pickmall.cn> | `admin` / `123456` |
 | **Seller / Store Panel (`seller`)** | <https://store-b2b2c.pickmall.cn> | `13011111111` / `111111` |
 | **PC Buyer Mall (`buyer`)** | <https://pc-b2b2c.pickmall.cn> | SMS code: `111111` |
 | **Mobile H5 (`uni-app`)** | <https://m-b2b2c.pickmall.cn> | SMS code: `111111` |
 | WeChat Mini Program | Mobile H5 ([Visit Directly](https://m-b2b2c.pickmall.cn)) |
 | :---: | :---: |
 | <img src="https://static.pickmall.cn/images/h5-qrcode.png" width="180" alt="WeChat Mini Program QR Code" /> | <img src="https://lilishop-wechat.oss-cn-beijing.aliyuncs.com/h5-qrcode.png" width="180" alt="Mobile H5 QR Code" /> |
 | Scan with WeChat | Scan or visit <https://m-b2b2c.pickmall.cn> |
 ---
 ## 3. Core Features & Tech Stack
 ### Core Features
 - **Four-Portal Synergy**: Includes Platform Admin, Seller Panel, PC Buyer Mall, and IM Web Workbench with clear role boundaries.
 - **Drag-and-Drop Visual Decoration**: Built-in visual floor editor (`vuedraggable`) for customizing both PC and mobile storefronts.
 - **Multi-Vendor B2B2C Operations**: Merchant onboarding, product auditing, split-order fulfillment, promotions, and financial settlement ledgers.
 - **Rich Business Analytics**: Powered by `@antv/g2` for sales overview, YoY/MoM product reports, member analytics, and distribution metrics.
 - **IM Customer Service**: Integrated with Tencent Cloud IM / WebSocket customer service for real-time communication.
 ### Web Tech Stack
 | Category | Technology | Description |
 | :--- | :--- | :--- |
 | Core Framework | `Vue 3.5` + `Vue Router 4` | Modern reactive frontend framework |
 | State Management | `Pinia 4` | Official Vue 3 state management library |
 | UI Library | `Element Plus 2.x` | Enterprise desktop UI component library |
 | HTTP Client | `Axios 1.x` | Unified request/response interceptors & auth handling |
 | Data Visualization | `@antv/g2` | Interactive charts and business analytics |
 | Visual Decoration | `vuedraggable 4` | Drag-and-drop page floor builder |
 | Messaging & IM | `@tencentcloud/chat` / `sockjs-client` | Real-time customer service messaging |
 | Video Player | `dplayer` + `hls.js` | Product video and live streaming playback |
 | Build & Styling | `Vue CLI 5` + `Webpack 5` + `Sass / Less` | Modular build pipeline and theme customization |
 ---
 ## 4. Directory Structure
 ```text
 lilishop-ui
 ├── buyer/                    # [PC Buyer Mall]
 │   ├── public/               # Static assets & global config (config.js)
 │   └── src/
 │       ├── api/              # Buyer API modules (goods, cart, order, member, promotion)
 │       ├── components/       # Shared components (floor renderer, navbar, goods card)
 │       ├── pages/            # PC Mall pages (Home, Product Detail, Checkout, User Center)
 │       ├── router/           # Route definitions & guards
 │       ├── stores/           # Pinia stores
 │       └── utils/            # Request interceptors & helpers
 ├── seller/                   # [Seller / Store Management Portal]
 │   ├── public/               # Static assets & global config
 │   └── src/
 │       ├── api/              # Seller API modules
 │       ├── components/       # Seller shared & decoration components
 │       ├── views/            # Seller views (goods, orders, after-sales, promotions, store settings)
 │       ├── router/           # Dynamic permission routes
 │       └── stores/           # Pinia stores
 ├── manager/                  # [Platform Admin Portal]
 │   ├── public/               # Static assets & global config
 │   └── src/
 │       ├── api/              # Admin API modules
 │       ├── components/       # Admin components, rich-text editor, visual floor builder
 │       ├── views/            # Admin views (member, goods, order, seller, marketing, finance, stats, system)
 │       ├── router/           # Menu & permission routes
 │       └── stores/           # Pinia stores
 ├── im/                       # [IM Customer Service Web Client]
 │   └── src/
 │       ├── api/              # Chat session & message APIs
 │       ├── components/       # Chat window, message list, product/order cards
 │       ├── im-server/        # WebSocket / IM connection manager
 │       └── views/            # Customer service workbench
 ├── build.sh                  # Unified build script
 └── docker-build.sh           # Docker image build script
 ```
 ---
 ## 5. Related Repositories
 | Repository | Description | Links |
 | :--- | :--- | :--- |
 | **`lilishop`** | Backend Services (Spring Boot 4 / Java 21) | [Gitee](https://gitee.com/beijing_hongye_huicheng/lilishop) · [GitHub](https://github.com/lilishop/lilishop) |
 | **`lilishop-ui`** | PC Mall / Seller / Admin / IM Web Frontend | [Gitee](https://gitee.com/beijing_hongye_huicheng/lilishop-ui) |
 | **`lilishop-uniapp`** | Mobile Buyer Client (H5 / Mini Program / App) | [Gitee](https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp) |
 | **`docker`** | Docker Compose, Images & SQL Init Scripts | [Gitee](https://gitee.com/beijing_hongye_huicheng/docker) · [MySQL Scripts](https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql) |
 ---
 ## 6. License
 Lilishop is licensed under the [MIT](./LICENSE) License. Copyright © 2020-2026 **Beijing Hongye Huicheng Technology Co., Ltd.**
--- a/README.md
+++ b/README.md
@@ -1,277 +1,181 @@
-## Lilishop B2B2C商城系统
+<div align="center">
-
+  <img src="./manager/src/assets/logo.png" width="180" alt="Lilishop Logo" />
-##### 官方公众号 & 开源不易，如有帮助请点Star
+  <h1>Lilishop(PickMall) 开源商城系统 - Web 前端 (Vue 3)</h1>
-![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)
+
-
+  <p>
-[![star](https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark)](https://gitee.com/beijing_hongye_huicheng/lilishop/stargazers)
+    <a href="https://github.com/lilishop/lilishop"><img src="https://img.shields.io/github/stars/lilishop/lilishop.svg?style=social&logo=github" alt="GitHub Stars" /></a>
-
+    <a href="https://gitee.com/beijing_hongye_huicheng/lilishop"><img src="https://gitee.com/beijing_hongye_huicheng/lilishop/badge/star.svg?theme=dark" alt="Gitee Stars" /></a>
-
+    <a href="./LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue.svg" alt="License" /></a>
-### 介绍
+    <a href="https://vuejs.org/"><img src="https://img.shields.io/badge/Vue-3.5-brightgreen.svg" alt="Vue 3" /></a>
-**官网**：https://pickmall.cn
+    <a href="https://element-plus.org/"><img src="https://img.shields.io/badge/Element%20Plus-2.x-409EFF.svg" alt="Element Plus" /></a>
-
+    <a href="https://pinia.vuejs.org/"><img src="https://img.shields.io/badge/Pinia-4.x-yellow.svg" alt="Pinia" /></a>
-Lilishop 是一款Java开发，基于SpringBoot研发的B2B2C多用户商城，前端使用 Vue、uniapp开发 **系统全端全部代码开源**
+  </p>
-
+
-产品前后端分离、支持分布式部署。
+  <p>
-
+    <a href="https://pickmall.cn">🏠 官方网站</a> ·
-商城展示端包含 PC、H5、微信小程序、APP。
+    <a href="https://bdwx2tfwwt.feishu.cn/wiki/space/7675179368632617952?ccm_open_type=lark_wiki_spaceLink&open_tab_from=wiki_home">📖 产品文档</a> ·
-
+    <a href="#2-在线演示">💻 在线演示</a> ·
-商城包含 会员模块、**第三方登录模块**、**第三方支付模块**、**楼层装修模块**、订单模块、分销模块、文章模块、系统设置模块、流量分析模块
+    <a href="#7-社区与支持">💬 微信交流群</a>
-
+  </p>
-系统包含各种中间件、搜索引擎、多级缓存、分布式事务、分布式任务调度等，支持Docker，支持k8s。是一款高性能，支持高并发等商城系统。
+
-
+  <p>
-开箱即用，简单配置即可部署一套属于您的系统。
+    <b>简体中文</b> | <a href="./README.en.md">English</a>
-
+  </p>
-### 文档
+</div>
-
+
-**产品文档**（需求、架构、使用、部署、开发）：https://docs.pickmall.cn
+> ⭐ **如果觉得项目不错，请点击右上角 `Star` 收藏支持！您的 Star 是我们持续开源迭代的最大动力！**
-
+
-
+**LILISHOP** 是基于 Spring Boot / Vue 3 / uni-app 开发的开源商城系统，支持 B2B2C 多商户商城、微信小程序商城、H5 商城、APP 商城、直播电商、分销返佣、秒杀活动。
-### 项目链接(gitee)
+
-
+### ✨ 为什么选择 Lilishop
-**Java后台**：https://gitee.com/beijing_hongye_huicheng/lilishop.git
+- 🟢 **真 MIT 协议**：支持免费商用与私有化闭源二开，无版权后顾之忧。
-
+- 🚀 **Vue 3 全新栈**：全面基于 `Vue 3.5 + Pinia 4 + Vue Router 4 + Element Plus` 构建，告别老旧 Vue 2 架构。
-**Vue后台前端**： https://gitee.com/beijing_hongye_huicheng/lilishop-ui.git
+- 🧩 **四端合一生产级闭环**：完整覆盖 **PC 买家端 (`buyer`)**、**商家端 (`seller`)**、**平台运营管理端 (`manager`)** 与 **在线客服端 (`im`)**，支持拖拽式可视化楼层装修与多维数据统计报表。
-
+
-**Uni-app**：https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp.git
+---
-
+
-**docker一键部署**：https://gitee.com/beijing_hongye_huicheng/docker.git
+## 1. 项目简介
-
+
-### 项目链接(github)
+**Lilishop** 是一款功能完善的 B2B2C 多商户商城系统，采用前后端分离架构，全端代码开源。  
-
+后端基于 **Spring Boot 4**（Java 21）构建，具备高内聚、低耦合的特性，支持分布式部署；前端覆盖 PC、管理后台、H5、小程序和 APP，基于 **Vue 3** 和 **uni-app** 开发。
-**Java后台**：https://github.com/hongyehuicheng/lilishop.git
+
-
+本仓库（`lilishop-ui`）为 **Web 前端源码仓库**，包含 **PC 商城端、商家后台、平台管理后台、IM 在线客服** 四个独立子工程。
-**Vue后台前端**： https://github.com/hongyehuicheng/lilishop-ui.git
+
-
+- **官方网站**: <https://pickmall.cn>
-**Uni-app**：https://github.com/hongyehuicheng/lilishop-uniapp.git
+- **官方文档**: [产品文档](https://bdwx2tfwwt.feishu.cn/wiki/space/7675179368632617952?ccm_open_type=lark_wiki_spaceLink&open_tab_from=wiki_home)
-
+- **Gitee 仓库**: <https://gitee.com/beijing_hongye_huicheng>
-**docker一键部署**：https://github.com/hongyehuicheng/docker.git
+- **GitHub 主仓库**: <https://github.com/lilishop/lilishop>
-
+
-### 演示地址
+---
-
+
-**运营后台**：https://admin-b2b2c.pickmall.cn 账号：admin/123456
+## 2. 在线演示
-
+
-**店铺后台**：https://store-b2b2c.pickmall.cn 账号：13011111111/111111
+> **注意**: 演示站手机验证码统一为 `111111`。演示环境部署于 `master` 分支。
-
+
-**用户前台**：https://pc-b2b2c.pickmall.cn
+| 演示站点 | 访问地址 | 演示账号 |
-
+| :--- | :--- | :--- |
-**移动端**：https://m-b2b2c.pickmall.cn
+| **平台运营管理端 (`manager`)** | <https://admin-b2b2c.pickmall.cn> | 账号：`admin` / 密码：`123456` |
-
+| **商家店铺管理端 (`seller`)** | <https://store-b2b2c.pickmall.cn> | 账号：`13011111111` / 密码：`111111` |
-![image-20210511171611793](https://pickmall.cn/assets/imgs/h5-qrcode.png)
+| **商城 PC 买家端 (`buyer`)** | <https://pc-b2b2c.pickmall.cn> | 可使用手机号验证码 `111111` 登录 |
-
+| **移动端 H5 (`uni-app`)** | <https://m-b2b2c.pickmall.cn> | 可使用手机号验证码 `111111` 登录 |
-### 3行命令搭建本地环境
+
-
+| 微信小程序 | 移动端 H5（[点击直接访问](https://m-b2b2c.pickmall.cn)） |
-温馨提示：由于服务较多，如果笔记本环境启动内存没有32g可能无法启动成功（macbookpro 2020 16g内存启动无法成功），台式机在16g内存、AMD 3700x 的ubuntu系统成功运行。
+| :---: | :---: |
-
+| <img src="https://static.pickmall.cn/images/h5-qrcode.png" width="180" alt="微信小程序体验码" /> | <img src="https://lilishop-wechat.oss-cn-beijing.aliyuncs.com/h5-qrcode.png" width="180" alt="移动端 H5 体验二维码" /> |
-##### 下载docker脚本
+| 微信扫码体验小程序 | 手机扫码或访问 <https://m-b2b2c.pickmall.cn> |
-`git clone https://gitee.com/beijing_hongye_huicheng/docker.git `
+
-##### 部署基础环境
+---
-`docker-compose up -d`
+
-
+## 3. 核心特性与技术栈
-##### 部署应用
+
-`docker-compose -f docker-compose-application.yml up -d`
+### 核心特性
-
+- **四端协同**: 涵盖平台管理端、商家管理端、PC 买家商城端、IM 客服端，角色边界清晰，开箱即用。
-
+- **可视化拖拽装修**: 管理端与商家端内置可视化楼层编辑器（基于 `vuedraggable`），可同步配置 PC 端与移动端首页/专题页。
-
+- **多商户入驻与结算**: 完整的商家入驻审核、商品审核、拆单发货、促销报名、财务对账与结算台账体系。
-PS:单独部署的话，数据库文件访问这里：https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql
+- **多维经营分析**: 集成 `@antv/g2` 图表引擎，提供营业概况、商品同比环比、会员分析、营销与分销数据统计。
-
+- **即时通讯客服**: 集成腾讯云 IM / WebSocket 在线客服系统，支持买家、商家与平台实时沟通。
-##### 各个地址
+
-
+### Web 前端技术栈
-| API           | 地址            |
+| 类别 | 技术选型 | 说明 |
-| -------------- | --------------- |
+| :--- | :--- | :--- |
-| 买家API    | http://127.0.0.1:8888     |
+| 核心框架 | `Vue 3.5` + `Vue Router 4` | 基于 Composition API 的现代响应式前端框架 |
-| 商家API     | http://127.0.0.1:8889      |
+| 状态管理 | `Pinia 4` | 轻量、类型友好的 Vue 3 官方状态管理库 |
-| 管理端API       | http://127.0.0.1:8887   |
+| UI 组件库 | `Element Plus 2.x` | 企业级中后台与桌面端 UI 组件库 |
-| 通用API    | http://127.0.0.1:8890     |
+| 网络请求 | `Axios 1.x` | 统一请求/响应拦截、Token 刷新与异常提示 |
-
+| 数据可视化 | `@antv/g2` | 运营端与商家端数据统计图表渲染 |
-| 前端演示         | 地址            |
+| 可视化拖拽 | `vuedraggable 4` | 商城首页及专题楼层可视化拖拽装修 |
-| -------------- | --------------- |
+| 即时通讯 | `@tencentcloud/chat` / `sockjs-client` | 在线客服消息收发与实时通知 |
-| PC       | http://127.0.0.1:10000     |
+| 音视频播放 | `dplayer` + `hls.js` | 商品视频与直播流播放支持 |
-| WAP        | http://127.0.0.1:10001      |
+| 构建与样式 | `Vue CLI 5` + `Webpack 5` + `Sass / Less` | 模块化工程构建与全局主题样式定制 |
-| 商家       | http://127.0.0.1:10002   |
+
-| 管理端       | http://127.0.0.1:10003     |
+---
-
+
-
+## 4. 目录结构
-
+
-
+```text
-
+lilishop-ui
-### 功能列表
+├── buyer/                    # 【PC 买家商城端】源码工程
-
+│   ├── public/               # 静态资源与全局配置文件 (config.js)
-
+│   └── src/
-
+│       ├── api/              # 买家端接口定义（商品、购物车、订单、会员、促销等）
-#### 平台功能
+│       ├── components/       # 公共业务组件（楼层渲染、导航栏、商品卡片等）
-
+│       ├── pages/            # PC 商城各业务页面（首页、商品详情、结算、个人中心等）
-![平台功能](https://pickmall.cn/assets/imgs/other/managerList.jpg)
+│       ├── router/           # 路由配置与守卫
-
+│       ├── stores/           # Pinia 状态管理
-
+│       └── utils/            # 请求封装与通用工具函数
-
+├── seller/                   # 【商家店铺管理端】源码工程
-#### 商家端功能
+│   ├── public/               # 静态资源与全局配置
-
+│   └── src/
-![商家端功能](https://pickmall.cn/assets/imgs/other/storeList.jpg)
+│       ├── api/              # 商家端接口定义
-
+│       ├── components/       # 商家端公共组件与装修组件
-
+│       ├── views/            # 商家端业务视图（商品管理、订单发货、售后、促销、店铺设置、统计等）
-
+│       ├── router/           # 动态权限路由
-
+│       └── stores/           # Pinia 状态管理
-
+├── manager/                  # 【平台运营管理端】源码工程
-### 功能展示
+│   ├── public/               # 静态资源与全局配置
-
+│   └── src/
-
+│       ├── api/              # 运营端接口定义
-
+│       ├── components/       # 平台公共组件、富文本、可视化楼层装修编辑器
-#### 移动端
+│       ├── views/            # 运营端业务视图（会员、商品、订单、商家、营销、分销、财务、统计、系统设置）
-
+│       ├── router/           # 菜单与权限路由
-<img src="https://pickmall.cn/assets/imgs/other/app.gif" alt="管理端功能展示" style="zoom:50%;" />
+│       └── stores/           # Pinia 状态管理
-
+├── im/                       # 【IM 在线客服 Web 端】源码工程
-<img src="https://pickmall.cn/assets/imgs/other/app.gif" alt="移动端功能展示" style="zoom:50%;" />
+│   └── src/
-
+│       ├── api/              # 客服会话与消息接口
-
+│       ├── components/       # 聊天窗口、消息列表、商品/订单卡片组件
-
+│       ├── im-server/        # WebSocket / IM 连接服务管理
-#### 管理端
+│       └── views/            # 客服工作台页面
-
+├── build.sh                  # 多端统一构建脚本
-![管理端功能展示](https://pickmall.cn/assets/imgs/other/manager.gif)
+└── docker-build.sh           # Docker 镜像构建脚本
 ### 技术选型
 #### 架构图
 ![架构](https://lili-system.oss-cn-beijing.aliyuncs.com/docs/%E6%9E%B6%E6%9E%84.png)
 ##### Java后台
 | 说明           | 框架            | 说明           |               |
 | -------------- | --------------- | -------------- | ------------- |
 | 基础框架       | Spring Boot     | MVC框架        | Spring MVC    |
 | 持久框架       | Mybatis-Plus    | 程序构建       | Maven         |
 | 关系型数据库   | MySQL           | 消息中间件AMQP | RocketMQ      |
 | 缓存           | Redis +MongoDB  | 搜索引擎       | Elasticsearch |
 | 安全框架       | Spring Security | 数据库连接池   | Druid         |
 | 数据库分库分表 | sharding        | 定时任务       | xxl-job       |
 | 负载均衡       | Nginx           | 静态资源       | 阿里云OSS     |
 | 短信           | 阿里云短信      | 认证           | JWT           |
 | 日志处理       | Log4j           | 接口规范       | RESTful       |
 ##### 前端-运营后台、店铺后台
 | 说明       | 框架       | 说明       | 框架    |
 | ---------- | ---------- | ---------- | ------- |
 | 构建工具   | webpack    | JS版本     | ES6     |
 | 基础JS框架 | Vue.js     | 视频播放器 | Dplayer |
 | 路由管理   | Vue Router | 状态管理   | Vuex    |
 | 基础UI库   | iView      | UI界面基于 | iView   |
 | 网络请求   | axios      |            |         |
 ##### 前端-移动端
 | 说明      | 架构    | 说明     | 架构    |
 | --------- | ------- | -------- | ------- |
 | 基础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日
+---
-```
+## 5. 配套源码仓库
 新增功能：
 1.会员权益
 2.支持用户升级会员
 3.供求单
 4.IM：腾讯云智服
 5.服务商品
 6.店铺支持订单核销
 7.店铺自提点
 功能优化：
 1.用户分享商城、关注店铺、邀请新用户可获取积分、经验值。
 ```
-时间：2021年8月16日
+本仓库专注于 **PC / 商家端 / 运营端 / IM Web**（`lilishop-ui`）。完整系统由以下四个核心仓库组成：
-```
+| 仓库名称 | 职责说明 | 仓库地址 |
-新增功能：
+| :--- | :--- | :--- |
-1.微淘功能
+| **`lilishop`** | 后端服务源码（Spring Boot 4 / Java 21） | [Gitee](https://gitee.com/beijing_hongye_huicheng/lilishop) · [GitHub](https://github.com/lilishop/lilishop) |
-2.店铺移动端
+| **`lilishop-ui`** | PC 商城 / 商家端 / 运营管理端 / IM Web 前端 | [Gitee](https://gitee.com/beijing_hongye_huicheng/lilishop-ui) |
-3.店铺发货单
+| **`lilishop-uniapp`** | 买家端 H5 / 微信小程序 / Android & iOS APP | [Gitee](https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp) |
-```
+| **`docker`** | 容器化部署编排、镜像与数据库脚本 | [Gitee](https://gitee.com/beijing_hongye_huicheng/docker) · [MySQL 脚本](https://gitee.com/beijing_hongye_huicheng/docker/tree/master/init/mysql) |
-时间：2021年9月15日
+---
-```
+## 6. 开源与授权
 新增功能：
 增加供应商功能
 ```
-### 版本升级
+本项目遵循 [MIT](./LICENSE) 开源协议，版权归 **北京宏业汇成科技有限公司** 所有。允许个人及企业免费用于学习、研究、修改和商业用途（需保留原始版权和许可声明）。
-```
+---
 后续会持续版本升级，修复bug，完善功能，覆盖更多业务场景 o2o/b2b/s2b2b2c/跨境电商
-后续会考虑推出微服务/中台等 企业级版本
+## 7. 社区与支持
 ```
-### 技术亮点
+我们欢迎任何形式的交流与贡献。在提问前，请先查阅 [产品文档](https://bdwx2tfwwt.feishu.cn/wiki/space/7675179368632617952?ccm_open_type=lark_wiki_spaceLink&open_tab_from=wiki_home)，并参考 [《提问的智慧》](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way/blob/master/README-zh_CN.md) 以便高效沟通。
 - **[在线客服](https://work.weixin.qq.com/kfid/kfc4d8dc24a73c15f44)**
 - **微信交流群**:  
  <img src="https://lilishop-wechat.oss-cn-beijing.aliyuncs.com/wechat.jpg" width="200" alt="微信群" />
-    1.后端框架基于Springboot，构建基于maven，持久层使用MyBatisPlus。使用elasticsearch、redis、mongodb、rocketmq 等各种中间健。都是主流架构，轻松应对各种环境。
+---
-    2.支持集群、分布式，支持docker 轻松部署，解决各种复杂场景！
+## 8. 升级计划
-    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.已经对接好各种第三方插件，支持各种复杂等联合登陆，联合支付等场景。
 ### 开源须知
 1.仅允许用于个人学习研究使用.
 2.禁止将本开源的代码和资源进行任何形式任何名义的出售.
 3.限制商用，如果需要商业使用请联系我们。QQ3409056806.
 ### 交流群
 **QQ群**：961316482
 ### 🔜 近期规划中
 - 🔜 店铺结算汇总 & 结算台账
 - 🔜 支付方式汇总 & 钱包流水 & 财务汇总
 - 🔜 微信小店对接
 - 🔜 抖店对接
--- 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/.babelrc
+++ b/buyer/.babelrc
@@ -1,12 +0,0 @@
 {
  "presets": [
    ["env", {
      "modules": false,
      "targets": {
        "browsers": ["> 1%", "last 2 versions", "not ie <= 8"]
      }
    }],
    "stage-2"
  ],
  "plugins": ["transform-vue-jsx", "transform-runtime"]
 }
--- a/buyer/.eslintignore
+++ b/buyer/.eslintignore
@@ -1,4 +0,0 @@
 /build/
 /config/
 /dist/
 /*.js
--- a/buyer/.eslintrc.js
+++ b/buyer/.eslintrc.js
@@ -1,33 +0,0 @@
 // https://eslint.org/docs/user-guide/configuring
 module.exports = {
  root: true,
  parserOptions: {
    parser: 'babel-eslint'
  },
  env: {
    browser: true,
  },
  extends: [
    // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
    // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
    'plugin:vue/essential',
    // https://github.com/standard/standard/blob/master/docs/RULES-en.md
    'standard'
  ],
  // required to lint *.vue files
  plugins: [
    'vue'
  ],
  // add your custom rules here
  rules: {
    "semi": [0, "never"],
    // allow async-await
    'generator-star-spacing': 'off',
    // allow debugger during development
    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
    "vue/no-parsing-error": [2, {
      "x-invalid-end-tag": false
    }]
  }
 }
--- a/buyer/.npmrc
+++ b/buyer/.npmrc
@@ -0,0 +1 @@
 engine-strict=false
--- 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/
+# production stage
-COPY ./dist /app/
+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/MIGRATION-VUE3.md
+++ b/buyer/MIGRATION-VUE3.md
@@ -0,0 +1,55 @@
 # Buyer 买家端 Vue 3 迁移说明
 ## 技术栈
 - Vue 3 + Vue Router 4 + Pinia（vuex 已移除，见下文"组合式 API 迁移"）
 - Element Plus（替代 view-design / iView）
 - 保留 `$Message` / `$Modal` / `$Notice` 兼容层（`src/utils/message.js`）
 ## 启动
 ```bash
 cd buyer
 yarn install
 yarn dev    # 默认端口 10000
 yarn build
 ```
 ## 迁移要点
 1. **入口** `src/main.js` 使用 `createApp`，全局过滤器改为 `$filters`
 2. **路由** `src/router/index.js` 使用 `createRouter` + 动态 `import()`
 3. **请求** `src/plugins/request.js` 使用 Element Plus `ElLoading`
 4. **iView 组件已全部替换**：轮播 `el-carousel`、下拉 `el-dropdown`、侧栏 `el-menu`、头像 `el-avatar` 等
 5. **图标映射** `src/utils/iconMap.js` — 动态图标（如侧边栏菜单）通过 `resolveIcon()` 使用
 6. **自定义字体图标** `icomoon` 保留为 `<i class="icomoon icon-*">`（购物车步骤条、钱包等）
 7. **首页装修** `indexDecorate/modelList` 保留买家端展示逻辑（非 manager 编辑版）
 8. **特殊替换**
   - `vue-piczoom` → `el-image` 预览
   - `mv-count-down` → 内置倒计时
   - 秒杀轮播 → 横向滚动列表
 ## 组合式 API 迁移（2026-10 完成）
 全部 95 个 `.vue` 组件已从 Options API 转换为 `<script setup>`，同时完成 vuex → pinia：
 - **状态管理**：`src/stores/app.js`（`useAppStore`：navList / cartNum / unreadMsg / logoImg / siteName / hotWordsList / category + 对应 setXxx actions）。原 `src/vuex/` 已删除，package.json 不再依赖 vuex。
 - **路由守卫**：`beforeRouteEnter` 无组合式等价物，5 个页面（`GoodsList` / `GoodsDetail` / `PointGoodsDetail` / `Cart` / `ShoppingCart`）保留普通 `<script>` 块存放 `export default { name, beforeRouteEnter }`——这是官方支持的合并写法，统计 Options API 残留时需排除。
 - **defineExpose**：以下组件的方法/状态被父组件通过模板 ref 调用，已显式暴露：`verify`（init / close）、`multiple-map`（open）、`addressManage`（show / hide）、`invoiceModal`（invoiceAvailable）。新增此类父子调用时必须加 `defineExpose`。
 - **模板 ref 与响应式变量同名会互相覆盖**：同名时模板 ref 统一改名 `xxxRef`（如 `formRef` / `verifyRef`）。
 - **mixin 已消除**：原 `components/mixes/talkIm.vue` 的 IM 客服逻辑已内联进 `Merchant.vue` 和 `goodsDetail/StoreSide.vue`，文件已删除。
 - **全局属性照旧**：模板中的 `$filters.*` / `linkTo` / `connectCs` / `$inputMaxLength` 是 `main.js` 注册的全局属性，`<script setup>` 下模板可直接使用；script 内使用 `$filters` 函数需从 `@/plugins/filters.js` 具名导入，`this.Cookies` 等同 `storage`（`@/plugins/storage`）。
 - **其余三端（seller / manager / im）仍为 Options API + vuex**，迁移时参照本端模式。
 ## 批量脚本
 - `scripts/migrate-iview-to-element.js` — iView → Element 模板替换
 - `scripts/fix-filters.js` — Vue 2 过滤器语法修复
 - `scripts/replace-page.js` — `<Page>` → `el-pagination`
 - `scripts/replace-icon.js` — 静态 `<Icon type>` → `el-icon`
 - `scripts/fix-el-icon-click.js` — 修复 `@click` 绑定
 - `scripts/fix-broken-tags.js` — 闭合标签修复
 ## 上线前检查
 四端统一清单（认证、axios、Element Plus、分端专项）：[../MIGRATION-VUE3.md](../MIGRATION-VUE3.md)
--- a/buyer/README.md
+++ b/buyer/README.md
@@ -1,19 +0,0 @@
 # new
 ## Project setup
 ```
 npm install
 ```
 ### Compiles and hot-reloads for development
 ```
 npm run serve
 ```
 ### Compiles and minifies for production
 ```
 npm run build
 ```
 ### Customize configuration
 See [Configuration Reference](https://cli.vuejs.org/config/).
--- a/buyer/docker.sh
+++ b/buyer/docker.sh
@@ -1 +1 @@
-docker build -t registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-4.2.0:0.0.2 .
+docker build -t registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui:4.2.4.1 .
--- a/buyer/eslint.config.js
+++ b/buyer/eslint.config.js
@@ -0,0 +1,36 @@
 const globals = require('globals')
 const pluginVue = require('eslint-plugin-vue')
 module.exports = [
  {
    ignores: [
      'dist/**',
      'node_modules/**',
      'build/**',
      'config/**',
      'src/scripts/**', // 一次性迁移脚本，不参与 lint
    ],
  },
  ...pluginVue.configs['flat/essential'],
  {
    files: ['src/**/*.{js,vue}'],
    languageOptions: {
      ecmaVersion: 'latest',
      sourceType: 'module',
      globals: {
        ...globals.browser,
      },
    },
    rules: {
      'no-console': ['warn', { allow: ['warn', 'error'] }],
      'no-empty': ['error', { allowEmptyCatch: false }],
      'vue/no-parsing-error': ['error', { 'x-invalid-end-tag': false }],
      // 页面组件通过路由按文件路径引用，组件名不参与解析，存量单词组件名不再强制多词
      'vue/multi-word-component-names': 'off',
      // 存量代码大量使用与 HTML 保留名同名的组件（element-plus 图标 Search/View/Camera/Link 及全局注册的 empty/drawer 等），重命名成本高，暂不启用
      'vue/no-reserved-component-names': 'off',
      // 全端已完成 Options API → <script setup> 迁移，防止新代码回退（路由守卫的普通 script 块等有意保留的除外，故用 warn）
      'vue/component-api-style': ['warn', ['script-setup']],
    },
  },
 ]
--- a/buyer/favicon.ico
+++ b/buyer/favicon.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;
+    include mime.types;
-    default_type  application/octet-stream;
+    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_min_length 5k;
-    gzip_buffers     4 16k;
+    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;
+        listen 10000;
        server_name  localhost;
        location / {
            root /app;
            try_files $uri $uri/ /index.html $uri/ =404;
-            index  index.html index.htm;
+            index index.html index.htm;
        }
    }
 }
--- a/buyer/package-lock.json
+++ b/buyer/package-lock.json
--- a/buyer/package.json
+++ b/buyer/package.json
@@ -3,40 +3,54 @@
  "version": "1.0.0",
  "private": true,
  "scripts": {
    "dev": "vue-cli-service serve",
    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build"
+    "build": "vue-cli-service build",
    "dev": "vue-cli-service serve",
    "lint": "eslint src",
    "lint:fix": "eslint src --fix"
  },
  "engines": {
    "node": ">=16"
  },
  "dependencies": {
    "@amap/amap-jsapi-loader": "0.0.7",
-    "axios": "^0.19.2",
+    "@element-plus/icons-vue": "^2.3.2",
    "axios": "^1.7.9",
    "core-js": "^3.49.0",
    "dplayer": "^1.27.1",
    "element-plus": "^2.14.1",
    "js-cookie": "^2.2.1",
-    "less": "^2.7.0",
+    "nprogress": "^0.2.0",
-    "less-loader": "^5.0.0",
+    "pinia": "^4.0.3",
    "mv-count-down": "^0.1.15",
    "node-sass": "^4.14.1",
    "psl": "^1.8.0",
    "qs": "^6.9.4",
-    "sass-loader": "^7.3.1",
+    "sass": "^1.63.6",
    "sass-loader": "^10.4.1",
    "uuid": "^8.3.2",
-    "view-design": "^4.3.2",
+    "vue": "^3.5.35",
-    "vue": "^2.6.11",
+    "vue-qr": "^5.0.3",
-    "vue-awesome-swiper": "^3.1.3",
+    "vue-router": "^4.6.4"
    "vue-piczoom": "^1.0.6",
    "vue-qr": "^2.3.0",
    "vue-router": "^3.0.1",
    "vuex": "^3.0.1"
  },
  "devDependencies": {
-    "@vue/cli-service": "~4.5.0",
+    "@vue/cli-plugin-babel": "^5.0.9",
-    "compression-webpack-plugin": "^5.0.0",
+    "@vue/cli-service": "^5.0.9",
-    "sass-loader": "^7.3.1",
+    "@vue/compiler-sfc": "^3.5.35",
-    "uglifyjs-webpack-plugin": "^2.2.0",
+    "compression-webpack-plugin": "^10.0.0",
-    "vue-template-compiler": "^2.6.11"
+    "eslint": "^9.39.4",
    "eslint-plugin-vue": "^10.11.1",
    "globals": "^17.13.0",
    "less": "^4.2.0",
    "less-loader": "^11.1.4",
    "vue-eslint-parser": "^10.4.1",
    "webpack": "^5.95.0"
  },
  "browserslist": [
    "> 1%",
    "last 2 versions",
    "not dead"
-  ]
+  ],
  "resolutions": {
    "minimatch": "^3.1.2",
    "@achrinza/node-ipc": "9.2.2"
  }
 }
--- a/buyer/pnpm-lock.yaml
+++ b/buyer/pnpm-lock.yaml
--- a/buyer/public/config.js
+++ b/buyer/public/config.js
@@ -0,0 +1,11 @@
 var BASE = {
  /**
   * @description api请求基础路径
   */
  API_DEV: {
    buyer: "https://buyer-api.pickmall.cn",
  },
  API_PROD: {
    buyer: "https://buyer-api.pickmall.cn",
  },
 };
--- a/buyer/public/index.html
+++ b/buyer/public/index.html
@@ -3,21 +3,16 @@
  <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="<%= BASE_URL %>config.js"></script>
      <script src="<%=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/scripts/fix-broken-tags.js
+++ b/buyer/scripts/fix-broken-tags.js
@@ -0,0 +1,54 @@
 #!/usr/bin/env node
 const fs = require("fs");
 const path = require("path");
 const ROOT = path.join(__dirname, "..");
 function walkDir(dir, files = []) {
  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
    const full = path.join(dir, entry.name);
    if (entry.isDirectory()) walkDir(full, files);
    else if (entry.name.endsWith(".vue")) files.push(full);
  }
  return files;
 }
 function fix(content) {
  let c = content;
  c = c.replace(/<\/Button>/g, "</el-button>");
  c = c.replace(/<\/Button\b/g, "</el-button");
  c = c.replace(/<\/Input>/g, "</el-input>");
  c = c.replace(/<\/Input\b/g, "</el-input");
  c = c.replace(/<\/Option>/g, "</el-option>");
  c = c.replace(/<\/Option\b/g, "</el-option");
  c = c.replace(/<\/Checkbox>/g, "</el-checkbox>");
  c = c.replace(/<\/Checkbox\b/g, "</el-checkbox");
  c = c.replace(/<\/Select>/g, "</el-select>");
  c = c.replace(/<\/Select\b/g, "</el-select");
  c = c.replace(/<\/Form>/g, "</el-form>");
  c = c.replace(/<\/Modal>/g, "</el-dialog>");
  c = c.replace(/@click\.native/g, "@click");
  c = c.replace(/@on-search/g, "@keyup.enter");
  c = c.replace(/\bsearch\b(?=\s+enter-button)/g, "");
  c = c.replace(/\benter-button\b/g, "");
  c = c.replace(/<BreadcrumbItem/g, "<el-breadcrumb-item");
  c = c.replace(/<\/BreadcrumbItem>/g, "</el-breadcrumb-item>");
  c = c.replace(/<Breadcrumb/g, "<el-breadcrumb");
  c = c.replace(/<\/Breadcrumb>/g, "</el-breadcrumb>");
  c = c.replace(/type="error"/g, 'type="danger"');
  c = c.replace(/<i-col/g, "<div");
  c = c.replace(/<\/i-col>/g, "</div>");
  c = c.replace(/\{\{([^}|]+)\s*\|\s*secrecyMobile\s*\}\}/g, "{{ $filters.secrecyMobile($1) }}");
  return c;
 }
 let count = 0;
 for (const file of walkDir(path.join(ROOT, "src"))) {
  const original = fs.readFileSync(file, "utf8");
  const fixed = fix(original);
  if (fixed !== original) {
    fs.writeFileSync(file, fixed);
    count++;
  }
 }
 console.log(`Fixed tags in ${count} files`);
--- a/buyer/scripts/fix-dialog-slots.js
+++ b/buyer/scripts/fix-dialog-slots.js
@@ -0,0 +1,52 @@
 #!/usr/bin/env node
 const fs = require("fs");
 const path = require("path");
 const ROOT = path.join(__dirname, "..");
 function walkDir(dir, files = []) {
  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
    const full = path.join(dir, entry.name);
    if (entry.isDirectory()) walkDir(full, files);
    else if (entry.name.endsWith(".vue")) files.push(full);
  }
  return files;
 }
 function fix(content) {
  let c = content;
  c = c.replace(/<p #header>/g, "<template #header><p>");
  c = c.replace(
    /(<template #header><p>[\s\S]*?<\/p>)(\s*<div)/g,
    "$1</template>$2"
  );
  c = c.replace(
    /<template #footer><div([^>]*)>([\s\S]*?)<\/div><\/template><\/el-dialog>/g,
    "<template #footer><div$1>$2</div></template>\n    </el-dialog>"
  );
  c = c.replace(
    /<template #default\s*>([\s\S]*?)<\/template\s*>/g,
    (match, inner) => {
      if (match.includes("el-alert")) {
        return `<template #title>${inner}</template>`;
      }
      return match;
    }
  );
  return c;
 }
 let count = 0;
 for (const file of walkDir(path.join(ROOT, "src"))) {
  const original = fs.readFileSync(file, "utf8");
  const fixed = fix(original);
  if (fixed !== original) {
    fs.writeFileSync(file, fixed);
    count++;
  }
 }
 console.log(`Fixed dialog slots in ${count} files`);
--- a/buyer/scripts/fix-duplicate-size.js
+++ b/buyer/scripts/fix-duplicate-size.js
@@ -0,0 +1,26 @@
 #!/usr/bin/env node
 const fs = require("fs");
 const path = require("path");
 const ROOT = path.join(__dirname, "..", "src");
 function walk(dir, files = []) {
  for (const e of fs.readdirSync(dir, { withFileTypes: true })) {
    const f = path.join(dir, e.name);
    if (e.isDirectory()) walk(f, files);
    else if (e.name.endsWith(".vue")) files.push(f);
  }
  return files;
 }
 let n = 0;
 for (const file of walk(ROOT)) {
  let c = fs.readFileSync(file, "utf8");
  const next = c.replace(/:size="(\d+)"\s+:size="\1"/g, ':size="$1"');
  if (next !== c) {
    fs.writeFileSync(file, next);
    n++;
    console.log(path.relative(ROOT, file));
  }
 }
 console.log(`Fixed duplicate :size in ${n} files`);
--- a/buyer/scripts/fix-el-icon-click.js
+++ b/buyer/scripts/fix-el-icon-click.js
@@ -0,0 +1,28 @@
 #!/usr/bin/env node
 const fs = require("fs");
 const path = require("path");
 const ROOT = path.join(__dirname, "..", "src");
 function walk(dir, files = []) {
  for (const e of fs.readdirSync(dir, { withFileTypes: true })) {
    const f = path.join(dir, e.name);
    if (e.isDirectory()) walk(f, files);
    else if (e.name.endsWith(".vue")) files.push(f);
  }
  return files;
 }
 let n = 0;
 for (const file of walk(ROOT)) {
  let c = fs.readFileSync(file, "utf8");
  const next = c
    .replace(/<el-icon([^>]*?):click=/g, "<el-icon$1@click=")
    .replace(/:class="refresh"/g, 'class="refresh"')
    .replace(/:size="20" @click="show = false" :size="20"/g, ':size="20" @click="show = false"');
  if (next !== c) {
    fs.writeFileSync(file, next);
    n++;
  }
 }
 console.log(`Fixed el-icon click in ${n} files`);
--- a/buyer/scripts/fix-filters.js
+++ b/buyer/scripts/fix-filters.js
@@ -0,0 +1,77 @@
 #!/usr/bin/env node
 const fs = require("fs");
 const path = require("path");
 const ROOT = path.join(__dirname, "..");
 function walkDir(dir, files = []) {
  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
    const full = path.join(dir, entry.name);
    if (entry.isDirectory()) walkDir(full, files);
    else if (entry.name.endsWith(".vue")) files.push(full);
  }
  return files;
 }
 function fixFilters(content) {
  let c = content;
  // Fix broken: {{ expr {{ $filters.unitPrice(args) }}
  c = c.replace(
    /\{\{\s*([^}{]+?)\s*\{\{\s*\$filters\.unitPrice\(([^)]*)\)\s*\}\}/g,
    "{{ $filters.unitPrice($1, $2) }}"
  );
  // Fix: {{ expr | unitPrice }} or {{ expr | unitPrice('￥') }}
  c = c.replace(
    /\{\{\s*([^}|]+?)\s*\|\s*unitPrice(?:\(([^)]*)\))?\s*\}\}/g,
    (_, expr, args) => {
      const e = expr.trim();
      return args !== undefined
        ? `{{ $filters.unitPrice(${e}, ${args}) }}`
        : `{{ $filters.unitPrice(${e}) }}`;
    }
  );
  // Fix inline without braces: expr | unitPrice("￥")
  c = c.replace(
    /(?<!\{\{)\s*([a-zA-Z0-9_.?()[\]'"\s]+?)\s*\|\s*unitPrice\(([^)]*)\)/g,
    (match, expr, args) => {
      if (match.includes("{{")) return match;
      return `{{ $filters.unitPrice(${expr.trim()}, ${args}) }}`;
    }
  );
  // Fix inline without args: expr | unitPrice
  c = c.replace(
    /(?<!\{\{)\s*([a-zA-Z0-9_.?()[\]'"\s]+?)\s*\|\s*unitPrice(?!\()/g,
    (match, expr) => {
      if (match.includes("{{") || match.includes("$filters")) return match;
      return `{{ $filters.unitPrice(${expr.trim()}) }}`;
    }
  );
  // Fix unixToDate filter
  c = c.replace(
    /\{\{\s*([^}|]+?)\s*\|\s*unixToDate(?:\(([^)]*)\))?\s*\}\}/g,
    (_, expr, args) => {
      const e = expr.trim();
      return args !== undefined
        ? `{{ $filters.unixToDate(${e}, ${args}) }}`
        : `{{ $filters.unixToDate(${e}) }}`;
    }
  );
  return c;
 }
 let count = 0;
 for (const file of walkDir(path.join(ROOT, "src"))) {
  const original = fs.readFileSync(file, "utf8");
  const fixed = fixFilters(original);
  if (fixed !== original) {
    fs.writeFileSync(file, fixed);
    count++;
  }
 }
 console.log(`Fixed filters in ${count} files`);
--- a/buyer/scripts/fix-runtime-compat.js
+++ b/buyer/scripts/fix-runtime-compat.js
@@ -0,0 +1,55 @@
 #!/usr/bin/env node
 const fs = require("fs");
 const path = require("path");
 const ROOT = path.join(__dirname, "..");
 function walkDir(dir, files = []) {
  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
    const full = path.join(dir, entry.name);
    if (entry.isDirectory()) walkDir(full, files);
    else if (entry.name.endsWith(".vue")) files.push(full);
  }
  return files;
 }
 function fix(content) {
  let c = content;
  c = c.replace(/<el-pagination\b/g, "<Page");
  c = c.replace(/<\/el-pagination>/g, "</Page>");
  c = c.replace(
    /<Icon([^>]*)\s+#prepend\s*>\s*<\/Icon>/g,
    "<template #prepend><Icon$1></Icon></template>"
  );
  c = c.replace(
    /<Icon([^>]*)\s+#prepend\s*>\s*<\/Icon>/g,
    "<template #prepend><Icon$1></Icon></template>"
  );
  c = c.replace(
    /<template #prepend><Icon([^>]*)\s*\/>/g,
    "<template #prepend><Icon$1></Icon></template>"
  );
  c = c.replace(/@keyup\.enter\.native/g, "@keyup.enter");
  c = c.replace(/slot="append"/g, "#append");
  c = c.replace(/(<div[^>]*)\s+#append/g, "<template #append>$1");
  c = c.replace(/(<el-button[^>]*)\slong/g, '$1 style="width:100%"');
  c = c.replace(/@on-select/g, "@select");
  c = c.replace(/@on-click/g, "@click");
  return c;
 }
 let count = 0;
 for (const file of walkDir(path.join(ROOT, "src"))) {
  const original = fs.readFileSync(file, "utf8");
  const fixed = fix(original);
  if (fixed !== original) {
    fs.writeFileSync(file, fixed);
    count++;
  }
 }
 console.log(`Runtime compat fixes in ${count} files`);
--- a/buyer/scripts/fix-slots.js
+++ b/buyer/scripts/fix-slots.js
@@ -0,0 +1,54 @@
 #!/usr/bin/env node
 const fs = require("fs");
 const path = require("path");
 const ROOT = path.join(__dirname, "..");
 function walkDir(dir, files = []) {
  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
    const full = path.join(dir, entry.name);
    if (entry.isDirectory()) walkDir(full, files);
    else if (entry.name.endsWith(".vue")) files.push(full);
  }
  return files;
 }
 function fix(content) {
  let c = content;
  c = c.replace(
    /<template #default="(\{[^"]+\})" #([a-zA-Z0-9_-]+)>/g,
    '<template #$2="$1">'
  );
  c = c.replace(
    /<div([^>]*) #footer([^>]*)>/g,
    '<template #footer><div$1$2>'
  );
  c = c.replace(/<\/div>\s*(?=<\/el-dialog>)/g, "</div></template>");
  c = c.replace(/<span #append>/g, "<template #append><span>");
  c = c.replace(/<\/span><\/el-input/g, "</span></template></el-input");
  c = c.replace(/><span #append>/g, "><template #append><span>");
  c = c.replace(/<el-button #append/g, "<template #append><el-button");
  c = c.replace(
    /<\/el-button>(\s*<\/el-input>)/g,
    "</el-button></template>$1"
  );
  c = c.replace(/<template #desc\b/g, "<template #default");
  return c;
 }
 let count = 0;
 for (const file of walkDir(path.join(ROOT, "src"))) {
  const original = fs.readFileSync(file, "utf8");
  const fixed = fix(original);
  if (fixed !== original) {
    fs.writeFileSync(file, fixed);
    count++;
  }
 }
 console.log(`Fixed slots in ${count} files`);
--- a/buyer/scripts/fix-span-tags.js
+++ b/buyer/scripts/fix-span-tags.js
@@ -0,0 +1,46 @@
 #!/usr/bin/env node
 const fs = require("fs");
 const path = require("path");
 const ROOT = path.join(__dirname, "..");
 function walkDir(dir, files = []) {
  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
    const full = path.join(dir, entry.name);
    if (entry.isDirectory()) walkDir(full, files);
    else if (entry.name.endsWith(".vue")) files.push(full);
  }
  return files;
 }
 function fix(content) {
  let c = content;
  c = c.replace(/<\/span\s*\n\s*>/g, "</span>");
  c = c.replace(/<\/span\s+>/g, "</span>");
  c = c.replace(/<i-input/g, "<el-input");
  c = c.replace(/<\/i-input>/g, "</el-input>");
  c = c.replace(
    /<Icon([^>]*)\s+#prepend\s*\/>/g,
    "<template #prepend><Icon$1 /></template>"
  );
  c = c.replace(
    /<template #append><el-button([^>]*)>([\s\S]*?)<\/el-button>\s*<\/i-input>/g,
    "<template #append><el-button$1>$2</el-button></template></el-input>"
  );
  c = c.replace(
    /<template #append><el-button([^>]*)>([\s\S]*?)<\/el-button>\s*<\/el-input>/g,
    "<template #append><el-button$1>$2</el-button></template></el-input>"
  );
  return c;
 }
 let count = 0;
 for (const file of walkDir(path.join(ROOT, "src"))) {
  const original = fs.readFileSync(file, "utf8");
  const fixed = fix(original);
  if (fixed !== original) {
    fs.writeFileSync(file, fixed);
    count++;
  }
 }
 console.log(`Fixed span/input tags in ${count} files`);
--- a/buyer/scripts/fix-stray-templates.js
+++ b/buyer/scripts/fix-stray-templates.js
@@ -0,0 +1,55 @@
 #!/usr/bin/env node
 const fs = require("fs");
 const path = require("path");
 const ROOT = path.join(__dirname, "..");
 function walkDir(dir, files = []) {
  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
    const full = path.join(dir, entry.name);
    if (entry.isDirectory()) walkDir(full, files);
    else if (entry.name.endsWith(".vue")) files.push(full);
  }
  return files;
 }
 function fix(content) {
  let c = content;
  c = c.replace(
    /(<div[^>]*)\s+#content>/g,
    "<template #content><div$1>"
  );
  c = c.replace(
    /(<\/el-tooltip>)/g,
    (match, _m, offset, str) => {
      return match;
    }
  );
  c = c.replace(
    /(<div style="white-space:[^"]*"[^>]*>[\s\S]*?<\/div>)(\s*<\/el-tooltip>)/g,
    "$1</template>$2"
  );
  c = c.replace(/<\/div><\/template><\/el-dialog>/g, (m, offset, str) => {
    const before = str.slice(Math.max(0, offset - 200), offset);
    if (before.includes("#footer")) return m;
    return "</div></el-dialog>";
  });
  c = c.replace(/<i(\s[^>]*)\/>/g, "<i$1></i>");
  return c;
 }
 let count = 0;
 for (const file of walkDir(path.join(ROOT, "src"))) {
  const original = fs.readFileSync(file, "utf8");
  const fixed = fix(original);
  if (fixed !== original) {
    fs.writeFileSync(file, fixed);
    count++;
  }
 }
 console.log(`Fixed stray templates in ${count} files`);
--- a/buyer/scripts/migrate-iview-to-element.js
+++ b/buyer/scripts/migrate-iview-to-element.js
@@ -0,0 +1,227 @@
 #!/usr/bin/env node
 /**
 * Migrate buyer Vue files from iView to Element Plus.
 * Usage: node scripts/migrate-iview-to-element.js
 */
 const fs = require("fs");
 const path = require("path");
 const BUYER_ROOT = path.join(__dirname, "..");
 const MANAGER_ROOT = path.join(__dirname, "../../manager");
 const MODEL_LIST = [
  ["Carousel.vue", "carousel.vue"],
  ["Carousel1.vue", "carousel1.vue"],
  ["Carousel2.vue", "carousel2.vue"],
  ["FirstPageAdvert.vue", "firstPageAdvert.vue"],
  ["NewGoodsSort.vue", "newGoodsSort.vue"],
  ["NotEnough.vue", "notEnough.vue"],
  ["Recommend.vue", "recommend.vue"],
  ["Seckill.vue", "seckill.vue"],
  ["forYour.vue", "forYour.vue"],
  ["goodsAndType.vue", "goodsAndType.vue"],
  ["mixModel.vue", "mixModel.vue"],
  ["oneRowThreeColumns.vue", "oneRowThreeColumns.vue"],
  ["onlyGoodsModel.vue", "onlyGoodsModel.vue"],
  ["mixs/mix-brand.vue", "mixs/mix-brand.vue"],
  ["mixs/mix-goods.vue", "mixs/mix-goods.vue"],
 ];
 const DECORATE_COPY_MAP = [
  [
    "src/components/indexDecorate/ModelForm.vue",
    "src/views/page-decoration/modelForm.vue",
  ],
  [
    "src/components/indexDecorate/ModelFormItem.vue",
    "src/views/page-decoration/modelFormItem.vue",
  ],
 ];
 MODEL_LIST.forEach(([buyerName, managerName]) => {
  DECORATE_COPY_MAP.push([
    `src/components/indexDecorate/modelList/${buyerName}`,
    `src/views/page-decoration/modelList/${managerName}`,
  ]);
 });
 const TARGET_DIRS = ["src/pages", "src/components"];
 function adaptBuyerContent(content) {
  return content
    .replace(/@\/views\/page-decoration\//g, "@/components/indexDecorate/")
    .replace(/admin-setting/g, "buyer-setting")
    .replace(/adminPCPageCache/g, "buyerPCPageCache")
    .replace(/getStore\('adminPCPageCache'\)/g, "getStore('buyerPCPageCache')")
    .replace(/setStore\('adminPCPageCache'/g, "setStore('buyerPCPageCache'");
 }
 function applyScriptTransforms(content) {
  let c = content;
  c = c.replace(/\$options\.filters\./g, "$filters.");
  c = c.replace(/\|\s*unitPrice\(/g, "{{ $filters.unitPrice(");
  c = c.replace(/\|\s*unixToDate\(/g, "{{ $filters.unixToDate(");
  c = c.replace(/\bbeforeDestroy\b/g, "beforeUnmount");
  c = c.replace(/this\.\$set\(([^,]+),\s*([^,]+),\s*([^)]+)\)/g, "$1[$2] = $3");
  c = c.replace(/::v-deep/g, ":deep");
  c = c.replace(/\/deep\//g, ":deep");
  c = c.replace(/@on-change/g, "@change");
  c = c.replace(/@on-click/g, "@click");
  c = c.replace(/@on-ok/g, "@ok");
  c = c.replace(/@on-cancel/g, "@cancel");
  c = c.replace(/@on-clear/g, "@clear");
  c = c.replace(/@on-open-change/g, "@visible-change");
  c = c.replace(/@on-page-size-change/g, "@size-change");
  c = c.replace(/@on-select/g, "@select");
  c = c.replace(/@keydown\.enter\.native/g, "@keyup.enter");
  c = c.replace(/slot-scope="([^"]+)"/g, '#default="$1"');
  c = c.replace(/slot="([^"]+)"/g, '#$1');
  c = c.replace(/from ['"]view-design['"]/g, 'from "@/utils/message"');
  c = c.replace(/import\s*\{([^}]*)\}\s*from\s*['"]view-design['"]/g, 'import {$1} from "@/utils/message"');
  return c;
 }
 function applyTemplateTransforms(content) {
  let c = content;
  const replacements = [
    [/<\/?Card>/g, (m) => m.replace("Card", "el-card")],
    [/<Form-item/g, "<el-form-item"],
    [/<\/Form-item>/g, "</el-form-item>"],
    [/<FormItem/g, "<el-form-item"],
    [/<\/FormItem>/g, "</el-form-item>"],
    [/<Form(\s|>)/g, "<el-form$1"],
    [/<\/Form>/g, "</el-form>"],
    [/<InputNumber/g, "<el-input-number"],
    [/<\/InputNumber>/g, "</el-input-number>"],
    [/<Input(\s|>)/g, "<el-input$1"],
    [/<\/Input>/g, "</el-input>"],
    [/<Button(\s|>)/g, "<el-button$1"],
    [/<\/Button>/g, "</el-button>"],
    [/<Select(\s|>)/g, "<el-select$1"],
    [/<\/Select>/g, "</el-select>"],
    [/<Option(\s)/g, "<el-option "],
    [/<\/Option>/g, "</el-option>"],
    [/<DatePicker/g, "<el-date-picker"],
    [/<\/DatePicker>/g, "</el-date-picker>"],
    [/<TimePicker/g, "<el-time-picker"],
    [/<\/TimePicker>/g, "</el-time-picker>"],
    [/<Modal/g, "<el-dialog"],
    [/<\/Modal>/g, "</el-dialog>"],
    [/<Page(\s)/g, "<el-pagination "],
    [/<\/Page>/g, "</el-pagination>"],
    [/<Tabs(\s|>)/g, "<el-tabs$1"],
    [/<\/Tabs>/g, "</el-tabs>"],
    [/<TabPane/g, "<el-tab-pane"],
    [/<\/TabPane>/g, "</el-tab-pane>"],
    [/<Row(\s|>)/g, "<div$1"],
    [/<\/Row>/g, "</div>"],
    [/<Col(\s|>)/g, "<div$1"],
    [/<\/Col>/g, "</div>"],
    [/<Tag(\s|>)/g, "<el-tag$1"],
    [/<\/Tag>/g, "</el-tag>"],
    [/<Switch(\s|>)/g, "<el-switch$1"],
    [/<\/Switch>/g, "</el-switch>"],
    [/<RadioGroup/g, "<el-radio-group"],
    [/<\/RadioGroup>/g, "</el-radio-group>"],
    [/<Radio(\s)/g, "<el-radio "],
    [/<\/Radio>/g, "</el-radio>"],
    [/<CheckboxGroup/g, "<el-checkbox-group"],
    [/<\/CheckboxGroup>/g, "</el-checkbox-group>"],
    [/<Checkbox/g, "<el-checkbox"],
    [/<\/Checkbox>/g, "</el-checkbox>"],
    [/<Poptip/g, "<el-popover"],
    [/<\/Poptip>/g, "</el-popover>"],
    [/<Tooltip/g, "<el-tooltip"],
    [/<\/Tooltip>/g, "</el-tooltip>"],
    [/<Drawer/g, "<el-drawer"],
    [/<\/Drawer>/g, "</el-drawer>"],
    [/<Alert/g, "<el-alert"],
    [/<\/Alert>/g, "</el-alert>"],
    [/<Badge/g, "<el-badge"],
    [/<\/Badge>/g, "</el-badge>"],
    [/<Divider/g, "<el-divider"],
    [/<\/Divider>/g, "</el-divider>"],
    [/<Rate/g, "<el-rate"],
    [/<\/Rate>/g, "</el-rate>"],
    [/<Steps/g, "<el-steps"],
    [/<\/Steps>/g, "</el-steps>"],
    [/<Step(\s)/g, "<el-step "],
    [/<\/Step>/g, "</el-step>"],
    [/<Upload/g, "<el-upload"],
    [/<\/Upload>/g, "</el-upload>"],
    [/<Cascader/g, "<el-cascader"],
    [/<\/Cascader>/g, "</el-cascader>"],
    [/<Affix/g, "<el-affix"],
    [/<\/Affix>/g, "</el-affix>"],
    [/<Spin/g, "<el-skeleton"],
    [/<\/Spin>/g, "</el-skeleton>"],
    [/:label-width="(\d+)"/g, 'label-width="$1px"'],
    [/:mask-closable="false"/g, ':close-on-click-modal="false"'],
    [/:width="(\d+)"/g, 'width="$1"'],
    [/type="primary"/g, 'type="primary"'],
  ];
  for (const [pattern, replacement] of replacements) {
    c = c.replace(pattern, replacement);
  }
  return c;
 }
 function walkDir(dir, files = []) {
  if (!fs.existsSync(dir)) return files;
  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
    const full = path.join(dir, entry.name);
    if (entry.isDirectory()) {
      walkDir(full, files);
    } else if (entry.name.endsWith(".vue")) {
      files.push(full);
    }
  }
  return files;
 }
 const copied = [];
 const transformed = [];
 const skipped = [];
 for (const [buyerRel, managerRel] of DECORATE_COPY_MAP) {
  const managerPath = path.join(MANAGER_ROOT, managerRel);
  const buyerPath = path.join(BUYER_ROOT, buyerRel);
  if (!fs.existsSync(managerPath)) {
    skipped.push({ file: buyerRel, reason: "manager counterpart missing" });
    continue;
  }
  let content = fs.readFileSync(managerPath, "utf8");
  content = adaptBuyerContent(content);
  fs.mkdirSync(path.dirname(buyerPath), { recursive: true });
  fs.writeFileSync(buyerPath, content);
  copied.push(buyerRel);
 }
 const copiedSet = new Set(copied);
 for (const dir of TARGET_DIRS) {
  const absDir = path.join(BUYER_ROOT, dir);
  for (const filePath of walkDir(absDir)) {
    const rel = path.relative(BUYER_ROOT, filePath).replace(/\\/g, "/");
    if (copiedSet.has(rel)) continue;
    let content = fs.readFileSync(filePath, "utf8");
    const hasIView =
      /<(Card|Form|Form-item|FormItem|Table|Button|Modal|Page|Tabs|TabPane|Input|Select|Option|DatePicker|Row|Poptip|Drawer|Upload|Checkbox|Radio|Switch|Tag|Alert|Rate|Steps|Step|Spin|Affix|TimePicker|Cascader|Divider|Badge|InputNumber)\b/.test(
        content
      );
    if (!hasIView) {
      skipped.push({ file: rel, reason: "no iView components" });
      continue;
    }
    content = applyTemplateTransforms(content);
    content = applyScriptTransforms(content);
    fs.writeFileSync(filePath, content);
    transformed.push(rel);
  }
 }
 console.log("=== Buyer Migration Summary ===");
 console.log(`Copied from manager: ${copied.length}`);
 console.log(`Script-transformed: ${transformed.length}`);
 console.log(`Skipped: ${skipped.length}`);
--- a/buyer/scripts/replace-icon.js
+++ b/buyer/scripts/replace-icon.js
@@ -0,0 +1,149 @@
 #!/usr/bin/env node
 /**
 * 将静态 <Icon type="..." /> 替换为 <el-icon><Xxx /></el-icon>
 * 动态 :type / custom 属性保留，由人工或 resolveIcon 处理。
 */
 const fs = require("fs");
 const path = require("path");
 const ROOT = path.join(__dirname, "..", "src");
 const TYPE_TO_COMPONENT = {
  "md-checkmark": "Check",
  "md-close": "Close",
  "md-trash": "Delete",
  "md-add": "Plus",
  "md-arrow-dropdown": "ArrowDown",
  "md-arrow-dropup": "ArrowUp",
  "md-person": "User",
  "md-lock": "Lock",
  "md-phone-portrait": "Iphone",
  "md-key": "Key",
  "md-link": "Link",
  "md-refresh": "Refresh",
  "md-qr-scanner": "Iphone",
  "ios-arrow-down": "ArrowDown",
  "ios-arrow-up": "ArrowUp",
  "ios-arrow-forward": "ArrowRight",
  "ios-arrow-back": "ArrowLeft",
  "ios-arrow-round-down": "ArrowDown",
  "ios-arrow-round-forward": "ArrowRight",
  "ios-cart-outline": "ShoppingCart",
  "ios-camera": "Camera",
  "ios-eye-outline": "View",
  "ios-trash-outline": "Delete",
  "ios-alert-outline": "Warning",
  "ios-help-circle-outline": "Help",
  "ios-add-circle-outline": "Plus",
  "ios-information-circle": "InfoFilled",
  "ios-search": "Search",
  "ios-text-outline": "Document",
  "ios-alarm-outline": "AlarmClock",
  "ios-heart": "StarFilled",
  "md-close-circle": "CircleClose",
  edit: "Edit",
  "trash-a": "Delete",
  location: "Location",
 };
 function walkDir(dir, files = []) {
  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
    const full = path.join(dir, entry.name);
    if (entry.isDirectory() && entry.name !== "compat") walkDir(full, files);
    else if (entry.name.endsWith(".vue")) files.push(full);
  }
  return files;
 }
 function parseAttrs(attrStr) {
  const attrs = {};
  const re = /(?::([\w-]+)|@([\w-]+)|([\w-]+))=(?:"([^"]*)"|'([^']*)')|(?::([\w-]+)|@([\w-]+)|([\w-]+))(?=\s|\/|>)/g;
  let m;
  while ((m = re.exec(attrStr)) !== null) {
    const name = m[1] || m[2] || m[3] || m[6] || m[7] || m[8];
    const value = m[4] ?? m[5] ?? true;
    attrs[name] = value;
  }
  return attrs;
 }
 function attrsToString(attrs, exclude = []) {
  return Object.entries(attrs)
    .filter(([k]) => !exclude.includes(k))
    .map(([k, v]) => {
      if (v === true) return k;
      if (k.startsWith("@")) return `${k}="${v}"`;
      return `:${k}="${v}"`;
    })
    .join(" ");
 }
 function transform(content, filePath) {
  if (filePath.includes("/compat/")) return content;
  let c = content;
  const used = new Set();
  c = c.replace(/<Icon\b([^>]*?)\/>/g, (match, attrStr) => {
    if (/\bcustom=/.test(attrStr) || /:type=/.test(attrStr)) return match;
    const attrs = parseAttrs(attrStr);
    const type = attrs.type;
    if (!type || !TYPE_TO_COMPONENT[type]) return match;
    const comp = TYPE_TO_COMPONENT[type];
    used.add(comp);
    const rest = attrsToString(attrs, ["type"]);
    const size = attrs.size ? ` :size="${attrs.size}"` : "";
    const open = rest ? `<el-icon ${rest}${size}>` : `<el-icon${size}>`;
    return `${open}<${comp} /></el-icon>`;
  });
  c = c.replace(/<Icon\b([^>]*?)><\/Icon>/g, (match, attrStr) => {
    if (/\bcustom=/.test(attrStr) || /:type=/.test(attrStr)) return match;
    const attrs = parseAttrs(attrStr);
    const type = attrs.type;
    if (!type || !TYPE_TO_COMPONENT[type]) return match;
    const comp = TYPE_TO_COMPONENT[type];
    used.add(comp);
    const rest = attrsToString(attrs, ["type"]);
    const size = attrs.size ? ` :size="${attrs.size}"` : "";
    const open = rest ? `<el-icon ${rest}${size}>` : `<el-icon${size}>`;
    return `${open}<${comp} /></el-icon>`;
  });
  if (used.size && !c.includes("@element-plus/icons-vue")) {
    const imports = [...used].sort().join(", ");
    c = c.replace(
      /(<script[^>]*>\s*\n)/,
      `$1import { ${imports} } from '@element-plus/icons-vue';\n`
    );
    c = c.replace(/export default \{/, (m) => {
      if (/components:\s*\{/.test(c)) {
        return m;
      }
      return `${m}\n  components: { ${imports} },`;
    });
    if (/components:\s*\{/.test(c) && !c.includes(`${[...used][0]},`)) {
      c = c.replace(/components:\s*\{([^}]*)\}/, (m, inner) => {
        const existing = inner.trim();
        const add = [...used].filter((n) => !inner.includes(n)).join(", ");
        if (!add) return m;
        const merged = existing ? `${existing}, ${add}` : add;
        return `components: { ${merged} }`;
      });
    }
  }
  return c;
 }
 let count = 0;
 for (const file of walkDir(ROOT)) {
  const original = fs.readFileSync(file, "utf8");
  if (!/<Icon\b/.test(original)) continue;
  const fixed = transform(original, file);
  if (fixed !== original) {
    fs.writeFileSync(file, fixed);
    count++;
    console.log(path.relative(ROOT, file));
  }
 }
 console.log(`Icon replacements in ${count} files`);
--- a/buyer/scripts/replace-page.js
+++ b/buyer/scripts/replace-page.js
@@ -0,0 +1,63 @@
 #!/usr/bin/env node
 /**
 * 将全局 <Page> 封装替换为原生 el-pagination
 */
 const fs = require("fs");
 const path = require("path");
 const ROOT = path.join(__dirname, "..", "src");
 function walkDir(dir, files = []) {
  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
    const full = path.join(dir, entry.name);
    if (entry.isDirectory()) walkDir(full, files);
    else if (entry.name.endsWith(".vue")) files.push(full);
  }
  return files;
 }
 function transformPage(content) {
  return content.replace(
    /<Page\b([^>]*?)(\/>|>(\s*)<\/Page>)/gs,
    (match, attrs, close) => {
      let a = attrs;
      const hasTotal = /\bshow-total\b/.test(a);
      const hasSizer = /\bshow-sizer\b/.test(a);
      const hasElevator = /\bshow-elevator\b/.test(a);
      a = a.replace(/\s+show-total\b/g, "");
      a = a.replace(/\s+show-sizer\b/g, "");
      a = a.replace(/\s+show-elevator\b/g, "");
      a = a.replace(/:current=/g, ":current-page=");
      a = a.replace(/:page-size-opts=/g, ":page-sizes=");
      a = a.replace(/@change=/g, "@current-change=");
      a = a.replace(/\ssize="small"/g, " small");
      const layoutParts = [];
      if (hasTotal) layoutParts.push("total");
      if (hasSizer) layoutParts.push("sizes");
      layoutParts.push("prev", "pager", "next");
      if (hasElevator) layoutParts.push("jumper");
      const layoutAttr = ` layout="${layoutParts.join(", ")}"`;
      if (close.startsWith("/>")) {
        return `<el-pagination${a}${layoutAttr} />`;
      }
      return `<el-pagination${a}${layoutAttr}></el-pagination>`;
    }
  );
 }
 let count = 0;
 for (const file of walkDir(ROOT)) {
  const original = fs.readFileSync(file, "utf8");
  if (!/<Page\b/.test(original)) continue;
  const fixed = transformPage(original);
  if (fixed !== original) {
    fs.writeFileSync(file, fixed);
    count++;
    console.log(path.relative(ROOT, file));
  }
 }
 console.log(`Page → el-pagination in ${count} files`);
--- a/buyer/src/App.vue
+++ b/buyer/src/App.vue
@@ -1,25 +1,84 @@
 <template>
  <div id="app">
-    <router-view/>
+    <router-view />
  </div>
 </template>
-<script>
+<script setup>
-import {v4 as uuidv4} from 'uuid';
+import { onMounted } from "vue";
-import storage from '@/plugins/storage';
+import { useRoute } from "vue-router";
-export default {
+import storage from "@/plugins/storage";
-  name: 'App',
+import { getBaseSite, getThemeSetting } from "@/api/common.js";
-  mounted () {
+import { fetchAndApplyTheme } from "@/utils/theme";
-    let uuid = storage.getItem('uuid');
+import { useAppStore } from "@/stores/app";
-    if (!uuid) {
+
-      uuid = uuidv4();
+defineOptions({ name: "App" });
-      storage.setItem('uuid', uuid);
+
-    }
+const route = useRoute();
 const appStore = useAppStore();
 function applySiteInfo(data) {
  const 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);
  appStore.setSiteName(data.siteName);
  appStore.setLogoImg(data.buyerSideLogo);
  if (route.meta.title === undefined) {
    window.document.title = data.siteName;
  }
-};
+  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);
 }
 function init() {
  const expirationTime = storage.getItem("sitelogo_expiration_time");
  const cacheValid =
    expirationTime && new Date() <= new Date(Number(expirationTime));
  if (cacheValid) {
    applySiteInfo({
      siteName: storage.getItem("siteName"),
      buyerSideLogo: storage.getItem("logoImg"),
      buyerSideIcon: storage.getItem("siteIcon"),
    });
  }
  getSite();
  getTheme();
 }
 function getSite() {
  getBaseSite().then((res) => {
    if (res.success && res.result.settingValue) {
      try {
        const data = JSON.parse(res.result.settingValue);
        applySiteInfo(data);
      } catch {
        // 站点配置解析失败时使用缓存
      }
    }
  }).catch((err) => {
    console.warn('获取站点配置失败', err);
  });
 }
 function getTheme() {
  fetchAndApplyTheme(getThemeSetting).catch((err) => {
    console.warn('获取主题配置失败', err);
  });
 }
 onMounted(() => {
  init();
 });
 </script>
 <style lang="scss">
-#app{
+#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,19 +41,31 @@ 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
+    data: params,
    loading: false
  })
 }
 // 修改密码
 export function editPwd (params) {
  return request({
-    url: `/buyer/members/modifyPass`,
+    url: `/buyer/passport/member/modifyPass`,
    method: Method.PUT,
    needToken: true,
-    data: params
+    data: params,
    loading: false,
    skipMessage: true
  })
 }
 // 获取密码状态
 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
@@ -1,11 +1,11 @@
 import request, {
-  Method, commonUrl
+  Method, buyerUrl
 } from '@/plugins/request.js';
 // 会员收货地址列表
 export function memberAddress () {
  return request({
-    url: '/buyer/memberAddress',
+    url: '/buyer/member/address',
    needToken: true,
    method: Method.GET
  });
@@ -14,36 +14,39 @@ export function memberAddress () {
 // 添加收货地址
 export function newMemberAddress (params) {
  return request({
-    url: '/buyer/memberAddress',
+    url: '/buyer/member/address',
    needToken: true,
    method: Method.POST,
-    data: params
+    data: params,
    loading: false
  });
 }
 // 编辑收货地址
 export function editMemberAddress (params) {
  return request({
-    url: '/buyer/memberAddress',
+    url: '/buyer/member/address',
    needToken: true,
    method: Method.PUT,
-    params
+    params,
    loading: false
  });
 }
 // 删除收货地址
 export function delMemberAddress (id) {
  return request({
-    url: `/buyer/memberAddress/delById/${id}`,
+    url: `/buyer/member/address/delById/${id}`,
    needToken: true,
-    method: Method.DELETE
+    method: Method.DELETE,
    loading: false
  });
 }
 // 根据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 +55,7 @@ export function getAddrDetail (id) {
 // 传给后台citycode 获取城市街道等id
 export function handleRegion (params) {
  return request({
-    url: `${commonUrl}/common/region/region`,
+    url: `${buyerUrl}/buyer/common/region/region`,
    needToken: true,
    method: Method.GET,
    params
--- a/buyer/src/api/cart.js
+++ b/buyer/src/api/cart.js
@@ -20,7 +20,8 @@ export function cartGoodsAll () {
  return request({
    url: '/buyer/trade/carts/all',
    method: Method.GET,
-    needToken: true
+    needToken: true,
    loading: false
  });
 }
@@ -64,7 +65,7 @@ export function addCartGoods (params) {
 /**
 * 创建交易
 * @param client 客户端：H5/移动端 PC/PC端,WECHAT_MP/小程序端,APP/移动应用端
- * @param way 购物车购买：CART/立即购买：BUY_NOW / 积分购买：POINT
+ * @param way 购物车：CART / 立即购买：BUY_NOW / 积分：POINTS / 拼团：PINTUAN / 砍价：KANJIA
 * @param remark 备注  非必填
 */
 export function createTrade (data) {
@@ -80,7 +81,7 @@ export function createTrade (data) {
 /**
 * 选择优惠券
 * @param memberCouponId 优惠券id
- * @param way 购物车购买：CART/立即购买：BUY_NOW/ 积分购买：POINT
+ * @param way 购物车：CART / 立即购买：BUY_NOW / 积分：POINTS
 * @param used 使用true 弃用 false
 */
 export function selectCoupon (params) {
@@ -92,6 +93,21 @@ export function selectCoupon (params) {
  });
 }
 /**
 * 选择礼品卡
 * @param way 购物车：CART / 立即购买：BUY_NOW / 拼团：PINTUAN / 积分：POINTS / 砍价：KANJIA
 * @param credentialId 礼品卡凭证 id；used=false 且不传则清空全部
 * @param used 使用 true / 弃用 false
 */
 export function selectGiftCard (params) {
  return request({
    url: '/buyer/trade/carts/select/giftCard',
    method: Method.GET,
    needToken: true,
    params
  });
 }
 /**
 * 可用优惠券数量
 */
@@ -212,3 +228,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
@@ -1,11 +1,11 @@
-import request, {Method, commonUrl} from '@/plugins/request.js';
+import request, {Method, buyerUrl} from '@/plugins/request.js';
 /**
 * 获取拼图验证
 */
 export function getVerifyImg (verificationEnums) {
  return request({
-    url: `${commonUrl}/common/slider/${verificationEnums}`,
+    url: `${buyerUrl}/buyer/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: `${buyerUrl}/buyer/common/slider/${params.verificationEnums}`,
    method: Method.POST,
    needToken: false,
    params
@@ -26,28 +26,20 @@ export function postVerifyImg (params) {
 */
 export function sendSms (params) {
  return request({
-    url: `${commonUrl}/common/sms/${params.verificationEnums}/${params.mobile}`,
+    url: `${buyerUrl}/buyer/common/sms/${params.verificationEnums}/${params.mobile}`,
    method: Method.GET,
    needToken: false,
    params
  });
 }
-/**
+
 * 获取logo图标
 */
 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: `${buyerUrl}/buyer/common/region/item/${id}`,
    needToken: true,
-    method: Method.GET
+    method: Method.GET,
    loading: false
  });
 }
@@ -57,7 +49,7 @@ export function getRegion (id) {
 */
 export function articleList (params) {
  return request({
-    url: `/buyer/article`,
+    url: `/buyer/other/article`,
    method: Method.GET,
    params
  });
@@ -69,7 +61,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 +69,37 @@ 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: `${buyerUrl}/buyer/common/IM`,
    method: Method.GET
  });
 }
 //获取图片logo
 export function getBaseSite(){
  return request ({
    url:`${buyerUrl}/buyer/common/site`,
    method: Method.GET,
    needToken: false
  })
 }
 // 获取主题色配置
 export function getThemeSetting() {
  return request({
    url: `${buyerUrl}/buyer/common/site/theme`,
    method: Method.GET,
    needToken: false,
  });
 }
--- a/buyer/src/api/goods.js
+++ b/buyer/src/api/goods.js
@@ -5,9 +5,10 @@ import request, {
 // 商品列表
 export function goodsList (params) {
  return request({
-    url: '/buyer/goods/es',
+    url: '/buyer/goods/goods/search',
    method: Method.GET,
    needToken: false,
    optionalToken: true,
    params
  });
 }
@@ -15,9 +16,10 @@ export function goodsList (params) {
 // 商品分类 筛选条件  品牌， 尺寸等
 export function filterList (params) {
  return request({
-    url: '/buyer/goods/es/related',
+    url: '/buyer/goods/goods/search/related',
    method: Method.GET,
    needToken: false,
    optionalToken: true,
    params
  });
 }
@@ -25,18 +27,19 @@ 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
  });
 }
-// id获取商品Sku详情
+// id获取商品Sku详情（支持未登录浏览，登录后可选携带 token）
 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,
+    needToken: false,
    optionalToken: true,
    params
  });
 }
@@ -44,7 +47,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
  });
@@ -65,7 +68,7 @@ export function pintuanMembers (pintuanId) {
 */
 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,36 @@ 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,
-  })
+    // 刷新令牌请求自身不再进入 401/403 刷新分支，避免拦截器递归死锁；失败也不弹全局错误提示
    skipAuthHandler: true,
    skipMessage: true,
  });
 }
 // /**
 //  * 获取店铺楼层数据
 //  */
 // 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,18 +63,44 @@ 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
  });
 }
 export function getThirdAccountBindList () {
  return request({
    url: '/buyer/passport/connect/bind/list',
    method: Method.GET,
    needToken: true
  });
 }
 export function bindThirdAccount (data) {
  return request({
    url: '/buyer/passport/connect/bind',
    method: Method.POST,
    needToken: true,
    data
  });
 }
 export function unbindThirdAccount (data) {
  return request({
    url: '/buyer/passport/connect/bind/unbind',
    method: Method.POST,
    needToken: true,
    data
  });
 }
 /**
 * 忘记密码  验证手机验证码
 */
 export function validateCode (params) {
  return request({
-    url: `/buyer/members/resetByMobile`,
+    url: `/buyer/passport/member/resetByMobile`,
    method: Method.POST,
    needToken: false,
    params
@@ -86,9 +112,40 @@ 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,
    loading: false,
    params
  });
 }
 export function sCLogin(token,params) {
  return request({
    url: `/buyer/passport/member/session_login/`+token,
    method: Method.POST,
    needToken: false,
    loading: false,
    skipMessage: true,
    // 长轮询后端最长挂起 20s，需大于该值，避免 axios 10s 默认超时把二维码请求掐断
    timeout: 25000,
    params
  });
 }
 export function getWechatH5QrCode (params) {
  return request({
    url: '/buyer/other/wechat/h5/qrcode',
    method: Method.GET,
    needToken: true,
    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,16 +86,38 @@ export function cancelCollect (type, id) {
  });
 }
-// 查看是否收藏
+// 取消 收藏店铺
-export function isCollection (type, goodsId) {
+export function cancelStoreCollect (type, id) {
  return request({
-    url: `/buyer/member/collection/isCollection/${type}/${goodsId}`,
+    url: `/buyer/member/storeCollection/delete/${type}/${id}`,
-    method: Method.GET,
+    method: Method.DELETE,
    needToken: true
  });
 }
-// 会员收藏列表
+// 查看是否收藏商品（后台查询，token 失效时静默失败，不弹全局登录框）
 export function isCollection (type, goodsId) {
  return request({
    url: `/buyer/member/collection/isCollection/${type}/${goodsId}`,
    method: Method.GET,
    needToken: true,
    skipAuthHandler: true,
    skipMessage: true
  });
 }
 // 查看是否收藏店铺（后台查询，token 失效时静默失败，不弹全局登录框）
 export function isStoreCollection (type, goodsId) {
  return request({
    url: `/buyer/member/storeCollection/isCollection/${type}/${goodsId}`,
    method: Method.GET,
    needToken: true,
    skipAuthHandler: true,
    skipMessage: true
  });
 }
 // 会员收藏商品列表
 export function collectList (params) {
  return request({
    url: `/buyer/member/collection/${params.type}`,
@@ -96,39 +127,53 @@ export function collectList (params) {
  });
 }
-// 单个商品评价
+// 会员收藏店铺列表
-export function goodsComment (params) {
+export function storeCollectList (params) {
  return request({
-    url: `/buyer/memberEvaluation/${params.goodsId}/goodsEvaluation`,
+    url: `/buyer/member/storeCollection/${params.type}`,
    method: Method.GET,
-    needToken: false,
+    needToken: true,
    params
  });
 }
-// 商品各评价类别数量
+// 单个商品评价（需登录；token 失效时静默失败，不弹全局登录框）
 export function goodsComment (params) {
  return request({
    url: `/buyer/member/evaluation/${params.goodsId}/goodsEvaluation`,
    method: Method.GET,
    needToken: true,
    skipAuthHandler: true,
    skipMessage: true,
    params
  });
 }
 // 商品各评价类别数量（需登录；token 失效时静默失败，不弹全局登录框）
 export function goodsCommentNum (goodsId) {
  return request({
-    url: `/buyer/memberEvaluation/${goodsId}/evaluationNumber`,
+    url: `/buyer/member/evaluation/${goodsId}/evaluationNumber`,
    method: Method.GET,
-    needToken: false
+    needToken: true,
    skipAuthHandler: true,
    skipMessage: true
  });
 }
 // 添加会员评价
 export function addEvaluation (params) {
  return request({
-    url: `/buyer/memberEvaluation`,
+    url: `/buyer/member/evaluation`,
    method: Method.POST,
    needToken: true,
-    params
+    data: params
  });
 }
 // 会员评价详情
 export function evaluationDetail (id) {
  return request({
-    url: `/buyer/memberEvaluation/get/${id}`,
+    url: `/buyer/member/evaluation/get/${id}`,
    method: Method.GET,
    needToken: true
  });
@@ -143,6 +188,15 @@ export function receiptList () {
  });
 }
 // 发票详情
 export function receiptDetail (id) {
  return request({
    url: `/buyer/trade/receipt/${id}`,
    method: Method.GET,
    needToken: true
  });
 }
 // 保存发票信息
 export function saveReceipt (params) {
  return request({
@@ -159,6 +213,7 @@ export function couponList (params) {
    url: `/buyer/promotion/coupon`,
    method: Method.GET,
    needToken: true,
    loading: false,
    params
  });
 }
@@ -195,7 +250,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 +260,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 +269,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 +277,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 +285,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 +294,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,16 +304,17 @@ 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
+    needToken: true,
    loading: false
  });
 }
 // 投诉商品
 export function handleComplain (data) {
  return request({
-    url: `/buyer/complain`,
+    url: `/buyer/order/complain`,
    method: Method.POST,
    needToken: true,
    data
@@ -267,7 +323,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 +335,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,99 +346,12 @@ 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
  });
 }
 /**
 * 获取当前会员分销信息
 */
 export function distribution () {
  return request({
    url: `/buyer/distribution`,
    method: Method.GET,
    needToken: true
  });
 }
 /**
 * 申请成为分销商
 * @param idNumber 身份证号
 * @param name  名字
 */
 export function applyDistribution (params) {
  return request({
    url: `/buyer/distribution`,
    method: Method.POST,
    needToken: true,
    params
  });
 }
 /**
 * 获取分销商订单列表
 */
 export function getDistOrderList (params) {
  return request({
    url: `/buyer/distribution/distributionOrder`,
    method: Method.GET,
    needToken: true,
    params
  });
 }
 /**
 * 获取分销商商品列表
 */
 export function getDistGoodsList (params) {
  return request({
    url: `/buyer/distributionGoods`,
    method: Method.GET,
    needToken: true,
    params
  });
 }
 /**
 * 绑定、解绑分销商品
 * @param distributionGoodsId 分销商品id
 * @param checked 分销商品id,true为绑定，false为解绑
 */
 export function selectDistGoods (params) {
  return request({
    url: `/buyer/distributionGoods/checked/${params.distributionGoodsId}`,
    method: Method.GET,
    needToken: true,
    params
  });
 }
 /**
 * 分销商提现历史
 */
 export function distCashHistory (params) {
  return request({
    url: `/buyer/distribution/cash`,
    method: Method.GET,
    needToken: true,
    params
  });
 }
 /**
 * 分销商提现
 */
 export function distCash (params) {
  return request({
    url: `/buyer/distribution/cash`,
    method: Method.POST,
    needToken: true,
    params
  });
 }
 /**
 * 我的足迹
 * @param {Number} pageNumber 页码
@@ -390,7 +359,7 @@ export function distCash (params) {
 */
 export function tracksList (params) {
  return request({
-    url: `/buyer/footprint`,
+    url: `/buyer/member/footprint`,
    method: Method.GET,
    needToken: true,
    params
@@ -402,7 +371,7 @@ export function tracksList (params) {
 */
 export function clearTracks () {
  return request({
-    url: `/buyer/footprint`,
+    url: `/buyer/member/footprint`,
    method: Method.DELETE,
    needToken: true
  });
@@ -414,7 +383,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
  });
@@ -443,13 +412,38 @@ export function memberPointHistory (params) {
    params
  });
 }
 export function memberGradeCurrent (params) {
  return request({
    url: `/buyer/member/memberGrade/current`,
    method: Method.GET,
    needToken: true,
    params
  })
 }
 export function memberGradeRules () {
  return request({
    url: `/buyer/member/memberGrade/rules`,
    method: Method.GET,
    needToken: true
  })
 }
 export function memberGradeList () {
  return request({
    url: `/buyer/member/memberGrade/list`,
    method: Method.GET,
    needToken: true
  })
 }
 /**
 * 分页获取会员站内信
 * @param {Object} params 请求参数，包括pageNumber、pageSize、status
 */
 export function memberMsgList (params) {
  return request({
-    url: `/buyer/member/message`,
+    url: `/buyer/message/member`,
    method: Method.GET,
    needToken: true,
    params
@@ -460,9 +454,18 @@ export function memberMsgList (params) {
 * @param {String} messageId 消息id
 */
 export function getMemberMessage (id) {
  return request({
    url: `/buyer/message/member/${id}`,
    method: Method.GET,
    needToken: true,
    skipMessage: true
  });
 }
 export function readMemberMsg (id) {
  return request({
-    url: `/buyer/member/message/${id}`,
+    url: `/buyer/message/member/${id}`,
    method: Method.PUT,
    needToken: true
  });
@@ -473,7 +476,7 @@ export function readMemberMsg (id) {
 */
 export function delMemberMsg (id) {
  return request({
-    url: `/buyer/member/message/${id}`,
+    url: `/buyer/message/member/${id}`,
    method: Method.DELETE,
    needToken: true
  });
@@ -485,7 +488,7 @@ export function delMemberMsg (id) {
 */
 export function getGoodsDistribution (distributionId) {
  return request({
-    url: `/buyer/distribution/bindingDistribution/${distributionId}`,
+    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,7 +90,7 @@ 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
@@ -100,7 +100,7 @@ export function communication (params) {
 // 退换货服务 提交物流
 export function afterSaleDelivery (params) {
  return request({
-    url: `/buyer/afterSale/delivery/${params.afterSaleSn}`,
+    url: `/buyer/order/afterSale/delivery/${params.afterSaleSn}`,
    method: Method.POST,
    needToken: true,
    params
@@ -109,9 +109,27 @@ export function afterSaleDelivery (params) {
 // 获取退货可选物流公司
 export function getLogisticsCompany () {
  return request({
-    url: `/buyer/logistics`,
+    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
@@ -24,9 +24,24 @@ export function tradeDetail (params) {
 * @param payClient  调起方式 可用值：APP,NATIVE,JSAPI,H5
 * @param sn   订单编号
 */
-export function pay (params) {
+export function pay (params, config = {}) {
  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,
    skipMessage: !!config.skipMessage,
  });
 }
 /**
 * 支付结果查询
 * @param orderType 交易类型,可用值:TRADE,ORDER,RECHARGE
 * @param sn   订单编号
 */
 export function payCallback (params) {
  return request({
    url: `/buyer/payment/cashier/result`,
    needToken: true,
    method: Method.GET,
    params
@@ -38,9 +53,9 @@ export function pay (params) {
 * @param orderType 交易类型,可用值:TRADE,ORDER,RECHARGE
 * @param sn   订单编号
 */
-export function payCallback (params) {
+export function withdrawalSettingVO (params) {
  return request({
-    url: `/buyer/cashier/result`,
+    url: `/buyer/wallet/wallet/withdrawalSettingVO`,
    needToken: true,
    method: Method.GET,
    params
--- a/buyer/src/api/promotion.js
+++ b/buyer/src/api/promotion.js
@@ -57,3 +57,50 @@ export function pointGoodsDetail (id) {
    id
  });
 }
 /**
 * 分页查询当前客户礼品卡
 */
 export function getGiftCardCashMemberCardPage (params) {
  return request({
    url: '/buyer/promotion/giftCardCash/memberCard',
    method: Method.GET,
    needToken: true,
    params
  });
 }
 /**
 * 绑定礼品卡（卡号 + 兑换码/卡密）
 */
 export function bindGiftCardCashMemberCard (data) {
  return request({
    url: '/buyer/promotion/giftCardCash/memberCard/bind',
    method: Method.POST,
    needToken: true,
    headers: { 'Content-Type': 'application/json' },
    data
  });
 }
 /**
 * 激活礼品卡
 */
 export function activateGiftCardCashMemberCard (memberCardId) {
  return request({
    url: `/buyer/promotion/giftCardCash/memberCard/${memberCardId}/activate`,
    method: Method.POST,
    needToken: true
  });
 }
 /**
 * 下单页可用礼品卡列表
 */
 export function getAvailableGiftCardCashMemberCards () {
  return request({
    url: '/buyer/promotion/giftCardCash/memberCard/available',
    method: Method.GET,
    needToken: true
  });
 }
--- a/buyer/src/api/shopentry.js
+++ b/buyer/src/api/shopentry.js
@@ -5,8 +5,9 @@ import request, {
 // 店铺分页列表
 export function shopList (params) {
  return request({
-    url: '/buyer/store',
+    url: '/buyer/store/store',
-    needToken: true,
+    needToken: false,
    optionalToken: true,
    method: Method.GET,
    params
  })
@@ -15,7 +16,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 +26,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,25 +36,45 @@ 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
  })
 }
 // 店铺信息（含评分）
 export function getStoreById (id) {
  return request({
    url: `/buyer/store/store/store/${id}`,
    needToken: false,
    method: Method.GET
  })
 }
 // 店铺详情
 // 获取店铺工商/营业执照信息
 export function getLicencePhoto (id) {
  return request({
    url: `/buyer/store/store/get/licencePhoto/${id}`,
    needToken: false,
    optionalToken: true,
    method: Method.GET
  })
 }
 export function getDetailById (id) {
  return request({
-    url: `/buyer/store/get/detail/${id}`,
+    url: `/buyer/store/store/get/detail/${id}`,
-    needToken: true,
+    needToken: false,
    optionalToken: true,
    method: Method.GET
  })
 }
 // 店铺分类
 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 +82,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 +91,21 @@ export function agreement () {
 //  获取当前登录会员的店铺信息
 export function applyStatus () {
  return request({
-    url: `/buyer/store/apply`,
+    url: `/buyer/store/store/apply`,
    needToken: true,
-    method: Method.GET
+    method: Method.GET,
    loading: false
  })
 }
 /**
 * 获取自提点信息
 * @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/iconMap.js
+++ b/buyer/src/assets/iconfont/iconMap.js
@@ -0,0 +1,29 @@
 import back from "./back.png";
 import carts from "./carts.png";
 import collage from "./collage.png";
 import feedback from "./feedback.png";
 import notice from "./notice.png";
 import notification from "./notification.png";
 import shop from "./shop.png";
 import story from "./story.png";
 import support from "./support.png";
 import user from "./user.png";
 const iconMap = {
  back,
  carts,
  collage,
  feedback,
  notice,
  notification,
  shop,
  story,
  support,
  user,
 };
 export function getIconUrl(name) {
  return iconMap[name] || "";
 }
 export default iconMap;
--- 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/default.png
+++ b/buyer/src/assets/images/default.png
--- a/buyer/src/assets/images/jinghui.png
+++ b/buyer/src/assets/images/jinghui.png
--- a/buyer/src/assets/images/zhizhao.jpg
+++ b/buyer/src/assets/images/zhizhao.jpg
--- a/buyer/src/assets/styles/element.scss
+++ b/buyer/src/assets/styles/element.scss
@@ -0,0 +1,40 @@
 :root {
  --el-color-primary: var(--theme-color, #ff3c2a);
  --el-color-danger: var(--theme-color, #ff3c2a);
  --el-font-size-base: 14px;
 }
 .el-table--border {
  .el-table__cell {
    border-right: none !important;
  }
 }
 .link-text {
  color: var(--theme-color, #ff3c2a);
  cursor: pointer;
  text-decoration: none;
  &:hover {
    opacity: 0.85;
  }
 }
 .op-split {
  margin: 0 8px;
  color: #dcdfe6;
 }
 /* 次要强调按钮，使用高亮主题色（如「立即购买」） */
 .confirm-receipt-btn {
  background-color: var(--theme-light, #ff6b35) !important;
  border-color: var(--theme-light, #ff6b35) !important;
  color: #fff !important;
  &:hover,
  &:focus {
    background-color: color-mix(in srgb, var(--theme-light, #ff6b35) 88%, black) !important;
    border-color: color-mix(in srgb, var(--theme-light, #ff6b35) 88%, black) !important;
    color: #fff !important;
  }
 }
--- a/buyer/src/assets/styles/global-layout.scss
+++ b/buyer/src/assets/styles/global-layout.scss
@@ -0,0 +1,25 @@
 // 全局布局工具类（非 scoped，避免子组件继承 class 时宽度失效）
 .width_1200_auto {
  width: 1200px;
  max-width: 1200px;
  margin-left: auto;
  margin-right: auto;
  box-sizing: border-box;
 }
 // 首页主体：分类导航 + 楼层装修共用同一 1200px 容器，保证列对齐
 .index-main {
  width: 1200px;
  max-width: 1200px;
  margin-left: auto;
  margin-right: auto;
  box-sizing: border-box;
  position: relative;
 }
 // 与 CateNav 商品分类栏、Carousel 左占位一致的列宽
 $index-main-width: 1200px;
 $index-side-col-width: 263.2px;
 $index-col-gap: 10px;
 // 1200 - 263.2*2 - 10*2 = 653.6px
 $index-center-col-width: $index-main-width - ($index-side-col-width * 2) - ($index-col-gap * 2);
--- a/buyer/src/assets/styles/global.scss
+++ b/buyer/src/assets/styles/global.scss
@@ -10,20 +10,29 @@ $warning_color: #ff9900;
 $error_color: #ed3f14;
 $handle-btn-color: #438cde;
-$theme_color: #ed3f14;
+$theme_color: var(--theme-color, #ff3c2a);
 $border_color: #dddee1;
 $title_color: #8c8c8c;
 $light_title_color: #1c2438;
 $light_content_color: #495060;
 $light_sub_color: #80848f;
-$light_background_color: #f8f8f9;
+$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;
 	line-clamp: 2;
 	overflow: hidden;
 }
 /***** 封装一些方法可用于 黑暗主题 ，明亮主题 *****/
 // 背景颜色
@@ -170,6 +179,19 @@ $dark_content_color: #d5d5d5;
    margin-right: 20px;
 }
 .mb_24 {
    margin-bottom: 24px;
 }
 .mt_24 {
    margin-top: 24px;
 }
 .ml_24 {
    margin-left: 24px;
 }
 .mr_24 {
    margin-right: 24px;
 }
 .mb_10 {
    margin-bottom: 10px;
 }
@@ -270,10 +292,26 @@ li {
        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: 1200px;
  max-width: 1200px;
  margin: 0 auto;
-
+  box-sizing: border-box;
-
+}
@@ -290,18 +328,24 @@ li {
  .goods-list {
    display: flex;
    flex-wrap: wrap;
-    width: 1200px;
+    width: 100%;
    margin: 0 auto;
    column-gap: 10px;
  }
  .goods-show-info {
-    width: 235px;
+    width: calc(20% - 8px);
    padding: 6px;
-    margin: 10px 0px;
+    margin: 10px 0;
    margin-left: 5px;
    position: relative;
    border: 1px solid #fff;
    cursor: pointer;
    background-color: #fff;
    box-sizing: border-box;
  }
  .goods-show-img img {
    width: 100%;
    aspect-ratio: 1;
    object-fit: cover;
  }
  .goods-show-info:hover {
    border: 1px solid #ccc;
@@ -311,16 +355,17 @@ li {
    margin-top: 6px;
  }
  .goods-show-detail {
-    font-size: 12px;
+    font-size: 14px;
    line-height: 21px;
    margin: 6px 0px;
  }
  .goods-show-num {
-    font-size: 12px;
+    font-size: 14px;
    margin-bottom: 6px;
    color: #666;
  }
  .goods-show-num {
-    font-size: 12px;
+    font-size: 14px;
    margin-bottom: 6px;
    color: #009688;
  }
@@ -329,11 +374,16 @@ li {
    font-weight: bold;
  }
  .goods-show-seller {
-    font-size: 12px;
+    font-size: 14px;
    color: $theme_color;
  }
  .goods-page {
-    margin:10px auto ;
+    margin: 10px 0;
-    text-align: right;
+    width: 100%;
-    width: 1200px;
+    display: flex;
    justify-content: flex-end;
    :deep(.el-pagination) {
      justify-content: flex-end;
    }
  }
--- a/buyer/src/assets/styles/goodsList.scss
+++ b/buyer/src/assets/styles/goodsList.scss
@@ -9,18 +9,24 @@
 .goods-list {
  display: flex;
  flex-wrap: wrap;
-  width: 1200px;
+  width: 100%;
  margin: 0 auto;
  column-gap: 10px;
 }
 .goods-show-info {
-  width: 235px;
+  width: calc(20% - 8px);
  padding: 6px;
-  margin: 10px 0px;
+  margin: 10px 0;
  margin-left: 5px;
  position: relative;
  border: 1px solid #fff;
  cursor: pointer;
  background-color: #fff;
  box-sizing: border-box;
 }
 .goods-show-img img {
  width: 100%;
  aspect-ratio: 1;
  object-fit: cover;
 }
 .goods-show-info:hover {
  border: 1px solid #ccc;
@@ -30,16 +36,28 @@
  margin-top: 6px;
 }
 .goods-show-detail {
-  font-size: 12px;
+  height: 42px;
  font-size: 14px;
  line-height: 21px;
  margin: 6px 0px;
  overflow:hidden;
  text-overflow: ellipsis;
  display:-webkit-box;
  -webkit-line-clamp:2;
  line-clamp: 2;
  -webkit-box-orient:vertical;
  color:#808080;
 }
 .goods-show-detail :hover{
  color:#E23A3A;
 }
 .goods-show-num {
-  font-size: 12px;
+  font-size: 14px;
  margin-bottom: 6px;
  color: #666;
 }
 .goods-show-num {
-  font-size: 12px;
+  font-size: 14px;
  margin-bottom: 6px;
  color: #009688;
 }
@@ -48,11 +66,16 @@
  font-weight: bold;
 }
 .goods-show-seller {
-  font-size: 12px;
+  font-size: 14px;
  color: $theme_color;
 }
 .goods-page {
-  margin:10px auto ;
+  margin: 10px 0;
-  text-align: right;
+  width: 100%;
-  width: 1200px;
+  display: flex;
  justify-content: flex-end;
  :deep(.el-pagination) {
    justify-content: flex-end;
  }
 }
--- a/buyer/src/assets/styles/theme.less
+++ b/buyer/src/assets/styles/theme.less
@@ -1,9 +1,15 @@
-@import '~view-design/src/styles/index.less';
+// Element Plus 主题变量（原 view-design less 已移除）
@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;
-@primary-color: #ed3f14;
+.el-drawer,
-
+.drawer {
-
+  z-index: 2600 !important;
-@table-thead-bg               : #f8f8f9;
+}
@table-td-stripe-bg           : #f8f8f9;
@table-td-hover-bg            : #ededed;
@table-td-highlight-bg        : #ededed;
--- a/buyer/src/components/Search.vue
+++ b/buyer/src/components/Search.vue
@@ -1,162 +1,496 @@
 <template>
-  <div>
+  <div class="navbar" ref="rootRef" :class="{'small-search-box': useClass == 'fixed-show'}">
-    <div class="container">
+    <template v-if="useClass == 'fixed-show'">
-      <img
+      <div class="search search-embedded">
-        :src="$store.state.logoImg"
+        <el-input
-        v-if="showLogo"
+          v-model="searchData"
-        class="logo-img"
+          size="large"
-        alt=""
+          class="search-input"
-        @click="$router.push('/')"
+          :placeholder="placeholderText"
-      />
+          @focus="openPanel"
-      <i-input
+          @input="queueSuggest"
-        v-model="searchData"
+          @keyup.enter="search"
-        size="large"
+        />
-        class="search"
+        <div class="search-btn" @click="search">
-        placeholder="输入你想查找的商品"
+          <el-icon :size="21"><SearchIcon /></el-icon>
        @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>
      <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"
            class="mr_10"
          >
            <span class="hover-color" @click="selectTags(item)">{{ item }}</span>
          </Tag>
        </div>
-      </template>
+        <div v-if="showPanel" class="suggest-panel" @mousedown.prevent>
-    </div>
+          <SearchSuggest
            :keyword="trimmedKeyword"
            :history="history"
            :hot-words="promotionTags"
            :suggestions="suggestions"
            :suggesting="suggesting"
            @pick="selectTags"
            @clear="clearHistory"
          />
        </div>
      </div>
    </template>
    <template v-else>
      <div class="container width_1200_auto flex flex-a-c">
        <img
          :src="logoImg"
          v-if="showLogo"
          class="logo-img"
          alt=""
          @click="$router.push('/')"
        />
        <div class="search-box">
          <!-- 搜索类型切换：商品 / 店铺（店铺内搜索时不展示） -->
          <div v-if="showTypeSwitch" class="search-type">
            <span
              v-for="item in searchTypes"
              :key="item.value"
              class="search-type-item"
              :class="{ active: searchType === item.value }"
              @click="switchType(item.value)"
            >{{ item.label }}</span>
          </div>
          <div class="search">
            <el-input
              v-model="searchData"
              size="large"
              class="search-input"
              :placeholder="placeholderText"
              @focus="openPanel"
              @input="queueSuggest"
              @keyup.enter="search"
            />
            <div class="search-btn" @click="search">
              <el-icon :size="21"><SearchIcon /></el-icon>
            </div>
            <div v-if="showPanel" class="suggest-panel" @mousedown.prevent>
              <SearchSuggest
                :keyword="trimmedKeyword"
                :history="history"
                :hot-words="promotionTags"
                :suggestions="suggestions"
                :suggesting="suggesting"
                @pick="selectTags"
                @clear="clearHistory"
              />
            </div>
          </div>
          <template v-if="showTag">
            <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>
      </div>
    </template>
  </div>
 </template>
-<script>
+<script setup>
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import storage from '@/plugins/storage.js'
-import {hotWords} from '@/api/goods.js'
+import { goodsList, hotWords } from '@/api/goods.js'
-export default {
+import { Search as SearchIcon } from '@element-plus/icons-vue'
-  name: 'search',
+import SearchSuggest from '@/components/SearchSuggest.vue'
-  props: {
+import { useAppStore } from '@/stores/app'
-    showTag: { // 是否展示搜索栏下方热门搜索
+
-      type: Boolean,
+defineOptions({ name: 'search' })
-      default: true
+
-    },
+const props = defineProps({
-    showLogo: { // 是否展示左侧logo
+  showTag: {
-      type: Boolean,
+    type: Boolean,
-      default: true
+    default: true
    },
    store: { // 是否为店铺页面
      type: Boolean,
      default: false
    },
    hover: {
      type: Boolean,
      default: false
    }
  },
-  data () {
+  showLogo: {
-    return {
+    type: Boolean,
-      searchData: '' // 搜索内容
+    default: true
    };
  },
-  methods: {
+  storeId: {
-    selectTags (item) { // 选择热门标签
+    type: String,
-      this.searchData = item;
+    default: ""
      this.search();
    },
    search () { // 全平台搜索商品
      this.$router.push({
        path: '/goodsList',
        query: { keyword: this.searchData }
      });
    },
    searchStore () { // 店铺搜索商品
      this.$emit('search', this.searchData)
    }
  },
-  computed: {
+  hover: {
-    promotionTags () {
+    type: Boolean,
-      if (this.$store.state.hotWordsList) {
+    default: false
        return JSON.parse(this.$store.state.hotWordsList)
      } else {
        return []
      }
    }
  },
-  created () {
+  useClass: {
-    this.searchData = this.$route.query.keyword
+    type: null,
-    if (!this.hover) { // 首页顶部固定搜索栏不调用热词接口
+    default: ''
      // 搜索热词每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())
      }
    }
  }
-};
+})
 const emit = defineEmits(['search'])
 const route = useRoute()
 const router = useRouter()
 const appStore = useAppStore()
 const HISTORY_KEY = 'buyerSearchHistory'
 const HISTORY_LIMIT = 10
 function readHistory() {
  try {
    const raw = localStorage.getItem(HISTORY_KEY)
    const list = raw ? JSON.parse(raw) : []
    return Array.isArray(list) ? list.filter((item) => typeof item === 'string' && item.trim()) : []
  } catch {
    return []
  }
 }
 function parseHotWords(raw) {
  if (!raw) return []
  if (Array.isArray(raw)) return raw.filter(Boolean)
  if (typeof raw !== 'string') return []
  try {
    const parsed = JSON.parse(raw)
    if (Array.isArray(parsed)) return parsed.filter(Boolean)
  } catch {
    // 旧数据可能是逗号拼接
  }
  return raw.split(',').map((item) => item.trim()).filter(Boolean)
 }
 const rootRef = ref(null)
 const searchData = ref('')
 const history = ref([])
 const panelVisible = ref(false)
 const suggestions = ref([])
 const suggesting = ref(false)
 let suggestTimer = null
 let suggestSeq = 0
 const logoImg = computed(() => appStore.logoImg)
 const trimmedKeyword = computed(() => {
  return (searchData.value || '').trim()
 })
 const promotionTags = computed(() => {
  return parseHotWords(appStore.hotWordsList)
 })
 // 搜索类型：goods 商品 / store 店铺
 const searchTypes = [
  { label: '商品', value: 'goods' },
  { label: '店铺', value: 'store' },
 ]
 const searchType = ref(route.path === '/storeList' ? 'store' : 'goods')
 // 店铺内搜索（传了 storeId）只能搜本店商品，不展示切换
 const showTypeSwitch = computed(() => !props.storeId && props.useClass !== 'fixed-show')
 const isStoreMode = computed(() => searchType.value === 'store' && !props.storeId)
 const placeholderText = computed(() => (isStoreMode.value ? '输入你想查找的店铺' : '输入你想查找的商品'))
 function switchType(type) {
  if (searchType.value === type) return
  searchType.value = type
  suggestions.value = []
  suggesting.value = false
 }
 const showPanel = computed(() => {
  // 店铺搜索暂无联想/历史，不展示下拉面板
  if (isStoreMode.value) return false
  if (!panelVisible.value) return false
  if (trimmedKeyword.value) return true
  return history.value.length > 0 || promotionTags.value.length > 0
 })
 watch(
  () => route.query.keyword,
  (value) => {
    searchData.value = value || ''
  }
 )
 function selectTags(item) {
  // 热词/历史均为商品关键词，点击时按商品搜索
  searchType.value = 'goods'
  searchData.value = item
  search()
 }
 function remember(keyword) {
  const next = [keyword, ...history.value.filter((item) => item !== keyword)].slice(0, HISTORY_LIMIT)
  history.value = next
  localStorage.setItem(HISTORY_KEY, JSON.stringify(next))
 }
 function clearHistory() {
  history.value = []
  localStorage.removeItem(HISTORY_KEY)
 }
 function openPanel() {
  panelVisible.value = true
  if (trimmedKeyword.value) queueSuggest()
 }
 function closePanel() {
  panelVisible.value = false
 }
 function onDocumentClick(event) {
  if (rootRef.value && !rootRef.value.contains(event.target)) closePanel()
 }
 function queueSuggest() {
  if (isStoreMode.value) return
  panelVisible.value = true
  clearTimeout(suggestTimer)
  const keyword = trimmedKeyword.value
  if (!keyword) {
    suggestions.value = []
    suggesting.value = false
    return
  }
  suggesting.value = true
  suggestTimer = setTimeout(() => fetchSuggest(keyword), 300)
 }
 function fetchSuggest(keyword) {
  const seq = ++suggestSeq
  const params = { keyword, pageNumber: 1, pageSize: 8 }
  if (props.storeId) params.storeId = props.storeId
  goodsList(params).then((res) => {
    if (seq !== suggestSeq || keyword !== trimmedKeyword.value) return
    const records = res && res.success ? (res.result.records || []) : []
    const seen = new Set()
    const names = []
    promotionTags.value.forEach((word) => {
      if (word && String(word).toLowerCase().includes(keyword.toLowerCase()) && !seen.has(word)) {
        seen.add(word)
        names.push(word)
      }
    })
    records.forEach((item) => {
      const name = item && item.goodsName
      if (name && !seen.has(name)) {
        seen.add(name)
        names.push(name)
      }
    })
    suggestions.value = names.slice(0, 8)
  }).catch(() => {
    if (seq === suggestSeq) suggestions.value = []
  }).finally(() => {
    if (seq === suggestSeq) suggesting.value = false
  })
 }
 function search() {
  const keyword = trimmedKeyword.value
  searchData.value = keyword
  closePanel()
  if (isStoreMode.value) {
    if (route.path === '/storeList') {
      emit('search', keyword)
    } else {
      router.push({ path: '/storeList', query: keyword ? { keyword } : {} })
    }
    return
  }
  if (keyword) remember(keyword)
  const url = route.path
  if (url == '/goodsList') {
    emit('search', keyword)
  } else {
    const pushData = {
      path: '/goodsList',
      query: keyword ? { keyword } : {},
    }
    if (props.storeId) pushData.query.storeId = props.storeId
    router.push(pushData)
  }
 }
 function searchStore() {
  emit('search', trimmedKeyword.value)
 }
 function applyHotWords(result) {
  const list = parseHotWords(result)
  appStore.setHotWords(list)
  storage.setItem('hotWordsList', JSON.stringify(list))
 }
 function loadHotWords() {
  hotWords({ count: 5 }).then((res) => {
    if (res.success && res.result) applyHotWords(res.result)
  }).catch(() => {
    // 热词为可选数据，失败时沿用缓存或默认热词
  })
  storage.setItem('hotWordsReloadTime', new Date().getTime())
 }
 // 初始化（原 created 钩子逻辑）
 searchData.value = route.query.keyword || ''
 history.value = readHistory()
 if (!props.hover) {
  const reloadTime = storage.getItem('hotWordsReloadTime')
  const time = new Date().getTime() - 5 * 60 * 1000
  if (!reloadTime || time > reloadTime) loadHotWords()
 }
 onMounted(() => {
  document.addEventListener('click', onDocumentClick)
 })
 onUnmounted(() => {
  clearTimeout(suggestTimer)
  document.removeEventListener('click', onDocumentClick)
 })
 </script>
 <style scoped lang="scss">
-.container {
+.navbar {
-  margin: 30px auto;
+  height: 113px;
-  width: 460px;
+  background: #fff;
  position: relative;
 }
 .navbar.small-search-box {
  height: 60px;
  width: 100%;
  margin: 0;
  display: flex;
  align-items: center;
  background: transparent;
 }
 .search-embedded {
  width: 100%;
  margin: 0;
 }
 .container {
  position: relative;
  height: 100%;
 }
 .search {
  $btn-gap: 4px;
  $btn-width: 60px;
  $input-height: 37.8px;
  position: relative;
  width: 778.4px;
  height: $input-height;
  margin: 10px 0px 5px 0;
-  /deep/ .ivu-input.ivu-input-large {
+
-    border: 2px solid $theme_color;
+  .search-input {
-    font-size: 12px;
+    width: 100%;
-    height: 34px;
+
-    &:focus {
+    :deep(.el-input__wrapper) {
      border: 2px solid #409EFF;
      border-radius: 4px;
      padding-left: 26px;
      padding-right: calc(#{$btn-gap * 2} + #{$btn-width});
      font-size: 14px;
      font-weight: normal;
      height: $input-height;
      color: #999;
      box-shadow: none;
    }
  }
-  /deep/ .ivu-input-group-append {
+
-    border: 1px solid $theme_color;
+  .search-btn {
-    border-left: none;
+    position: absolute;
-    height: 30px;
+    right: $btn-gap;
-    background-color: $theme_color;
+    top: $btn-gap;
    bottom: $btn-gap;
    width: $btn-width;
    border-radius: 0 3px 3px 0;
    cursor: pointer;
    box-sizing: border-box;
    display: flex;
    align-items: center;
    justify-content: center;
    z-index: 1;
    background-color: #409EFF;
    color: #ffffff;
-    button {
+    transition: background 0.2s;
-      font-size: 14px;
+
-      font-weight: 600;
+    &:hover {
-      line-height: 1;
+      background-color: #66b1ff;
    }
  }
 }
-.logo-img {
+
-  position: absolute;
+.search-embedded.search {
-  left: -360px;
+  width: 100%;
  top: -9px;
  width: 150px;
  cursor: pointer;
 }
-.store-search{
+
-  padding: 0 9px;
+.search-box{
-  border-radius: 0;
+  margin-left: 28px;
-  &:nth-child(2){
+}
-    margin-left: -5px;
+
 .search-type {
  display: flex;
  align-items: flex-end;
  gap: 4px;
  height: 22px;
  padding-left: 18px;
  margin-top: 4px;
 }
 .search-type-item {
  padding: 2px 10px;
  border-radius: 4px 4px 0 0;
  color: #666;
  font-size: 13px;
  line-height: 18px;
  cursor: pointer;
  user-select: none;
  &:hover {
    color: $theme_color;
  }
  &.active {
    color: #fff;
    background: $theme_color;
  }
 }
-.btn-div{
+
-  position: relative;
+.search-type + .search {
-  height: 0px;
+  margin-top: 0;
  top: -38px;
  left: 339px;
 }
 .logo-img {
  max-width: 150px;
  cursor: pointer;
 }
 .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;
 }
 .suggest-panel {
  position: absolute;
  left: 0;
  right: 0;
  top: calc(100% + 8px);
  z-index: 30;
  padding: 8px 0;
  background: #fff;
  border: 1px solid #eee;
  border-radius: 8px;
  box-shadow: 0 8px 24px rgba(0, 0, 0, 0.08);
 }
 </style>
--- a/buyer/src/components/SearchSuggest.vue
+++ b/buyer/src/components/SearchSuggest.vue
@@ -0,0 +1,150 @@
 <template>
  <div>
    <div v-if="keyword" class="suggest-section">
      <div v-if="suggesting && !suggestions.length" class="suggest-empty">正在查找...</div>
      <button
        v-for="item in suggestions"
        :key="item"
        type="button"
        class="suggest-item"
        @click="$emit('pick', item)"
      >
        <span v-for="(part, index) in parts(item)" :key="index" :class="{ hit: part.hit }">{{ part.text }}</span>
      </button>
      <div v-if="!suggesting && !suggestions.length" class="suggest-empty">没有匹配的商品，回车查看全部结果</div>
    </div>
    <template v-else>
      <div v-if="history.length" class="suggest-section">
        <div class="suggest-head">
          <span>搜索历史</span>
          <button type="button" class="suggest-clear" @click="$emit('clear')">清空</button>
        </div>
        <div class="suggest-tags">
          <button
            v-for="item in history"
            :key="item"
            type="button"
            class="suggest-tag"
            @click="$emit('pick', item)"
          >{{ item }}</button>
        </div>
      </div>
      <div v-if="hotWords.length" class="suggest-section">
        <div class="suggest-head"><span>热门搜索</span></div>
        <div class="suggest-tags">
          <button
            v-for="item in hotWords"
            :key="item"
            type="button"
            class="suggest-tag"
            @click="$emit('pick', item)"
          >{{ item }}</button>
        </div>
      </div>
    </template>
  </div>
 </template>
 <script setup>
 defineOptions({ name: "SearchSuggest" });
 const props = defineProps({
  keyword: { type: String, default: "" },
  history: { type: Array, default: () => [] },
  hotWords: { type: Array, default: () => [] },
  suggestions: { type: Array, default: () => [] },
  suggesting: { type: Boolean, default: false },
 });
 defineEmits(["pick", "clear"]);
 function parts(text) {
  const value = String(text || "");
  const key = props.keyword;
  if (!key) return [{ text: value, hit: false }];
  const index = value.toLowerCase().indexOf(key.toLowerCase());
  if (index < 0) return [{ text: value, hit: false }];
  return [
    { text: value.slice(0, index), hit: false },
    { text: value.slice(index, index + key.length), hit: true },
    { text: value.slice(index + key.length), hit: false },
  ].filter((part) => part.text);
 }
 </script>
 <style scoped lang="scss">
 .suggest-section + .suggest-section {
  margin-top: 4px;
  padding-top: 4px;
  border-top: 1px solid #f5f5f5;
 }
 .suggest-head {
  display: flex;
  align-items: center;
  justify-content: space-between;
  padding: 6px 16px;
  color: #999;
  font-size: 13px;
 }
 .suggest-clear {
  border: none;
  background: transparent;
  color: #999;
  font-size: 13px;
  cursor: pointer;
 }
 .suggest-tags {
  display: flex;
  flex-wrap: wrap;
  gap: 8px;
  padding: 0 16px 8px;
 }
 .suggest-tag {
  max-width: 180px;
  padding: 4px 10px;
  border: none;
  border-radius: 14px;
  background: #f5f5f5;
  color: #333;
  font-size: 13px;
  line-height: 20px;
  cursor: pointer;
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
 }
 .suggest-item {
  display: block;
  width: 100%;
  padding: 8px 16px;
  border: none;
  background: transparent;
  color: #333;
  font-size: 14px;
  line-height: 22px;
  text-align: left;
  cursor: pointer;
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
  &:hover {
    background: #fafafa;
  }
  .hit {
    color: $theme_color;
  }
 }
 .suggest-empty {
  padding: 10px 16px;
  color: #999;
  font-size: 13px;
 }
 </style>
--- a/buyer/src/components/addressManage/index.vue
+++ b/buyer/src/components/addressManage/index.vue
@@ -1,166 +1,177 @@
 <template>
  <div>
-    <Modal v-model="showAddr" width="800" title="收件人地址">
+    <el-dialog v-model="showAddr" width="800" title="收件人地址">
-      <Form
+      <el-form
        :model="formData"
-        ref="form"
+        ref="formRef"
        label-position="left"
-        :label-width="100"
+        label-width="100px"
        :rules="ruleInline"
      >
-        <FormItem label="收件人" prop="name">
+        <el-form-item label="收件人" prop="name">
-          <i-input v-model="formData.name" style="width: 600px"></i-input>
+          <el-input v-model="formData.name" style="width: 600px"></el-input>
-        </FormItem>
+        </el-form-item>
-        <FormItem label="收件地区" prop="address">
+        <el-form-item label="收件地区" prop="address">
-          <i-input
+          {{ formData.address || '暂无地址' }}
-            v-model="formData.address"
+          <el-button type="primary" style="margin-left: 10px;" size="small" @click="mapRef.open()">选择</el-button>
-            disabled
+        </el-form-item>
-            style="width: 600px"
+        <el-form-item label="详细地址" prop="detail">
-          ></i-input>
+          <el-input v-model="formData.detail" style="width: 600px"></el-input>
-          <Button type="primary" size="small" @click="$refs.map.showMap = true">选择</Button>
+        </el-form-item>
-        </FormItem>
+        <el-form-item label="手机号码" prop="mobile">
-        <FormItem label="详细地址" prop="detail">
+          <el-input v-model="formData.mobile" style="width: 600px"></el-input>
-          <i-input v-model="formData.detail" style="width: 600px"></i-input>
+        </el-form-item>
-        </FormItem>
+        <el-form-item label="地址别名">
-        <FormItem label="手机号码" prop="mobile">
+          <el-input
          <i-input v-model="formData.mobile" style="width: 600px"></i-input>
        </FormItem>
        <FormItem label="地址别名">
          <i-input
            v-model="formData.alias"
-            length
+            :maxlength="5"
-            :maxlength="4"
+            show-word-limit
            placeholder="请输入地址别名，例如公司"
            style="width: 600px"
-          ></i-input>
+          ></el-input>
-        </FormItem>
+        </el-form-item>
-        <FormItem label="默认地址">
+        <el-form-item label="默认地址">
-          <i-switch v-model="formData.isDefault" />
+          <el-switch v-model="formData.isDefault" />
-        </FormItem>
+        </el-form-item>
-      </Form>
+      </el-form>
-      <div class="mt_20" slot="footer">
+      <template #footer><div class="mt_20">
-        <Button @click="hide">取消</Button>
+        <el-button @click="hide">取消</el-button>
-        <Button type="primary" class="mr_10" :loading="loading" @click="save">保存收货地址</Button>
+        <el-button type="primary" class="mr_10" :loading="loading" @click="save">保存收货地址</el-button>
-      </div>
+      </div></template>
-    </Modal>
+    </el-dialog>
-    <lili-map ref="map" @getAddress="getAddress"></lili-map>
+    <multipleMap ref="mapRef" @callback="getAddress"></multipleMap>
  </div>
 </template>
-<script>
+<script setup>
-import liliMap from '@/components/map';
+import { ref, watch } from "vue";
 import { Message } from "@/utils/message";
 import multipleMap from "@/components/map/multiple-map";
 import {
  newMemberAddress,
  editMemberAddress,
  getAddrDetail
 } from '@/api/address';
-export default {
+
-  name: 'addressManage',
+defineOptions({ name: 'addressManage' });
-  props: {
+
-    id: { // 传入的地址id
+const props = defineProps({
-      defalut: '',
+  id: { // 传入的地址id
-      type: String
+    defalut: '',
    type: String
  }
 });
 const emit = defineEmits(['change']);
 const showAddr = ref(false); // 控制模态框显隐
 const formData = ref({ // 表单数据
  isDefault: false
 });
 const ruleInline = { // 验证规则
  name: [{ required: true, message: '请输入收件人姓名', trigger: 'blur' }],
  address: [{ required: true, message: '请输入地址', trigger: 'change' }],
  detail: [
    { required: true, message: '请输入详细地址', trigger: 'blur' }
  ],
  mobile: [
    { required: true, message: '手机号不能为空', trigger: 'blur' },
    {
      type: 'string',
      pattern: /^1[3|4|5|6|7|8][0-9]{9}$/,
      message: '手机号格式出错',
      trigger: 'blur'
    }
-  },
+  ]
-  data () {
+};
-    return {
+const loading = ref(false); // 提交的加载状态
-      showAddr: false, // 控制模态框显隐
+const mapMsg = ref({}); // 地图信息
-      formData: { // 表单数据
+
-        isDefault: false
+const formRef = ref(null);
-      },
+const mapRef = ref(null);
-      ruleInline: { // 验证规则
+
-        name: [{ required: true, message: '请输入收件人姓名', trigger: 'blur' }],
+function save () { // 保存地址
-        address: [{ required: true, message: '请输入地址', trigger: 'change' }],
+  formRef.value.validate((valid) => {
-        detail: [
+    if (valid) {
-          { required: true, message: '请输入详细地址', trigger: 'blur' }
+      const params = JSON.parse(JSON.stringify(formData.value));
-        ],
+      params.consigneeAddressPath = params.address.replace(/\s/g, ',');
-        mobile: [
+      delete params.address;
-          { required: true, message: '手机号不能为空', trigger: 'blur' },
+      loading.value = true;
-          {
+      if (props.id) {
-            type: 'string',
+        editMemberAddress(params).then((res) => {
-            pattern: /^1[3|4|5|6|7|8][0-9]{9}$/,
+          loading.value = false;
-            message: '手机号格式出错',
+          if (res.success) {
-            trigger: 'blur'
+            Message.success('编辑地址成功');
            emit('change', true);
            hide();
          }
-        ]
+        }).catch(() => { loading.value = false; });
-      },
+      } else {
-      loading: false, // 提交的加载状态
+        newMemberAddress(params).then((res) => {
-      mapMsg: {} // 地图信息
+          loading.value = false;
-    };
+          if (res.success) {
-  },
+            Message.success('新增地址成功');
-  methods: {
+            emit('change', true);
-    save () { // 保存地址
+            hide();
      this.$refs.form.validate((valid) => {
        if (valid) {
          const params = JSON.parse(JSON.stringify(this.formData));
          params.consigneeAddressPath = params.address.replace(/\s/g, ',');
          delete params.address;
          this.loading = true;
          if (this.id) {
            editMemberAddress(params).then((res) => {
              this.loading = false;
              if (res.success) {
                this.$Message.success('编辑地址成功');
                this.$emit('change', true);
                this.hide();
              }
            }).catch(() => { this.loading = false; });
          } else {
            newMemberAddress(params).then((res) => {
              this.loading = false;
              if (res.success) {
                this.$Message.success('新增地址成功');
                this.$emit('change', true);
                this.hide();
              }
            }).catch(() => { this.loading = false; });
          }
-        }
+        }).catch(() => { loading.value = false; });
      });
    },
    getAddrById (id) {
      // 获取地址详情
      getAddrDetail(id).then((res) => {
        if (res.success) {
          console.log(res);
          const data = res.result;
          data.address = res.result.consigneeAddressPath.replace(/,/g, ' ');
          this.formData = data;
        }
      });
    },
    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;
    },
    show () { // 地址模态框显示
      this.showAddr = true;
    },
    hide () { // 地址模态框隐藏
      this.showAddr = false;
    }
  },
  watch: {
    id: { // 传入的地址id
      handler: function (v) {
        if (v) {
          this.getAddrById(v);
        } else {
          this.formData = {isDefault: false}
          this.$refs.form.resetFields();
        }
      }
    }
-  },
+  });
-  components: {
+}
-    liliMap
+
 function getAddrById (id) {
  // 获取地址详情
  getAddrDetail(id).then((res) => {
    if (res.success) {
      const data = res.result;
      data.address = res.result.consigneeAddressPath.replace(/,/g, ' ');
      formData.value = data;
    }
  });
 }
 function getAddress (val) {
   // 获取地图选择信息
   if(val.type === 'select'){
    const paths = val.data.map(item => item.name).join(',')
    const ids = val.data.map(item => item.id).join(',')
    formData.value['address'] = paths
    formData.value['consigneeAddressIdPath'] = ids
    const coord = val.data[val.data.length - 1].center.split(',')
    formData.value.lat = coord[1]
    formData.value.lon = coord[0]
  }else{
    formData.value["address"] = val.data.addr;
    formData.value["consigneeAddressIdPath"] = val.data.addrId;
    formData.value["detail"] = val.data.address;
    formData.value.lat = val.data.position.lat;
    formData.value.lon = val.data.position.lng;
  }
-};
+
 }
 function show () { // 地址模态框显示
  showAddr.value = true;
 }
 function hide () { // 地址模态框隐藏
  showAddr.value = false;
 }
 defineExpose({ show, hide });
 watch(
  () => props.id, // 传入的地址id
  (v) => {
    if (v) {
      getAddrById(v);
    } else {
      formData.value = {isDefault: false}
      formRef.value.resetFields();
    }
  }
 );
 </script>
 <style scoped lang="scss">
--- a/buyer/src/components/advertising/FixedTop.vue
+++ b/buyer/src/components/advertising/FixedTop.vue
@@ -1,30 +1,28 @@
 <template>
  <!-- 头部广告 -->
-  <div class="advertising" v-if="show" :style="{'background-color': data.bgColor}">
+  <div class="advertising" v-if="show && data" :style="{'background-color': data.bgColor}">
    <img :src="data.img" class="hover-pointer" @click="linkTo(data.url)"/>
-    <Icon type="md-close-circle" size="20" @click="show = false" />
+    <el-icon :size="20" @click="show = false"><CircleClose /></el-icon>
  </div>
 </template>
-<script>
+<script setup>
-export default {
+import { ref } from 'vue';
-  props: {
+import { CircleClose } from '@element-plus/icons-vue';
-    data: { // 传入的广告信息
+
-      type: Object,
+defineProps({
-      default: null
+  data: { // 传入的广告信息
-    }
+    type: Object,
-  },
+    default: null
  data () {
    return {
      show: true // 是否显示头部广告
    }
  }
-};
+});
 const show = ref(true); // 是否显示头部广告
 </script>
 <style scoped lang="scss">
 .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
@@ -1,148 +1,159 @@
 <template>
-  <Card class="_Card" :bordered="false" :dis-hover="true">
+  <el-card class="_Card" shadow="never">
-    <div slot="title" class="cardTitle">
+    <template #header>
-      <span :style="{fontSize:`${_Size}px`}">{{_Title}}</span>
+      <div class="card-header">
-
+        <div class="cardTitle">
-      <div v-if="_Tabs" class="cardTabs">
+          <span :style="{ fontSize: `${_Size}px` }">{{ _Title }}</span>
-        <div @click="tabsChange(index)" :class="{active:(isActive==index)}" class="cardTabsItem" :style="{fontSize:`${_Size-2}px`}" v-for="(item,index) in _Tabs"
+          <div v-if="_Tabs" class="cardTabs">
-             :key="index">
+            <div
-          {{item}}
+              @click="tabsChange(index)"
              :class="{ active: isActive == index }"
              class="cardTabsItem"
              :style="{ fontSize: `${_Size - 2}px` }"
              v-for="(item, index) in _Tabs"
              :key="index"
            >
              {{ item }}
            </div>
          </div>
        </div>
        <div class="cardExtra" v-if="_More" @click="callBack()">
          {{ _More }}
        </div>
      </div>
-    </div>
+    </template>
-    <div slot="extra" class="cardExtra" v-if="_More" @click="callBack()">
+    <slot />
-      {{_More}}
+  </el-card>
    </div>
    <div>
    </div>
  </Card>
 </template>
-<script>
+<script setup>
-export default {
+import { ref, watch } from "vue";
-  name: 'index',
+import { useRouter } from "vue-router";
-  props:
+
-    {
+defineOptions({ name: "index" });
-      _Tabs: { // 可点击的tab栏
+
-        type: null,
+const props = defineProps({
-        default: ''
+  _Tabs: {
-      },
+    type: null,
-      // 头部
+    default: "",
      _Title: { // 标题
        type: null,
        default: '卡片头部'
      },
      // 右侧更多
      _More: {
        type: null,
        default: false
      },
      _Size: { // 文字大小
        type: Number,
        default: 16
      },
      // 点击更多触发跳转
      _Src: {
        type: null,
        default: function (val) {
          if (this._More) {
            return val;
          } else {
            return false;
          }
        }
      }
    },
  data () {
    return {
      isActive: 0 // 已激活tab栏下标
    };
  },
-  methods: {
+  _Title: {
-    // 点击右侧的回调
+    type: null,
-    callBack () {
+    default: "卡片头部",
-      let _this = this;
+  },
-      if (this._Src !== '' || this._Src != null) {
+  _More: {
-        this.$router.push({
+    type: null,
-          path: _this._Src
+    default: false,
-        });
+  },
-      }
+  _Size: {
-    },
+    type: Number,
-    // 点击tab的回调
+    default: 16,
-    tabsChange (index) {
+  },
-    //  处理并返回index
+  _Src: {
-      this.isActive = index;
+    type: null,
-      this.$emit('_Change', index);
+    default: null,
-    }
+  },
  _ActiveTab: {
    type: Number,
    default: 0,
  },
 });
 const emit = defineEmits(["_Change"]);
 const router = useRouter();
 const isActive = ref(props._ActiveTab);
 watch(
  () => props._ActiveTab,
  (val) => {
    isActive.value = val;
  }
-};
+);
 function callBack() {
  if (props._Src) {
    router.push({ path: props._Src });
  }
 }
 function tabsChange(index) {
  isActive.value = index;
  emit("_Change", index);
 }
 </script>
 <style scoped lang="scss">
-  .cardTitle {
+.card-header {
-    display: flex;
+  display: flex;
-    cursor: pointer;
+  align-items: center;
-  }
+  justify-content: space-between;
-  .active{
+}
-    color: $theme_color;
+.cardTitle {
-    position: relative;
+  display: flex;
-    &::before{
+  cursor: pointer;
-      content: '';
+}
-      position: absolute;
+.active {
-      width: 100%;
+  color: $theme_color;
-      height: 3px;
+  position: relative;
-      bottom: 0;
+  &::before {
-      left: 0;
+    content: "";
-      background: $theme_color;
+    position: absolute;
-    }
+    width: 100%;
    height: 3px;
    bottom: 0;
    left: 0;
    background: $theme_color;
  }
 }
-  .cardTabs {
+.cardTabs {
-    display: flex;
+  display: flex;
  padding: 0 12px;
  > .cardTabsItem {
    padding: 0 12px;
    > .cardTabsItem {
      padding: 0 12px;
    }
    > .cardTabsItem:hover {
      color: $theme_color;
    }
  }
-  /deep/ .ivu-card, .ivu-card-head, ._Card {
+  > .cardTabsItem:hover {
    margin-bottom: 20px;
    @include white_background_color();
  }
  /deep/ .ivu-card-head {
    position: relative;
    padding: 0 14px;
    height: 50px;
    line-height: 50px;
    &::before {
      content: '';
      width: 3px;
      height: 50%;
      top: 25%;
      background: $theme_color;
      position: absolute;
      left: 0;
    }
  }
  .cardExtra {
    color: $theme_color;
    cursor: pointer;
  }
 }
-  /deep/ .ivu-card-body {
+:deep(._Card) {
-    padding: 0 !important;
+  margin-bottom: 20px;
-    display: none;
+  @include white_background_color();
 }
 :deep(._Card .el-card__header) {
  position: relative;
  padding: 0 14px;
  height: 50px;
  line-height: 50px;
  &::before {
    content: "";
    width: 3px;
    height: 50%;
    top: 25%;
    background: $theme_color;
    position: absolute;
    left: 0;
  }
 }
 .cardExtra {
  color: $theme_color;
  cursor: pointer;
 }
 :deep(._Card .el-card__body) {
  padding: 0 !important;
  min-height: 0;
 }
 :deep(._Card .el-card__body:empty) {
  display: none;
 }
 </style>
--- a/buyer/src/components/drawer/Drawer.vue
+++ b/buyer/src/components/drawer/Drawer.vue
@@ -4,16 +4,16 @@
      <ul>
        <li v-for="(goods,goodsIndex) in cartList" :key="goodsIndex">
          <div>
-            <img :src="goods.goodsSku.thumbnail" width="90" height="90" alt="">
+            <img :src="goods.goodsSku.thumbnail" loading="lazy" decoding="async" width="90" height="90" alt="">
          </div>
          <div>
            <p class="hover-color" @click="linkTo(`/goodsDetail?skuId=${goods.goodsSku.id}&goodsId=${goods.goodsSku.goodsId}`)">{{goods.goodsSku.goodsName}}</p>
-            <p class="price">{{goods.goodsSku.price | unitPrice('￥')}}<span>&nbsp; x{{goods.num}}</span></p>
+            <p class="price">{{ $filters.unitPrice(goods.goodsSku.price, '￥') }}<span>&nbsp; x{{goods.num}}</span></p>
          </div>
          <span class="del hover-color" @click="delGoods(goods.goodsSku.id)">删除</span>
        </li>
      </ul>
-      <Button size="large" class="mt_10" type="primary" @click="linkTo('/cart')" long>去购物车结算</Button>
+      <el-button size="large" class="mt_10" type="primary" @click="linkTo('/cart')" style="width:100%">去购物车结算</el-button>
    </div>
    <div v-else-if="title === '我的订单'" class="order-con">
@@ -21,15 +21,15 @@
        <li v-for="(order,orderIndex) in orderList" :key="orderIndex">
          <div class="order-status"><span>{{filterOrderStatus(order.orderStatus)}}</span><span>{{order.createTime}}</span></div>
          <div class="goods-img">
-            <img :src="img.image"
+            <img :src="img.image" loading="lazy" decoding="async"
              @click="linkTo(`/goodsDetail?skuId=${img.skuId}&goodsId=${img.goodsId}`)"
              v-for="(img,imgIndex) in order.orderItems"
              :key="imgIndex" width="40" height="40" alt="">
          </div>
-          <div class="order-handle"><span>{{ order.flowPrice | unitPrice("￥") }}</span><span class="hover-color" @click="linkTo(`home/OrderDetail?sn=${order.sn}`)">查看订单</span></div>
+          <div class="order-handle"><span>{{ $filters.unitPrice(order.flowPrice, "￥") }}</span><span class="hover-color" @click="linkTo(`/home/OrderDetail?sn=${order.sn}`)">查看订单</span></div>
        </li>
      </ul>
-      <Button type="primary" @click="linkTo('/home/MyOrder')" long>查看全部订单</Button>
+      <el-button type="primary" @click="linkTo('/home/MyOrder')" style="width:100%">查看全部订单</el-button>
    </div>
    <div v-else-if="title === '优惠券'" class="coupon-con">
@@ -37,7 +37,7 @@
          <li v-for="(coupon, index) in couponList" class="coupon-item" :key="index">
            <div class="c-left">
              <div>
-                <span v-if="coupon.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{coupon.price | unitPrice}}</span></span>
+                <span v-if="coupon.couponType === 'PRICE'" class="fontsize_12 global_color">￥<span class="price">{{ $filters.unitPrice(coupon.price) }}</span></span>
                <span v-if="coupon.couponType === 'DISCOUNT'" class="fontsize_12 global_color"><span class="price">{{coupon.couponDiscount}}</span>折</span>
                <span class="describe">满{{coupon.consumeThreshold}}元可用</span>
              </div>
@@ -54,9 +54,9 @@
    <div v-else-if="title === '我的足迹'" class="tracks-con">
      <ul>
        <li v-for="(track,trackIndex) in tracksList" :key="trackIndex">
-          <img :src="track.thumbnail" :alt="track.thumbnail" @click="linkTo(`/goodsDetail?skuId=${track.id}&goodsId=${track.goodsId}`)" width="100" height="100">
+          <img :src="track.thumbnail" loading="lazy" decoding="async" :alt="track.thumbnail" @click="linkTo(`/goodsDetail?skuId=${track.id}&goodsId=${track.goodsId}`)" width="100" height="100">
          <div @click="addToCart(track.id)">加入购物车</div>
-          <p class="global_color">{{track.price | unitPrice('￥')}}</p>
+          <p class="global_color">{{ $filters.unitPrice(track.price, '￥') }}</p>
        </li>
      </ul>
      <div class="hover-color" style="text-align:center;" @click="linkTo('/home/MyTracks')">查看更多>></div>
@@ -64,238 +64,242 @@
    <div v-else-if="title === '我的收藏'" class="collect-con">
      <ul>
        <li v-for="(collect,collectIndex) in collectList" :key="collectIndex">
-          <img :src="collect.image" :alt="collect.image" @click="linkTo(`/goodsDetail?skuId=${collect.skuId}&goodsId=${collect.goodsId}`)" width="100" height="100">
+          <img :src="collect.image" loading="lazy" decoding="async" :alt="collect.image" @click="linkTo(`/goodsDetail?skuId=${collect.skuId}&goodsId=${collect.goodsId}`)" width="100" height="100">
          <div @click="addToCart(collect.skuId)">加入购物车</div>
          <span class="del-icon" @click.stop="cancelCollect(collect.skuId)">
-            <Icon type="md-trash" />
+            <el-icon><Delete /></el-icon>
          </span>
-          <p class="global_color">{{collect.price | unitPrice('￥')}}</p>
+          <p class="global_color">{{ $filters.unitPrice(collect.price, '￥') }}</p>
        </li>
      </ul>
      <div class="hover-color" style="text-align:center;" @click="linkTo('/home/Favorites')">查看更多>></div>
    </div>
-    <Spin v-if="loading" fix></Spin>
+    <el-skeleton v-if="loading" fix></el-skeleton>
  </div>
 </template>
-<script>
+<script setup>
 import { ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { Message, Modal } from "@/utils/message";
 import { Delete } from '@element-plus/icons-vue';
 import {cartGoodsAll, delCartGoods, addCartGoods, cartCount} from '@/api/cart.js'
-import { getOrderList } from '@/api/order';
+import { getOrderList as fetchOrderList } from '@/api/order';
-import {couponList, receiveCoupon, tracksList, collectList, cancelCollect} from '@/api/member.js'
+import {couponList as fetchCouponList, receiveCoupon, tracksList as fetchTracksList, collectList as fetchCollectList, cancelCollect as apiCancelCollect} from '@/api/member.js'
-export default {
+import storage from '@/plugins/storage.js'
-  name: 'Drawer',
+import { useAppStore } from '@/stores/app'
-  props: {
+
-    title: {
+defineOptions({ name: 'Drawer' })
-      default: '',
+
-      type: String
+const props = defineProps({
-    }
+  title: {
-  },
+    default: '',
-  watch: {
+    type: String
    title (val) {
      switch (val) {
        case '购物车':
          this.getCartList()
          break;
        case '我的订单':
          this.getOrderList()
          break;
        case '我的足迹':
          this.getTracksList()
          break;
        case '优惠券':
          this.getCouponList()
          break;
        case '我的收藏':
          this.getCollectList()
          break;
      }
    }
  },
  data () {
    return {
      loading: false, // 控制spin显隐
      cartList: [], // 购物车列表
      couponList: [], // 优惠券列表
      orderList: [], // 订单列表
      collectList: [], // 收藏列表
      tracksList: [], // 足迹列表
      orderStatusList: [ // 订单状态
        {
          name: '未付款',
          status: 'UNPAID'
        },
        {
          name: '已付款',
          status: 'PAID'
        },
        {
          name: '待发货',
          status: 'UNDELIVERED'
        },
        {
          name: '已发货',
          status: 'DELIVERED'
        },
        {
          name: '已完成',
          status: 'COMPLETED'
        },
        {
          name: '待核验',
          status: 'TAKE'
        },
        {
          name: '已取消',
          status: 'CANCELLED'
        }
      ]
    };
  },
  methods: {
    getCartList () { // 获取购物车列表
      this.loading = true
      cartGoodsAll().then(res => {
        this.loading = false
        this.cartList = res.result.skuList
      })
    },
    // 删除商品
    delGoods (id) {
      delCartGoods({ skuIds: id }).then((res) => {
        if (res.success) {
          this.$Message.success('删除成功');
          this.getCartList();
          cartCount().then(res => {
            this.$store.commit('SET_CARTNUM', res.result)
            this.Cookies.setItem('cartNum', res.result)
          })
        } else {
          this.$Message.error(res.message);
        }
      });
    },
    filterOrderStatus (status) { // 获取订单状态中文
      const ob = this.orderStatusList.filter(e => { return e.status === status });
      return ob[0].name
    },
    receive (item) { // 领取优惠券
      receiveCoupon(item.id).then(res => {
        if (res.success) {
          this.$Modal.confirm({
            title: '领取优惠券',
            content: '<p>优惠券领取成功，可到我的优惠券页面查看</p>',
            okText: '我的优惠券',
            cancelText: '立即使用',
            onOk: () => {
              this.$router.push('/home/Coupons')
            },
            onCancel: () => {
              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'})
                }
              }
            }
          });
        }
      })
    },
    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}可用`
    },
    addToCart (id) { // 添加商品到购物车
      const params = {
        num: 1,
        skuId: id
      }
      this.loading = true;
      addCartGoods(params).then(res => {
        this.loading = false;
        if (res.success) {
          this.$Message.success('商品已成功添加到购物车')
        } else {
          this.$Message.warning(res.message);
        }
      }).catch(() => { this.loading = false });
    },
    getCouponList () { // 获取优惠券列表
      // this.loading = true;
      const params = {
        pageNumber: 1,
        pageSize: 10
      }
      couponList(params).then(res => {
        this.loading = false
        if (res.success) {
          this.couponList = res.result.records
        }
      }).catch(() => { this.loading = false })
    },
    getOrderList () { // 获取订单列表
      this.loading = true
      const params = {
        pageNumber: 1,
        pageSize: 10,
        tag: 'ALL'
      }
      getOrderList(params).then(res => {
        this.loading = false
        if (res.success) {
          this.orderList = res.result.records;
        }
      });
    },
    getCollectList () { // 获取收藏列表
      const params = {
        pageNumber: 1,
        pageSize: 10,
        type: 'GOODS'
      }
      this.loading = true
      collectList(params).then(res => {
        this.loading = false
        this.collectList = res.result.records
      })
    },
    cancelCollect (id) { // 取消商品收藏
      cancelCollect('GOODS', id).then(res => {
        if (res.success) {
          this.$Message.success('取消收藏成功')
          this.getCollectList();
        }
      })
    },
    getTracksList () { // 获取足迹列表
      const params = {
        pageNumber: 1,
        pageSize: 20
      }
      this.loading = true
      tracksList(params).then(res => {
        this.tracksList = res.result
        this.loading = false
      }).catch(() => { this.loading = false })
    }
  }
-};
+})
 const router = useRouter()
 const appStore = useAppStore()
 const loading = ref(false) // 控制spin显隐
 const cartList = ref([]) // 购物车列表
 const couponList = ref([]) // 优惠券列表
 const orderList = ref([]) // 订单列表
 const collectList = ref([]) // 收藏列表
 const tracksList = ref([]) // 足迹列表
 const orderStatusList = ref([ // 订单状态
  {
    name: '未付款',
    status: 'UNPAID'
  },
  {
    name: '已付款',
    status: 'PAID'
  },
  {
    name: '待发货',
    status: 'UNDELIVERED'
  },
  {
    name: '已发货',
    status: 'DELIVERED'
  },
  {
    name: '已完成',
    status: 'COMPLETED'
  },
  {
    name: '待核验',
    status: 'TAKE'
  },
  {
    name: '已取消',
    status: 'CANCELLED'
  }
 ])
 watch(() => props.title, (val) => {
  switch (val) {
    case '购物车':
      getCartList()
      break;
    case '我的订单':
      getOrderList()
      break;
    case '我的足迹':
      getTracksList()
      break;
    case '优惠券':
      getCouponList()
      break;
    case '我的收藏':
      getCollectList()
      break;
  }
 })
 function getCartList () { // 获取购物车列表
  loading.value = true
  cartGoodsAll().then(res => {
    loading.value = false
    cartList.value = res.result.skuList
  })
 }
 // 删除商品
 function delGoods (id) {
  delCartGoods({ skuIds: id }).then((res) => {
    if (res.success) {
      Message.success('删除成功');
      getCartList();
      cartCount().then(res => {
        appStore.setCartNum(res.result)
        storage.setItem('cartNum', res.result)
      })
    } else {
      Message.error(res.message);
    }
  });
 }
 function filterOrderStatus (status) { // 获取订单状态中文
  const ob = orderStatusList.value.filter(e => { return e.status === status });
  return ob[0].name
 }
 function receive (item) { // 领取优惠券
  receiveCoupon(item.id).then(res => {
    if (res.success) {
      Modal.confirm({
        title: '领取优惠券',
        content: '<p>优惠券领取成功，可到我的优惠券页面查看</p>',
        okText: '我的优惠券',
        cancelText: '立即使用',
        onOk: () => {
          router.push('/home/Coupons')
        },
        onCancel: () => {
          if (item.storeId !== '0') {
            router.push({path: '/merchant', query: {id: item.storeId}})
          } else {
            if (item.scopeType === 'PORTION_GOODS_CATEGORY') {
              router.push({path: '/goodsList', query: {categoryId: item.scopeId}})
            } else {
              router.push({path: '/goodsList'})
            }
          }
        }
      });
    }
  })
 }
 function 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}可用`
 }
 function addToCart (id) { // 添加商品到购物车
  const params = {
    num: 1,
    skuId: id
  }
  loading.value = true;
  addCartGoods(params).then(res => {
    loading.value = false;
    if (res.success) {
      Message.success('商品已成功添加到购物车')
    } else {
      Message.warning(res.message);
    }
  }).catch(() => { loading.value = false });
 }
 function getCouponList () { // 获取优惠券列表
  // loading.value = true;
  const params = {
    pageNumber: 1,
    pageSize: 10
  }
  fetchCouponList(params).then(res => {
    loading.value = false
    if (res.success) {
      couponList.value = res.result.records
    }
  }).catch(() => { loading.value = false })
 }
 function getOrderList () { // 获取订单列表
  loading.value = true
  const params = {
    pageNumber: 1,
    pageSize: 10,
    tag: 'ALL'
  }
  fetchOrderList(params).then(res => {
    loading.value = false
    if (res.success) {
      orderList.value = res.result.records;
    }
  });
 }
 function getCollectList () { // 获取收藏列表
  const params = {
    pageNumber: 1,
    pageSize: 10,
    type: 'GOODS'
  }
  loading.value = true
  fetchCollectList(params).then(res => {
    loading.value = false
    collectList.value = res.result.records
  })
 }
 function cancelCollect (id) { // 取消商品收藏
  apiCancelCollect('GOODS', id).then(res => {
    if (res.success) {
      Message.success('取消收藏成功')
      getCollectList();
    }
  })
 }
 function getTracksList () { // 获取足迹列表
  const params = {
    pageNumber: 1,
    pageSize: 20
  }
  loading.value = true
  fetchTracksList(params).then(res => {
    tracksList.value = res.result.records
    loading.value = false
  }).catch(() => { loading.value = false })
 }
 </script>
 <style scoped lang="scss">
--- a/buyer/src/components/drawer/Main.vue
+++ b/buyer/src/components/drawer/Main.vue
@@ -3,102 +3,99 @@
    <div class="wrapper" :style="{right:handleDrawer ? '300px' : '0px'}">
      <div class="barItem" @mouseenter="showCartNum(item)" @click="clickBar(item)" v-for="(item,index) in resetConfig.menuList" :key="index">
-        <Tooltip placement="left" :content="item.title">
+        <el-tooltip placement="left" :content="item.title">
-          <Icon size="20" :type="item.icon"/>
+          <el-icon :size="20"><component :is="resolveIcon(item.icon)" /></el-icon>
          <p class="barTitle" v-if="item.titleShow"> {{item.title}}</p>
          <div class="circle" v-if="item.title === '购物车'">
-            {{cartNum < 100 ? cartNum : 99}}
+            {{ Number(cartNum) > 99 ? '99+' : cartNum }}
          </div>
-        </Tooltip>
+        </el-tooltip>
      </div>
    </div>
-    <Drawer width="300" class="popup" :title="drawerData.title" :mask="resetConfig.mask" :closable="resetConfig.closable"
+    <el-drawer width="300" class="popup" :title="drawerData.title" :modal="resetConfig.mask" :show-close="resetConfig.closable"
      v-model="handleDrawer">
      <drawerPage :title="drawerData.title" />
-    </Drawer>
+    </el-drawer>
  </div>
 </template>
-<script>
+<script setup>
-import Storage from '@/plugins/storage.js';
+import { computed, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { Modal } from "@/utils/message";
 import storage from '@/plugins/storage.js';
 import Configuration from './config';
 import drawerPage from './Drawer'
 import {cartCount} from '@/api/cart.js'
-export default {
+import { resolveIcon } from '@/utils/iconMap'
-  name: 'Main',
+import { useAppStore } from '@/stores/app'
-  data () {
+
-    return {
+defineOptions({ name: 'Main' })
-      resetConfig: Configuration, // 菜单项
+
-      handleDrawer: false, // 是否可展开
+const route = useRoute()
-      drawerData: '' // 菜单基础数据
+const router = useRouter()
-    }
+const appStore = useAppStore()
-  },
+
-  components: {drawerPage},
+const resetConfig = ref(Configuration) // 菜单项
-  computed: {
+const handleDrawer = ref(false) // 是否可展开
-    // 用户信息
+const drawerData = ref('') // 菜单基础数据
-    userInfo () {
+
-      return Storage.getItem('userInfo');
+// 用户信息
-    },
+const userInfo = computed(() => {
-    // 购物车商品数量
+  return storage.getItem('userInfo');
-    cartNum () {
+})
-      return this.$store.state.cartNum
+
-    }
+// 购物车商品数量
-  },
+const cartNum = computed(() => appStore.cartNum)
-  methods: {
+
-    showCartNum (item) { // 获取购物车数量
+function showCartNum (item) { // 获取购物车数量
-      if (this.userInfo && item.title === '购物车') {
+  if (userInfo.value && item.title === '购物车') {
-        this.getCartList()
+    getCartList()
-      }
+  }
-    },
+}
-    clickBar (val) { // tabbar点击操作
+
-      if (!this.userInfo) {
+function clickBar (val) { // tabbar点击操作
-        this.$Modal.confirm({
+  if (!userInfo.value) {
-          title: '请登录',
+    Modal.confirm({
-          content: '<p>请登录后执行此操作</p>',
+      title: '请登录',
-          okText: '立即登录',
+      content: '请登录后执行此操作',
-          cancelText: '继续浏览',
+      okText: '立即登录',
-          onOk: () => {
+      cancelText: '继续浏览',
-            this.$router.push({
+      onOk: () => {
-              path: '/login',
+        router.push({
-              query: {
+          path: '/login',
-                rePath: this.$router.history.current.path,
+          query: {
-                query: JSON.stringify(this.$router.history.current.query)
+            rePath: route.path,
-              }
+            query: JSON.stringify(route.query || {}),
-            });
+          },
          }
        });
      } else {
        if (val.display) {
          this.handleDrawer = true
          this.drawerData = val
        } else {
          this.handleDrawer = false
          switch (val.title) {
            case '会员中心':
              this.openBlank('/home')
              break;
            case '我的资产':
              this.openBlank('/home/MoneyManagement')
              break;
          }
        }
      }
-    },
+    });
-    openBlank (path) { // 新页面打开地址
+  } else {
-      let routerUrl = this.$router.resolve({
+    if (val.display) {
-        path: path
+      handleDrawer.value = true
-      })
+      drawerData.value = val
-      window.open(routerUrl.href, '_blank')
+    } else {
-    },
+      handleDrawer.value = false
-    getCartList () { // 获取购物车列表
+      switch (val.title) {
-      cartCount().then(res => {
+        case '会员中心':
-        this.$store.commit('SET_CARTNUM', res.result)
+          router.push('/home')
-        this.Cookies.setItem('cartNum', res.result)
+          break;
-      })
+        case '我的资产':
          router.push('/home/MoneyManagement')
          break;
      }
    }
  }
 }
 function getCartList () { // 获取购物车列表
  cartCount().then(res => {
    appStore.setCartNum(res.result)
    storage.setItem('cartNum', res.result)
  })
 }
 </script>
 <style scoped lang="scss">
@@ -128,11 +125,15 @@ export default {
  }
  .circle {
-    width: 20px;
+    min-width: 20px;
    height: 20px;
-    border-radius: 50%;
+    padding: 0 4px;
    border-radius: 10px;
    color: #fff;
    background: $theme_color;
    font-size: 12px;
    line-height: 20px;
    box-sizing: border-box;
  }
  .wrapper {
@@ -147,11 +148,11 @@ export default {
    justify-content: center;
    flex-direction: column;
  }
-  /deep/.popup .ivu-drawer-body{
+  :deep(.popup .el-drawer__body) {
-    padding: 0!important;
+    padding: 0 !important;
    background-color: #eee;
  }
-  /deep/.popup .ivu-drawer-wrap{
+  :deep(.popup) {
    z-index: 3001;
  }
 </style>
--- a/buyer/src/components/drawer/README.md
+++ b/buyer/src/components/drawer/README.md
@@ -1,42 +1,30 @@
 # 右侧侧边栏组件
 > 本组件依赖于iview的组件基础上进行封装
 >项目结构
 >* Main  -- 组件用于挂在右侧的横栏
 >* drawer -- 右侧横栏的内容
 >* config -- 用于设置大小
 基于 Element Plus `el-drawer` 封装的右侧悬浮栏。
-#### config设置
+## 项目结构
-```
+
 - `Main.vue` — 挂载右侧横栏的容器
 - `Drawer.vue` — 横栏展开后的内容面板
 - `config.js` — 尺寸与菜单配置
 ## config 设置
 ```js
 /**
-menuList // 组件的menu
+ * menuList  菜单项列表
-display //是否显示此menu
+ * display   是否显示该项
-badge //显示徽标数
+ * badge     徽标数字
-titleShow //是否显示title
+ * titleShow 是否显示标题
-*/
+ */
-
+width: 50,
-//实例代码
+menuList: [{ icon: '...' }]
 width : 50, //bar的大小
 menuList:[
   {
      icon
   }
 ]
 ```
 ## 功能模块
 账户信息、购物车、我的订单、优惠券、我的资产、我的足迹、我的收藏、邮箱订阅
-> 账户信息
+## 使用
 > 购物车
 > 我的订单
 > 优惠券
 > 我的资产
 > 我的足迹
 > 我的收藏
 > 邮箱订阅
-
+在页面中注册全局组件 `<drawer />` 即可（已在 `global.js` 中注册）。
 ## 如何使用
 1.
--- a/buyer/src/components/empty/Main.vue
+++ b/buyer/src/components/empty/Main.vue
@@ -7,23 +7,23 @@
      alt=""
    />
    <p v-if="_Title">{{ _Title }}</p>
    <slot></slot>
  </div>
 </template>
-<script>
+<script setup>
-export default {
+defineOptions({ name: 'Main' })
-  name: 'Main',
+
-  props: {
+defineProps({
-    _Title: { // 描述内容
+  _Title: { // 描述内容
-      type: null,
+    type: null,
-      default: '暂无更多'
+    default: '暂无更多'
-    },
+  },
-    _Size: { // 图片大小
+  _Size: { // 图片大小
-      type: Number,
+    type: Number,
-      default: 150
+    default: 150
    }
  }
-};
+})
 </script>
 <style scoped lang="scss">
--- a/buyer/src/components/fixed/index.vue
+++ b/buyer/src/components/fixed/index.vue
@@ -0,0 +1,149 @@
 <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="getIconUrl(item.icon)">
          <div class="shadow-label">{{item.label}}</div>
          <div class="line" v-if="iconList.length-1 !=index"></div>
        </div>
    </div>
 </template>
 <script setup>
 import { onMounted, ref } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { getIconUrl } from "@/assets/iconfont/iconMap";
 import storage from "@/plugins/storage.js";
 defineOptions({ name: "fixed-index" });
 const route = useRoute();
 const router = useRouter();
 const iconList = ref([
  {
    icon:"user",
    label:"会员中心",
    path:"/home",
    requireLogin: true,
  },
  {
    icon:"carts",
    label:"购物车",
    path:"/cart",
    requireLogin: true,
  },
  {
    icon:"notification",
    label:"消息",
    path:"/home/MsgList",
    requireLogin: true,
  },
  {
    icon:"collage",
    label:"收藏",
    path:"/home/Favorites",
    requireLogin: true,
  },
  {
    icon:"back",
    label:"顶部",
    path:"back"
  },
 ]);
 let isScrolling = false;
 let timeoutId = "";
 onMounted(() => {
  // 添加滚轮事件监听器
  window.addEventListener('wheel', function() {
    if (isScrolling) {
      // 如果页面正在滚动，则取消定时器并设置 isScrolling 为 false
      window.cancelAnimationFrame(timeoutId);
      isScrolling  = false;
    }
  });
 });
 function scrollToTop() {
  const c = document.documentElement.scrollTop || document.body.scrollTop;
  if (c > 0) {
    timeoutId = window.requestAnimationFrame(scrollToTop);
    window.scrollTo(0, c - c / 4);
    isScrolling = true;
  }else {
    isScrolling = false;
  }
 }
 function isLoggedIn () {
  const rawUserInfo = storage.getItem('userInfo');
  if (rawUserInfo) {
    try {
      return !!JSON.parse(rawUserInfo).username;
    } catch {
      return false;
    }
  }
  return !!storage.getItem('accessToken');
 }
 function goLogin (rePath) {
  router.push({
    path: '/login',
    query: {
      rePath,
      query: JSON.stringify(route.query || {}),
    },
  });
 }
 function handleClickIcon (val) {
  if (val.path === 'back') {
    scrollToTop();
    return;
  }
  if (val.requireLogin && !isLoggedIn()) {
    goLogin(val.path);
    return;
  }
  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">
+        <div class="footer-icon flex flex-a-c">
-          <h5 class="footer-icon-child"></h5>
+          <h5 class="footer-icon-child">多</h5>
          <span class="footer-icon-text">品类齐全，轻松购物</span>
        </div>
-        <div class="footer-icon">
+        <div class="footer-icon flex flex-a-c">
-          <h5 class="footer-icon-child footer-icon-child-2"></h5>
+          <h5 class="footer-icon-child footer-icon-child-2">快</h5>
          <span class="footer-icon-text">多仓直发，极速配送</span>
        </div>
-        <div class="footer-icon">
+        <div class="footer-icon flex flex-a-c">
-          <h5 class="footer-icon-child footer-icon-child-3"></h5>
+          <h5 class="footer-icon-child footer-icon-child-3">好</h5>
          <span class="footer-icon-text">正品行货，精致服务</span>
        </div>
-        <div class="footer-icon">
+        <div class="footer-icon flex flex-a-c">
-          <h5 class="footer-icon-child footer-icon-child-4"></h5>
+          <h5 class="footer-icon-child footer-icon-child-4">省</h5>
          <span class="footer-icon-text">天天低价，畅选无忧</span>
        </div>
      </div>
@@ -29,131 +29,185 @@
          </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 © {{year}} LILI</p>
+          <p>Copyright © {{year}} {{config.title}}</p>
        </div>
      </div>
    </footer>
  </div>
 </template>
-<script>
+<script setup>
-export default {
+import { ref } from 'vue'
-  name: 'Footer',
+import { useRouter } from 'vue-router'
-  data () {
+import config from '@/config'
-    return {
+
-      guideArr: [ // 导航链接
+defineOptions({ name: 'Footer' })
-        [ '购物指南', '购物流程', '会员介绍', '生活旅行', '常见问题' ],
+
-        [ '配送方式', '上门自提', '配送服务查询', '收取标准', '物流规则' ],
+const router = useRouter()
-        [ '支付方式', '在线支付', '公司转账', '余额支付', '积分支付' ],
+
-        [ '售后服务', '售后政策', '退款说明', '返修/退货', '取消订单' ]
+const guideArr = ref([
-      ],
+  // 导航链接
-      moreLink: ['关于我们', '联系我们', '联系客服', '商家帮助', '隐私政策'], // 更多链接
+  ["购物指南", "购物流程", "会员介绍", "生活旅行", "常见问题"],
-      year: new Date().getFullYear() // 当前年份
+  ["配送方式", "上门自提", "配送查询", "收取标准", "物流规则"],
-    };
+  ["支付方式", "在线支付", "公司转账", "余额支付", "积分支付"],
-  },
+  ["售后服务", "售后政策", "退款说明", "返修/退货", "取消订单"],
-  methods: {
+])
-    goArticle () { // 跳转文章页
+const moreLink = ref(["关于我们", "联系我们", "联系客服", "商家帮助", "隐私政策"]) // 更多链接
-      let routeUrl = this.$router.resolve({
+const year = ref(new Date().getFullYear()) // 当前年份
-        path: '/article'
+
-      })
+function goArticle() {
-      window.open(routeUrl.href, '_blank')
+  // 跳转文章页
-    }
+  router.push("/article")
-  }
+}
 };
 </script>
 <style scoped lang="scss">
 /*****************************底 部 开 始*****************************/
 .footer {
  width: 100%;
-  height: 380px;
+  height: 370px;
-  padding-top: 30px;
+  background: #FFFFFF;
  @include background_color($light_background_color);
 }
 .icon-row {
-  margin: 15px auto;
+  display: flex;
-  padding-top: 8px;
+  align-items: center;
-  width: 1000px;
+  justify-content: space-between;
-  height: 64px;
+  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: 36.4px;
-  width: 36px;
+  display: flex;
-  height: 42px;
+  align-items: center;
-  background-image: url("../../assets/images/footer/ico_service.png");
+  justify-content: center;
-  text-indent: -999px;
+  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 {
+.flex{
-  background-position: 0 -86px;
+  display: flex;
  align-items: center;
  >img{
    margin-right: 4px;
  }
 }
-.footer-icon-child-4 {
+.footer-icon-text {
-  background-position: 0 -129px;
+  margin-left: 11px;
-}
+  font-size: 16px;
- .footer-icon-text{
+
-  margin-left: 45px;
+  font-weight: normal;
-  font-size: 18px;
+
-  font-weight: bold;
+  text-align: center;
  line-height: 64px;
 }
 .service-intro {
  width: 100%;
  border-top: 1px solid $border_color;
 }
 .servece-type {
-  margin: 15px auto;
+  width: 952px;
-  width: 800px;
+  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;
+  font-size: 14.82px;
-  line-height: 28px;
+  font-weight: normal;
-  font-weight: bold;
+  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 {
+.information {
-  margin: 0px auto;
+  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 +215,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;
+.footer-icon-text {
-  font-size: 20px;
+  @include title_color($light_title_color);
 }
-.footer-icon-text{
+.copyright,
-  @include title_color($light_title_color)
+.friend-link,
-}
+.servece-type-info {
-.copyright,.friend-link,.servece-type-info {
+  @include sub_color($light_sub_color);
  @include sub_color($light_sub_color)
 }
 /*****************************底 部 结 束*****************************/
 </style>
--- a/buyer/src/components/global.js
+++ b/buyer/src/components/global.js
@@ -1,54 +1,21 @@
-// 全局组件配置
+import empty from "./empty/Main.vue";
 import drawer from "./drawer/Main.vue";
 import Header from "@/components/header/Header.vue";
 import FixedTopPage from "@/components/advertising/FixedTop.vue";
 import Footer from "@/components/footer/Footer.vue";
 import Search from "@/components/Search.vue";
 import card from "@/components/card/index.vue";
 import cateNav from "@/components/nav/CateNav.vue";
 import UserCenterLayout from "@/components/userCenter/Layout.vue";
-import empty from './empty/Main' // 空状态组件
+export function registerGlobalComponents(app) {
-import drawer from './drawer/Main' // 右侧bar
+  app.component("empty", empty);
-import Header from '@/components/header/Header'; // 头部组件
+  app.component("drawer", drawer);
-import FixedTopPage from '@/components/advertising/FixedTop'; // 顶部广告
+  app.component("BaseHeader", Header);
-import Footer from '@/components/footer/Footer'; // 底部栏
+  app.component("FixedTopPage", FixedTopPage);
-import Search from '@/components/Search' // 搜索框
+  app.component("BaseFooter", Footer);
-import card from '@/components/card' // 个人中心 卡片
+  app.component("Search", Search);
-import cateNav from '@/components/nav/CateNav' // 个人中心 卡片
+  app.component("card", card);
-
+  app.component("UserCenterLayout", UserCenterLayout);
-empty.install = function (Vue) {
+  app.component("cateNav", cateNav);
  Vue.component('empty', empty);
 };
 drawer.install = function (Vue) {
  Vue.component('drawer', drawer);
 };
 Header.install = function (Vue) {
  Vue.component('BaseHeader', Header);
 };
 FixedTopPage.install = function (Vue) {
  Vue.component('FixedTopPage', FixedTopPage);
 };
 Footer.install = function (Vue) {
  Vue.component('BaseFooter', Footer);
 };
 Search.install = function (Vue) {
  Vue.component('Search', Search);
 };
 card.install = function (Vue) {
  Vue.component('card', card)
 }
 cateNav.install = function (Vue) {
  Vue.component('cateNav', cateNav)
 }
 // 引用本js中所有的组件
 export function InstallAll (Vue) {
  Vue.use(empty)
  Vue.use(drawer)
  Vue.use(Header)
  Vue.use(FixedTopPage)
  Vue.use(Footer)
  Vue.use(Search)
  Vue.use(card)
  Vue.use(cateNav)
 }
--- a/buyer/src/components/goods/GoodsThumb.vue
+++ b/buyer/src/components/goods/GoodsThumb.vue
@@ -0,0 +1,146 @@
 <template>
  <div class="goods-thumb" ref="rootEl" :class="{ 'is-loaded': loaded, 'is-error': error }">
    <img v-if="currentSrc" :src="currentSrc" :alt="alt" @load="loaded = true" @error="onError" />
    <img v-else-if="error" :src="defaultImg" :alt="alt || '默认商品图片'" class="default-img" />
  </div>
 </template>
 <script setup>
 import { onBeforeUnmount, onMounted, ref, watch } from "vue";
 import defaultImg from "@/assets/images/default.png";
 defineOptions({ name: "GoodsThumb" });
 const props = defineProps({
  src: {
    type: String,
    default: "",
  },
  alt: {
    type: String,
    default: "",
  },
 });
 const rootEl = ref(null);
 const currentSrc = ref("");
 const loaded = ref(false);
 const error = ref(false);
 let observer = null;
 function isValidUrl(url) {
  if (!url || typeof url !== "string") return false;
  const s = url.trim().toLowerCase();
  if (
    !s ||
    s === "null" ||
    s === "undefined" ||
    s.startsWith("null?") ||
    s.startsWith("undefined?")
  ) {
    return false;
  }
  return true;
 }
 watch(
  () => props.src,
  () => {
    observe();
  }
 );
 function disconnect() {
  if (observer) {
    observer.disconnect();
    observer = null;
  }
 }
 function observe() {
  disconnect();
  currentSrc.value = "";
  loaded.value = false;
  error.value = false;
  if (!isValidUrl(props.src)) {
    error.value = true;
    return;
  }
  if (typeof IntersectionObserver === "undefined") {
    currentSrc.value = props.src;
    return;
  }
  observer = new IntersectionObserver(
    (entries) => {
      if (!entries.some((entry) => entry.isIntersecting)) return;
      currentSrc.value = props.src;
      disconnect();
    },
    { rootMargin: "160px 0px" }
  );
  observer.observe(rootEl.value);
 }
 function onError() {
  error.value = true;
  loaded.value = false;
  currentSrc.value = "";
 }
 onMounted(() => {
  observe();
 });
 onBeforeUnmount(() => {
  disconnect();
 });
 </script>
 <style scoped lang="scss">
 .goods-thumb {
  position: relative;
  width: 100%;
  aspect-ratio: 1;
  overflow: hidden;
  background: #f3f3f3;
 }
 .goods-thumb::before {
  content: "";
  position: absolute;
  inset: 0;
  background: linear-gradient(90deg, #f3f3f3 25%, #e8e8e8 37%, #f3f3f3 63%);
  background-size: 400% 100%;
  animation: goods-thumb-loading 1.2s ease infinite;
 }
 .goods-thumb.is-loaded::before,
 .goods-thumb.is-error::before {
  display: none;
 }
 .goods-thumb img {
  position: relative;
  z-index: 1;
  width: 100%;
  height: 100%;
  object-fit: cover;
  display: block;
  &.default-img {
    object-fit: contain;
    padding: 14px;
    box-sizing: border-box;
    opacity: 0.55;
  }
 }
@keyframes goods-thumb-loading {
  0% {
    background-position: 100% 0;
  }
  100% {
    background-position: 0 0;
  }
 }
 </style>
--- a/buyer/src/components/goodsDetail/Promotion.vue
+++ b/buyer/src/components/goodsDetail/Promotion.vue
@@ -1,9 +1,14 @@
 <template>
  <div>
    <div class="wrapper" v-if="type === 'goodsDetail'">
-      <div class="wr-l"><Icon size="23" type="ios-alarm-outline" /> 秒杀活动</div>
+      <div class="wr-l"><el-icon :size="23"><AlarmClock /></el-icon> 秒杀活动</div>
      <div class="count-down" v-if="end === ''">
-      <p>倒计时：</p><span>{{ hours }}</span><span>{{ minutes }}</span><span>{{ seconds }}</span>
+        <span class="count-down-label">倒计时：</span>
        <span class="count-down-num">{{ hours }}</span>
        <span class="count-down-colon">:</span>
        <span class="count-down-num">{{ minutes }}</span>
        <span class="count-down-colon">:</span>
        <span class="count-down-num">{{ seconds }}</span>
      </div>
      <div v-else>{{end}}</div>
    </div>
@@ -13,58 +18,57 @@
    </span>
  </div>
 </template>
-<script>
+<script setup>
-export default {
+import { onMounted, ref } from 'vue';
-  props: {
+import { AlarmClock } from '@element-plus/icons-vue';
-    time: { // 传入的初始时间
+
-      default: 1718977559428
+const props = defineProps({
-    },
+  time: { // 传入的初始时间
-    type: { // 区分是在详情还是购物车调用
+    default: 1718977559428
      default: 'goodsDetail', // 设置两个值，goodsDetail和cart，样式不同
      type: String
    }
  },
-  data () {
+  type: { // 区分是在详情还是购物车调用
-    return {
+    default: 'goodsDetail', // 设置两个值，goodsDetail和cart，样式不同
-      end: '', // 结束状态
+    type: String
      hours: '', // 小时
      minutes: '', // 分钟
      seconds: '', // 秒
      interval: '' // 定时器
    };
  },
  mounted () {
    this.init()
  },
  methods: {
    countDown (val) { // 倒计时方法
      function addZero (i) {
        return i < 10 ? '0' + i : i + '';
      }
      var nowtime = new Date();
      var endtime = new Date(val);
      var lefttime = parseInt((endtime.getTime() - nowtime.getTime()) / 1000);
      var h = parseInt((lefttime / (60 * 60)) % 24);
      var m = parseInt((lefttime / 60) % 60);
      var s = parseInt(lefttime % 60);
      h = addZero(h);
      m = addZero(m);
      s = addZero(s);
      this.hours = h;
      this.minutes = m
      this.seconds = s;
      if (lefttime <= 0) {
        this.end = `活动已结束`;
        clearInterval(this.interval)
      }
    },
    init () { // 初始化
      this.interval = setInterval(() => {
        this.countDown(this.time);
      }, 1000);
    }
  }
-};
+});
 const end = ref(''); // 结束状态
 const hours = ref(''); // 小时
 const minutes = ref(''); // 分钟
 const seconds = ref(''); // 秒
 let interval = null; // 定时器
 function countDown (val) { // 倒计时方法
  function addZero (i) {
    return i < 10 ? '0' + i : i + '';
  }
  var nowtime = new Date();
  var endtime = new Date(val);
  var lefttime = parseInt((endtime.getTime() - nowtime.getTime()) / 1000);
  var h = parseInt((lefttime / (60 * 60)) % 24);
  var m = parseInt((lefttime / 60) % 60);
  var s = parseInt(lefttime % 60);
  h = addZero(h);
  m = addZero(m);
  s = addZero(s);
  hours.value = h;
  minutes.value = m
  seconds.value = s;
  if (lefttime <= 0) {
    end.value = `活动已结束`;
    clearInterval(interval)
  }
 }
 function init () { // 初始化
  interval = setInterval(() => {
    countDown(props.time);
  }, 1000);
 }
 onMounted(() => {
  init()
 });
 </script>
 <style scoped lang="scss">
 .cart-promotion{
@@ -87,36 +91,35 @@ export default {
  font-size: 13px;
 }
 .count-down {
-  margin-right: -20px;
+  display: flex;
-  p{
+  align-items: center;
-    float: left;
+  gap: 4px;
-    line-height: 20px;
+  font-size: 13px;
  line-height: 1;
  .count-down-label {
    flex-shrink: 0;
    white-space: nowrap;
  }
-  > span {
+
-    position: relative;
+  .count-down-num {
-    float: left;
+    display: inline-flex;
-    width: 20px;
+    align-items: center;
    justify-content: center;
    min-width: 20px;
    height: 20px;
-    text-align: center;
+    padding: 0 2px;
    background-color: #2f3430;
-    margin-right: 20px;
+    color: #fff;
    color: white;
    font-size: 14px;
-    line-height: 20px;
+    line-height: 1;
-    &::after {
+    border-radius: 2px;
      content: ":";
      display: block;
      position: absolute;
      right: -20px;
      font-weight: bolder;
      font-size: 14px;
      width: 20px;
      height: 100%;
      top: 0;
    }
  }
-  > span:last-child::after {
+
-    content: "";
+  .count-down-colon {
    font-weight: bold;
    font-size: 14px;
    line-height: 1;
  }
 }
--- 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
--- a/buyer/src/components/goodsDetail/StoreSide.vue
+++ b/buyer/src/components/goodsDetail/StoreSide.vue
@@ -0,0 +1,495 @@
 <template>
  <aside class="store-side" v-if="storeId">
    <div class="store-card">
      <div class="store-head" @click="goStore">
        <img
          v-if="store.storeLogo && !logoError"
          class="store-logo"
          :src="store.storeLogo"
          loading="lazy"
          decoding="async"
          :alt="storeName"
          @error="logoError = true"
        />
        <span v-else class="store-logo store-logo-fallback">{{ storeInitial }}</span>
        <div class="store-head-text">
          <p class="store-name">
            <span v-if="isSelfOperated" class="store-self">自营</span>
            <span class="store-name-text">{{ storeName }}</span>
          </p>
        </div>
      </div>
      <div class="store-scores">
        <div class="score-item">
          <span class="score-label">描述</span>
          <span class="score-value">{{ formatScore(store.descriptionScore) }}</span>
        </div>
        <div class="score-item">
          <span class="score-label">服务</span>
          <span class="score-value">{{ formatScore(store.serviceScore) }}</span>
        </div>
        <div class="score-item">
          <span class="score-label">物流</span>
          <span class="score-value">{{ formatScore(store.deliveryScore) }}</span>
        </div>
      </div>
      <div class="store-actions">
        <button type="button" class="store-btn" @click="contact">联系客服</button>
        <button type="button" class="store-btn" :class="{ 'is-on': collected }" @click="toggleCollect">
          {{ collected ? "已收藏" : "收藏店铺" }}
        </button>
      </div>
      <button type="button" class="enter-store" @click="goStore">进店逛逛</button>
    </div>
    <div class="recommend-card" v-if="recommends.length">
      <p class="recommend-title">店铺推荐</p>
      <div
        class="recommend-item"
        v-for="item in recommends"
        :key="item.id"
        @click="goGoods(item)"
      >
        <img class="recommend-img" :src="item.thumbnail || item.small" loading="lazy" decoding="async" :alt="item.goodsName" />
        <div class="recommend-info">
          <p class="recommend-name">{{ item.goodsName }}</p>
          <div class="recommend-meta">
            <p class="recommend-price">{{ $filters.unitPrice(item.price, "￥") }}</p>
            <span class="recommend-sales">销量 {{ item.buyCount || 0 }}</span>
          </div>
        </div>
      </div>
    </div>
  </aside>
 </template>
 <script setup>
 import { computed, ref, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { Message, Modal } from "@/utils/message";
 import { goodsList } from "@/api/goods";
 import { getStoreById } from "@/api/shopentry";
 import { cancelStoreCollect, collectStore, isStoreCollection } from "@/api/member";
 import { getIMDetail } from "@/api/common";
 import { getMemberMsg } from "@/api/login";
 import storage from "@/plugins/storage.js";
 defineOptions({ name: "StoreSide" });
 const props = defineProps({
  storeId: {
    type: [String, Number],
    default: "",
  },
  goodsId: {
    type: [String, Number],
    default: "",
  },
  skuId: {
    type: [String, Number],
    default: "",
  },
  storeNameFallback: {
    type: String,
    default: "",
  },
 });
 const route = useRoute();
 const router = useRouter();
 const store = ref({});
 const logoError = ref(false);
 const collected = ref(false);
 const recommends = ref([]);
 // 原 talkIm mixin 的 IM 链接
 const IMLink = ref("");
 const storeName = computed(() => {
  return store.value.storeName || props.storeNameFallback || "店铺";
 });
 const storeInitial = computed(() => {
  return storeName.value.slice(0, 1);
 });
 // 自营标记后端可能是 true、1 或 "1"
 const isSelfOperated = computed(() => {
  const flag = store.value.selfOperated;
  return flag === true || flag === 1 || flag === "1";
 });
 watch(
  () => props.storeId,
  (id) => {
    if (!id) return;
    logoError.value = false;
    loadStore(id);
    loadRecommend(id);
    loadCollected(id);
  },
  { immediate: true }
 );
 // 没有评分或小于等于 0 时按满分展示
 function formatScore(value) {
  const score = Number(value);
  if (!Number.isFinite(score) || score <= 0) return "5.00";
  return score.toFixed(2);
 }
 function loadStore(id) {
  getStoreById(id).then((res) => {
    if (res.success && res.result) store.value = res.result;
  }).catch((err) => {
    console.warn('获取店铺信息失败', err);
  });
 }
 // 按销量取店内商品，去掉当前商品，最多 4 个
 function loadRecommend(id) {
  goodsList({
    storeId: id,
    pageNumber: 1,
    pageSize: 8,
    sort: "buyCount",
    order: "desc",
  }).then((res) => {
    const records = (res.success && res.result && res.result.records) || [];
    recommends.value = records
      .filter((item) => String(item.goodsId) !== String(props.goodsId))
      .slice(0, 4);
  }).catch(() => {
    // 推荐商品为可选数据，加载失败时静默
  });
 }
 // 同时有 token 和用户信息才查收藏，避免残留 userInfo 触发登录跳转
 function loadCollected(id) {
  if (!storage.getItem("accessToken") || !storage.getItem("userInfo")) return;
  isStoreCollection("STORE", id).then((res) => {
    if (res.success && res.result) collected.value = true;
  }).catch(() => {
    // 收藏状态为可选数据，失败时静默
  });
 }
 function goStore() {
  router.push({ path: "/merchant", query: { id: props.storeId } });
 }
 // 推荐商品新开详情页，店铺页仍在当前页打开
 function goGoods(item) {
  const href = router.resolve({
    path: "/goodsDetail",
    query: { skuId: item.id, goodsId: item.goodsId },
  }).href;
  window.open(href, "_blank");
 }
 // 原 talkIm mixin 的登录提示
 function promptLogin() {
  Modal.confirm({
    title: "温馨提示",
    content: "请登录后执行此操作",
    okText: "立即登录",
    cancelText: "取消",
    onOk: () => {
      router.push({
        path: "/login",
        query: {
          rePath: route.path,
          query: JSON.stringify(route.query || {}),
        },
      });
    },
  });
 }
 // 获取im信息（原 talkIm mixin）
 async function getIMDetailMethods() {
  let res = await getIMDetail();
  if (res.success) {
    IMLink.value = res.result;
  }
 }
 // 跳转im客服（原 talkIm mixin；本组件无 storeMsg，mixin 的 storeMsg?.storeId 兜底恒为 undefined，等价于直接用传入的 id）
 async function IMService(id, goodsId, skuId) {
  if (!storage.getItem("accessToken")) {
    promptLogin();
    return;
  }
  try {
    await getIMDetailMethods();
    const userInfo = await getMemberMsg();
    if (!userInfo.success) {
      promptLogin();
      return;
    }
    const accessToken = storage.getItem("accessToken");
    const storeId = id;
    const baseUrl = `${IMLink.value}?token=${accessToken}&id=${storeId}`;
    if (goodsId && skuId) {
      window.open(`${baseUrl}&goodsId=${goodsId}&skuId=${skuId}`);
    } else {
      window.open(baseUrl);
    }
  } catch {
    // token 过期等场景由 request 拦截器处理；未登录时避免未捕获异常
    if (!storage.getItem("accessToken")) {
      promptLogin();
    }
  }
 }
 function contact() {
  IMService(props.storeId, props.goodsId, props.skuId);
 }
 // 未登录先去登录，并带回当前商品页
 async function toggleCollect() {
  if (!storage.getItem("accessToken") || !storage.getItem("userInfo")) {
    router.push({
      path: "/login",
      query: {
        rePath: route.path,
        query: JSON.stringify(route.query || {}),
      },
    });
    return;
  }
  if (collected.value) {
    const cancel = await cancelStoreCollect("STORE", props.storeId);
    if (cancel.success) {
      collected.value = false;
      Message.success("已取消收藏");
    }
    return;
  }
  const collect = await collectStore("STORE", props.storeId);
  if (collect.code === 200) {
    collected.value = true;
    Message.success("收藏店铺成功，可以前往个人中心我的收藏查看");
  }
 }
 </script>
 <style scoped lang="scss">
 .store-side {
  width: 260px;
  flex-shrink: 0;
  position: sticky;
  top: 16px;
 }
 .store-card,
 .recommend-card {
  background: #fff;
  border: 1px solid #f0f0f0;
  border-radius: 4px;
 }
 .store-card {
  padding: 16px;
 }
 .store-head {
  display: flex;
  flex-direction: column;
  align-items: center;
  gap: 10px;
  cursor: pointer;
 }
 .store-logo {
  width: 64px;
  height: 64px;
  border-radius: 4px;
  object-fit: cover;
  border: 1px solid #f0f0f0;
  flex-shrink: 0;
  background: #fafafa;
 }
 .store-logo-fallback {
  display: flex;
  align-items: center;
  justify-content: center;
  color: #fff;
  background: $theme_color;
  font-size: 18px;
  font-weight: 600;
 }
 .store-head-text {
  width: 100%;
  text-align: center;
 }
 .store-name {
  display: flex;
  align-items: center;
  justify-content: center;
  gap: 6px;
  margin: 0;
  color: #171A26;
  font-size: 15px;
  font-weight: 600;
  line-height: 22px;
 }
 .store-name-text {
  min-width: 0;
 }
 .store-self {
  flex-shrink: 0;
  padding: 0 6px;
  border-radius: 2px;
  background: $theme_color;
  color: #fff;
  font-size: 12px;
  font-weight: 400;
  line-height: 18px;
 }
 .store-scores {
  display: flex;
  margin-top: 14px;
  padding: 10px 0;
  border-top: 1px solid #f5f5f5;
  border-bottom: 1px solid #f5f5f5;
 }
 .score-item {
  flex: 1;
  text-align: center;
 }
 .score-label {
  display: block;
  color: #999;
  font-size: 12px;
  line-height: 18px;
 }
 .score-value {
  display: block;
  margin-top: 2px;
  color: $theme_color;
  font-size: 14px;
  font-weight: 600;
  line-height: 20px;
 }
 .store-actions {
  display: flex;
  gap: 8px;
  margin-top: 14px;
 }
 .store-btn,
 .enter-store {
  border: 1px solid #eee;
  background: #fff;
  color: #171A26;
  font-size: 13px;
  line-height: 32px;
  border-radius: 4px;
  cursor: pointer;
  &:hover {
    color: $theme_color;
    border-color: $theme_color;
  }
 }
 .store-btn {
  flex: 1;
 }
 .store-btn.is-on {
  color: $theme_color;
  border-color: $theme_color;
  background: #fff5f4;
 }
 .enter-store {
  width: 100%;
  margin-top: 8px;
 }
 .recommend-card {
  margin-top: 12px;
  padding: 12px 12px 4px;
 }
 .recommend-title {
  margin: 0 0 8px;
  color: #171A26;
  font-size: 18px;
  font-weight: 600;
  line-height: 26px;
 }
 .recommend-item {
  display: flex;
  flex-direction: column;
  gap: 8px;
  padding: 8px 0 12px;
  cursor: pointer;
  & + & {
    border-top: 1px solid #f5f5f5;
  }
 }
 .recommend-img {
  width: 100%;
  aspect-ratio: 1;
  object-fit: cover;
  border-radius: 4px;
  background: #fafafa;
 }
 .recommend-info {
  min-width: 0;
 }
 .recommend-name {
  margin: 0;
  color: #333;
  font-size: 16px;
  line-height: 24px;
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
 }
 .recommend-meta {
  display: flex;
  align-items: center;
  justify-content: space-between;
  gap: 8px;
  margin-top: 4px;
 }
 .recommend-price {
  margin: 0;
  color: $theme_color;
  font-size: 18px;
  font-weight: 600;
  line-height: 26px;
 }
 .recommend-sales {
  flex-shrink: 0;
  color: #999;
  font-size: 15px;
  line-height: 22px;
 }
 </style>
--- a/buyer/src/components/header/Header.vue
+++ b/buyer/src/components/header/Header.vue
@@ -1,27 +1,35 @@
 <template>
  <div class="box">
-    <div class="nav">
+    <div class="nav width_1200_auto">
-      <ul class="location">
+      <ul class="location flex">
-        <li v-if="$route.path.includes('home')" style="margin-left:10px"><router-link to="/">首页</router-link></li>
+        <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">
+      <ul class="detail flex">
        <li class="first" v-show="!userInfo.username">
          <router-link :to="`/signUp`">
            <span style="border:none">立即注册</span>
          </router-link>
        </li>
        <li v-show="!userInfo.username">
          <router-link :to="`/login?rePath=${$route.path}&query=${JSON.stringify($route.query)}`">
            <span style="border:none">请登录</span>
          </router-link>
        </li>
        <li v-show="!!userInfo.username">
          <div class="username-p">
            <div>
-              <Avatar class="person-icon" :src="userInfo.face" icon="person" size="small" />
+              <el-avatar class="person-icon" :src="userInfo.face" :size="24" />
-              <span class="username">{{ userInfo.nickName? userInfo.nickName : userInfo.username | secrecyMobile }}</span>
+              <span class="username">{{ $filters.secrecyMobile(
                  userInfo.nickName ? userInfo.nickName : userInfo.username ) }}</span>
            </div>
            <transition name='fade'>
              <!-- 下拉菜单通过父级 hover 的 CSS 控制显隐，transition 内无需 v-if/v-show -->
              <!-- eslint-disable-next-line vue/require-toggle-inside-transition -->
              <ul class="drop-items">
                <li @click="goUserCenter('/home')">我的主页</li>
                <li @click="goUserCenter('/home/Coupons')">优惠券</li>
@@ -31,342 +39,513 @@
            </transition>
          </div>
        </li>
-        <li @click="goUserCenter('/home/MyOrder')"><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 hover-color">我的足迹</span></li>
+        <li @click="goUserCenter('/home/MyTracks')"><span class="nav-item">我的足迹</span></li>
-        <li @click="goUserCenter('/home/MsgList')"><span class="nav-item hover-color">我的消息</span></li>
+        <li @click="goUserCenter('/home/MsgList')">
-        <li v-if="$route.name !== 'Cart'" style="position:relative;">
+          <span class="nav-item">
-          <i class="cart-badge" v-show="Number(cartNum)">{{cartNum < 100 ? cartNum : '99'}}</i>
+            我的消息
-          <Dropdown placement="bottom-start">
+            <i v-if="unreadMsg > 0" class="msg-badge">{{ unreadLabel }}</i>
-            <router-link to="/cart" target="_blank">
+          </span>
-              <span @mouseenter="getCartList">
+        </li>
-                <Icon size="18" type="ios-cart-outline"></Icon>
+        <li v-if="$route.name !== 'Cart'" class="cart-nav-item">
-                购物车
+          <el-dropdown
-              </span>
+            class="cart-nav-dropdown"
-            </router-link>
+            placement="bottom-start"
-            <DropdownMenu slot="list">
+            trigger="hover"
-              <div class="shopping-cart-null" style="width:200px" v-show="shoppingCart.length <= 0">
+            @visible-change="handleCartDropdownVisible"
-                <Icon type="ios-cart-outline" class="cart-null-icon"></Icon>
+          >
            <span class="nav-item" @click="goToPay">
              <el-icon :size="18"><ShoppingCart /></el-icon>
              购物车（{{ Number(cartNum) > 99 ? '99+' : cartNum }}）
            </span>
            <template #dropdown>
              <div class="shopping-cart-null" v-show="shoppingCart.length <= 0">
                <el-icon class="cart-null-icon"><ShoppingCart /></el-icon>
                <span>你的购物车没有宝贝哦</span>
                <span>赶快去添加商品吧~</span>
              </div>
              <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" alt="" />
                  </div>
                  <div class="shopping-cart-info">
-                    <div class="shopping-cart-title ">
+                    <p class="goods-title">{{ item.goodsSku.goodsName }}</p>
                      <p class="hover-pointer goods-title ellipsis">{{ item.goodsSku.goodsName }}</p>
                    </div>
                    <div class="shopping-cart-detail">
-                      <p>
+                      <span>数量 {{ item.num }}</span>
-                        数量:
+                      <span class="shopping-price">{{ $filters.unitPrice(item.purchasePrice, '￥') }}</span>
                        <span class="shopping-cart-text">{{ item.num }}</span>
                        价钱:
                        <span class="shopping-cart-text">{{ item.purchasePrice | unitPrice('￥') }}</span>
                      </p>
                    </div>
                  </div>
                </div>
                <div class="go-to-buy">
                  <Button type="error" size="small" @click="goToPay">去结账</Button>
                </div>
              </div>
-            </DropdownMenu>
+            </template>
-          </Dropdown>
+          </el-dropdown>
        </li>
        <li>
          <span class="nav-item" @click="shopEntry">店铺入驻</span>
        </li>
      </ul>
    </div>
  </div>
 </template>
-<script>
+<script setup>
 import { ref, computed } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { Modal } from "@/utils/message";
 import { ShoppingCart } from '@element-plus/icons-vue';
 import storage from '@/plugins/storage.js';
-import { cartGoodsAll } from '@/api/cart.js';
+import {cartGoodsAll} from '@/api/cart.js';
-export default {
+import {logout} from '@/api/account.js';
-  name: 'M-Header',
+import config from '@/config';
-  created () {
+import { refreshUnreadMessage } from '@/utils/unreadMessage';
-    if (storage.getItem('userInfo')) {
+import { useAppStore } from '@/stores/app';
      this.userInfo = JSON.parse(storage.getItem('userInfo'));
    }
  },
-  data () {
+defineOptions({ name: 'M-Header' });
-    return {
+
-      userInfo: {}, // 用户信息
+const route = useRoute();
-      shoppingCart: [] // 购物车
+const router = useRouter();
-    };
+const appStore = useAppStore();
-  },
+
-  computed: {
+const userInfo = ref({}); // 用户信息
-    // 购物车商品数量
+const shoppingCart = ref([]); // 购物车
-    cartNum () {
+const cartLoading = ref(false);
-      return this.$store.state.cartNum;
+const cartLoadedAt = ref(0);
-    }
+const cartCacheTime = ref(5000);
-  },
+
-  methods: {
+// 购物车商品数量
-    goToPay () { // 跳转购物车
+const cartNum = computed(() => appStore.cartNum);
-      let url = this.$router.resolve({
+const unreadMsg = computed(() => appStore.unreadMsg);
-        path: '/cart'
+const unreadLabel = computed(() => {
-      });
+  return unreadMsg.value > 99 ? '99+' : String(unreadMsg.value);
-      window.open(url.href, '_blank');
+});
-    },
+
-    myInfo () { // 跳转会员中心
+if (storage.getItem('userInfo')) {
-      let url = this.$router.resolve({
+  userInfo.value = JSON.parse(storage.getItem('userInfo'));
-        path: '/home'
+  refreshUnreadMessage();
-      });
+}
-      window.open(url.href, '_blank');
+
-    },
+function goToPay() {
-    signOutFun () { // 退出登录
+  if (!userInfo.value.username) {
-      storage.removeItem('accessToken');
+    Modal.confirm({
-      storage.removeItem('refreshToken');
+      title: '温馨提示',
-      storage.removeItem('userInfo');
+      content: '请登录后执行此操作',
-      storage.removeItem('cartNum');
+      okText: '立即登录',
-      this.$store.commit('SET_CARTNUM', 0)
+      cancelText: '取消',
-      this.$router.push('/login');
+      onOk: () => {
-    },
+        router.push({
-    goUserCenter (path) {
+          path: '/login',
-      // 跳转我的订单，我的足迹、收藏等
+          query: {
-      if (this.userInfo.username) {
+            rePath: '/cart',
-        this.$router.push({ path: path });
+            query: JSON.stringify(route.query || {}),
-      } else {
+          },
        this.$Modal.confirm({
          title: '请登录',
          content: '<p>请登录后执行此操作</p>',
          okText: '立即登录',
          cancelText: '继续浏览',
          onOk: () => {
            this.$router.push({
              path: '/login',
              query: {
                rePath: this.$router.history.current.path,
                query: JSON.stringify(this.$router.history.current.query)
              }
            });
          }
        });
-      }
+      },
-    },
+    });
-    shopEntry () {
+    return;
      // 店铺入驻
      if (storage.getItem('accessToken')) {
        let routeUrl = this.$router.resolve({
          path: '/shopEntry',
          query: { id: 1 }
        });
        window.open(routeUrl.href, '_blank');
      } else {
        this.$router.push('login');
      }
    },
    getCartList () {
      // 获取购物车列表
      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);
        });
      }
    }
  }
-};
+  router.push('/cart');
 }
 function myInfo() { // 跳转会员中心
  router.push('/home');
 }
 function signOutFun() { // 退出登录
  logout().then(res => {
    storage.removeItem('accessToken');
    storage.removeItem('refreshToken');
    storage.removeItem('userInfo');
    storage.removeItem('cartNum');
    appStore.setCartNum(0)
    appStore.setUnreadMsg(0)
    router.push('/login');
  });
 }
 function goUserCenter(path) {
  // 跳转我的订单，我的足迹、收藏等
  if (userInfo.value.username) {
    router.push({path: path});
  } else {
    Modal.confirm({
      title: '请登录',
      content: '请登录后执行此操作',
      okText: '立即登录',
      cancelText: '继续浏览',
      onOk: () => {
        router.push({
          path: '/login',
          query: {
            rePath: route.path,
            query: JSON.stringify(route.query || {}),
          },
        });
      }
    });
  }
 }
 function shopEntry() {
  if (storage.getItem('accessToken')) {
    router.push({
      path: '/shopEntry',
      query: { id: 1 },
    });
    return;
  }
  Modal.confirm({
    title: '温馨提示',
    content: '请登录后执行此操作',
    okText: '立即登录',
    cancelText: '取消',
    onOk: () => {
      router.push({
        path: '/login',
        query: {
          rePath: '/shopEntry',
          query: JSON.stringify({ id: 1 }),
        },
      });
    },
  });
 }
 function handleCartDropdownVisible(visible) {
  if (visible) {
    getCartList();
  }
 }
 function getCartList() {
  // 获取购物车列表
  if (!userInfo.value.username || cartLoading.value) {
    return;
  }
  const now = Date.now();
  if (cartLoadedAt.value && now - cartLoadedAt.value < cartCacheTime.value) {
    return;
  }
  cartLoadedAt.value = now;
  cartLoading.value = true;
  cartGoodsAll().then((res) => {
    if (res.success) {
      shoppingCart.value = (res.result && res.result.skuList) || [];
      appStore.setCartNum(shoppingCart.value.length);
      storage.setItem('cartNum', shoppingCart.value.length);
    }
  }).finally(() => {
    cartLoading.value = false;
  });
 }
 </script>
 <style scoped lang="scss">
 .shopping-cart-detail,
 .shopping-cart-text,
 .shopping-cart-info,
 .nav a,
 .location,
 .first,
 .username,
 .shopping-cart-null span {
 }
 .box {
  width: 100%;
-  font-size: 12px!important;
+  font-size: 12px;
-  // height: 35px;
+  height: 40px;
-  @include background_color($light_white_background_color);
+  background: #f8fafc;
  border-bottom: 1px solid #e2e8f0;
  color: #64748b;
  display: flex;
  align-items: center;
 }
 .nav {
  margin: 0 auto;
  width: 1200px;
  display: flex;
  flex-direction: row;
  align-items: center;
  justify-content: space-between;
  height: 100%;
 }
-.nav ul {
+
 .nav > ul {
  list-style: none;
  margin: 0;
  padding: 0;
  display: flex;
  align-items: center;
 }
-.nav li {
+
-  float: left;
+.nav > ul > li,
-  font-size: 12px;
+.location > ul.flex > li {
-  line-height: 35px;
+  cursor: pointer;
-  margin-right: 10px;
+  float: none;
-  font-weight: bold;
+  line-height: 40px;
  margin-right: 15px;
  display: flex;
  align-items: center;
 }
 .nav a,
 .nav-item {
  font-size: 12px;
  font-weight: normal;
  text-decoration: none;
  padding-left: 14px;
  border-left: 1px solid #ccc;
  color: #999;
  cursor: pointer;
  color: #64748b;
  display: inline-flex;
  align-items: center;
  line-height: 1;
  transition: color 0.15s ease;
  &:hover {
    color: #409EFF;
  }
 }
 .nav-item {
  padding-left: 20px;
  gap: 4px;
 }
 .msg-badge {
  min-width: 16px;
  height: 16px;
  padding: 0 4px;
  border-radius: 8px;
  background: $theme_color;
  color: #fff;
  font-size: 12px;
  font-style: normal;
  line-height: 16px;
  text-align: center;
 }
 .cart-nav-item {
  :deep(.cart-nav-dropdown),
  :deep(.el-dropdown) {
    display: inline-flex;
    align-items: center;
    margin: 0;
    padding: 0;
    vertical-align: middle;
    line-height: 40px;
  }
  :deep(.el-tooltip__trigger),
  :deep(.el-dropdown-selfdefine),
  :deep([aria-expanded="true"]) {
    outline: none !important;
    border: none !important;
    box-shadow: none !important;
  }
 }
 .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;
  justify-content: space-between;
  align-content: space-between;
  width: 200px;
  overflow: hidden;
  font-size: 12px;
  line-height: 20px;
 }
 .go-to-buy {
  display: flex;
  justify-content: flex-end;
 }
 .shopping-cart-null {
-  padding: 15px;
+  width: 320px;
  padding: 28px 16px;
  box-sizing: border-box;
  display: flex;
  flex-direction: column;
  align-items: center;
  justify-content: center;
 }
 .cart-null-icon {
-  font-size: 38px;
+  font-size: 36px;
-  margin-bottom: 15px;
+  margin-bottom: 12px;
  color: #ccc;
 }
 .shopping-cart-null span {
-  font-size: 12px;
+  font-size: 13px;
-  line-height: 16px;
+  line-height: 1.6;
  color: #999;
 }
 .shopping-cart-list {
  width: 320px;
  max-height: 320px;
  overflow-y: auto;
  padding: 4px 0;
  box-sizing: border-box;
  color: #333;
 }
 .shopping-cart-box {
  display: flex;
  align-items: flex-start;
  gap: 12px;
  padding: 12px 16px;
  cursor: pointer;
  &:hover {
    background: #fafafa;
  }
  & + .shopping-cart-box {
    border-top: 1px solid #f2f2f2;
  }
 }
 .shopping-cart-img {
  width: 64px;
  height: 64px;
  flex-shrink: 0;
  border-radius: 6px;
  overflow: hidden;
  background: #f5f5f5;
  img {
    width: 100%;
    height: 100%;
    object-fit: cover;
    display: block;
  }
 }
 .shopping-cart-info {
  flex: 1;
  min-width: 0;
  min-height: 64px;
  display: flex;
  flex-direction: column;
  justify-content: space-between;
 }
 .shopping-cart-info .goods-title {
  margin: 0;
  font-size: 13px;
  line-height: 1.4;
  color: #333;
  display: -webkit-box;
  -webkit-box-orient: vertical;
  -webkit-line-clamp: 2;
  overflow: hidden;
  white-space: normal;
 }
 .shopping-cart-detail {
  display: flex;
  align-items: center;
  justify-content: space-between;
  margin-top: 8px;
  color: #999;
  font-size: 14px;
 }
 .shopping-price {
  color: $theme_color;
  font-size: 14px;
  font-weight: 600;
 }
 .username-p {
  position: relative;
-  div{
+  z-index: 100;
  div {
    cursor: pointer;
-    >span{
+    display: flex;
    align-items: center;
    > span {
      margin-left: 5px;
    }
  }
  .drop-items {
    position: absolute;
    display: none;
-    top: 45px;
+    flex-direction: column;
-    left: 0;
+    top: calc(100% + 10px);
-    right: 0;
+    left: 50%;
-    margin: 0 auto;
+    transform: translateX(-50%);
-    padding: 5px 10px;
+    margin: 0;
-    z-index: 20;
+    padding: 4px 0;
-    height: 150px;
+    z-index: 1000;
    min-width: 100px;
    width: max-content;
    background-color: #fff;
    width: 80px;
    border: 1px solid #eee;
-    box-shadow: 2px 2px 7px #999;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.12);
    list-style: none;
    li {
-      color: rgb(107, 106, 106);
+      display: block;
      float: none;
      width: 100%;
-      border-bottom:1px solid rgb(207, 206, 206);
+      margin: 0;
      padding: 8px 16px;
      line-height: 1.4;
      color: #666;
      font-size: 14px;
      font-weight: normal;
      text-align: center;
-      &:last-child{
+      white-space: nowrap;
-        border: none;
+      border-bottom: 1px solid #f0f0f0;
      box-sizing: border-box;
      &:last-child {
        border-bottom: none;
      }
-      &:hover{
+
      &:hover {
        cursor: pointer;
        color: $theme_color;
        background-color: #fff7f7;
      }
    }
-    &::before{
+    &::before {
      position: absolute;
-      top: -20px;
+      top: -6px;
-      left: 30px;
+      left: 50%;
      transform: translateX(-50%);
      content: '';
      width: 0;
      height: 0;
-      border: 10px solid #999;
+      border: 6px solid transparent;
-      border-color:  transparent transparent #fff transparent ;
+      border-bottom-color: #fff;
    }
-    &::after{
+    &::after {
      content: '';
      position: absolute;
-      width: 80px;
+      width: 100%;
-      height: 20px;
+      height: 10px;
-      top: -20px;
+      top: -10px;
      left: 0;
    }
  }
-  &:hover{
+
-    .drop-items{
+  &:hover {
-      display: block;
+    .drop-items {
      display: flex;
    }
  }
 }
@@ -379,11 +558,13 @@ export default {
  justify-content: center;
  align-items: center;
 }
 .my-page a {
  margin: 0px;
  padding: 0px;
  border: none;
 }
 .my-info {
  padding: 5px;
  width: 50%;
@@ -391,15 +572,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;
+  font-size: 14px;
 }
 .sign-out {
  padding: 5px;
  width: 50%;
@@ -407,18 +592,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;
+  font-size: 14px;
 }
 .goods-title:hover {
  color: $theme_color;
 }
 .cart-badge {
  position: absolute;
  right: -8px;
--- 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,251 @@
 <template>
  <div class="scroll-show">
-    <div class="content clearfix">
+    <div class="content">
-      <cateNav class="cate" :hover="true" :showNavBar="false"></cateNav>
+      <!-- 1. 左侧区域：商城 Logo -->
-      <Search class="search-con" :hover="true" :showLogo="false" :showTag="false"></Search>
+      <div class="left-section">
-      <Icon type="ios-cart-outline" @click="goCartList" class="cart-icon"  @mouseenter.native="getCartList" />
+        <router-link to="/" class="logo-link">
-      <i class="cart-badge">{{cartNum < 100 ? cartNum : '99'}}</i>
+          <img v-if="logoSrc" :src="logoSrc" alt="Logo" class="site-logo" />
          <span v-else class="text-logo">LiliShop</span>
        </router-link>
      </div>
      <!-- 2. 中间搜索区域：与 SearchHeader 样式完全一致（蓝底色、圆角4px、搜索按钮） -->
      <div class="search-main">
        <div class="search-box">
          <input
            v-model="keyword"
            type="text"
            class="search-input"
            :placeholder="placeholderText"
            @keyup.enter="handleSearch"
          />
          <button type="button" class="search-btn" @click="handleSearch">
            <el-icon><Search /></el-icon>
            <span>搜索</span>
          </button>
        </div>
      </div>
      <!-- 3. 右侧“我的购物车”胶囊入口：与 SearchHeader 样式完全一致 -->
      <div class="cart-entry">
        <router-link to="/cart" class="cart-btn" @mouseenter="getCartList">
          <el-icon class="cart-icon"><ShoppingCart /></el-icon>
          <span class="cart-text">{{ options.cartText || '我的购物车' }}</span>
          <span class="cart-count">{{ Number(cartNum) > 99 ? '99+' : cartNum }}</span>
        </router-link>
      </div>
    </div>
  </div>
 </template>
-<script>
+
-import {cartCount} from '@/api/cart.js'
+<script setup>
 import { computed, onMounted, ref, watch } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { cartCount } from '@/api/cart.js';
 import storage from '@/plugins/storage.js';
-export default {
+import { ShoppingCart, Search } from '@element-plus/icons-vue';
-  data () {
+import { useAppStore } from '@/stores/app';
-    return {
+
-      userInfo: {} // 用户信息
+const props = defineProps({
  options: {
    type: Object,
    default: () => ({})
  }
 });
 const router = useRouter();
 const route = useRoute();
 const appStore = useAppStore();
 const keyword = ref(route.query.keyword || '');
 const cartNum = computed(() => appStore.cartNum || 0);
 watch(() => route.query.keyword, (v) => {
  keyword.value = v || '';
 });
 const logoSrc = computed(() => {
  return props.options?.logoUrl || appStore.logoImg || '';
 });
 const placeholderText = computed(() => {
  const ph = props.options?.placeholder;
  if (!ph || ph === '搜索品牌或商品' || ph === '请输入商品名称、品牌或型号') {
    return '请输入商品名称';
  }
  return ph;
 });
 function handleSearch() {
  const kw = (keyword.value || '').trim();
  if (route.path === '/goodsList') {
    const nextQuery = { ...route.query };
    if (kw) {
      nextQuery.keyword = kw;
    } else {
      delete nextQuery.keyword;
    }
-  },
+    router.push({ path: '/goodsList', query: nextQuery });
-  computed: {
+  } else {
-    cartNum () { // 购物车商品数量
+    router.push({ path: '/goodsList', query: kw ? { keyword: kw } : {} });
-      return this.$store.state.cartNum
+  }
 }
 function getCartList() {
  if (storage.getItem('userInfo')) {
    cartCount().then((res) => {
      appStore.setCartNum(res.result);
      storage.setItem('cartNum', res.result);
    });
  }
 }
 onMounted(() => {
  getCartList();
 });
 </script>
 <style lang="scss" scoped>
 .scroll-show {
  height: 60px;
  width: 100%;
  background: #ffffff;
 }
 .content {
  width: 1200px;
  max-width: 100%;
  height: 60px;
  margin: 0 auto;
  display: flex;
  align-items: center;
  justify-content: space-between;
  box-sizing: border-box;
  padding: 0 10px;
 }
 .left-section {
  display: flex;
  align-items: center;
  flex-shrink: 0;
  .logo-link {
    display: flex;
    align-items: center;
    text-decoration: none;
    height: 40px;
    .site-logo {
      max-height: 36px;
      max-width: 160px;
      object-fit: contain;
      display: block;
    }
-  },
+
-  methods: {
+    .text-logo {
-    goCartList () { // 跳转购物车页面
+      font-size: 22px;
-      let routerUrl = this.$router.resolve({
+      font-weight: 800;
-        path: '/cart'
+      color: #409EFF;
-      })
+      letter-spacing: -0.5px;
-      window.open(routerUrl.href, '_blank')
+      line-height: 1;
    },
    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'));
    }
  }
 }
-</script>
+
-<style lang="scss" scoped>
+.search-main {
-  .content{
+  width: 560px;
-    width: 1200px;
+  flex-shrink: 0;
-    height: 40px;
+
-    margin: 10px auto;
+  .search-box {
-    position: relative;
+    display: flex;
-  }
+    border: 2px solid #409EFF;
-  .cate {
+    border-radius: 4px;
    float: left;
    width: 200px!important;
  }
  .search-con{
    float: left;
    width: 800px;
    overflow: hidden;
-    margin-top: -27px;
+    height: 38px;
-  }
+    box-sizing: border-box;
-  .cart-icon {
+    background: #ffffff;
-    width: 30px;
+
-    float: left;
+    .search-input {
-    font-size: 25px;
+      flex: 1;
-    margin-top: 8px;
+      min-width: 0;
-    color: $theme_color;
+      border: none;
-    z-index: 1;
+      padding: 0 14px;
-    position: relative;
+      font-size: 13px;
-    &:hover{
+      color: #334155;
      outline: none;
      background: #ffffff;
      &::placeholder {
        color: #94a3b8;
      }
    }
    .search-btn {
      background: #409EFF;
      color: #ffffff;
      border: none;
      padding: 0 22px;
      display: flex;
      align-items: center;
      gap: 4px;
      font-size: 14px;
      font-weight: 600;
      cursor: pointer;
      transition: background 0.15s;
      flex-shrink: 0;
      &:hover {
        background: #66b1ff;
      }
    }
  }
-  .cart-badge {
+}
-    position: absolute;
+
-    font-style: normal;
+.cart-entry {
-    right: 165px;
+  flex-shrink: 0;
-    display: block;
+
-    background-color: $theme_color;
+  .cart-btn {
-    color: #fff;
+    height: 38px;
-    font-size: 12px;
+    display: flex;
-    width: 17px;
+    align-items: center;
-    height: 17px;
+    gap: 8px;
-    border-radius: 10px;
+    padding: 0 16px;
-    line-height: 17px;
+    border: 1px solid #e2e8f0;
-    text-align: center;
+    border-radius: 4px;
-    z-index: 5;
+    font-size: 13px;
-    top: 3px;
+    color: #334155;
    background: #ffffff;
    text-decoration: none;
    cursor: pointer;
    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.02);
    transition: all 0.15s ease;
    box-sizing: border-box;
    .cart-icon {
      font-size: 16px;
      color: #409EFF;
    }
    .cart-text {
      font-weight: 500;
      white-space: nowrap;
    }
    .cart-count {
      background: #409EFF;
      color: #ffffff;
      font-size: 11px;
      font-weight: 700;
      padding: 0 6px;
      height: 18px;
      line-height: 18px;
      border-radius: 9px;
    }
    &:hover {
      border-color: #409EFF;
      color: #409EFF;
    }
  }
 }
 </style>
--- a/buyer/src/components/indexDecorate/ModelForm.vue
+++ b/buyer/src/components/indexDecorate/ModelForm.vue
@@ -1,31 +1,82 @@
 <template>
-  <div class="model-form">
+  <div class="model-form" :style="pageContainerStyle">
-    <div class="model-content">
+    <!-- Version 2: 新万米行模型渲染 -->
-      <template v-for="(element, index) in data.list">
+    <div v-if="isVersion2" class="v2-rows-container">
-        <model-form-item
+      <row-wrapper
-          v-if="element && element.key"
+        v-for="row in v2Rows"
-          :key="element.key"
+        :key="row.id"
-          :element="element"
+        :row="row"
-          :index="index"
+      />
-          :data="data"
+    </div>
-        ></model-form-item>
+
-      </template>
+    <!-- 旧版降级渲染 -->
    <div v-else class="model-content">
      <model-form-item
        v-for="(element, index) in renderList"
        :key="element.key"
        :element="element"
        :index="index"
        :data="data"
      ></model-form-item>
    </div>
  </div>
 </template>
-<script>
+
 <script setup>
 import { computed } from 'vue';
 import ModelFormItem from './ModelFormItem.vue';
-export default {
+import RowWrapper from './RowWrapper.vue';
-  name: 'modelForm',
+
-  components: {
+defineOptions({ name: 'modelForm' });
-    ModelFormItem
+
-  },
+const props = defineProps(['data']);
-  props: ['data']
+
-};
+// 是否为 v2 行模型数据
 const isVersion2 = computed(() => {
  return (props.data?.version === 2 || props.data?.version === '2.0') && Array.isArray(props.data?.list);
 });
 const v2Rows = computed(() => {
  return props.data?.list || [];
 });
 const pageContainerStyle = computed(() => {
  if (isVersion2.value && props.data?.pageStyle?.backgroundColor) {
    return {
      backgroundColor: props.data.pageStyle.backgroundColor
    };
  }
  return {};
 });
 const renderList = computed(() => {
  const list = props.data?.list || [];
  return list.filter(
    (el) => el && el.key && !isBuiltinModule(el.type)
  );
 });
 function isBuiltinModule(type) {
  return type === 'topAdvert' || type === 'navBar';
 }
 </script>
 <style lang="scss" scoped>
 .model-form {
  position: relative;
  z-index: 0;
  width: 100%;
 }
 .v2-rows-container {
  width: 100%;
  min-height: 400px;
 }
 .model-content {
  width: 100%;
  min-height: 1200px;
  box-sizing: border-box;
  overflow-x: visible;
 }
 </style>
--- a/buyer/src/components/indexDecorate/ModelFormItem.vue
+++ b/buyer/src/components/indexDecorate/ModelFormItem.vue
@@ -2,69 +2,81 @@
  <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>
+      <div class="carousel-wrap mb_20">
        <model-carousel :key="element.key" :data="element"></model-carousel>
      </div>
    </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>
+      <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">
+      <div class="hot-advert mb_20 width_1200_auto">
-        <img
+        <div class="hot-advert-banner">
-          style="display: block"
+          <img
          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"
+            :src="element.options.list[0].img"
-          >
+            @click="linkTo(element.options.list[0].url)"
-            <img :src="item.img" width="230" height="190" alt="" />
+            alt=""
-          </li>
+          />
-        </template>
+        </div>
-      </ul>
+        <ul class="advert-list">
          <template v-for="(item, index) in element.options.list" :key="index">
            <li
              v-if="index !== 0"
              @click="linkTo(item.url)"
              class="hover-pointer"
            >
              <img :src="item.img" alt="" />
            </li>
          </template>
        </ul>
      </div>
    </template>
    <!-- 限时秒杀 待完善 -->
-    <template v-if="element.type == 'seckill' && element.options.list.length">
+    <template v-if="element.type == 'seckill' && element.options?.list?.length">
-      <seckill :data="element"  class="mb_20 width_1200_auto"></seckill>
+      <seckill :data="element" class="mb_20 width_1200_auto"></seckill>
    </template>
    <!-- 折扣广告 -->
    <template v-if="element.type == 'discountAdvert'">
-      <div
+      <div class="discountAdvert-wrap width_1200_auto mb_20">
-        class="discountAdvert"
+        <div
-        :style="{'backgroundImage' :'url(' + require('@/assets/images/decorate.png') + ')'}"
+          class="discountAdvert"
-      >
+          :style="{
-        <img
+            backgroundImage: 'url(' + decorateImg + ')',
-          @click="linkTo(item.url)"
+          }"
-          class="hover-pointer"
+        >
-          v-for="(item, index) in element.options.classification"
+          <div>
-          :key="index"
+            <img
-          :src="item.img"
+              @click="linkTo(item.url)"
-          width="190"
+              class="hover-pointer"
-          height="210"
+              v-for="(item, index) in element.options.classification"
-          alt=""
+              :key="index"
-        />
+              :src="item.img"
-        <img
+              width="190"
-          @click="linkTo(item.url)"
+              height="210"
-          class="hover-pointer"
+              alt=""
-          v-for="(item, index) in element.options.brandList"
+            />
-          :key="'discount' + index"
+          </div>
-          :src="item.img"
+          <div>
-          width="240"
+            <img
-          height="105"
+              @click="linkTo(item.url)"
-          alt=""
+              class="hover-pointer"
-        />
+              v-for="(item, index) in element.options.brandList"
              :key="'discount' + index"
              :src="item.img"
              width="240"
              height="105"
              alt=""
            />
          </div>
        </div>
      </div>
    </template>
@@ -72,76 +84,148 @@
    <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>
+      <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>
+      <first-page-advert
        :data="element"
        class="mb_20 width_1200_auto"
      ></first-page-advert>
    </template>
    <!-- 横幅广告 -->
-    <template v-if="element.type == 'bannerAdvert'">
+    <template v-if="element.type == 'bannerAdvert' && element.options.img">
-      <img
+      <div
-        width="1200"
+        class="horizontal-advert width_1200_auto mb_20 hover-pointer"
        class="hover-pointer mb_20"
        @click="linkTo(element.options.url)"
-        :src="element.options.img"
+      >
-        alt=""
+        <img class="bannerAd" :src="element.options.img" alt="" />
-      />
+      </div>
    </template>
-    <template v-if="element.type == 'notEnough'">
+    <template v-if="element.type == 'notEnough'"
-      <not-enough :data="element" class="mb_20 width_1200_auto"></not-enough>
+        >
      <not-enough
        :data="element"
        class="mb_20 width_1200_auto"
      ></not-enough>
    </template>
  </div>
 </template>
-<script>
+<script setup>
-import ModelCarousel from './modelList/Carousel.vue';
+import { ref } from "vue";
-import ModelCarousel1 from './modelList/Carousel1.vue';
+import ModelCarousel from "./modelList/Carousel.vue";
-import ModelCarousel2 from './modelList/Carousel2.vue';
+import ModelCarousel1 from "./modelList/Carousel1.vue";
-import FirstPageAdvert from './modelList/FirstPageAdvert.vue';
+import ModelCarousel2 from "./modelList/Carousel2.vue";
-import NewGoodsSort from './modelList/NewGoodsSort.vue';
+import FirstPageAdvert from "./modelList/FirstPageAdvert.vue";
-import Recommend from './modelList/Recommend.vue';
+import NewGoodsSort from "./modelList/NewGoodsSort.vue";
-import NotEnough from './modelList/NotEnough.vue';
+import Recommend from "./modelList/Recommend.vue";
-import Seckill from './modelList/Seckill.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";
 import decorateImgUrl from "@/assets/images/decorate.png";
-export default {
+defineOptions({ name: "modelFormItem" });
-  name: 'modelFormItem',
+
-  props: ['element', 'select', 'index', 'data'],
+defineProps(["element", "select", "index", "data"]);
-  components: {
+
-    ModelCarousel,
+const decorateImg = ref(decorateImgUrl);
-    ModelCarousel1,
+const showModal = ref(false); // 控制模态框显隐
-    ModelCarousel2,
+const selected = ref({}); // 已选数据
    Recommend,
    NewGoodsSort,
    FirstPageAdvert,
    NotEnough,
    Seckill
  },
  data () {
    return {
      showModal: false, // 控制模态框显隐
      selected: {} // 已选数据
    };
  }
 };
 </script>
 <style lang="scss" scoped>
 .model-item {
  position: relative;
  margin-bottom: 10px;
  width: 100%;
  box-sizing: border-box;
 }
 .carousel-wrap {
  width: 100%;
  max-width: 1200px;
  margin: 0 auto;
  box-sizing: border-box;
  overflow: hidden;
 }
 /** 横幅广告 */
 .horizontal-advert {
  width: 100%;
  max-width: 1200px;
  overflow: hidden;
  border-radius: 10px;
  line-height: 0;
 }
 .bannerAd {
  display: block;
  width: 100%;
  height: auto;
  max-height: 166px;
  object-fit: cover;
 }
 /** 热门广告 */
-.advert-list {
+.hot-advert {
-  background: $theme_color;
+  width: 1200px;
-  height: 200px;
+  max-width: 100%;
-  display: flex;
+  overflow: hidden;
-  justify-content: space-around;
+
-  padding: 3px 10px;
+  .hot-advert-banner {
-  > li {
+    line-height: 0;
    img {
      display: block;
      width: 100%;
      height: auto;
    }
  }
 }
 .advert-list {
  width: 100%;
  margin: 0;
  padding: 10px;
  list-style: none;
  box-sizing: border-box;
  background: $theme_color;
  height: 210px;
  display: flex;
  gap: 10px;
  align-items: center;
  > li {
    flex: 1 1 0;
    min-width: 0;
    img {
      display: block;
      width: 100%;
      height: 190px;
      cursor: pointer;
      border-radius: 10px;
      transition: all 150ms ease-in-out;
@@ -154,32 +238,45 @@ export default {
 }
 /** 折扣广告 */
 .discountAdvert-wrap {
  width: 1200px;
  position: relative;
  overflow: visible;
 }
 .discountAdvert {
  width: 1300px;
-  height: 566px;
+  height: 585px;
-  margin: 0 auto;
+  margin-left: -100px;
-  margin-bottom: 20px;
+  box-sizing: border-box;
  background-repeat: no-repeat;
  background-size: 1300px 585px;
  background-position: left top;
  position: relative;
-  left: -47px;
+  > div {
-  padding-left: 295px;
+    padding-left: 295px;
-  display: flex;
+    display: flex;
-  flex-wrap: wrap;
+    flex-wrap: wrap;
-  align-items: flex-start;
+    box-sizing: border-box;
-  img {
+    &:nth-child(1) img {
-    margin-top: 10px;
+      margin: 10px 10px 0 0;
-    margin-right: 10px;
+      transition: all 150ms ease-in-out;
-    transition: all 150ms ease-in-out;
+      &:hover {
-    &:hover {
+        box-shadow: 0 5px 12px 0 rgba(0, 0, 0, 0.4);
-      box-shadow: 0 5px 12px 0 rgba(0, 0, 0, 0.4);
+        transform: translateY(-2px);
-      transform: translateY(-2px);
+      }
    }
    &:nth-child(2) {
      margin-top: 10px;
      img {
        margin: 0 10px 0 0;
        transition: all 150ms ease-in-out;
        &:hover {
          box-shadow: 0 5px 12px 0 rgba(0, 0, 0, 0.4);
          transform: translateY(-2px);
        }
      }
    }
  }
 }
 .width_1200_auto{
  width: 1200px;
  margin: 0 auto;
  background-color: #fff;
 }
 </style>
--- a/buyer/src/components/indexDecorate/RowWrapper.vue
+++ b/buyer/src/components/indexDecorate/RowWrapper.vue
@@ -0,0 +1,368 @@
 <template>
  <div class="row-wrapper" :style="rowWrapperStyle">
    <div class="row-inner-flex" :style="rowInnerFlexStyle">
      <div
        v-for="comp in row.components"
        :key="comp.id"
        class="component-cell"
        :style="getComponentCellStyle(comp.componentStyle, row.rowStyle, row.components ? row.components.length : 1)"
      >
        <component
          :is="resolveComponent(comp.type)"
          v-if="resolveComponent(comp.type)"
          :component="comp"
          :options="comp.options || {}"
          :component-style="comp.componentStyle || {}"
          :row-style="row.rowStyle || {}"
        />
        <div v-else class="unknown-component-placeholder">
          未知组件: {{ comp.type }}
        </div>
      </div>
    </div>
  </div>
 </template>
 <script setup>
 import { computed } from 'vue';
 import { resolveComponent } from './registry.js';
 const props = defineProps({
  row: {
    type: Object,
    required: true
  }
 });
 const rowWrapperStyle = computed(() => {
  const s = props.row.rowStyle || {};
  const style = {};
  // 宽度 (width)
  if (s.width !== undefined && s.width !== '') {
    const w = String(s.width).trim();
    if (w && w !== '100%') {
      const num = parseInt(w, 10);
      if (!isNaN(num) && num >= 1920 && !w.endsWith('%')) {
        style.width = '100%';
      } else {
        style.width = /^\d+$/.test(w) ? `${w}px` : w;
        style.maxWidth = '100%';
      }
    } else {
      style.width = '100%';
    }
  } else {
    style.width = '100%';
  }
  // 高度 (height)
  if (s.height !== undefined && s.height !== '') {
    const h = String(s.height).trim();
    if (h && Number(h) > 0) {
      const hVal = /^\d+$/.test(h) ? `${h}px` : h;
      style.height = hVal;
      style.minHeight = hVal;
    }
  }
  // 外边距 (margin)
  const isNarrow = style.width !== '100%';
  if (Array.isArray(s.margin)) {
    style.marginTop = `${s.margin[0] || 0}px`;
    style.marginRight = s.margin[1] ? `${s.margin[1]}px` : (isNarrow ? 'auto' : '0px');
    style.marginBottom = `${s.margin[2] || 0}px`;
    style.marginLeft = s.margin[3] ? `${s.margin[3]}px` : (isNarrow ? 'auto' : '0px');
  } else if (isNarrow) {
    style.marginLeft = 'auto';
    style.marginRight = 'auto';
  }
  // 内边距 (padding)
  if (Array.isArray(s.padding)) {
    style.paddingTop = `${s.padding[0] || 0}px`;
    style.paddingRight = `${s.padding[1] || 0}px`;
    style.paddingBottom = `${s.padding[2] || 0}px`;
    style.paddingLeft = `${s.padding[3] || 0}px`;
  }
  // 圆角 (radius)
  if (Array.isArray(s.radius)) {
    style.borderTopLeftRadius = `${s.radius[0] || 0}px`;
    style.borderTopRightRadius = `${s.radius[1] || 0}px`;
    style.borderBottomRightRadius = `${s.radius[2] || 0}px`;
    style.borderBottomLeftRadius = `${s.radius[3] || 0}px`;
  }
 // 行背景由各组件配置统一管理
  return style;
 });
 const rowInnerFlexStyle = computed(() => {
  const s = props.row.rowStyle || {};
  const styleObj = {
    display: 'flex',
    flexDirection: 'row',
    flexWrap: 'nowrap',
    alignItems: s.alignItems || 'stretch',
    justifyContent: s.justifyContent || 'flex-start',
    width: '100%',
    height: '100%',
    gap: `${s.gap || 0}px`
  };
  if (s.height !== undefined && s.height !== '') {
    const h = String(s.height).trim();
    if (h && Number(h) > 0) {
      const hVal = /^\d+$/.test(h) ? `${h}px` : h;
      styleObj.height = hVal;
      styleObj.minHeight = hVal;
    }
  }
  return styleObj;
 });
 function getComponentCellStyle(style, rowStyle = {}, totalComps = 1) {
  if (!style) return { flex: '1 1 0%' };
  const s = {};
  if (rowStyle?.height !== undefined && rowStyle?.height !== '') {
    const rh = String(rowStyle.height).trim();
    if (rh && Number(rh) > 0) {
      const rhVal = /^\d+$/.test(rh) ? `${rh}px` : rh;
      s.height = rhVal;
      s.minHeight = rhVal;
    }
  }
  const gap = Number(rowStyle?.gap) || 0;
  const totalGap = (totalComps > 1 && gap > 0) ? gap * (totalComps - 1) : 0;
  if (style.widthRatio && style.widthRatio !== 'auto') {
    let w = style.widthRatio;
    if (w === '16.67%' || w === '16.6%' || w === '16.7%') {
      w = totalGap > 0 ? `calc((100% - ${totalGap}px) / 6)` : 'calc(100% / 6)';
    } else if (w === '66.67%' || w === '66.6%' || w === '66.7%') {
      w = totalGap > 0 ? `calc((100% - ${totalGap}px) * 2 / 3)` : 'calc(100% * 2 / 3)';
    } else if (w === '33.33%' || w === '33.3%') {
      w = totalGap > 0 ? `calc((100% - ${totalGap}px) / 3)` : 'calc(100% / 3)';
    } else if (w === '50%') {
      w = totalGap > 0 ? `calc((100% - ${totalGap}px) / 2)` : '50%';
    }
    s.flex = `0 0 ${w}`;
    s.width = w;
    s.maxWidth = w;
    s.minWidth = '0';
  } else {
    s.flex = '1 1 0%';
    s.minWidth = '0';
  }
  if (Array.isArray(style.padding)) {
    s.paddingTop = `${style.padding[0] || 0}px`;
    s.paddingRight = `${style.padding[1] || 0}px`;
    s.paddingBottom = `${style.padding[2] || 0}px`;
    s.paddingLeft = `${style.padding[3] || 0}px`;
  }
  if (Array.isArray(style.radius)) {
    s.borderTopLeftRadius = `${style.radius[0] || 0}px`;
    s.borderTopRightRadius = `${style.radius[1] || 0}px`;
    s.borderBottomRightRadius = `${style.radius[2] || 0}px`;
    s.borderBottomLeftRadius = `${style.radius[3] || 0}px`;
  }
  if (Array.isArray(style.margin)) {
    s.marginTop = `${style.margin[0] || 0}px`;
    s.marginRight = `${style.margin[1] || 0}px`;
    s.marginBottom = `${style.margin[2] || 0}px`;
    s.marginLeft = `${style.margin[3] || 0}px`;
  }
  if (style.backgroundColor && style.backgroundColor !== 'transparent') {
    let bg = style.backgroundColor;
    if (/^rgba\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*0\s*\)$/.test(bg.trim())) {
      bg = bg.trim().replace(/,\s*0\s*\)$/, ', 1)');
    }
    s.backgroundColor = bg;
  }
  if (style.backgroundImage) {
    s.backgroundImage = `url(${style.backgroundImage})`;
    s.backgroundSize = 'cover';
    s.backgroundRepeat = 'no-repeat';
    s.backgroundPosition = 'center';
  }
  return s;
 }
 </script>
 <style lang="scss" scoped>
 .row-wrapper {
  box-sizing: border-box;
  display: flex;
  flex-direction: column;
  .row-inner-flex {
    box-sizing: border-box;
    flex: 1;
    height: 100%;
    min-height: 0;
    .component-cell {
      box-sizing: border-box;
      min-width: 0;
      display: flex;
      flex-direction: column;
      height: 100%;
      > * {
        flex: 1;
        height: 100%;
        width: 100%;
        box-sizing: border-box;
      }
    }
  }
 }
 .unknown-component-placeholder {
  padding: 20px;
  background: #fef2f2;
  border: 1px dashed #f87171;
  color: #dc2626;
  text-align: center;
  font-size: 13px;
  border-radius: 6px;
 }
 </style>
--- a/Show More
+++ b/Show More
`@@ -1 +1 @@`
	`docker build -t registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui-4.2.0:0.0.2 .`	`docker build -t registry.cn-beijing.aliyuncs.com/lili-images/buyer-ui:4.2.4.1 .`
		`@@ -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>`