diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..aca29012
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+/.vscode/
+/.idea/
+/dist/
+node_modules/
+yarn.lock
+package-lock.json
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 88b623fc..00000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index 79ee123c..00000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 03d9549e..00000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/lili-shop-ui.iml b/.idea/lili-shop-ui.iml
deleted file mode 100644
index 24643cc3..00000000
--- a/.idea/lili-shop-ui.iml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 1c24890b..00000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="WebPackConfiguration">
-    <option name="mode" value="DISABLED" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index b3b94630..00000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f..00000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 4702c80f..00000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -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>
\ No newline at end of file
diff --git a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
index 8e27e6c6..862e59e9 100644
--- a/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
+++ b/buyer/src/components/goodsDetail/ShowGoodsDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="height:auto;">
     <div class="item-intro-show">
       <div class="item-intro-detail" ref="itemIntroDetail">
         <div class="item-intro-nav item-tabs">
@@ -71,7 +71,7 @@
             </TabPane>
             <TabPane label="商品参数">
               <template v-if="detail.goodsParamsDTOList && detail.goodsParamsDTOList.length">
-                <div class="goods-params" v-for="item in detail.goodsParamsDTOList" :key="item.groupId">
+                <div class="goods-params" style="height:inherit;" v-for="item in detail.goodsParamsDTOList" :key="item.groupId">
                   <span class="ml_10">{{item.groupName}}</span>
                   <table class="mb_10" cellpadding='0' cellspacing="0" >
                     <tr v-for="param in item.goodsParamsItemDTOList" :key="param.paramId">
@@ -220,6 +220,7 @@ export default {
   width: 1200px;
   margin: 15px auto;
   display: flex;
+  overflow: scroll;
   flex-direction: row;
 
 }
diff --git a/buyer/src/pages/Cart.vue b/buyer/src/pages/Cart.vue
index 321376b2..ff6cfb63 100644
--- a/buyer/src/pages/Cart.vue
+++ b/buyer/src/pages/Cart.vue
@@ -228,7 +228,7 @@ export default {
     return {
       couponAvailable: false, // 展示优惠券
       stepIndex: 0, // 当前处于哪一步，购物车==0，填写订单信息==1，成功提交订单==2
-      goodsTotal: 1, // 商品数量
+      goodsTotal: 0, // 商品数量
       checkedNum: 0, // 选中数量
       allChecked: false, // 全选
       loading: false, // 加载状态
@@ -278,7 +278,7 @@ export default {
         const list = this.cartList;
         list.forEach((shop) => {
           shop.skuList.forEach((goods) => {
-            if(goods.checked) {
+            if (goods.checked) {
               idArr.push(goods.goodsSku.id);
             }
           });
diff --git a/buyer/src/pages/GoodsList.vue b/buyer/src/pages/GoodsList.vue
index 90106cb7..6343afcf 100644
--- a/buyer/src/pages/GoodsList.vue
+++ b/buyer/src/pages/GoodsList.vue
@@ -150,6 +150,12 @@ export default {
     $route() {
       const keyword = this.$route.query.keyword;
       this.handleSearch(keyword);
+      if (this.$route.query.categoryId) {
+        let cateId = this.$route.query.categoryId.split(",");
+        Object.assign(this.params, this.$route.query);
+        this.params.categoryId = cateId[cateId.length - 1];
+        this.getGoodsList();
+      }
     },
   },
   methods: {
diff --git a/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue b/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue
index ba9364b4..c898f1b3 100644
--- a/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue
+++ b/buyer/src/pages/home/memberCenter/evaluation/EvalDetail.vue
@@ -3,8 +3,9 @@
     <div class="title">
       <card _Title="评价详情" :_Size="16"></card>
       <p>
-        <span class="color999">创建人：</span><span>{{orderGoods.createBy | secrecyMobile}}</span>
-        <span class="color999 ml_20">{{orderGoods.createTime}}</span>
+        <span class="color999">创建人：</span
+        ><span>{{ orderGoods.createBy | secrecyMobile }}</span>
+        <span class="color999 ml_20">{{ orderGoods.createTime }}</span>
       </p>
     </div>
     <!-- 物流评分、服务评分 -->
@@ -13,31 +14,64 @@
       <div class="color999">
         <span>物流评价：<Rate disabled :value="Number(orderGoods.deliveryScore)" /></span>
         <span>服务评价：<Rate disabled :value="Number(orderGoods.serviceScore)" /></span>
-        <span>服务评价：<Rate disabled :value="Number(orderGoods.descriptionScore)" /></span>
+        <span
+          >服务评价：<Rate disabled :value="Number(orderGoods.descriptionScore)"
+        /></span>
       </div>
     </div>
     <!-- 添加订单评价  左侧商品详情  右侧评价框 -->
     <ul class="goods-eval">
-      <li >
+      <li>
         <div class="goods-con">
-          <img :src="orderGoods.goodsImage" class="hover-pointer" alt="" width="100" @click="goGoodsDetail(orderGoods.skuId, orderGoods.goodsId)">
-          <p class="hover-pointer color999" @click="goGoodsDetail(orderGoods.skuId, orderGoods.goodsId)">{{orderGoods.goodsName}}</p>
+          <img
+            :src="orderGoods.goodsImage"
+            class="hover-pointer"
+            alt=""
+            width="100"
+            @click="goGoodsDetail(orderGoods.skuId, orderGoods.goodsId)"
+          />
+          <p
+            class="hover-pointer color999"
+            @click="goGoodsDetail(orderGoods.skuId, orderGoods.goodsId)"
+          >
+            {{ orderGoods.goodsName }}
+          </p>
         </div>
 
         <div class="eval-con">
           <div>
             <span class="color999">商品评价：</span>
-            <RadioGroup style="margin-bottom:5px;color:#999" v-model="orderGoods.grade" type="button" button-style="solid">
+            <RadioGroup
+              style="margin-bottom: 5px; color: #999"
+              v-model="orderGoods.grade"
+              type="button"
+              button-style="solid"
+            >
               <Radio label="GOOD" disabled>好评</Radio>
               <Radio label="MODERATE" disabled>中评</Radio>
               <Radio label="WORSE" disabled>差评</Radio>
             </RadioGroup>
-            <Input type="textarea" maxlength="500" readonly show-word-limit :rows="4" v-model="orderGoods.content" />
+            <Input
+              type="textarea"
+              maxlength="500"
+              readonly
+              show-word-limit
+              :rows="4"
+              v-model="orderGoods.content"
+            />
           </div>
-          <div style="display:flex;align-items:center;">
+          <div>
+            <span class="color999">商家回复：</span>
+            <span>{{ orderGoods.reply }}</span>
+          </div>
+          <div style="display: flex; align-items: center">
             <template v-if="orderGoods.images">
-              <div class="demo-upload-list"  v-for="(img, index) in orderGoods.images.split(',')" :key="index">
-                <img :src="img">
+              <div
+                class="demo-upload-list"
+                v-for="(img, index) in orderGoods.images.split(',')"
+                :key="index"
+              >
+                <img :src="img" />
                 <div class="demo-upload-list-cover">
                   <Icon type="ios-eye-outline" @click.native="handleView(img)"></Icon>
                 </div>
@@ -48,44 +82,47 @@
       </li>
     </ul>
     <Modal title="View Image" v-model="visible">
-        <img :src="previewImage" v-if="visible" style="width: 100%">
+      <img :src="previewImage" v-if="visible" style="width: 100%" />
     </Modal>
   </div>
 </template>
 <script>
-import { evaluationDetail } from '@/api/member.js';
+import { evaluationDetail } from "@/api/member.js";
 export default {
-  data () {
+  data() {
     return {
       order: {}, // 订单详情
       orderGoods: {}, // 订单商品
       visible: false, // 图片预览
-      previewImage: '', // 预览图片链接
-      loading: false // 加载状态
-    }
+      previewImage: "", // 预览图片链接
+      loading: false, // 加载状态
+    };
   },
   methods: {
-    getDetail () { // 获取评价详情
-      evaluationDetail(this.$route.query.id).then(res => {
-        if (res.success) this.orderGoods = res.result
-      })
+    getDetail() {
+      // 获取评价详情
+      evaluationDetail(this.$route.query.id).then((res) => {
+        if (res.success) this.orderGoods = res.result;
+      });
     },
-    goGoodsDetail (skuId, goodsId) { // 跳转商品详情
+    goGoodsDetail(skuId, goodsId) {
+      // 跳转商品详情
       let routerUrl = this.$router.resolve({
-        path: '/goodsDetail',
-        query: {skuId, goodsId}
-      })
-      window.open(routerUrl.href, '_blank')
+        path: "/goodsDetail",
+        query: { skuId, goodsId },
+      });
+      window.open(routerUrl.href, "_blank");
     },
-    handleView (name) { // 预览图片
+    handleView(name) {
+      // 预览图片
       this.previewImage = name;
       this.visible = true;
-    }
+    },
   },
-  mounted () {
-    this.getDetail()
-  }
-}
+  mounted() {
+    this.getDetail();
+  },
+};
 </script>
 <style lang="scss" scoped>
 .delivery-rate {
@@ -94,12 +131,12 @@ export default {
   margin-top: 20px;
   height: 50px;
   border-bottom: 1px solid #eee;
-  >div:nth-child(1) {
+  > div:nth-child(1) {
     width: 120px;
     font-weight: bold;
   }
 }
-.goods-eval li{
+.goods-eval li {
   display: flex;
   border-bottom: 1px solid #eee;
 
@@ -109,7 +146,9 @@ export default {
     text-align: center;
     p {
       word-wrap: wrap;
-      &:hover{ color: $theme_color; }
+      &:hover {
+        color: $theme_color;
+      }
     }
   }
   .eval-con {
@@ -118,7 +157,7 @@ export default {
   }
 }
 
-.demo-upload-list{
+.demo-upload-list {
   display: inline-block;
   width: 60px;
   height: 60px;
@@ -129,27 +168,27 @@ export default {
   overflow: hidden;
   background: #fff;
   position: relative;
-  box-shadow: 0 1px 1px rgba(0,0,0,.2);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
   margin-right: 4px;
   margin-top: 10px;
 }
-.demo-upload-list img{
+.demo-upload-list img {
   width: 100%;
   height: 100%;
 }
-.demo-upload-list-cover{
+.demo-upload-list-cover {
   display: none;
   position: absolute;
   top: 0;
   bottom: 0;
   left: 0;
   right: 0;
-  background: rgba(0,0,0,.6);
+  background: rgba(0, 0, 0, 0.6);
 }
-.demo-upload-list:hover .demo-upload-list-cover{
+.demo-upload-list:hover .demo-upload-list-cover {
   display: block;
 }
-.demo-upload-list-cover i{
+.demo-upload-list-cover i {
   color: #fff;
   font-size: 20px;
   cursor: pointer;
@@ -157,14 +196,14 @@ export default {
 }
 .icon-upload {
   width: 58px;
-  height:58px;
+  height: 58px;
   line-height: 58px;
-  text-align:center;
+  text-align: center;
   display: inline-block;
-  border:1px dashed #999;
+  border: 1px dashed #999;
   border-radius: 4px;
   margin-top: 10px;
-  &:hover{
+  &:hover {
     cursor: pointer;
     border-color: $theme_color;
   }
diff --git a/buyer/src/pages/home/orderCenter/OrderDetail.vue b/buyer/src/pages/home/orderCenter/OrderDetail.vue
index f765c389..8eee5ab7 100644
--- a/buyer/src/pages/home/orderCenter/OrderDetail.vue
+++ b/buyer/src/pages/home/orderCenter/OrderDetail.vue
@@ -47,12 +47,12 @@
           </div>
       </div>
     </div>
-    <div class="order-card">
+    <div class="order-card" v-if="order.order.payStatus === 'PAID'">
       <h3>发票信息</h3>
-      <template v-if="order.order.receipt">
-        <p>发票抬头：{{order.order.receiptVO.receiptTitle}}</p>
-        <p>发票内容：{{order.order.receiptVO.receiptContent}}</p>
-        <p v-if="order.order.receiptVO.taxpayerId">纳税人识别号：{{order.order.receiptVO.taxpayerId}}</p>
+      <template v-if="order.order.needReceipt">
+        <p>发票抬头：{{order.receipt.receiptTitle}}</p>
+        <p>发票内容：{{order.receipt.receiptContent}}</p>
+        <p v-if="order.receipt.taxpayerId">纳税人识别号：{{order.receipt.taxpayerId}}</p>
       </template>
       <div v-else style="color:#999;margin-left:5px">
         未开发票
diff --git a/buyer/src/pages/home/userCenter/MyTracks.vue b/buyer/src/pages/home/userCenter/MyTracks.vue
index 5f3d6e0b..b3cbb97c 100644
--- a/buyer/src/pages/home/userCenter/MyTracks.vue
+++ b/buyer/src/pages/home/userCenter/MyTracks.vue
@@ -1,15 +1,19 @@
 <template>
   <div class="wrapper">
     <!-- 卡片组件 -->
-    <card _Title="我的足迹" :_Size="16" ></card>
+    <card _Title="我的足迹" :_Size="16"></card>
     <Button class="del-btn" @click="clearAll" type="primary">删除全部</Button>
     <!-- 订单列表 -->
     <empty v-if="list.length === 0" />
     <ul class="track-list" v-else>
-      <li v-for="(item, index) in list" :key="index" @click="goodsDetail(item.id, item.goodsId)">
-        <img :src="item.thumbnail" :alt="item.thumbnail" width="200" height="200">
-        <p class="ellipsis">{{item.goodsName}}</p>
-        <p>{{item.price | unitPrice('￥')}}</p>
+      <li
+        v-for="(item, index) in list"
+        :key="index"
+        @click="goodsDetail(item.id, item.goodsId)"
+      >
+        <img :src="item.thumbnail" :alt="item.thumbnail" width="200" height="200" />
+        <p class="ellipsis">{{ item.goodsName }}</p>
+        <p>{{ item.price | unitPrice("￥") }}</p>
         <span class="del-icon" @click.stop="clearById(item.goodsId)">
           <Icon type="md-trash" />
         </span>
@@ -17,96 +21,104 @@
     </ul>
     <!-- 分页 -->
     <div class="page-size">
-      <Page :total="total" @on-change="changePageNum"
+      <Page
+        :total="total"
+        @on-change="changePageNum"
         @on-page-size-change="changePageSize"
         :page-size="params.pageSize"
-        show-sizer>
+        show-sizer
+      >
       </Page>
     </div>
   </div>
 </template>
 
 <script>
-import { tracksList, clearTracks, clearTracksById } from '@/api/member';
+import { tracksList, clearTracks, clearTracksById } from "@/api/member";
 export default {
-  name: 'MyTrack',
-  data () {
+  name: "MyTrack",
+  data() {
     return {
       list: [], // 我的足迹，商品列表
       spinShow: false, // 控制loading是否加载
       params: {
         pageNumber: 1,
         pageSize: 30,
-        order: 'desc',
-        sort: 'createTime'
+        order: "desc",
+        sort: "updateTime",
       },
-      total: 0
+      total: 0,
     };
   },
-  mounted () {
+  mounted() {
     this.getList();
   },
   methods: {
-    goodsDetail (skuId, goodsId) {
+    goodsDetail(skuId, goodsId) {
       // 跳转商品详情
       let routeUrl = this.$router.resolve({
-        path: '/goodsDetail',
-        query: { skuId, goodsId }
+        path: "/goodsDetail",
+        query: { skuId, goodsId },
       });
-      window.open(routeUrl.href, '_blank');
+      window.open(routeUrl.href, "_blank");
     },
     // 跳转店铺首页
-    shopPage (id) {
+    shopPage(id) {
       let routeUrl = this.$router.resolve({
-        path: '/Merchant',
-        query: { id: id }
+        path: "/Merchant",
+        query: { id: id },
       });
-      window.open(routeUrl.href, '_blank');
+      window.open(routeUrl.href, "_blank");
     },
-    clearAll () { // 清除全部足迹
+    clearAll() {
+      // 清除全部足迹
       this.$Modal.confirm({
-        title: '删除',
-        content: '<p>确定要删除全部足迹吗？</p>',
+        title: "删除",
+        content: "<p>确定要删除全部足迹吗？</p>",
         onOk: () => {
-          clearTracks().then(res => {
+          clearTracks().then((res) => {
             if (res.success) {
-              this.$Message.success('删除成功')
-              this.getList()
+              this.$Message.success("删除成功");
+              this.getList();
             }
-          })
+          });
         },
-        onCancel: () => { }
+        onCancel: () => {},
       });
     },
-    clearById (id) { // 清除全部足迹
-      clearTracksById(id).then(res => {
+    clearById(id) {
+      // 清除全部足迹
+      clearTracksById(id).then((res) => {
         if (res.success) {
-          this.$Message.success('删除成功')
-          this.getList()
+          this.$Message.success("删除成功");
+          this.getList();
         }
-      })
+      });
     },
-    changePageNum (val) { // 修改页码
+    changePageNum(val) {
+      // 修改页码
       this.params.pageNumber = val;
-      this.getList()
+      this.getList();
     },
-    changePageSize (val) { // 修改页数
+    changePageSize(val) {
+      // 修改页数
       this.params.pageNumber = 1;
       this.params.pageSize = val;
-      this.getList()
+      this.getList();
     },
-    getList () { // 获取足迹列表
+    getList() {
+      // 获取足迹列表
       this.spinShow = true;
-      tracksList(this.params).then(res => {
-        this.spinShow = false
+      tracksList(this.params).then((res) => {
+        this.spinShow = false;
         if (res.success && res.result) {
           this.list = res.result;
         } else {
-          this.list = []
+          this.list = [];
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped lang="scss">
@@ -120,34 +132,34 @@ export default {
 .track-list {
   display: flex;
   flex-wrap: wrap;
-  li{
+  li {
     width: 200px;
     overflow: hidden;
     margin-left: 15px;
     margin-bottom: 10px;
     border: 1px solid #eee;
     position: relative;
-    &:hover{
+    &:hover {
       cursor: pointer;
-      box-shadow:1px 1px 3px #999;
-      .del-icon{
+      box-shadow: 1px 1px 3px #999;
+      .del-icon {
         display: block;
       }
     }
-    p{
+    p {
       padding: 0 5px;
       margin: 3px 0;
     }
     p:nth-child(2) {
       color: #999;
     }
-    p:nth-child(3){
+    p:nth-child(3) {
       color: $theme_color;
     }
     .del-icon {
       display: none;
       font-size: 30px;
-      background-color:rgba(0,0,0,.3);
+      background-color: rgba(0, 0, 0, 0.3);
       position: absolute;
       width: 40px;
       height: 40px;
diff --git a/manager/src/views/lili-floor-renovation/floorList.vue b/manager/src/views/lili-floor-renovation/floorList.vue
index c65b84cd..39e4cd5a 100644
--- a/manager/src/views/lili-floor-renovation/floorList.vue
+++ b/manager/src/views/lili-floor-renovation/floorList.vue
@@ -82,7 +82,9 @@ export default {
         pageNumber:1,
         pageSize:10,
         sort: 'createTime',
-        order: 'desc'
+        order: 'desc',
+        pageType:"INDEX",
+        pageClientType:"PC",
       },
       columns: [
         // 列表展示的column
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index 303a7b9d..758c6ce8 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -51,6 +51,9 @@
     <!-- 修改模态框 -->
     <Modal v-model="descFlag" :title="descTitle" @on-ok="handleSubmitModal" width="500">
       <Form ref="form" :model="form" :rules="ruleValidate" :label-width="80">
+
+        <Input v-model="form.id" v-show="false"/>
+
         <FormItem label="头像">
           <img :src="form.face" class="face" />
           <Button type="text" class="upload" @click="() => {
@@ -462,7 +465,7 @@ export default {
 
     // 提交修改数据
     handleSubmitModal() {
-      const { nickName, sex, username, face, newPassword } = this.form;
+      const { nickName, sex, username, face, newPassword,id } = this.form;
       let time = new Date(this.form.birthday);
       let birthday =
         time.getFullYear() + "-" + (time.getMonth() + 1) + "-" + time.getDate();
@@ -474,6 +477,7 @@ export default {
         sex,
         birthday,
         face,
+        id
       };
       if (this.region != "undefined") {
         submit.regionId = this.regionId;